From 6eee75e1f7064740e0f0de8a6b39d86171df0311 Mon Sep 17 00:00:00 2001 From: "guillaume.lambert" Date: Mon, 6 May 2019 17:44:57 +0200 Subject: [PATCH] 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 --- api/pom.xml | 2 +- artifacts/pom.xml | 2 +- common/pom.xml | 2 +- features/features-transportpce/pom.xml | 2 +- features/odl-transportpce-api/pom.xml | 2 +- features/odl-transportpce-ordmodels/pom.xml | 4 ++-- features/odl-transportpce-stubmodels/pom.xml | 2 +- features/odl-transportpce/pom.xml | 4 ++-- features/pom.xml | 2 +- karaf/pom.xml | 2 +- networkmodel/pom.xml | 2 +- olm/pom.xml | 2 +- ordmodels/common/pom.xml | 2 +- ordmodels/device/pom.xml | 2 +- ordmodels/network/pom.xml | 2 +- ordmodels/pom.xml | 2 +- ordmodels/service/pom.xml | 2 +- pce/pom.xml | 2 +- pom.xml | 2 +- renderer/pom.xml | 2 +- servicehandler/pom.xml | 2 +- test-common/pom.xml | 4 ++-- .../binding/converter/JSONDataObjectConverter.java | 3 ++- tests/pom.xml | 2 +- tests/stubmodels/pom.xml | 2 +- tests/stubpce/pom.xml | 2 +- tests/stubrenderer/pom.xml | 2 +- 27 files changed, 31 insertions(+), 30 deletions(-) diff --git a/api/pom.xml b/api/pom.xml index 0ee1444e8..3b6d7a839 100644 --- a/api/pom.xml +++ b/api/pom.xml @@ -12,7 +12,7 @@ and is available at http://www.eclipse.org/legal/epl-v10.html org.opendaylight.mdsal binding-parent - 3.0.6 + 3.0.8 diff --git a/artifacts/pom.xml b/artifacts/pom.xml index bb5655f68..db7bf7d30 100644 --- a/artifacts/pom.xml +++ b/artifacts/pom.xml @@ -13,7 +13,7 @@ and is available at http://www.eclipse.org/legal/epl-v10.html org.opendaylight.odlparent odlparent-lite - 4.0.9 + 4.0.10 diff --git a/common/pom.xml b/common/pom.xml index a37870b0d..2786a5a1b 100644 --- a/common/pom.xml +++ b/common/pom.xml @@ -10,7 +10,7 @@ org.opendaylight.odlparent bundle-parent - 4.0.9 + 4.0.10 diff --git a/features/features-transportpce/pom.xml b/features/features-transportpce/pom.xml index 039e65d80..a9c93a737 100644 --- 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 org.opendaylight.odlparent feature-repo-parent - 4.0.9 + 4.0.10 diff --git a/features/odl-transportpce-api/pom.xml b/features/odl-transportpce-api/pom.xml index 8a9298364..6f9e5be11 100644 --- 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 org.opendaylight.odlparent single-feature-parent - 4.0.9 + 4.0.10 diff --git a/features/odl-transportpce-ordmodels/pom.xml b/features/odl-transportpce-ordmodels/pom.xml index ec00b75a4..660d5fb1a 100644 --- 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 org.opendaylight.odlparent single-feature-parent - 4.0.9 + 4.0.10 @@ -24,7 +24,7 @@ and is available at http://www.eclipse.org/legal/epl-v10.html INTERNAL 1.9.1-SNAPSHOT 1.9.1-SNAPSHOT - 2.1.8 + 2.1.10 1.6.1-SNAPSHOT etc/opendaylight/karaf diff --git a/features/odl-transportpce-stubmodels/pom.xml b/features/odl-transportpce-stubmodels/pom.xml index 0b7309a2d..68a7766aa 100644 --- 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 org.opendaylight.odlparent single-feature-parent - 4.0.9 + 4.0.10 diff --git a/features/odl-transportpce/pom.xml b/features/odl-transportpce/pom.xml index 8ed189171..f0ff1eb8a 100644 --- 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 org.opendaylight.odlparent single-feature-parent - 4.0.9 + 4.0.10 @@ -25,7 +25,7 @@ and is available at http://www.eclipse.org/legal/epl-v10.html INTERNAL 0.13.2 1.9.1-SNAPSHOT - 2.1.8 + 2.1.10 1.6.1-SNAPSHOT 1.9.1-SNAPSHOT etc/opendaylight/karaf diff --git a/features/pom.xml b/features/pom.xml index bb519474b..f9061c088 100644 --- 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 org.opendaylight.odlparent odlparent-lite - 4.0.9 + 4.0.10 diff --git a/karaf/pom.xml b/karaf/pom.xml index 8f1397d7f..60247ff1c 100644 --- 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 org.opendaylight.odlparent karaf4-parent - 4.0.9 + 4.0.10 diff --git a/networkmodel/pom.xml b/networkmodel/pom.xml index 631a00ec0..4f5f6dfbb 100644 --- a/networkmodel/pom.xml +++ b/networkmodel/pom.xml @@ -13,7 +13,7 @@ and is available at http://www.eclipse.org/legal/epl-v10.html org.opendaylight.odlparent bundle-parent - 4.0.9 + 4.0.10 diff --git a/olm/pom.xml b/olm/pom.xml index 8b8578471..67212f852 100644 --- a/olm/pom.xml +++ b/olm/pom.xml @@ -13,7 +13,7 @@ and is available at http://www.eclipse.org/legal/epl-v10.html org.opendaylight.mdsal binding-parent - 3.0.6 + 3.0.8 diff --git a/ordmodels/common/pom.xml b/ordmodels/common/pom.xml index 44e21bc22..866a5a5f6 100644 --- 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 org.opendaylight.mdsal binding-parent - 3.0.6 + 3.0.8 diff --git a/ordmodels/device/pom.xml b/ordmodels/device/pom.xml index ac800e55d..e5dd035f6 100644 --- 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 org.opendaylight.mdsal binding-parent - 3.0.6 + 3.0.8 diff --git a/ordmodels/network/pom.xml b/ordmodels/network/pom.xml index a1d55a513..ab2f64eca 100644 --- 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 org.opendaylight.mdsal binding-parent - 3.0.6 + 3.0.8 diff --git a/ordmodels/pom.xml b/ordmodels/pom.xml index 1e3155b38..78627d582 100644 --- a/ordmodels/pom.xml +++ b/ordmodels/pom.xml @@ -12,7 +12,7 @@ and is available at http://www.eclipse.org/legal/epl-v10.html org.opendaylight.mdsal binding-parent - 3.0.6 + 3.0.8 diff --git a/ordmodels/service/pom.xml b/ordmodels/service/pom.xml index 1e1a8eb61..82ae919da 100644 --- 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 org.opendaylight.mdsal binding-parent - 3.0.6 + 3.0.8 diff --git a/pce/pom.xml b/pce/pom.xml index 591ed9bdb..2d5e2f896 100644 --- a/pce/pom.xml +++ b/pce/pom.xml @@ -17,7 +17,7 @@ Author: Martial Coulibaly on behalf of Orange org.opendaylight.odlparent bundle-parent - 4.0.9 + 4.0.10 diff --git a/pom.xml b/pom.xml index d35fa4f19..df2c1e278 100644 --- a/pom.xml +++ b/pom.xml @@ -11,7 +11,7 @@ and is available at http://www.eclipse.org/legal/epl-v10.html INTERNAL org.opendaylight.odlparent odlparent - 4.0.9 + 4.0.10 diff --git a/renderer/pom.xml b/renderer/pom.xml index 73e6f0cf0..30807d4da 100644 --- a/renderer/pom.xml +++ b/renderer/pom.xml @@ -13,7 +13,7 @@ and is available at http://www.eclipse.org/legal/epl-v10.html org.opendaylight.mdsal binding-parent - 3.0.6 + 3.0.8 diff --git a/servicehandler/pom.xml b/servicehandler/pom.xml index 198bab8dc..c120b9133 100644 --- a/servicehandler/pom.xml +++ b/servicehandler/pom.xml @@ -15,7 +15,7 @@ Author: Martial Coulibaly on behalf of Orange org.opendaylight.mdsal binding-parent - 3.0.6 + 3.0.8 diff --git a/test-common/pom.xml b/test-common/pom.xml index 886b28f40..8563dc2be 100644 --- a/test-common/pom.xml +++ b/test-common/pom.xml @@ -11,7 +11,7 @@ org.opendaylight.odlparent bundle-parent - 4.0.9 + 4.0.10 @@ -32,7 +32,7 @@ org.opendaylight.yangtools yangtools-artifacts - 2.1.8 + 2.1.10 pom import 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 c97b2145c..c0fc3256f 100644 --- 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 e3151ff15..61bc63384 100644 --- 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 org.opendaylight.odlparent odlparent - 4.0.9 + 4.0.10 diff --git a/tests/stubmodels/pom.xml b/tests/stubmodels/pom.xml index 3d75c40dd..3be01860f 100644 --- 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 org.opendaylight.mdsal binding-parent - 3.0.6 + 3.0.8 diff --git a/tests/stubpce/pom.xml b/tests/stubpce/pom.xml index a6abff3ec..2263cd1f0 100644 --- a/tests/stubpce/pom.xml +++ b/tests/stubpce/pom.xml @@ -17,7 +17,7 @@ Author: Martial Coulibaly on behalf of Orange org.opendaylight.mdsal binding-parent - 3.0.6 + 3.0.8 diff --git a/tests/stubrenderer/pom.xml b/tests/stubrenderer/pom.xml index 3f18e6a22..a80b60132 100644 --- a/tests/stubrenderer/pom.xml +++ b/tests/stubrenderer/pom.xml @@ -15,7 +15,7 @@ Author: Martial Coulibaly on behalf of Orange org.opendaylight.mdsal binding-parent - 3.0.6 + 3.0.8 -- 2.36.6