Bump to Neon SR1 dependencies

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

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

diff --git a/api/pom.xml b/api/pom.xml
index 0ee1444e83cbde5178a3dd4db02bc681f319d5e7..3b6d7a839e3409f8924e8ba48e9b3ed3bd7c480d 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>3.0.6</version>
+    <version>3.0.8</version>
     <relativePath/>
   </parent>
 

diff --git a/artifacts/pom.xml b/artifacts/pom.xml
index bb5655f68f82dc1a1eef81181667fdfc8c291f6b..db7bf7d309d3c4f110ba08cb50b93b38722bbe66 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>4.0.9</version>
+    <version>4.0.10</version>
     <relativePath/>
   </parent>
 

diff --git a/common/pom.xml b/common/pom.xml
index a37870b0d068599bb670c3b6312028f0520e8185..2786a5a1b37cc85ef234419854c663880986a94e 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>4.0.9</version>
+        <version>4.0.10</version>
         <relativePath />
     </parent>
 

diff --git a/features/features-transportpce/pom.xml b/features/features-transportpce/pom.xml
index 039e65d808f68173c7a84c3608093d5d87f4840a..a9c93a737242d8933bce4b9586af0e843324be54 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>4.0.9</version>
+    <version>4.0.10</version>
     <relativePath/>
   </parent>
 

diff --git a/features/odl-transportpce-api/pom.xml b/features/odl-transportpce-api/pom.xml
index 8a929836442279a6702d7d040a522503d72759d5..6f9e5be118e8fbeb85326caa671bd8a4c7552377 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>4.0.9</version>
+    <version>4.0.10</version>
     <relativePath/>
   </parent>
 

diff --git a/features/odl-transportpce-ordmodels/pom.xml b/features/odl-transportpce-ordmodels/pom.xml
index ec00b75a4feee947c1ba2532883bf3746f784c79..660d5fb1abe9b0b5d75b5a62ae709852bd19dd7d 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>4.0.9</version>
+    <version>4.0.10</version>
     <relativePath/>
   </parent>
 
@@ -24,7 +24,7 @@ and is available at http://www.eclipse.org/legal/epl-v10.html INTERNAL
   <properties>
     <mdsal.version>1.9.1-SNAPSHOT</mdsal.version>
     <restconf.version>1.9.1-SNAPSHOT</restconf.version>
-    <yangtools.version>2.1.8</yangtools.version>
+    <yangtools.version>2.1.10</yangtools.version>
     <netconf.version>1.6.1-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 0b7309a2dd0064450908e11fa16aba3c2a70ae38..68a7766aa7b6e1b03847fb67d43bfc30195c3326 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>4.0.9</version>
+    <version>4.0.10</version>
     <relativePath/>
   </parent>
 

diff --git a/features/odl-transportpce/pom.xml b/features/odl-transportpce/pom.xml
index 8ed1891712eb392de5ef018103318c47df8d1783..f0ff1eb8a465d8accb8d3b11a5bb616351f5fca5 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>4.0.9</version>
+    <version>4.0.10</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.2</mdsal.model.version>
     <mdsal.version>1.9.1-SNAPSHOT</mdsal.version>
-    <yangtools.version>2.1.8</yangtools.version>
+    <yangtools.version>2.1.10</yangtools.version>
     <netconf.version>1.6.1-SNAPSHOT</netconf.version>
     <restconf.version>1.9.1-SNAPSHOT</restconf.version>
     <configfile.directory>etc/opendaylight/karaf</configfile.directory>

diff --git a/features/pom.xml b/features/pom.xml
index bb519474b87f4eb9455a60e2eef67dbe106a168a..f9061c088ecef0085badd2ccc14932a2ff582fc0 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>4.0.9</version>
+    <version>4.0.10</version>
     <relativePath/>
   </parent>
 

diff --git a/karaf/pom.xml b/karaf/pom.xml
index 8f1397d7f7bb2daa93e9d3e1582575b07d1e4cc0..60247ff1cb3924e8b042ffaba31373ce87f07754 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>4.0.9</version>
+    <version>4.0.10</version>
     <relativePath/>
   </parent>
 

diff --git a/networkmodel/pom.xml b/networkmodel/pom.xml
index 631a00ec02820e5a98ce725153f0a8ce72c6aaba..4f5f6dfbb807eec68a6fcf343923d8668cd9f440 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>4.0.9</version>
+    <version>4.0.10</version>
     <relativePath/>
   </parent>
 

diff --git a/olm/pom.xml b/olm/pom.xml
index 8b85784718b8762f8ebb2f5db404916865ff6992..67212f852c86a8b584fb43998876ee1f12730084 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>3.0.6</version>
+    <version>3.0.8</version>
     <relativePath/>
   </parent>
 

diff --git a/ordmodels/common/pom.xml b/ordmodels/common/pom.xml
index 44e21bc22ba832c3f99587ce8b2692c18961881b..866a5a5f6bd65581d382c926307ae6b6aab3abc9 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>3.0.6</version>
+    <version>3.0.8</version>
     <relativePath/>
   </parent>
 

diff --git a/ordmodels/device/pom.xml b/ordmodels/device/pom.xml
index ac800e55d299b32f6e94672716d3ce670cb3aaaa..e5dd035f65db78b2ffba0b9d00db6da6ad52c6b5 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>3.0.6</version>
+    <version>3.0.8</version>
     <relativePath/>
   </parent>
 

diff --git a/ordmodels/network/pom.xml b/ordmodels/network/pom.xml
index a1d55a513b5685d261e78b9764474bcb4c24b28d..ab2f64ecac2651c1b37b25edeeffaa76fb832968 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>3.0.6</version>
+    <version>3.0.8</version>
     <relativePath/>
   </parent>
 

diff --git a/ordmodels/pom.xml b/ordmodels/pom.xml
index 1e3155b38867b0a5e32ec3ae47c61746a106d608..78627d582ea7ab195c774ddf716f836a348cd08a 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>3.0.6</version>
+    <version>3.0.8</version>
     <relativePath/>
   </parent>
 

diff --git a/ordmodels/service/pom.xml b/ordmodels/service/pom.xml
index 1e1a8eb618503d95463b513e8d5e7a52df7948d1..82ae919da8d0ccb053ed0cacedfcb370e24a4cd4 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>3.0.6</version>
+    <version>3.0.8</version>
     <relativePath/>
   </parent>
 

diff --git a/pce/pom.xml b/pce/pom.xml
index 591ed9bdbe5129077e0b0faa7c8d60226e86073c..2d5e2f896d5a9de93b38dbaba072a8e0d305c32b 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>4.0.9</version>
+    <version>4.0.10</version>
     <relativePath/>
   </parent>
 

diff --git a/pom.xml b/pom.xml
index d35fa4f197b51e45dc3eefe5beda6a3730a72c43..df2c1e278b43d82cd763ef777060df54dd6de34a 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>4.0.9</version>
+    <version>4.0.10</version>
     <relativePath/>
   </parent>
 

diff --git a/renderer/pom.xml b/renderer/pom.xml
index 73e6f0cf0bd3f92a8e3242543cfd4ee0863b7f6a..30807d4da3882147f26148d9a55868049f2c7c9b 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>3.0.6</version>
+    <version>3.0.8</version>
     <relativePath/>
   </parent>
 

diff --git a/servicehandler/pom.xml b/servicehandler/pom.xml
index 198bab8dc95dcb4697b491ece4798fd00d6fc49b..c120b9133879651de5d1ccdd9c50fd0e69cfac63 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>3.0.6</version>
+    <version>3.0.8</version>
     <relativePath/>
   </parent>
 

diff --git a/test-common/pom.xml b/test-common/pom.xml
index 886b28f4044d71f29cd8769fc013db4339f0d515..8563dc2be0c7953d3d8897a946b12125d612f221 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>4.0.9</version>
+        <version>4.0.10</version>
         <relativePath/>
     </parent>
 
@@ -32,7 +32,7 @@
             <dependency>
                 <groupId>org.opendaylight.yangtools</groupId>
                 <artifactId>yangtools-artifacts</artifactId>
-                <version>2.1.8</version>
+                <version>2.1.10</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 e3151ff15f1ec0a8edea66723470e03c7b576a8d..61bc63384f650fc37fd31da97f449680c9c10b81 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>4.0.9</version>
+    <version>4.0.10</version>
     <relativePath/>
   </parent>
 

diff --git a/tests/stubmodels/pom.xml b/tests/stubmodels/pom.xml
index 3d75c40ddd4f2265c90eaac63c6546c774a0bc1b..3be01860f6d153a44d7b29806bfa026e0d1defef 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>3.0.6</version>
+    <version>3.0.8</version>
     <relativePath/>
   </parent>
 

diff --git a/tests/stubpce/pom.xml b/tests/stubpce/pom.xml
index a6abff3ecb8d7eb904015283fbdd273198164472..2263cd1f0ede72d0317b1285a350bbb098d676dc 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>3.0.6</version>
+    <version>3.0.8</version>
     <relativePath/>
   </parent>
 

diff --git a/tests/stubrenderer/pom.xml b/tests/stubrenderer/pom.xml
index 3f18e6a2299c3137ae6cbfd9b97cef21d796f066..a80b601326cb58445eacb26357ffdd7585e358b9 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>3.0.6</version>
+    <version>3.0.8</version>
     <relativePath/>
   </parent>