Bump to yangtools 2.0.20 and odlparent 3.1.7

to comply with new Fluorine SR3 dependencies

yangtools.yang.data.codec.gson.JSONNormalizedNodeStreamWriter
createExclusiveWriter has now 2 prototypes
JSONDataObjectConverter.java has to be adapted to avoid ambiguity

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

diff --git a/artifacts/pom.xml b/artifacts/pom.xml
index 06fa993b70261a83d829ffeb701279fc8efefd09..a799807fcd8b243b083e5fd83d774051677e2e16 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>3.1.7</version>
     <relativePath/>
   </parent>
 

diff --git a/common/pom.xml b/common/pom.xml
index 51a8c4c81b8f4c1c7febb2af441a58d14d4e0c07..bf98a7fa6007a06028a8eadadcb1960c3ca9503a 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>3.1.7</version>
         <relativePath />
     </parent>
 

diff --git a/features/features-transportpce/pom.xml b/features/features-transportpce/pom.xml
index 37f2bd46da52e74421971211e434aaf09981b485..81acc6fe61f6449c7f314e7da0e1f5d0edab7d17 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>3.1.7</version>
     <relativePath/>
   </parent>
 

diff --git a/features/odl-transportpce-api/pom.xml b/features/odl-transportpce-api/pom.xml
index 86a1fa5b071388bd3f9272bf2df810528730914a..e02c21b5219ac79b246abdc09c13687a7d557fed 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>3.1.7</version>
     <relativePath/>
   </parent>
 

diff --git a/features/odl-transportpce-ordmodels/pom.xml b/features/odl-transportpce-ordmodels/pom.xml
index 227bddf2dd1f76bfdfe216ceb49c57967409f8c5..0eb1a661ff1bf30834c46f28f91b842246ce42ef 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>3.1.7</version>
     <relativePath/>
   </parent>
 
@@ -25,7 +25,7 @@ and is available at http://www.eclipse.org/legal/epl-v10.html INTERNAL
     <mdsal.model.version>0.13.3-SNAPSHOT</mdsal.model.version>
     <mdsal.version>1.8.3-SNAPSHOT</mdsal.version>
     <restconf.version>1.8.3-SNAPSHOT</restconf.version>
-    <yangtools.version>2.0.16</yangtools.version>
+    <yangtools.version>2.0.20</yangtools.version>
     <netconf.version>1.5.3-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 51563fe6fa244522526f1a536c5399b8f469b573..8a64bc40d64788bebbd45e4a7e82b2cb12563443 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>3.1.7</version>
     <relativePath/>
   </parent>
 

diff --git a/features/odl-transportpce/pom.xml b/features/odl-transportpce/pom.xml
index c814bbd5a134e3836ece2e985140fb0595a1aaaa..fb361b21a00fc176f1fc8adb48dab63b69e48ce7 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>3.1.7</version>
     <relativePath/>
   </parent>
 
@@ -25,7 +25,7 @@ and is available at http://www.eclipse.org/legal/epl-v10.html INTERNAL
   <properties>
     <mdsal.model.version>0.13.3-SNAPSHOT</mdsal.model.version>
     <mdsal.version>1.8.3-SNAPSHOT</mdsal.version>
-    <yangtools.version>2.0.16</yangtools.version>
+    <yangtools.version>2.0.20</yangtools.version>
     <netconf.version>1.5.3-SNAPSHOT</netconf.version>
     <restconf.version>1.8.3-SNAPSHOT</restconf.version>
     <configfile.directory>etc/opendaylight/karaf</configfile.directory>

diff --git a/features/pom.xml b/features/pom.xml
index 45381d68de28fdb6fc450f442c500e93d0e8fe7c..cae4a3c869a3e8542a56ecd79890a4bda0c45ba7 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>3.1.7</version>
     <relativePath/>
   </parent>
 

diff --git a/karaf/pom.xml b/karaf/pom.xml
index 46e11317b213ac65f10c896c27c41197c3d8a5c7..d64442ad15754c82a6de03b05e9f86813777582a 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>3.1.7</version>
     <relativePath/>
   </parent>
 

diff --git a/networkmodel/pom.xml b/networkmodel/pom.xml
index dfb6d087589087e0c0b55e949ecf28ec7cc66af5..3acc25f50c166f97c6abee59c7cac481a7c18a49 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>3.1.7</version>
     <relativePath/>
   </parent>
 

diff --git a/pce/pom.xml b/pce/pom.xml
index a54fd0aaf6469b97067b32620fd76d43390b52f0..2626d114bd15f5ca738d278279cb54192fda0e98 100644 (file)
--- 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>3.1.7</version>
     <relativePath/>
   </parent>
 

diff --git a/pom.xml b/pom.xml
index 2f15d0c4907f11e54720f6932701031705ef1986..5ef489093f31a7c44401e5b61e423f6f3acc90b6 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>3.1.7</version>
     <relativePath/>
   </parent>
 

diff --git a/test-common/pom.xml b/test-common/pom.xml
index b3b7b98f688bbf146e9eec8def55978a90d91035..3f85afa6b28ca8fe178fcae2d8cbffd08548542d 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>3.1.7</version>
         <relativePath/>
     </parent>
 
@@ -32,7 +32,7 @@
             <dependency>
                 <groupId>org.opendaylight.yangtools</groupId>
                 <artifactId>yangtools-artifacts</artifactId>
-                <version>2.0.16</version>
+                <version>2.0.20</version>
                 <type>pom</type>
                 <scope>import</scope>
             </dependency>

diff --git a/test-common/src/main/java/org/opendaylight/transportpce/binding/converter/JSONDataObjectConverter.java b/test-common/src/main/java/org/opendaylight/transportpce/binding/converter/JSONDataObjectConverter.java
index c97b2145c1602035cc1a152c9182aa7500deabed..c0fc3256fe88bbecf1588fcdc89b725b2778ebef 100644 (file)
--- a/test-common/src/main/java/org/opendaylight/transportpce/binding/converter/JSONDataObjectConverter.java
+++ b/test-common/src/main/java/org/opendaylight/transportpce/binding/converter/JSONDataObjectConverter.java
@@ -105,7 +105,8 @@ public final class JSONDataObjectConverter extends AbstractDataObjectConverter {
         JsonWriter jsonWriter = new JsonWriter(writer);
         JSONCodecFactory jsonCodecFactory = JSONCodecFactory.createLazy(getSchemaContext());
         NormalizedNodeStreamWriter create =
-                JSONNormalizedNodeStreamWriter.createExclusiveWriter(jsonCodecFactory, null, null, jsonWriter);
+            JSONNormalizedNodeStreamWriter.createExclusiveWriter(jsonCodecFactory,
+            (org.opendaylight.yangtools.yang.model.api.DataNodeContainer)null, null, jsonWriter);
 
         try (NormalizedNodeWriter normalizedNodeWriter = NormalizedNodeWriter.forStreamWriter(create);) {
             normalizedNodeWriter

diff --git a/tests/pom.xml b/tests/pom.xml
index 19b5fcfe32943b9630a531c23d045ec6d196282f..e79e691dcf0da742b5ac4fb61145ad15bede1ea4 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>3.1.7</version>
     <relativePath/>
   </parent>