Upgrade to Fluorine dependencies

This switches all the ODL dependencies to the appropriate versions for
Fluorine.

Note that due to the rfc8345 ietf-network migration, openroadm imports
of 2015-06-08 ietf-network-* models are no more available so this fails
to build until those obsolete draft models are repackaged inside tpce.
https://git.opendaylight.org/gerrit/#/c/73591/

JIRA: NETCONF-550
JIRA: TSC-124
JIRA: TRNSPRTPCE-29

Change-Id: I288e560cc9eb376facc61c34a098b3fba5f524d8
Signed-off-by: Stephen Kitt <skitt@redhat.com>

diff --git a/api/pom.xml b/api/pom.xml
index 400e544e83f4a1e53ce71e1655b3d3fb243a1d63..ee4f2f9990718d146ce29b7e9218325081f4fb35 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>0.12.3-SNAPSHOT</version>
+    <version>0.13.0-SNAPSHOT</version>
     <relativePath/>
   </parent>
 

diff --git a/artifacts/pom.xml b/artifacts/pom.xml
index e3182c5a388f8ba97f2c5fe80a605ead21ff1dab..4de4129d2c1bb5b5bd6179f90a886701c8605c10 100644 (file)
--- a/artifacts/pom.xml
+++ b/artifacts/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>odlparent-lite</artifactId>
-    <version>3.1.0</version>
+    <version>3.1.2</version>
     <relativePath/>
   </parent>
 

diff --git a/common/pom.xml b/common/pom.xml
index 0b2fef7264de1818e51e8c1b710995e997c6d27b..abe279f6db6ec5340c657a462ab554917a728294 100644 (file)
--- a/common/pom.xml
+++ b/common/pom.xml
@@ -10,7 +10,7 @@
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>bundle-parent</artifactId>
-        <version>3.1.0</version>
+        <version>3.1.2</version>
         <relativePath />
     </parent>
 
@@ -24,21 +24,21 @@
             <dependency>
                 <groupId>org.opendaylight.controller</groupId>
                 <artifactId>mdsal-artifacts</artifactId>
-                <version>1.7.3-SNAPSHOT</version>
+                <version>1.8.0-SNAPSHOT</version>
                 <scope>import</scope>
                 <type>pom</type>
             </dependency>
             <dependency>
                 <groupId>org.opendaylight.netconf</groupId>
                 <artifactId>netconf-artifacts</artifactId>
-                <version>1.4.3-SNAPSHOT</version>
+                <version>1.5.0-SNAPSHOT</version>
                 <scope>import</scope>
                 <type>pom</type>
             </dependency>
             <dependency>
                 <groupId>org.opendaylight.mdsal.model</groupId>
                 <artifactId>mdsal-model-artifacts</artifactId>
-                <version>0.12.3-SNAPSHOT</version>
+                <version>0.13.0-SNAPSHOT</version>
                 <scope>import</scope>
                 <type>pom</type>
             </dependency>
@@ -59,10 +59,12 @@
             <groupId>org.opendaylight.controller.model</groupId>
             <artifactId>model-topology</artifactId>
         </dependency>
+<!-- Bump to  Fluorine
         <dependency>
             <groupId>org.opendaylight.mdsal.model</groupId>
             <artifactId>ietf-network-2015-06-08</artifactId>
         </dependency>
+-->
         <dependency>
             <groupId>org.opendaylight.netconf</groupId>
             <artifactId>sal-netconf-connector</artifactId>

diff --git a/features/features-transportpce/pom.xml b/features/features-transportpce/pom.xml
index 8c3d652b0b78deb194bb2e37fd739dc1d8ccac8f..a9d52281ddf7a64a7ff4e4710fe65e6b33a1a2f3 100644 (file)
--- a/features/features-transportpce/pom.xml
+++ b/features/features-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>feature-repo-parent</artifactId>
-    <version>3.1.0</version>
+    <version>3.1.2</version>
     <relativePath/>
   </parent>
 

diff --git a/features/odl-transportpce-api/pom.xml b/features/odl-transportpce-api/pom.xml
index 076206eecf029c2c4d85b057b302b2f4a575b208..af54d826118fbfa2d3958a028ae1b80dcd2b2786 100644 (file)
--- a/features/odl-transportpce-api/pom.xml
+++ b/features/odl-transportpce-api/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>3.1.0</version>
+    <version>3.1.2</version>
     <relativePath/>
   </parent>
 
@@ -23,11 +23,11 @@ and is available at http://www.eclipse.org/legal/epl-v10.html INTERNAL
 
 
   <properties>
-    <mdsal.model.version>0.12.3-SNAPSHOT</mdsal.model.version>
-    <mdsal.version>1.7.3-SNAPSHOT</mdsal.version>
-    <restconf.version>1.7.3-SNAPSHOT</restconf.version>
-    <yangtools.version>1.3.0-SNAPSHOT</yangtools.version>
-    <netconf.version>1.4.3-SNAPSHOT</netconf.version>
+    <mdsal.model.version>0.13.0-SNAPSHOT</mdsal.model.version>
+    <mdsal.version>1.8.0-SNAPSHOT</mdsal.version>
+    <restconf.version>1.8.0-SNAPSHOT</restconf.version>
+    <yangtools.version>2.0.7</yangtools.version>
+    <netconf.version>1.5.0-SNAPSHOT</netconf.version>
     <configfile.directory>etc/opendaylight/karaf</configfile.directory>
   </properties>
 

diff --git a/features/odl-transportpce-inventory/pom.xml b/features/odl-transportpce-inventory/pom.xml
index f713b1f18f7b0ee46ce4d9482dab7f19f80840ed..c7d527a1619914bd97546d94b72d80cba6b1c222 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>3.1.0</version>
+        <version>3.1.2</version>
         <relativePath />
     </parent>
 

diff --git a/features/odl-transportpce-ordmodels/pom.xml b/features/odl-transportpce-ordmodels/pom.xml
index 984ceaf00598b1ed365e9d2754fbd7fc1c4b1941..cd2d5ba0fce0e884b8e7b6e7ae0ca52a202ffad6 100644 (file)
--- a/features/odl-transportpce-ordmodels/pom.xml
+++ b/features/odl-transportpce-ordmodels/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>3.1.0</version>
+    <version>3.1.2</version>
     <relativePath/>
   </parent>
 
@@ -22,11 +22,11 @@ and is available at http://www.eclipse.org/legal/epl-v10.html INTERNAL
   <packaging>feature</packaging>
 
   <properties>
-    <mdsal.model.version>0.12.3-SNAPSHOT</mdsal.model.version>
-    <mdsal.version>1.7.3-SNAPSHOT</mdsal.version>
-    <restconf.version>1.7.3-SNAPSHOT</restconf.version>
-    <yangtools.version>1.3.0-SNAPSHOT</yangtools.version>
-    <netconf.version>1.4.3-SNAPSHOT</netconf.version>
+    <mdsal.model.version>0.13.0-SNAPSHOT</mdsal.model.version>
+    <mdsal.version>1.8.0-SNAPSHOT</mdsal.version>
+    <restconf.version>1.8.0-SNAPSHOT</restconf.version>
+    <yangtools.version>2.0.7</yangtools.version>
+    <netconf.version>1.5.0-SNAPSHOT</netconf.version>
     <configfile.directory>etc/opendaylight/karaf</configfile.directory>
   </properties>
 

diff --git a/features/odl-transportpce-stubmodels/pom.xml b/features/odl-transportpce-stubmodels/pom.xml
index 637bee3fc3fb961941070d7b650fcf4f3a329bcf..8af42f65e0f6a32d4e0d4a96d8b8fbf7c9b9893a 100644 (file)
--- a/features/odl-transportpce-stubmodels/pom.xml
+++ b/features/odl-transportpce-stubmodels/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>3.1.0</version>
+    <version>3.1.2</version>
     <relativePath/>
   </parent>
 
@@ -23,7 +23,7 @@ and is available at http://www.eclipse.org/legal/epl-v10.html INTERNAL
 
 
   <properties>
-    <mdsal.model.version>0.12.3-SNAPSHOT</mdsal.model.version>
+    <mdsal.model.version>0.13.0-SNAPSHOT</mdsal.model.version>
     <configfile.directory>etc/opendaylight/karaf</configfile.directory>
   </properties>
 

diff --git a/features/odl-transportpce/pom.xml b/features/odl-transportpce/pom.xml
index cbe1e43a7a67b17c6fcd609062c11e85f7e69088..07f6a58f3b7686580daf1a0720360ee9a24c9675 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>3.1.0</version>
+    <version>3.1.2</version>
     <relativePath/>
   </parent>
 
@@ -23,10 +23,10 @@ and is available at http://www.eclipse.org/legal/epl-v10.html INTERNAL
 
 
   <properties>
-    <mdsal.model.version>0.12.3-SNAPSHOT</mdsal.model.version>
-    <mdsal.version>1.7.3-SNAPSHOT</mdsal.version>
-    <yangtools.version>1.3.0-SNAPSHOT</yangtools.version>
-    <netconf.version>1.4.3-SNAPSHOT</netconf.version>
+    <mdsal.model.version>0.13.0-SNAPSHOT</mdsal.model.version>
+    <mdsal.version>1.8.0-SNAPSHOT</mdsal.version>
+    <yangtools.version>2.0.7</yangtools.version>
+    <netconf.version>1.5.0-SNAPSHOT</netconf.version>
     <configfile.directory>etc/opendaylight/karaf</configfile.directory>
   </properties>
 

diff --git a/inventory/pom.xml b/inventory/pom.xml
index 5f2658ff86e521f63d93da683b0c91a1fa8f139d..0539a20623b32573082860750ee5a62fd4e6b8e4 100644 (file)
--- a/inventory/pom.xml
+++ b/inventory/pom.xml
@@ -8,9 +8,9 @@
     <modelVersion>4.0.0</modelVersion>
 
     <parent>
-        <groupId>org.opendaylight.controller</groupId>
-        <artifactId>config-parent</artifactId>
-        <version>0.8.3-SNAPSHOT</version>
+        <groupId>org.opendaylight.odlparent</groupId>
+        <artifactId>bundle-parent</artifactId>
+        <version>3.1.2</version>
         <relativePath />
     </parent>
 
@@ -24,14 +24,14 @@
             <dependency>
                 <groupId>org.opendaylight.controller</groupId>
                 <artifactId>mdsal-artifacts</artifactId>
-                <version>1.7.3-SNAPSHOT</version>
+                <version>1.8.0-SNAPSHOT</version>
                 <scope>import</scope>
                 <type>pom</type>
             </dependency>
             <dependency>
                 <groupId>org.opendaylight.netconf</groupId>
                 <artifactId>netconf-artifacts</artifactId>
-                <version>1.4.3-SNAPSHOT</version>
+                <version>1.5.0-SNAPSHOT</version>
                 <scope>import</scope>
                 <type>pom</type>
             </dependency>
@@ -74,7 +74,7 @@
        <dependency>
             <groupId>org.apache.karaf.scheduler</groupId>
             <artifactId>org.apache.karaf.scheduler.core</artifactId>
-            <version>4.0.9</version>
+            <version>${karaf.version}</version>
             <scope>provided</scope>
         </dependency>
     </dependencies>

diff --git a/karaf/pom.xml b/karaf/pom.xml
index 0870992420085468383f3a07039ff85563a2357c..ed689b708f1ee6603d6eb9e452506cedfc69ef61 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>3.1.0</version>
+    <version>3.1.2</version>
     <relativePath/>
   </parent>
 

diff --git a/networkmodel/pom.xml b/networkmodel/pom.xml
index e7805e31d5f2ec7565f114bc149ebad376f4d267..bcc5066f621e4af33801ac2e815d2501b9fcf283 100644 (file)
--- a/networkmodel/pom.xml
+++ b/networkmodel/pom.xml
@@ -11,9 +11,9 @@ and is available at http://www.eclipse.org/legal/epl-v10.html
   <modelVersion>4.0.0</modelVersion>
 
   <parent>
-    <groupId>org.opendaylight.controller</groupId>
-    <artifactId>config-parent</artifactId>
-    <version>0.8.3-SNAPSHOT</version>
+    <groupId>org.opendaylight.odlparent</groupId>
+    <artifactId>bundle-parent</artifactId>
+    <version>3.1.2</version>
     <relativePath/>
   </parent>
 
@@ -27,7 +27,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.4.3-SNAPSHOT</version>
+        <version>1.5.0-SNAPSHOT</version>
         <scope>import</scope>
         <type>pom</type>
       </dependency>

diff --git a/olm/pom.xml b/olm/pom.xml
index 46e2401d062f8f8b9e114c416cacd7411e239c01..7671215dfeb4f82b628b139982c3e7fde9242a18 100644 (file)
--- a/olm/pom.xml
+++ b/olm/pom.xml
@@ -11,9 +11,9 @@ and is available at http://www.eclipse.org/legal/epl-v10.html
   <modelVersion>4.0.0</modelVersion>
 
   <parent>
-    <groupId>org.opendaylight.controller</groupId>
-    <artifactId>config-parent</artifactId>
-    <version>0.8.3-SNAPSHOT</version>
+    <groupId>org.opendaylight.mdsal</groupId>
+    <artifactId>binding-parent</artifactId>
+    <version>0.13.0-SNAPSHOT</version>
     <relativePath/>
   </parent>
 
@@ -27,14 +27,14 @@ and is available at http://www.eclipse.org/legal/epl-v10.html
       <dependency>
         <groupId>org.opendaylight.controller</groupId>
         <artifactId>mdsal-artifacts</artifactId>
-        <version>1.7.3-SNAPSHOT</version>
+        <version>1.8.0-SNAPSHOT</version>
         <scope>import</scope>
         <type>pom</type>
       </dependency>
       <dependency>
         <groupId>org.opendaylight.netconf</groupId>
         <artifactId>netconf-artifacts</artifactId>
-        <version>1.4.3-SNAPSHOT</version>
+        <version>1.5.0-SNAPSHOT</version>
         <scope>import</scope>
         <type>pom</type>
       </dependency>

diff --git a/ordmodels/common/pom.xml b/ordmodels/common/pom.xml
index 9572a9bb4b624e3af69aa0ae122871467111d40b..9bb422d210e05072b9b33630747556cf09579a9e 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>0.12.3-SNAPSHOT</version>
+    <version>0.13.0-SNAPSHOT</version>
     <relativePath/>
   </parent>
 
@@ -26,7 +26,7 @@ and is available at http://www.eclipse.org/legal/epl-v10.html
       <dependency>
         <groupId>org.opendaylight.mdsal.model</groupId>
         <artifactId>mdsal-model-artifacts</artifactId>
-        <version>0.12.3-SNAPSHOT</version>
+        <version>0.13.0-SNAPSHOT</version>
         <scope>import</scope>
         <type>pom</type>
       </dependency>

diff --git a/ordmodels/device/pom.xml b/ordmodels/device/pom.xml
index 1fa230f922448be0997932d7c637b5bca20367d8..f438c66ee0598d4fe1d0f65afefbfe093006413c 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>0.12.3-SNAPSHOT</version>
+    <version>0.13.0-SNAPSHOT</version>
     <relativePath/>
   </parent>
 
@@ -26,14 +26,14 @@ and is available at http://www.eclipse.org/legal/epl-v10.html
       <dependency>
         <groupId>org.opendaylight.netconf</groupId>
         <artifactId>netconf-artifacts</artifactId>
-        <version>1.4.3-SNAPSHOT</version>
+        <version>1.5.0-SNAPSHOT</version>
         <scope>import</scope>
         <type>pom</type>
       </dependency>
       <dependency>
         <groupId>org.opendaylight.mdsal.model</groupId>
         <artifactId>mdsal-model-artifacts</artifactId>
-        <version>0.12.3-SNAPSHOT</version>
+        <version>0.13.0-SNAPSHOT</version>
         <scope>import</scope>
         <type>pom</type>
       </dependency>

diff --git a/ordmodels/network/pom.xml b/ordmodels/network/pom.xml
index 71824cf1c1b53a5ae682a02f63ddc7b02fd5acdc..64c1157074eb7b07fdbb50dd4152c76df426f525 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>0.12.3-SNAPSHOT</version>
+    <version>0.13.0-SNAPSHOT</version>
     <relativePath/>
   </parent>
 
@@ -26,7 +26,7 @@ and is available at http://www.eclipse.org/legal/epl-v10.html
       <dependency>
         <groupId>org.opendaylight.mdsal.model</groupId>
         <artifactId>mdsal-model-artifacts</artifactId>
-        <version>0.12.3-SNAPSHOT</version>
+        <version>0.13.0-SNAPSHOT</version>
         <scope>import</scope>
         <type>pom</type>
       </dependency>
@@ -51,8 +51,25 @@ and is available at http://www.eclipse.org/legal/epl-v10.html
       <artifactId>ietf-yang-types-20130715</artifactId>
     </dependency>
     <dependency>
+      <groupId>org.opendaylight.mdsal.binding.model.ietf</groupId>
+      <artifactId>rfc8345</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>org.opendaylight.mdsal.binding.model.ietf</groupId>
+      <artifactId>rfc8345-ietf-network</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>org.opendaylight.mdsal.binding.model.ietf</groupId>
+      <artifactId>rfc8345-ietf-network-topology</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>org.opendaylight.mdsal.binding.model.ietf</groupId>
+      <artifactId>rfc8345-ietf-network-topology-state</artifactId>
+    </dependency>
+    <!--dependency>
       <groupId>org.opendaylight.mdsal.model</groupId>
       <artifactId>ietf-network-2015-06-08</artifactId>
-    </dependency>
+      <version>1.5.0-SNAPSHOT</version>
+    </dependency-->
   </dependencies>
 </project>

diff --git a/ordmodels/pom.xml b/ordmodels/pom.xml
index 8e011735cad4330496c25e911e426c206c4b8ded..b85177387258797f686201b0f06e24030414a4c8 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>0.12.3-SNAPSHOT</version>
+    <version>0.13.0-SNAPSHOT</version>
     <relativePath/>
   </parent>
 
@@ -77,49 +77,58 @@ and is available at http://www.eclipse.org/legal/epl-v10.html
     </plugins>
   </reporting>
 
+  <dependencyManagement>
+    <dependencies>
+      <dependency>
+        <groupId>org.opendaylight.netconf</groupId>
+        <artifactId>netconf-artifacts</artifactId>
+        <version>1.5.0-SNAPSHOT</version>
+        <type>pom</type>
+        <scope>import</scope>
+      </dependency>
+      <dependency>
+        <groupId>org.opendaylight.mdsal.model</groupId>
+        <artifactId>mdsal-model-artifacts</artifactId>
+        <version>0.13.0-SNAPSHOT</version>
+        <type>pom</type>
+        <scope>import</scope>
+      </dependency>
+    </dependencies>
+  </dependencyManagement>
+
   <dependencies>
     <dependency>
       <groupId>org.opendaylight.netconf</groupId>
       <artifactId>ietf-netconf</artifactId>
-      <version>1.4.3-SNAPSHOT</version>
     </dependency>
     <dependency>
       <groupId>org.opendaylight.mdsal.model</groupId>
       <artifactId>ietf-inet-types-2013-07-15</artifactId>
-      <version>1.4.3-SNAPSHOT</version>
     </dependency>
     <dependency>
       <groupId>org.opendaylight.mdsal.model</groupId>
       <artifactId>iana-afn-safi</artifactId>
-      <version>2013.07.04.12.3-SNAPSHOT</version>
     </dependency>
     <dependency>
       <groupId>org.opendaylight.mdsal.model</groupId>
       <artifactId>ietf-access-control-list</artifactId>
-      <version>0.10.3-SNAPSHOT</version>
     </dependency>
     <dependency>
       <groupId>org.opendaylight.mdsal.model</groupId>
       <artifactId>iana-if-type-2014-05-08</artifactId>
-      <version>2014.05.08.12.3-SNAPSHOT</version>
     </dependency>
     <dependency>
       <groupId>org.opendaylight.mdsal.model</groupId>
       <artifactId>ietf-yang-types-20130715</artifactId>
-      <version>2013.07.15.12.3-SNAPSHOT</version>
     </dependency>
     <dependency>
       <groupId>org.opendaylight.mdsal.model</groupId>
       <artifactId>ietf-interfaces</artifactId>
-      <version>2014.05.08.12.3-SNAPSHOT</version>
     </dependency>
     <dependency>
       <groupId>org.opendaylight.mdsal.model</groupId>
       <artifactId>ietf-packet-fields</artifactId>
-      <version>0.10.3-SNAPSHOT</version>
     </dependency>
   </dependencies>
 
-
-
 </project>

diff --git a/ordmodels/service/pom.xml b/ordmodels/service/pom.xml
index e7176de15d40f3e07f6e16c75ff9b9ba83ffedb1..e243d2cab76c057fc0b0a0f13d5f7448284da476 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>0.12.3-SNAPSHOT</version>
+    <version>0.13.0-SNAPSHOT</version>
     <relativePath/>
   </parent>
 
@@ -26,7 +26,7 @@ and is available at http://www.eclipse.org/legal/epl-v10.html
       <dependency>
         <groupId>org.opendaylight.mdsal.model</groupId>
         <artifactId>mdsal-model-artifacts</artifactId>
-        <version>0.12.3-SNAPSHOT</version>
+        <version>0.13.0-SNAPSHOT</version>
         <scope>import</scope>
         <type>pom</type>
       </dependency>

diff --git a/pce/pom.xml b/pce/pom.xml
index 2c59463ae4fc3eb7c16cb09da6030550aeacd5c9..677d51c120563c3191b75fd72b6b6f2fd08e08a0 100755 (executable)
--- a/pce/pom.xml
+++ b/pce/pom.xml
@@ -15,9 +15,9 @@ Author: Martial Coulibaly <martial.coulibaly@gfi.com> on behalf of Orange
   <modelVersion>4.0.0</modelVersion>
 
   <parent>
-    <groupId>org.opendaylight.controller</groupId>
-    <artifactId>config-parent</artifactId>
-    <version>0.8.3-SNAPSHOT</version>
+    <groupId>org.opendaylight.odlparent</groupId>
+    <artifactId>bundle-parent</artifactId>
+    <version>3.1.2</version>
     <relativePath/>
   </parent>
 
@@ -80,6 +80,7 @@ Author: Martial Coulibaly <martial.coulibaly@gfi.com> on behalf of Orange
     <dependency>
       <groupId>org.opendaylight.controller</groupId>
       <artifactId>sal-binding-broker-impl</artifactId>
+      <version>1.8.0-SNAPSHOT</version>
       <scope>test</scope>
     </dependency>
 

diff --git a/pom.xml b/pom.xml
index 76be13e56372070ecaa2bf178fbc693f9c0b06f4..9ed4041e52f42022b5ffbf001e4bb4940f4b2393 100644 (file)
--- a/pom.xml
+++ b/pom.xml
@@ -11,7 +11,7 @@ and is available at http://www.eclipse.org/legal/epl-v10.html INTERNAL
   <parent>
     <groupId>org.opendaylight.odlparent</groupId>
     <artifactId>odlparent</artifactId>
-    <version>3.1.0</version>
+    <version>3.1.2</version>
     <relativePath/>
   </parent>
 

diff --git a/renderer/pom.xml b/renderer/pom.xml
index a571b97cadedb849ae0f0e2b529b8089276426b4..69dcc6eb467f930e0fba58c616f410a63067693a 100644 (file)
--- a/renderer/pom.xml
+++ b/renderer/pom.xml
@@ -11,9 +11,9 @@ and is available at http://www.eclipse.org/legal/epl-v10.html
   <modelVersion>4.0.0</modelVersion>
 
   <parent>
-    <groupId>org.opendaylight.controller</groupId>
-    <artifactId>config-parent</artifactId>
-    <version>0.8.3-SNAPSHOT</version>
+    <groupId>org.opendaylight.mdsal</groupId>
+    <artifactId>binding-parent</artifactId>
+    <version>0.13.0-SNAPSHOT</version>
     <relativePath/>
   </parent>
 
@@ -27,14 +27,14 @@ and is available at http://www.eclipse.org/legal/epl-v10.html
       <dependency>
         <groupId>org.opendaylight.controller</groupId>
         <artifactId>mdsal-artifacts</artifactId>
-        <version>1.7.3-SNAPSHOT</version>
+        <version>1.8.0-SNAPSHOT</version>
         <scope>import</scope>
         <type>pom</type>
       </dependency>
       <dependency>
         <groupId>org.opendaylight.netconf</groupId>
         <artifactId>netconf-artifacts</artifactId>
-        <version>1.4.3-SNAPSHOT</version>
+        <version>1.5.0-SNAPSHOT</version>
         <scope>import</scope>
         <type>pom</type>
       </dependency>

diff --git a/servicehandler/pom.xml b/servicehandler/pom.xml
index 43085f679e46e96252a477dcc99028c2284abe52..4f4cf1afb2006728a349abee3137d40508f34217 100644 (file)
--- a/servicehandler/pom.xml
+++ b/servicehandler/pom.xml
@@ -13,9 +13,9 @@ Author: Martial Coulibaly <martial.coulibaly@gfi.com> on behalf of Orange
   <modelVersion>4.0.0</modelVersion>
 
   <parent>
-    <groupId>org.opendaylight.controller</groupId>
-    <artifactId>config-parent</artifactId>
-    <version>0.8.3-SNAPSHOT</version>
+    <groupId>org.opendaylight.mdsal</groupId>
+    <artifactId>binding-parent</artifactId>
+    <version>0.13.0-SNAPSHOT</version>
     <relativePath/>
   </parent>
 
@@ -29,7 +29,7 @@ Author: Martial Coulibaly <martial.coulibaly@gfi.com> on behalf of Orange
       <dependency>
         <groupId>org.opendaylight.controller</groupId>
         <artifactId>mdsal-artifacts</artifactId>
-        <version>1.7.3-SNAPSHOT</version>
+        <version>1.8.0-SNAPSHOT</version>
         <scope>import</scope>
         <type>pom</type>
       </dependency>
@@ -83,7 +83,6 @@ Author: Martial Coulibaly <martial.coulibaly@gfi.com> on behalf of Orange
     <dependency>
       <groupId>org.opendaylight.controller</groupId>
       <artifactId>sal-binding-broker-impl</artifactId>
-      <version>1.7.3-SNAPSHOT</version>
       <scope>test</scope>
     </dependency>
     <dependency>

diff --git a/test-common/pom.xml b/test-common/pom.xml
index 1933e4acf28ddf2b222b39327f2130237a796f47..53e26b7576e3a862064c2d186fdd28344ed70db6 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>3.1.0</version>
+        <version>3.1.2</version>
         <relativePath/>
     </parent>
 
@@ -25,7 +25,7 @@
             <dependency>
                 <groupId>org.opendaylight.controller</groupId>
                 <artifactId>mdsal-artifacts</artifactId>
-                <version>1.7.3-SNAPSHOT</version>
+                <version>1.8.0-SNAPSHOT</version>
                 <type>pom</type>
                 <scope>import</scope>
             </dependency>

diff --git a/test-common/src/main/java/org/opendaylight/transportpce/binding/converter/AbstractDataObjectConverter.java b/test-common/src/main/java/org/opendaylight/transportpce/binding/converter/AbstractDataObjectConverter.java
index b050095d6fd9fdbe14b271c9b060ed9f176d23a3..6a44ebfe8360b92800c179fa89e25a5aa7cc2d6b 100644 (file)
--- a/test-common/src/main/java/org/opendaylight/transportpce/binding/converter/AbstractDataObjectConverter.java
+++ b/test-common/src/main/java/org/opendaylight/transportpce/binding/converter/AbstractDataObjectConverter.java
@@ -80,7 +80,7 @@ public abstract class AbstractDataObjectConverter implements DataObjectConverter
             YangInstanceIdentifier.PathArgument directChildIdentifier =
                     YangInstanceIdentifier.of(rootNode).getLastPathArgument();
             Optional<NormalizedNode<?, ?>> directChild =
-                    NormalizedNodes.getDirectChild(normalizedNode, directChildIdentifier);//.toJavaUtil();
+                    NormalizedNodes.getDirectChild(normalizedNode, directChildIdentifier);
             if (!directChild.isPresent()) {
                 throw new IllegalStateException(String.format("Could not get the direct child of %s", rootNode));
             }

diff --git a/test-common/src/main/java/org/opendaylight/transportpce/test/DeviceWrapper.java b/test-common/src/main/java/org/opendaylight/transportpce/test/DeviceWrapper.java
index 5c2d737165fe093531ee81f3e2938202703ede25..833de2289f0f8bfde9773d4d99454df8b3512c00 100644 (file)
--- a/test-common/src/main/java/org/opendaylight/transportpce/test/DeviceWrapper.java
+++ b/test-common/src/main/java/org/opendaylight/transportpce/test/DeviceWrapper.java
@@ -135,7 +135,7 @@ public final class DeviceWrapper {
         YangInstanceIdentifier initialDataIi = YangInstanceIdentifier.of(dataQName);
         LOG.debug("Searching for {} inside {}", initialDataIi, initialDataNormalizedNodes.get());
         Optional<NormalizedNode<?, ?>> dataNormalizedNodes =
-                NormalizedNodes.findNode(initialDataNormalizedNodes.get(), initialDataIi);//.toJavaUtil();
+                NormalizedNodes.findNode(initialDataNormalizedNodes.get(), initialDataIi);
         Preconditions.checkArgument(dataNormalizedNodes.isPresent());
         LOG.info("Initial data was successfully stored into ds");
         DOMDataWriteTransaction writeOnlyTransaction = domDataBroker.newWriteOnlyTransaction();

diff --git a/tests/pom.xml b/tests/pom.xml
index 09dff6a1d0ef76245455e7d539d29e0964775499..15ebc4e36cd8002c5d73157cae94350b9374a8ea 100644 (file)
--- a/tests/pom.xml
+++ b/tests/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>3.1.0</version>
+    <version>3.1.2</version>
     <relativePath/>
   </parent>
 

diff --git a/tests/stubmodels/pom.xml b/tests/stubmodels/pom.xml
index 835f45ff95f5eeeb654b586d048db002dba20457..4d8f74feaa6cb420a142c17051c03346c8262d0e 100644 (file)
--- a/tests/stubmodels/pom.xml
+++ b/tests/stubmodels/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>0.12.3-SNAPSHOT</version>
+    <version>0.13.0-SNAPSHOT</version>
     <relativePath/>
   </parent>
 

diff --git a/tests/stubpce/pom.xml b/tests/stubpce/pom.xml
index 3d4efaa5d35a66c06a894d49f879fe943e654472..755a4a0f3bf84576eac92e3dcd15eae3e205fe2a 100644 (file)
--- a/tests/stubpce/pom.xml
+++ b/tests/stubpce/pom.xml
@@ -15,9 +15,9 @@ Author: Martial Coulibaly <martial.coulibaly@gfi.com> on behalf of Orange
   <modelVersion>4.0.0</modelVersion>
 
   <parent>
-    <groupId>org.opendaylight.controller</groupId>
-    <artifactId>config-parent</artifactId>
-    <version>0.8.3-SNAPSHOT</version>
+    <groupId>org.opendaylight.mdsal</groupId>
+    <artifactId>binding-parent</artifactId>
+    <version>0.13.0-SNAPSHOT</version>
     <relativePath/>
   </parent>
 

diff --git a/tests/stubrenderer/pom.xml b/tests/stubrenderer/pom.xml
index 81f168299116331f3207127cdf921b32f1192f51..aa6e9eabc421bd5148919b6e342183c9f835f16f 100644 (file)
--- a/tests/stubrenderer/pom.xml
+++ b/tests/stubrenderer/pom.xml
@@ -13,9 +13,9 @@ Author: Martial Coulibaly <martial.coulibaly@gfi.com> on behalf of Orange
   <modelVersion>4.0.0</modelVersion>
 
   <parent>
-    <groupId>org.opendaylight.controller</groupId>
-    <artifactId>config-parent</artifactId>
-    <version>0.8.3-SNAPSHOT</version>
+    <groupId>org.opendaylight.mdsal</groupId>
+    <artifactId>binding-parent</artifactId>
+    <version>0.13.0-SNAPSHOT</version>
     <relativePath/>
   </parent>