Bump to Neon

Upgrade poms core dependencies:

org.opendaylight.odlparent                      4.0.9
org.opendaylight.yangtools  yangtools-artifacts 2.1.8
org.opendaylight.mdsal      binding-parent      3.0.6
org.opendaylight.mdsal      mdsal-artifacts     3.0.6
org.opendaylight.controller mdsal-artifacts     1.9.0-SNAPSHOT
org.opendaylight.netconf    netconf-artifacts   1.6.0-SNAPSHOT
org.opendaylight.netconf    restconf-artifacts  1.9.0-SNAPSHOT

Migrate poms ietf and iana models dependencies:

org.opendaylight.mdsal.binding.model.ietf
    rfc6991-ietf-inet-types               1.2.6-SNAPSHOT
    rfc6991-ietf-yang-types               1.2.6-SNAPSHOT
    rfc7223                               1.2.6-SNAPSHOT

org.opendaylight.mdsal.model  ietf-access-control-list  0.13.6-SNAPSHOT
org.opendaylight.mdsal.model  ietf-packet-fields        0.13.6-SNAPSHOT

org.opendaylight.mdsal.model  iana-afn-safi   2013.07.04.15.6
org.opendaylight.mdsal.binding.model.iana iana-if-type  1.0.6-SNAPSHOT

Change-Id: I2675746b2c3d3202080907e6be0bcc59facce1ed
Signed-off-by: guillaume.lambert <guillaume.lambert@orange.com>

diff --git a/api/pom.xml b/api/pom.xml
index 48e0e3471018683fe97af665d5fa512002089b71..a67212f71e1edc9e7d79c56566bfb0bb4df40c5b 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.13.2-SNAPSHOT</version>
+    <version>3.0.6</version>
     <relativePath/>
   </parent>
 

diff --git a/artifacts/pom.xml b/artifacts/pom.xml
index 6a68bd3250da2217c19f8fb17d6ee2b003100048..2760b6848451133a3021ccb58c14b4fffebb13dd 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.6</version>
+    <version>4.0.9</version>
     <relativePath/>
   </parent>
 

diff --git a/common/pom.xml b/common/pom.xml
index b7d8de3b42421f98e6fce42a902e0aceee0bee81..369578ff7a2df7f22c02934519d247d7c1c79291 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.6</version>
+        <version>4.0.9</version>
         <relativePath />
     </parent>
 
@@ -24,14 +24,14 @@
             <dependency>
                 <groupId>org.opendaylight.controller</groupId>
                 <artifactId>mdsal-artifacts</artifactId>
-                <version>1.8.2-SNAPSHOT</version>
+                <version>1.9.0-SNAPSHOT</version>
                 <scope>import</scope>
                 <type>pom</type>
             </dependency>
             <dependency>
                 <groupId>org.opendaylight.netconf</groupId>
                 <artifactId>netconf-artifacts</artifactId>
-                <version>1.5.2-SNAPSHOT</version>
+                <version>1.6.0-SNAPSHOT</version>
                 <scope>import</scope>
                 <type>pom</type>
             </dependency>

diff --git a/features/features-transportpce/pom.xml b/features/features-transportpce/pom.xml
index 66a06838fb71d83f3dc09824373e68883d2e3f9f..06942cfdad97d71a1d2f18539fe89dccc366f1ca 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.6</version>
+    <version>4.0.9</version>
     <relativePath/>
   </parent>
 

diff --git a/features/odl-transportpce-api/pom.xml b/features/odl-transportpce-api/pom.xml
index 18ef219aa5083ac5eadcafd90ed87841d87cadbb..8314cf09bd96422dc6e6ae51d2b2c86779c213f1 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.6</version>
+    <version>4.0.9</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.13.1-SNAPSHOT</mdsal.model.version>
-    <mdsal.version>1.8.1-SNAPSHOT</mdsal.version>
-    <restconf.version>1.8.1-SNAPSHOT</restconf.version>
-    <yangtools.version>2.0.16</yangtools.version>
-    <netconf.version>1.5.2-SNAPSHOT</netconf.version>
+    <mdsal.bmodel.version>1.2.6-SNAPSHOT</mdsal.bmodel.version>
+    <mdsal.version>1.9.0-SNAPSHOT</mdsal.version>
+    <restconf.version>1.9.0-SNAPSHOT</restconf.version>
+    <yangtools.version>2.1.8</yangtools.version>
+    <netconf.version>1.6.0-SNAPSHOT</netconf.version>
     <configfile.directory>etc/opendaylight/karaf</configfile.directory>
   </properties>
 
@@ -36,9 +36,14 @@ and is available at http://www.eclipse.org/legal/epl-v10.html INTERNAL
 
   <dependencies>
     <dependency>
-      <groupId>org.opendaylight.mdsal.model</groupId>
-      <artifactId>ietf-inet-types-2013-07-15</artifactId>
-      <version>${netconf.version}</version>
+      <groupId>org.opendaylight.mdsal.binding.model.ietf</groupId>
+      <artifactId>rfc6991-ietf-inet-types</artifactId>
+      <version>${mdsal.bmodel.version}</version>
+    </dependency>
+    <dependency>
+      <groupId>org.opendaylight.mdsal.binding.model.ietf</groupId>
+      <artifactId>rfc6991-ietf-yang-types</artifactId>
+      <version>${mdsal.bmodel.version}</version>
     </dependency>
     <dependency>
       <groupId>${project.groupId}</groupId>

diff --git a/features/odl-transportpce-ordmodels/pom.xml b/features/odl-transportpce-ordmodels/pom.xml
index 5a39fe1b475a214f034107ee0ccdc480bc8815b8..218aa18939ff83d553fa9c3fbd60c6c769d81bf0 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.6</version>
+    <version>4.0.9</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.13.2-SNAPSHOT</mdsal.model.version>
-    <mdsal.version>1.8.2-SNAPSHOT</mdsal.version>
-    <restconf.version>1.8.2-SNAPSHOT</restconf.version>
-    <yangtools.version>2.0.16</yangtools.version>
-    <netconf.version>1.5.2-SNAPSHOT</netconf.version>
+    <mdsal.bmodel.version>1.2.6-SNAPSHOT</mdsal.bmodel.version>
+    <mdsal.version>1.9.0-SNAPSHOT</mdsal.version>
+    <restconf.version>1.9.0-SNAPSHOT</restconf.version>
+    <yangtools.version>2.1.8</yangtools.version>
+    <netconf.version>1.6.0-SNAPSHOT</netconf.version>
     <configfile.directory>etc/opendaylight/karaf</configfile.directory>
   </properties>
 
@@ -35,9 +35,14 @@ and is available at http://www.eclipse.org/legal/epl-v10.html INTERNAL
 
   <dependencies>
     <dependency>
-      <groupId>org.opendaylight.mdsal.model</groupId>
-      <artifactId>ietf-inet-types-2013-07-15</artifactId>
-      <version>${netconf.version}</version>
+      <groupId>org.opendaylight.mdsal.binding.model.ietf</groupId>
+      <artifactId>rfc6991-ietf-inet-types</artifactId>
+      <version>${mdsal.bmodel.version}</version>
+    </dependency>
+    <dependency>
+      <groupId>org.opendaylight.mdsal.binding.model.ietf</groupId>
+      <artifactId>rfc6991-ietf-yang-types</artifactId>
+      <version>${mdsal.bmodel.version}</version>
     </dependency>
     <dependency>
       <groupId>${project.groupId}.ordmodels</groupId>

diff --git a/features/odl-transportpce-stubmodels/pom.xml b/features/odl-transportpce-stubmodels/pom.xml
index ed8337f253dac95d03b7c5362766065921278f3f..177cb39eaf84bc2326e00ea539c4a8f653476b1d 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.6</version>
+    <version>4.0.9</version>
     <relativePath/>
   </parent>
 
@@ -32,9 +32,14 @@ and is available at http://www.eclipse.org/legal/epl-v10.html INTERNAL
 
   <dependencies>
     <dependency>
-      <groupId>org.opendaylight.mdsal.model</groupId>
-      <artifactId>ietf-inet-types-2013-07-15</artifactId>
-      <version>1.5.2-SNAPSHOT</version>
+      <groupId>org.opendaylight.mdsal.binding.model.ietf</groupId>
+      <artifactId>rfc6991-ietf-inet-types</artifactId>
+      <version>1.2.6-SNAPSHOT</version>
+    </dependency>
+    <dependency>
+      <groupId>org.opendaylight.mdsal.binding.model.ietf</groupId>
+      <artifactId>rfc6991-ietf-yang-types</artifactId>
+      <version>1.2.6-SNAPSHOT</version>
     </dependency>
     <dependency>
       <groupId>${project.groupId}</groupId>

diff --git a/features/odl-transportpce/pom.xml b/features/odl-transportpce/pom.xml
index 9557ce24aa51dd0a66a23af395822805fcece5b8..8ca387a30ecbc035b562c8497c45386c546f9755 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.6</version>
+    <version>4.0.9</version>
     <relativePath/>
   </parent>
 
@@ -24,10 +24,10 @@ and is available at http://www.eclipse.org/legal/epl-v10.html INTERNAL
 
   <properties>
     <mdsal.model.version>0.13.2-SNAPSHOT</mdsal.model.version>
-    <mdsal.version>1.8.2-SNAPSHOT</mdsal.version>
-    <yangtools.version>2.0.16</yangtools.version>
-    <netconf.version>1.5.2-SNAPSHOT</netconf.version>
-    <restconf.version>1.8.2-SNAPSHOT</restconf.version>
+    <mdsal.version>1.9.0-SNAPSHOT</mdsal.version>
+    <yangtools.version>2.1.8</yangtools.version>
+    <netconf.version>1.6.0-SNAPSHOT</netconf.version>
+    <restconf.version>1.9.0-SNAPSHOT</restconf.version>
     <configfile.directory>etc/opendaylight/karaf</configfile.directory>
   </properties>
 

diff --git a/features/pom.xml b/features/pom.xml
index 690ee8b19d5aa3200af7dac183c117ca026aef27..8198e0f3ec00a6b1e91622acf9da190af838ad57 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>3.1.6</version>
+    <version>4.0.9</version>
     <relativePath/>
   </parent>
 

diff --git a/karaf/pom.xml b/karaf/pom.xml
index 11ce12b5326bb181e37717d35f9da252cadd3e51..bdaa50e75bbc0cd21c332ab92c2d6061e106429d 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.6</version>
+    <version>4.0.9</version>
     <relativePath/>
   </parent>
 

diff --git a/networkmodel/pom.xml b/networkmodel/pom.xml
index 22b82e15c23eaba3115114a57f5eb3942ee25834..d6587d9063f2ebe0a92fd0b8e8efca3a5d934d7f 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>3.1.6</version>
+    <version>4.0.9</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.5.2-SNAPSHOT</version>
+        <version>1.6.0-SNAPSHOT</version>
         <scope>import</scope>
         <type>pom</type>
       </dependency>

diff --git a/olm/pom.xml b/olm/pom.xml
index 6c7d512ae7a266c0068a8a19a5c9935c5fe49afc..284a0f9d54ebe4766e3fbc64501e617df7b445d7 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>0.13.2-SNAPSHOT</version>
+    <version>3.0.6</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.8.2-SNAPSHOT</version>
+        <version>1.9.0-SNAPSHOT</version>
         <scope>import</scope>
         <type>pom</type>
       </dependency>
       <dependency>
         <groupId>org.opendaylight.netconf</groupId>
         <artifactId>netconf-artifacts</artifactId>
-        <version>1.5.2-SNAPSHOT</version>
+        <version>1.6.0-SNAPSHOT</version>
         <scope>import</scope>
         <type>pom</type>
       </dependency>

diff --git a/ordmodels/common/pom.xml b/ordmodels/common/pom.xml
index 6c509578cead524fb3017f7fa4398055b5d6047e..06d8277584c66bf146c0c33b0df266db4119e4cc 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.13.2-SNAPSHOT</version>
+    <version>3.0.6</version>
     <relativePath/>
   </parent>
 
@@ -35,8 +35,9 @@ and is available at http://www.eclipse.org/legal/epl-v10.html
 
   <dependencies>
     <dependency>
-      <groupId>org.opendaylight.mdsal.model</groupId>
-      <artifactId>ietf-yang-types-20130715</artifactId>
+      <groupId>org.opendaylight.mdsal.binding.model.ietf</groupId>
+      <artifactId>rfc6991-ietf-yang-types</artifactId>
+      <version>1.2.6-SNAPSHOT</version>
     </dependency>
   </dependencies>
 </project>

diff --git a/ordmodels/device/pom.xml b/ordmodels/device/pom.xml
index 4f9fdba0e249afb5aa034dfcb9589a289cdd6e2f..1abad60898f5af19fcd2b17464b1a0e5de35ae01 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.13.2-SNAPSHOT</version>
+    <version>3.0.6</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.5.2-SNAPSHOT</version>
+        <version>1.6.0-SNAPSHOT</version>
         <scope>import</scope>
         <type>pom</type>
       </dependency>
@@ -55,15 +55,18 @@ and is available at http://www.eclipse.org/legal/epl-v10.html
     </dependency>
     <dependency>
       <groupId>org.opendaylight.mdsal.model</groupId>
-      <artifactId>ietf-inet-types-2013-07-15</artifactId>
+      <artifactId>iana-afn-safi</artifactId>
+      <version>2013.07.04.15.6</version>
     </dependency>
     <dependency>
-      <groupId>org.opendaylight.mdsal.model</groupId>
-      <artifactId>iana-afn-safi</artifactId>
+      <groupId>org.opendaylight.mdsal.binding.model.ietf</groupId>
+      <artifactId>rfc6991-ietf-inet-types</artifactId>
+      <version>1.2.6-SNAPSHOT</version>
     </dependency>
     <dependency>
-      <groupId>org.opendaylight.mdsal.model</groupId>
-      <artifactId>ietf-yang-types-20130715</artifactId>
+      <groupId>org.opendaylight.mdsal.binding.model.ietf</groupId>
+      <artifactId>rfc6991-ietf-yang-types</artifactId>
+      <version>1.2.6-SNAPSHOT</version>
     </dependency>
   </dependencies>
 

diff --git a/ordmodels/network/pom.xml b/ordmodels/network/pom.xml
index e8b007e4e86e7809abcda24b8713ff3591fd873a..b36b32bc3e4ca5252090a9c16adf9197bc5d961a 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.13.2-SNAPSHOT</version>
+    <version>3.0.6</version>
     <relativePath/>
   </parent>
 
@@ -43,12 +43,14 @@ and is available at http://www.eclipse.org/legal/epl-v10.html
 
     <!-- other model dependencies -->
     <dependency>
-      <groupId>org.opendaylight.mdsal.model</groupId>
-      <artifactId>ietf-inet-types-2013-07-15</artifactId>
+      <groupId>org.opendaylight.mdsal.binding.model.ietf</groupId>
+      <artifactId>rfc6991-ietf-inet-types</artifactId>
+      <version>1.2.6-SNAPSHOT</version>
     </dependency>
     <dependency>
-      <groupId>org.opendaylight.mdsal.model</groupId>
-      <artifactId>ietf-yang-types-20130715</artifactId>
+      <groupId>org.opendaylight.mdsal.binding.model.ietf</groupId>
+      <artifactId>rfc6991-ietf-yang-types</artifactId>
+      <version>1.2.6-SNAPSHOT</version>
     </dependency>
     <!--dependency>
       <groupId>org.opendaylight.mdsal.binding.model.ietf</groupId>
@@ -69,7 +71,7 @@ and is available at http://www.eclipse.org/legal/epl-v10.html
     <dependency>
       <groupId>org.opendaylight.mdsal.model</groupId>
       <artifactId>ietf-network-2015-06-08</artifactId>
-      <version>1.5.2-SNAPSHOT</version>
+      <version>1.6.0-SNAPSHOT</version>
     </dependency-->
   </dependencies>
 </project>

diff --git a/ordmodels/pom.xml b/ordmodels/pom.xml
index c73d1f157183709c8fd2c3fef6cb833395c245fb..35e3ed6a54a95ab4e0dba5d29cf408fa269c74d6 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.13.2-SNAPSHOT</version>
+    <version>3.0.6</version>
     <relativePath/>
   </parent>
 
@@ -82,7 +82,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.5.2-SNAPSHOT</version>
+        <version>1.6.0-SNAPSHOT</version>
         <type>pom</type>
         <scope>import</scope>
       </dependency>
@@ -102,32 +102,50 @@ and is available at http://www.eclipse.org/legal/epl-v10.html
       <artifactId>ietf-netconf</artifactId>
     </dependency>
     <dependency>
-      <groupId>org.opendaylight.mdsal.model</groupId>
-      <artifactId>ietf-inet-types-2013-07-15</artifactId>
+      <groupId>org.opendaylight.mdsal.binding.model.ietf</groupId>
+      <artifactId>rfc6991-ietf-inet-types</artifactId>
+      <version>1.2.6-SNAPSHOT</version>
+    </dependency>
+    <dependency>
+      <groupId>org.opendaylight.mdsal.binding.model.ietf</groupId>
+      <artifactId>rfc6991-ietf-yang-types</artifactId>
+      <version>1.2.6-SNAPSHOT</version>
     </dependency>
     <dependency>
       <groupId>org.opendaylight.mdsal.model</groupId>
       <artifactId>iana-afn-safi</artifactId>
+      <version>2013.07.04.15.6</version>
+      <type>pom</type>
     </dependency>
     <dependency>
       <groupId>org.opendaylight.mdsal.model</groupId>
       <artifactId>ietf-access-control-list</artifactId>
+      <version>0.13.6-SNAPSHOT</version>
     </dependency>
-    <dependency>
+    <!--dependency>
       <groupId>org.opendaylight.mdsal.model</groupId>
       <artifactId>iana-if-type-2014-05-08</artifactId>
+      <version>2014.05.08.13.2-SNAPSHOT</version>
     </dependency>
     <dependency>
       <groupId>org.opendaylight.mdsal.model</groupId>
-      <artifactId>ietf-yang-types-20130715</artifactId>
+      <artifactId>ietf-interfaces</artifactId>
+      <version>2014.05.08.13.2-SNAPSHOT</version>
+    </dependency-->
+    <dependency>
+      <groupId>org.opendaylight.mdsal.binding.model.iana</groupId>
+      <artifactId>iana-if-type</artifactId>
+      <version>1.0.6-SNAPSHOT</version>
     </dependency>
     <dependency>
-      <groupId>org.opendaylight.mdsal.model</groupId>
-      <artifactId>ietf-interfaces</artifactId>
+      <groupId>org.opendaylight.mdsal.binding.model.ietf</groupId>
+      <artifactId>rfc7223</artifactId>
+      <version>1.2.6-SNAPSHOT</version>
     </dependency>
     <dependency>
       <groupId>org.opendaylight.mdsal.model</groupId>
       <artifactId>ietf-packet-fields</artifactId>
+      <version>0.13.6-SNAPSHOT</version>
     </dependency>
   </dependencies>
 

diff --git a/ordmodels/service/pom.xml b/ordmodels/service/pom.xml
index c2a1c933ab9f3fad2aa09dc7522f3a476416e0c4..074367de2c520b8209824fc3633fb22dce69b569 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.13.2-SNAPSHOT</version>
+    <version>3.0.6</version>
     <relativePath/>
   </parent>
 
@@ -43,12 +43,14 @@ and is available at http://www.eclipse.org/legal/epl-v10.html
 
     <!-- other model dependencies -->
     <dependency>
-      <groupId>org.opendaylight.mdsal.model</groupId>
-      <artifactId>ietf-inet-types-2013-07-15</artifactId>
+      <groupId>org.opendaylight.mdsal.binding.model.ietf</groupId>
+      <artifactId>rfc6991-ietf-inet-types</artifactId>
+      <version>1.2.6-SNAPSHOT</version>
     </dependency>
     <dependency>
-      <groupId>org.opendaylight.mdsal.model</groupId>
-      <artifactId>ietf-yang-types-20130715</artifactId>
+      <groupId>org.opendaylight.mdsal.binding.model.ietf</groupId>
+      <artifactId>rfc6991-ietf-yang-types</artifactId>
+      <version>1.2.6-SNAPSHOT</version>
     </dependency>
   </dependencies>
 </project>

diff --git a/pce/pom.xml b/pce/pom.xml
old mode 100755 (executable)
new mode 100644 (file)
index 695b437..f55172e
--- a/pce/pom.xml
+++ b/pce/pom.xml
@@ -17,7 +17,7 @@ Author: Martial Coulibaly <martial.coulibaly@gfi.com> on behalf of Orange
   <parent>
     <groupId>org.opendaylight.odlparent</groupId>
     <artifactId>bundle-parent</artifactId>
-    <version>3.1.6</version>
+    <version>4.0.9</version>
     <relativePath/>
   </parent>
 
@@ -81,7 +81,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.2-SNAPSHOT</version>
+      <version>1.9.0-SNAPSHOT</version>
       <scope>test</scope>
     </dependency>
 

diff --git a/pom.xml b/pom.xml
index 11b36ecadf6d5cd4617f5747e75597100b463609..0b1906ab42a7c782ef305dacc3ea68e4792dedfb 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.6</version>
+    <version>4.0.9</version>
     <relativePath/>
   </parent>
 

diff --git a/renderer/pom.xml b/renderer/pom.xml
index 06cbb8ee7b2adc542fa83c6c21b8ced5952c25d2..8703a6e2ca881355662d23b43201004031c03eae 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>0.13.2-SNAPSHOT</version>
+    <version>3.0.6</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.8.2-SNAPSHOT</version>
+        <version>1.9.0-SNAPSHOT</version>
         <scope>import</scope>
         <type>pom</type>
       </dependency>
       <dependency>
         <groupId>org.opendaylight.netconf</groupId>
         <artifactId>netconf-artifacts</artifactId>
-        <version>1.5.2-SNAPSHOT</version>
+        <version>1.6.0-SNAPSHOT</version>
         <scope>import</scope>
         <type>pom</type>
       </dependency>

diff --git a/servicehandler/pom.xml b/servicehandler/pom.xml
index f8dff79723c187833cbcaeaa6f82ff8f20c1a43a..d0530c286d6888c01c04a346ca6c04a87694c6de 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>0.13.2-SNAPSHOT</version>
+    <version>3.0.6</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.8.2-SNAPSHOT</version>
+        <version>1.9.0-SNAPSHOT</version>
         <scope>import</scope>
         <type>pom</type>
       </dependency>

diff --git a/test-common/pom.xml b/test-common/pom.xml
index dee110771ce1a33700e248152d39f65285b922a8..b6192ce6902c6056c76dfb25c50acb161e1f33bb 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.6</version>
+        <version>4.0.9</version>
         <relativePath/>
     </parent>
 
@@ -25,14 +25,14 @@
             <dependency>
                 <groupId>org.opendaylight.controller</groupId>
                 <artifactId>mdsal-artifacts</artifactId>
-                <version>1.8.2-SNAPSHOT</version>
+                <version>1.9.0-SNAPSHOT</version>
                 <type>pom</type>
                 <scope>import</scope>
             </dependency>
             <dependency>
                 <groupId>org.opendaylight.yangtools</groupId>
                 <artifactId>yangtools-artifacts</artifactId>
-                <version>2.0.16</version>
+                <version>2.1.8</version>
                 <type>pom</type>
                 <scope>import</scope>
             </dependency>

diff --git a/test-common/src/main/java/org/opendaylight/transportpce/test/common/DataStoreContextImpl.java b/test-common/src/main/java/org/opendaylight/transportpce/test/common/DataStoreContextImpl.java
index f0dc8f7ef8827a64080b88e1c34835a8692495ab..2b7a4d27b1b086860e34572d08820087e195a51f 100644 (file)
--- a/test-common/src/main/java/org/opendaylight/transportpce/test/common/DataStoreContextImpl.java
+++ b/test-common/src/main/java/org/opendaylight/transportpce/test/common/DataStoreContextImpl.java
@@ -185,7 +185,7 @@ public class DataStoreContextImpl implements DataStoreContext {
         private SchemaContext getSchemaContext(List<YangModuleInfo> moduleInfos) {
             this.moduleInfoBackedCntxt.addModuleInfos(moduleInfos);
             Optional<SchemaContext> tryToCreateSchemaContext =
-                    this.moduleInfoBackedCntxt.tryToCreateSchemaContext().toJavaUtil();
+                    this.moduleInfoBackedCntxt.tryToCreateSchemaContext();
             if (!tryToCreateSchemaContext.isPresent()) {
                 LOG.error("Could not create the initial schema context. Schema context is empty");
                 throw new IllegalStateException();

diff --git a/tests/pom.xml b/tests/pom.xml
index 944c65b578757a20535fd947ee326cee19287d29..35ee0810582c17cf8cee49b4be425241d0fc3cbb 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.6</version>
+    <version>4.0.9</version>
     <relativePath/>
   </parent>
 

diff --git a/tests/stubmodels/pom.xml b/tests/stubmodels/pom.xml
index 6c5962e103b92f356332aec8039b9ba68a525cf9..c9d28e23aae64ded39a8ac4961d0c6b23bf9ee56 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.13.2-SNAPSHOT</version>
+    <version>3.0.6</version>
     <relativePath/>
   </parent>
 

diff --git a/tests/stubpce/pom.xml b/tests/stubpce/pom.xml
index 15b0fe9c2ec7584d45867b32c6cc01a3e2eaefd6..85fab8cb02e2ceb8ae399c20e8dfba01c769aaa3 100644 (file)
--- a/tests/stubpce/pom.xml
+++ b/tests/stubpce/pom.xml
@@ -17,7 +17,7 @@ Author: Martial Coulibaly <martial.coulibaly@gfi.com> on behalf of Orange
   <parent>
     <groupId>org.opendaylight.mdsal</groupId>
     <artifactId>binding-parent</artifactId>
-    <version>0.13.2-SNAPSHOT</version>
+    <version>3.0.6</version>
     <relativePath/>
   </parent>
 
@@ -40,20 +40,20 @@ Author: Martial Coulibaly <martial.coulibaly@gfi.com> on behalf of Orange
       </plugin>
     </plugins>
   </build>
-  
+
   <dependencyManagement>
     <dependencies>
       <dependency>
         <groupId>org.opendaylight.controller</groupId>
         <artifactId>mdsal-artifacts</artifactId>
-        <version>1.8.2-SNAPSHOT</version>
+        <version>1.9.0-SNAPSHOT</version>
         <scope>import</scope>
         <type>pom</type>
       </dependency>
       <dependency>
         <groupId>org.opendaylight.netconf</groupId>
         <artifactId>netconf-artifacts</artifactId>
-        <version>1.5.2-SNAPSHOT</version>
+        <version>1.6.0-SNAPSHOT</version>
         <scope>import</scope>
         <type>pom</type>
       </dependency>

diff --git a/tests/stubrenderer/pom.xml b/tests/stubrenderer/pom.xml
index d7f027d3a5a747af46b83c692cfab34f6bcd6533..23b1114831aa784709aab8d23a2a32df562a4684 100644 (file)
--- a/tests/stubrenderer/pom.xml
+++ b/tests/stubrenderer/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>0.13.2-SNAPSHOT</version>
+    <version>3.0.6</version>
     <relativePath/>
   </parent>
 
@@ -29,14 +29,14 @@ Author: Martial Coulibaly <martial.coulibaly@gfi.com> on behalf of Orange
       <dependency>
         <groupId>org.opendaylight.controller</groupId>
         <artifactId>mdsal-artifacts</artifactId>
-        <version>1.8.2-SNAPSHOT</version>
+        <version>1.9.0-SNAPSHOT</version>
         <scope>import</scope>
         <type>pom</type>
       </dependency>
       <dependency>
         <groupId>org.opendaylight.netconf</groupId>
         <artifactId>netconf-artifacts</artifactId>
-        <version>1.5.2-SNAPSHOT</version>
+        <version>1.6.0-SNAPSHOT</version>
         <scope>import</scope>
         <type>pom</type>
       </dependency>