Bump projet dependencies to Aluminium

- odlparent => 7.0.5
- mdsal => 6.0.4
- netconf => 1.9.0-SNAPSHOT
- restconf => 1.12.0-SNAPSHOT
- controller => 2.0.3
- lighty.io => 13.0.0 (not yet available on maven central)
  maybe 13.0.0-SNAPSHOT would be more indicated at that stage
  but it is not referenced
  the other option would be to build lighty-core master as before

https://docs.opendaylight.org/projects/integration-distribution/en/latest/platform-versions.html
https://docs.opendaylight.org/en/latest/release-notes/upgrade-process.html?highlight=upgrade#version-bump

JIRA: TRNSPRTPCE-292 TRNSPRTPCE-296 TRNSPRTPCE-294
Signed-off-by: Gilles Thouenon <gilles.thouenon@orange.com>
Co-authored-by: manuedelf <emmanuelle.delfour@orange.com>
Co-authored-by: guillaume.lambert <guillaume.lambert@orange.com>
Change-Id: Ibe488f1822f39ece3c054c4dab9ceac253a2b555

diff --git a/api/pom.xml b/api/pom.xml
index 0111724f00ae315ba41f857b7e8c3f7a2dade871..340cb30364d4304fefeec14c3d9c63851323a8dc 100644 (file)
--- a/api/pom.xml
+++ b/api/pom.xml
@@ -12,7 +12,7 @@ and is available at http://www.eclipse.org/legal/epl-v10.html
   <parent>
     <groupId>org.opendaylight.mdsal</groupId>
     <artifactId>binding-parent</artifactId>
-    <version>5.0.14</version>
+    <version>6.0.4</version>
     <relativePath/>
   </parent>
 

diff --git a/common/pom.xml b/common/pom.xml
index b52e7a824574adf6861a5e782ec13970a5fff9bf..227a51ca759610eafd4f2dddc018d0741841babd 100644 (file)
--- a/common/pom.xml
+++ b/common/pom.xml
@@ -10,7 +10,7 @@
     <parent>
         <groupId>org.opendaylight.mdsal</groupId>
         <artifactId>binding-parent</artifactId>
-        <version>5.0.14</version>
+        <version>6.0.4</version>
         <relativePath />
     </parent>
 
@@ -24,14 +24,14 @@
             <dependency>
                 <groupId>org.opendaylight.netconf</groupId>
                 <artifactId>netconf-artifacts</artifactId>
-                <version>1.8.3-SNAPSHOT</version>
+                <version>1.9.0-SNAPSHOT</version>
                 <scope>import</scope>
                 <type>pom</type>
             </dependency>
             <dependency>
                 <groupId>org.opendaylight.mdsal</groupId>
                 <artifactId>mdsal-artifacts</artifactId>
-                <version>5.0.14</version>
+                <version>6.0.4</version>
                 <scope>import</scope>
                 <type>pom</type>
             </dependency>
@@ -57,7 +57,15 @@
             <groupId>org.opendaylight.mdsal</groupId>
             <artifactId>mdsal-binding-dom-adapter</artifactId>
         </dependency>
-
+        <!-- Aluminium bump: undocumented new dependencies -->
+        <dependency>
+            <groupId>org.opendaylight.mdsal</groupId>
+            <artifactId>mdsal-dom-broker</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.opendaylight.mdsal</groupId>
+            <artifactId>mdsal-dom-inmemory-datastore</artifactId>
+        </dependency>
         <!-- Sodium bump: javax.annotation.Nullable and friends -->
         <dependency>
             <groupId>com.google.code.findbugs</groupId>

diff --git a/features/odl-transportpce-inventory/pom.xml b/features/odl-transportpce-inventory/pom.xml
index 2f022ef4b104e88f4346b1daeb6b9c2dc47bb05f..40546eee20950836b71530c9318bff5eb3439032 100644 (file)
--- a/features/odl-transportpce-inventory/pom.xml
+++ b/features/odl-transportpce-inventory/pom.xml
@@ -9,7 +9,7 @@
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>single-feature-parent</artifactId>
-        <version>6.0.11</version>
+        <version>7.0.5</version>
         <relativePath/>
     </parent>
 

diff --git a/features/odl-transportpce-tapi/pom.xml b/features/odl-transportpce-tapi/pom.xml
index ec1914622b0d247075bba766796cbc25f4b89783..4d7763c828cab1ffc3d092bd03dce29cc5d5a6dd 100644 (file)
--- a/features/odl-transportpce-tapi/pom.xml
+++ b/features/odl-transportpce-tapi/pom.xml
@@ -12,7 +12,7 @@ and is available at http://www.eclipse.org/legal/epl-v10.html INTERNAL
   <parent>
     <groupId>org.opendaylight.odlparent</groupId>
     <artifactId>single-feature-parent</artifactId>
-    <version>6.0.11</version>
+    <version>7.0.5</version>
     <relativePath/>
   </parent>
 

diff --git a/features/odl-transportpce/pom.xml b/features/odl-transportpce/pom.xml
index 21426fc3a0aec35bac5b67f83e5c8c21ebbd4840..7c594cc19d4fb2ec612457e2288bcfc289036040 100644 (file)
--- a/features/odl-transportpce/pom.xml
+++ b/features/odl-transportpce/pom.xml
@@ -12,7 +12,7 @@ and is available at http://www.eclipse.org/legal/epl-v10.html INTERNAL
   <parent>
     <groupId>org.opendaylight.odlparent</groupId>
     <artifactId>single-feature-parent</artifactId>
-    <version>6.0.11</version>
+    <version>7.0.5</version>
     <relativePath/>
   </parent>
 
@@ -24,9 +24,9 @@ and is available at http://www.eclipse.org/legal/epl-v10.html INTERNAL
   <name>OpenDaylight :: transportpce</name>
 
   <properties>
-    <mdsal.version>1.11.3-SNAPSHOT</mdsal.version>
-    <netconf.version>1.8.3-SNAPSHOT</netconf.version>
-    <restconf.version>1.11.3-SNAPSHOT</restconf.version>
+    <controller.version>2.0.3</controller.version>
+    <netconf.version>1.9.0-SNAPSHOT</netconf.version>
+    <restconf.version>1.12.0-SNAPSHOT</restconf.version>
     <configfile.directory>etc/opendaylight/karaf</configfile.directory>
   </properties>
 
@@ -90,7 +90,7 @@ and is available at http://www.eclipse.org/legal/epl-v10.html INTERNAL
     <dependency>
       <groupId>org.opendaylight.controller</groupId>
       <artifactId>odl-mdsal-broker</artifactId>
-      <version>${mdsal.version}</version>
+      <version>${controller.version}</version>
       <classifier>features</classifier>
       <type>xml</type>
     </dependency>

diff --git a/features/pom.xml b/features/pom.xml
index 38414c36fdd1caf630ff7c40874739497448aa00..dfc48804bae6ad0354ddf407373d2bc2653a9b55 100644 (file)
--- a/features/pom.xml
+++ b/features/pom.xml
@@ -12,7 +12,7 @@ and is available at http://www.eclipse.org/legal/epl-v10.html INTERNAL
   <parent>
     <groupId>org.opendaylight.odlparent</groupId>
     <artifactId>odlparent-lite</artifactId>
-    <version>6.0.11</version>
+    <version>7.0.5</version>
     <relativePath/>
   </parent>
 

diff --git a/inventory/pom.xml b/inventory/pom.xml
index 8d95239f1a8955196c9a77bb610f54a7979e2d58..52e8ab9f73285a088c53b8f56f35a4bf28d11f40 100644 (file)
--- a/inventory/pom.xml
+++ b/inventory/pom.xml
@@ -10,7 +10,7 @@
     <parent>
         <groupId>org.opendaylight.mdsal</groupId>
         <artifactId>binding-parent</artifactId>
-        <version>5.0.14</version>
+        <version>6.0.4</version>
         <relativePath />
     </parent>
 

diff --git a/karaf/pom.xml b/karaf/pom.xml
index f26e645f572ab51f75ff880f9abb0a0fb7f6c8b2..67d7a565cb44a5d222aeb8c6db8ba5886f661974 100644 (file)
--- a/karaf/pom.xml
+++ b/karaf/pom.xml
@@ -12,7 +12,7 @@ and is available at http://www.eclipse.org/legal/epl-v10.html INTERNAL
   <parent>
     <groupId>org.opendaylight.odlparent</groupId>
     <artifactId>karaf4-parent</artifactId>
-    <version>6.0.11</version>
+    <version>7.0.5</version>
     <relativePath/>
   </parent>
 

diff --git a/lighty/pom.xml b/lighty/pom.xml
index 898e445fb2ff289357287ca04e7b1193b5e6b5d3..6e753fe2dfd5440ab0b561c68fbcd1e7277d7996 100644 (file)
--- a/lighty/pom.xml
+++ b/lighty/pom.xml
@@ -11,7 +11,12 @@
     <parent>
         <groupId>io.lighty.core</groupId>
         <artifactId>lighty-app-parent</artifactId>
-        <version>12.1.0</version>
+        <version>13.0.0</version>
+        <!--
+        13.0.0 correspond to the master branch version on the official repo
+        that is advised for Aluminium.
+        At that date 08/2020, it seems not yet published on Nexus
+        -->
         <relativePath />
     </parent>
 

diff --git a/networkmodel/pom.xml b/networkmodel/pom.xml
index c801e7572748edd4aa8e00d431681e09b72fefcb..9e9091ef31e2b2881107153df55dec2c49cba56e 100644 (file)
--- a/networkmodel/pom.xml
+++ b/networkmodel/pom.xml
@@ -13,7 +13,7 @@ and is available at http://www.eclipse.org/legal/epl-v10.html
   <parent>
     <groupId>org.opendaylight.odlparent</groupId>
     <artifactId>bundle-parent</artifactId>
-    <version>6.0.11</version>
+    <version>7.0.5</version>
     <relativePath/>
   </parent>
 
@@ -27,7 +27,7 @@ and is available at http://www.eclipse.org/legal/epl-v10.html
       <dependency>
         <groupId>org.opendaylight.mdsal</groupId>
         <artifactId>mdsal-artifacts</artifactId>
-        <version>5.0.14</version>
+        <version>6.0.4</version>
         <scope>import</scope>
         <type>pom</type>
       </dependency>

diff --git a/olm/pom.xml b/olm/pom.xml
index 555b09eae75da5888539fe6870324c1161b878c2..ed80430c8b3eb1cd2cb274f07d19bd08851f0296 100644 (file)
--- a/olm/pom.xml
+++ b/olm/pom.xml
@@ -13,7 +13,7 @@ and is available at http://www.eclipse.org/legal/epl-v10.html
   <parent>
     <groupId>org.opendaylight.mdsal</groupId>
     <artifactId>binding-parent</artifactId>
-    <version>5.0.14</version>
+    <version>6.0.4</version>
     <relativePath/>
   </parent>
 

diff --git a/ordmodels/common/pom.xml b/ordmodels/common/pom.xml
index 3e479f163c4a2abad259ebc2e73712c937f0e793..5b59c29054a7f8e22460ac9e33b50da42b703e05 100644 (file)
--- a/ordmodels/common/pom.xml
+++ b/ordmodels/common/pom.xml
@@ -12,7 +12,7 @@ and is available at http://www.eclipse.org/legal/epl-v10.html
   <parent>
     <groupId>org.opendaylight.mdsal</groupId>
     <artifactId>binding-parent</artifactId>
-    <version>5.0.14</version>
+    <version>6.0.4</version>
     <relativePath/>
   </parent>
 

diff --git a/ordmodels/device/pom.xml b/ordmodels/device/pom.xml
index 69fa2d74c2722db334c97c20501234dde4490ac1..bb2780e5d40e56d757070aaee126d493221de4f7 100644 (file)
--- a/ordmodels/device/pom.xml
+++ b/ordmodels/device/pom.xml
@@ -12,7 +12,7 @@ and is available at http://www.eclipse.org/legal/epl-v10.html
   <parent>
     <groupId>org.opendaylight.mdsal</groupId>
     <artifactId>binding-parent</artifactId>
-    <version>5.0.14</version>
+    <version>6.0.4</version>
     <relativePath/>
   </parent>
 
@@ -26,7 +26,7 @@ and is available at http://www.eclipse.org/legal/epl-v10.html
       <dependency>
         <groupId>org.opendaylight.netconf</groupId>
         <artifactId>netconf-artifacts</artifactId>
-        <version>1.8.3-SNAPSHOT</version>
+        <version>1.9.0-SNAPSHOT</version>
         <scope>import</scope>
         <type>pom</type>
       </dependency>
@@ -49,7 +49,7 @@ and is available at http://www.eclipse.org/legal/epl-v10.html
     <dependency>
       <groupId>org.opendaylight.mdsal.model</groupId>
       <artifactId>iana-afn-safi</artifactId>
-      <!--version>2013.07.04.17.9</version-->
+      <version>2013.07.04.17.9</version>
     </dependency>
     <dependency>
       <groupId>org.opendaylight.mdsal.binding.model.ietf</groupId>

diff --git a/ordmodels/network/pom.xml b/ordmodels/network/pom.xml
index e93fd45fba8de79cd6614d2bf45ffc8c9a0f258a..68752f13e328bd158c25cc31685ee66d05cae348 100644 (file)
--- a/ordmodels/network/pom.xml
+++ b/ordmodels/network/pom.xml
@@ -12,7 +12,7 @@ and is available at http://www.eclipse.org/legal/epl-v10.html
   <parent>
     <groupId>org.opendaylight.mdsal</groupId>
     <artifactId>binding-parent</artifactId>
-    <version>5.0.14</version>
+    <version>6.0.4</version>
     <relativePath/>
   </parent>
 

diff --git a/ordmodels/pom.xml b/ordmodels/pom.xml
index cb16e2046ae81bb6189059424490f351ec819659..28cac4006e9265d757ffe645327cfbe7a4f393bb 100644 (file)
--- a/ordmodels/pom.xml
+++ b/ordmodels/pom.xml
@@ -12,7 +12,7 @@ and is available at http://www.eclipse.org/legal/epl-v10.html
   <parent>
     <groupId>org.opendaylight.mdsal</groupId>
     <artifactId>binding-parent</artifactId>
-    <version>5.0.14</version>
+    <version>6.0.4</version>
     <relativePath/>
   </parent>
 

diff --git a/ordmodels/service/pom.xml b/ordmodels/service/pom.xml
index 19ea23e1300d338177475c1a52837d7e87569713..98d53f88340babddd4ea20fe5d2814b3110136a6 100644 (file)
--- a/ordmodels/service/pom.xml
+++ b/ordmodels/service/pom.xml
@@ -12,7 +12,7 @@ and is available at http://www.eclipse.org/legal/epl-v10.html
   <parent>
     <groupId>org.opendaylight.mdsal</groupId>
     <artifactId>binding-parent</artifactId>
-    <version>5.0.14</version>
+    <version>6.0.4</version>
     <relativePath/>
   </parent>
 

diff --git a/pce/pom.xml b/pce/pom.xml
index d9634e4aabe2c312c37e9baaae0d47273e5b1312..0ac84a94e717a4b2976bc90d5c72b2bdffb472a5 100644 (file)
--- a/pce/pom.xml
+++ b/pce/pom.xml
@@ -14,7 +14,7 @@
     <parent>
         <groupId>org.opendaylight.mdsal</groupId>
         <artifactId>binding-parent</artifactId>
-        <version>5.0.14</version>
+        <version>6.0.4</version>
         <relativePath />
     </parent>
 

diff --git a/pom.xml b/pom.xml
index 71b43b243e65e1d666a68214569ea50bd50328af..d6077cba792cfa38ac27effaed761aa6b43a1962 100644 (file)
--- a/pom.xml
+++ b/pom.xml
@@ -12,7 +12,7 @@ and is available at http://www.eclipse.org/legal/epl-v10.html INTERNAL
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>odlparent</artifactId>
-        <version>6.0.11</version>
+        <version>7.0.5</version>
         <relativePath/>
     </parent>
 

diff --git a/renderer/pom.xml b/renderer/pom.xml
index 5970e4db67faad83fe8415d6ba95d1b9dd0bc279..7a86abce5391eee615bacc86afee7f5e3b8c2f3d 100644 (file)
--- a/renderer/pom.xml
+++ b/renderer/pom.xml
@@ -13,7 +13,7 @@ and is available at http://www.eclipse.org/legal/epl-v10.html
   <parent>
     <groupId>org.opendaylight.mdsal</groupId>
     <artifactId>binding-parent</artifactId>
-    <version>5.0.14</version>
+    <version>6.0.4</version>
     <relativePath/>
   </parent>
 

diff --git a/servicehandler/pom.xml b/servicehandler/pom.xml
index 7f880cacb8030d9e7dbe72014423dc504c285a17..2d998ecca6348bf29e34da7145433460e512da2d 100644 (file)
--- a/servicehandler/pom.xml
+++ b/servicehandler/pom.xml
@@ -15,7 +15,7 @@ Author: Martial Coulibaly <martial.coulibaly@gfi.com> on behalf of Orange
   <parent>
     <groupId>org.opendaylight.mdsal</groupId>
     <artifactId>binding-parent</artifactId>
-    <version>5.0.14</version>
+    <version>6.0.4</version>
     <relativePath/>
   </parent>
 

diff --git a/tapi/pom.xml b/tapi/pom.xml
index 9068208dd5cbf755930fd195982658ebf5d92649..dc585670b0ac94ad0d46c3371d59ec05494d10d1 100644 (file)
--- a/tapi/pom.xml
+++ b/tapi/pom.xml
@@ -15,7 +15,7 @@ Author: Martial Coulibaly <martial.coulibaly@gfi.com> on behalf of Orange
   <parent>
     <groupId>org.opendaylight.mdsal</groupId>
     <artifactId>binding-parent</artifactId>
-    <version>5.0.14</version>
+    <version>6.0.4</version>
     <relativePath/>
   </parent>
 
@@ -29,7 +29,7 @@ Author: Martial Coulibaly <martial.coulibaly@gfi.com> on behalf of Orange
       <dependency>
         <groupId>org.opendaylight.mdsal</groupId>
         <artifactId>mdsal-artifacts</artifactId>
-        <version>5.0.14</version>
+        <version>6.0.4</version>
         <scope>import</scope>
         <type>pom</type>
       </dependency>

diff --git a/tapimodels/pom.xml b/tapimodels/pom.xml
index 418376622425024b57ad69aa05bf15d1dfef57e8..023f2119a127025d04e87f6ac45a9e712785e6af 100644 (file)
--- a/tapimodels/pom.xml
+++ b/tapimodels/pom.xml
@@ -12,7 +12,7 @@ and is available at http://www.eclipse.org/legal/epl-v10.html
   <parent>
     <groupId>org.opendaylight.mdsal</groupId>
     <artifactId>binding-parent</artifactId>
-    <version>5.0.14</version>
+    <version>6.0.4</version>
     <relativePath/>
   </parent>
 

diff --git a/test-common/pom.xml b/test-common/pom.xml
index 9b38208425dfd0d8b43731c718be3d8078b05773..0d69e66fec4a5e1228a66c45bc7154d71e23da76 100644 (file)
--- a/test-common/pom.xml
+++ b/test-common/pom.xml
@@ -11,7 +11,7 @@
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>bundle-parent</artifactId>
-        <version>6.0.11</version>
+        <version>7.0.5</version>
         <relativePath/>
     </parent>