From 0d2599843447182bfdd8dd4b3815c543ff9c5268 Mon Sep 17 00:00:00 2001 From: "guillaume.lambert" Date: Wed, 5 Dec 2018 15:28:54 +0100 Subject: [PATCH] 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 --- api/pom.xml | 2 +- artifacts/pom.xml | 2 +- common/pom.xml | 6 ++-- features/features-transportpce/pom.xml | 2 +- features/odl-transportpce-api/pom.xml | 23 ++++++++----- features/odl-transportpce-ordmodels/pom.xml | 23 ++++++++----- features/odl-transportpce-stubmodels/pom.xml | 13 ++++--- features/odl-transportpce/pom.xml | 10 +++--- features/pom.xml | 2 +- karaf/pom.xml | 2 +- networkmodel/pom.xml | 4 +-- olm/pom.xml | 6 ++-- ordmodels/common/pom.xml | 7 ++-- ordmodels/device/pom.xml | 17 ++++++---- ordmodels/network/pom.xml | 14 ++++---- ordmodels/pom.xml | 34 ++++++++++++++----- ordmodels/service/pom.xml | 12 ++++--- pce/pom.xml | 4 +-- pom.xml | 2 +- renderer/pom.xml | 6 ++-- servicehandler/pom.xml | 4 +-- test-common/pom.xml | 6 ++-- .../test/common/DataStoreContextImpl.java | 2 +- tests/pom.xml | 2 +- tests/stubmodels/pom.xml | 2 +- tests/stubpce/pom.xml | 8 ++--- tests/stubrenderer/pom.xml | 6 ++-- 27 files changed, 131 insertions(+), 90 deletions(-) mode change 100755 => 100644 pce/pom.xml diff --git a/api/pom.xml b/api/pom.xml index 48e0e3471..a67212f71 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 - 0.13.2-SNAPSHOT + 3.0.6 diff --git a/artifacts/pom.xml b/artifacts/pom.xml index 6a68bd325..2760b6848 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 - 3.1.6 + 4.0.9 diff --git a/common/pom.xml b/common/pom.xml index b7d8de3b4..369578ff7 100644 --- a/common/pom.xml +++ b/common/pom.xml @@ -10,7 +10,7 @@ org.opendaylight.odlparent bundle-parent - 3.1.6 + 4.0.9 @@ -24,14 +24,14 @@ org.opendaylight.controller mdsal-artifacts - 1.8.2-SNAPSHOT + 1.9.0-SNAPSHOT import pom org.opendaylight.netconf netconf-artifacts - 1.5.2-SNAPSHOT + 1.6.0-SNAPSHOT import pom diff --git a/features/features-transportpce/pom.xml b/features/features-transportpce/pom.xml index 66a06838f..06942cfda 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 - 3.1.6 + 4.0.9 diff --git a/features/odl-transportpce-api/pom.xml b/features/odl-transportpce-api/pom.xml index 18ef219aa..8314cf09b 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 - 3.1.6 + 4.0.9 @@ -23,11 +23,11 @@ and is available at http://www.eclipse.org/legal/epl-v10.html INTERNAL - 0.13.1-SNAPSHOT - 1.8.1-SNAPSHOT - 1.8.1-SNAPSHOT - 2.0.16 - 1.5.2-SNAPSHOT + 1.2.6-SNAPSHOT + 1.9.0-SNAPSHOT + 1.9.0-SNAPSHOT + 2.1.8 + 1.6.0-SNAPSHOT etc/opendaylight/karaf @@ -36,9 +36,14 @@ and is available at http://www.eclipse.org/legal/epl-v10.html INTERNAL - org.opendaylight.mdsal.model - ietf-inet-types-2013-07-15 - ${netconf.version} + org.opendaylight.mdsal.binding.model.ietf + rfc6991-ietf-inet-types + ${mdsal.bmodel.version} + + + org.opendaylight.mdsal.binding.model.ietf + rfc6991-ietf-yang-types + ${mdsal.bmodel.version} ${project.groupId} diff --git a/features/odl-transportpce-ordmodels/pom.xml b/features/odl-transportpce-ordmodels/pom.xml index 5a39fe1b4..218aa1893 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 - 3.1.6 + 4.0.9 @@ -22,11 +22,11 @@ and is available at http://www.eclipse.org/legal/epl-v10.html INTERNAL feature - 0.13.2-SNAPSHOT - 1.8.2-SNAPSHOT - 1.8.2-SNAPSHOT - 2.0.16 - 1.5.2-SNAPSHOT + 1.2.6-SNAPSHOT + 1.9.0-SNAPSHOT + 1.9.0-SNAPSHOT + 2.1.8 + 1.6.0-SNAPSHOT etc/opendaylight/karaf @@ -35,9 +35,14 @@ and is available at http://www.eclipse.org/legal/epl-v10.html INTERNAL - org.opendaylight.mdsal.model - ietf-inet-types-2013-07-15 - ${netconf.version} + org.opendaylight.mdsal.binding.model.ietf + rfc6991-ietf-inet-types + ${mdsal.bmodel.version} + + + org.opendaylight.mdsal.binding.model.ietf + rfc6991-ietf-yang-types + ${mdsal.bmodel.version} ${project.groupId}.ordmodels diff --git a/features/odl-transportpce-stubmodels/pom.xml b/features/odl-transportpce-stubmodels/pom.xml index ed8337f25..177cb39ea 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 - 3.1.6 + 4.0.9 @@ -32,9 +32,14 @@ and is available at http://www.eclipse.org/legal/epl-v10.html INTERNAL - org.opendaylight.mdsal.model - ietf-inet-types-2013-07-15 - 1.5.2-SNAPSHOT + org.opendaylight.mdsal.binding.model.ietf + rfc6991-ietf-inet-types + 1.2.6-SNAPSHOT + + + org.opendaylight.mdsal.binding.model.ietf + rfc6991-ietf-yang-types + 1.2.6-SNAPSHOT ${project.groupId} diff --git a/features/odl-transportpce/pom.xml b/features/odl-transportpce/pom.xml index 9557ce24a..8ca387a30 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 - 3.1.6 + 4.0.9 @@ -24,10 +24,10 @@ and is available at http://www.eclipse.org/legal/epl-v10.html INTERNAL 0.13.2-SNAPSHOT - 1.8.2-SNAPSHOT - 2.0.16 - 1.5.2-SNAPSHOT - 1.8.2-SNAPSHOT + 1.9.0-SNAPSHOT + 2.1.8 + 1.6.0-SNAPSHOT + 1.9.0-SNAPSHOT etc/opendaylight/karaf diff --git a/features/pom.xml b/features/pom.xml index 690ee8b19..8198e0f3e 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 - 3.1.6 + 4.0.9 diff --git a/karaf/pom.xml b/karaf/pom.xml index 11ce12b53..bdaa50e75 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 - 3.1.6 + 4.0.9 diff --git a/networkmodel/pom.xml b/networkmodel/pom.xml index 22b82e15c..d6587d906 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 - 3.1.6 + 4.0.9 @@ -27,7 +27,7 @@ and is available at http://www.eclipse.org/legal/epl-v10.html org.opendaylight.netconf netconf-artifacts - 1.5.2-SNAPSHOT + 1.6.0-SNAPSHOT import pom diff --git a/olm/pom.xml b/olm/pom.xml index 6c7d512ae..284a0f9d5 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 - 0.13.2-SNAPSHOT + 3.0.6 @@ -27,14 +27,14 @@ and is available at http://www.eclipse.org/legal/epl-v10.html org.opendaylight.controller mdsal-artifacts - 1.8.2-SNAPSHOT + 1.9.0-SNAPSHOT import pom org.opendaylight.netconf netconf-artifacts - 1.5.2-SNAPSHOT + 1.6.0-SNAPSHOT import pom diff --git a/ordmodels/common/pom.xml b/ordmodels/common/pom.xml index 6c509578c..06d827758 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 - 0.13.2-SNAPSHOT + 3.0.6 @@ -35,8 +35,9 @@ and is available at http://www.eclipse.org/legal/epl-v10.html - org.opendaylight.mdsal.model - ietf-yang-types-20130715 + org.opendaylight.mdsal.binding.model.ietf + rfc6991-ietf-yang-types + 1.2.6-SNAPSHOT diff --git a/ordmodels/device/pom.xml b/ordmodels/device/pom.xml index 4f9fdba0e..1abad6089 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 - 0.13.2-SNAPSHOT + 3.0.6 @@ -26,7 +26,7 @@ and is available at http://www.eclipse.org/legal/epl-v10.html org.opendaylight.netconf netconf-artifacts - 1.5.2-SNAPSHOT + 1.6.0-SNAPSHOT import pom @@ -55,15 +55,18 @@ and is available at http://www.eclipse.org/legal/epl-v10.html org.opendaylight.mdsal.model - ietf-inet-types-2013-07-15 + iana-afn-safi + 2013.07.04.15.6 - org.opendaylight.mdsal.model - iana-afn-safi + org.opendaylight.mdsal.binding.model.ietf + rfc6991-ietf-inet-types + 1.2.6-SNAPSHOT - org.opendaylight.mdsal.model - ietf-yang-types-20130715 + org.opendaylight.mdsal.binding.model.ietf + rfc6991-ietf-yang-types + 1.2.6-SNAPSHOT diff --git a/ordmodels/network/pom.xml b/ordmodels/network/pom.xml index e8b007e4e..b36b32bc3 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 - 0.13.2-SNAPSHOT + 3.0.6 @@ -43,12 +43,14 @@ and is available at http://www.eclipse.org/legal/epl-v10.html - org.opendaylight.mdsal.model - ietf-inet-types-2013-07-15 + org.opendaylight.mdsal.binding.model.ietf + rfc6991-ietf-inet-types + 1.2.6-SNAPSHOT - org.opendaylight.mdsal.model - ietf-yang-types-20130715 + org.opendaylight.mdsal.binding.model.ietf + rfc6991-ietf-yang-types + 1.2.6-SNAPSHOT diff --git a/ordmodels/pom.xml b/ordmodels/pom.xml index c73d1f157..35e3ed6a5 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 - 0.13.2-SNAPSHOT + 3.0.6 @@ -82,7 +82,7 @@ and is available at http://www.eclipse.org/legal/epl-v10.html org.opendaylight.netconf netconf-artifacts - 1.5.2-SNAPSHOT + 1.6.0-SNAPSHOT pom import @@ -102,32 +102,50 @@ and is available at http://www.eclipse.org/legal/epl-v10.html ietf-netconf - org.opendaylight.mdsal.model - ietf-inet-types-2013-07-15 + org.opendaylight.mdsal.binding.model.ietf + rfc6991-ietf-inet-types + 1.2.6-SNAPSHOT + + + org.opendaylight.mdsal.binding.model.ietf + rfc6991-ietf-yang-types + 1.2.6-SNAPSHOT org.opendaylight.mdsal.model iana-afn-safi + 2013.07.04.15.6 + pom org.opendaylight.mdsal.model ietf-access-control-list + 0.13.6-SNAPSHOT - + + + org.opendaylight.mdsal.binding.model.iana + iana-if-type + 1.0.6-SNAPSHOT - org.opendaylight.mdsal.model - ietf-interfaces + org.opendaylight.mdsal.binding.model.ietf + rfc7223 + 1.2.6-SNAPSHOT org.opendaylight.mdsal.model ietf-packet-fields + 0.13.6-SNAPSHOT diff --git a/ordmodels/service/pom.xml b/ordmodels/service/pom.xml index c2a1c933a..074367de2 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 - 0.13.2-SNAPSHOT + 3.0.6 @@ -43,12 +43,14 @@ and is available at http://www.eclipse.org/legal/epl-v10.html - org.opendaylight.mdsal.model - ietf-inet-types-2013-07-15 + org.opendaylight.mdsal.binding.model.ietf + rfc6991-ietf-inet-types + 1.2.6-SNAPSHOT - org.opendaylight.mdsal.model - ietf-yang-types-20130715 + org.opendaylight.mdsal.binding.model.ietf + rfc6991-ietf-yang-types + 1.2.6-SNAPSHOT diff --git a/pce/pom.xml b/pce/pom.xml old mode 100755 new mode 100644 index 695b43723..f55172e25 --- a/pce/pom.xml +++ b/pce/pom.xml @@ -17,7 +17,7 @@ Author: Martial Coulibaly on behalf of Orange org.opendaylight.odlparent bundle-parent - 3.1.6 + 4.0.9 @@ -81,7 +81,7 @@ Author: Martial Coulibaly on behalf of Orange org.opendaylight.controller sal-binding-broker-impl - 1.8.2-SNAPSHOT + 1.9.0-SNAPSHOT test diff --git a/pom.xml b/pom.xml index 11b36ecad..0b1906ab4 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 - 3.1.6 + 4.0.9 diff --git a/renderer/pom.xml b/renderer/pom.xml index 06cbb8ee7..8703a6e2c 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 - 0.13.2-SNAPSHOT + 3.0.6 @@ -27,14 +27,14 @@ and is available at http://www.eclipse.org/legal/epl-v10.html org.opendaylight.controller mdsal-artifacts - 1.8.2-SNAPSHOT + 1.9.0-SNAPSHOT import pom org.opendaylight.netconf netconf-artifacts - 1.5.2-SNAPSHOT + 1.6.0-SNAPSHOT import pom diff --git a/servicehandler/pom.xml b/servicehandler/pom.xml index f8dff7972..d0530c286 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 - 0.13.2-SNAPSHOT + 3.0.6 @@ -29,7 +29,7 @@ Author: Martial Coulibaly on behalf of Orange org.opendaylight.controller mdsal-artifacts - 1.8.2-SNAPSHOT + 1.9.0-SNAPSHOT import pom diff --git a/test-common/pom.xml b/test-common/pom.xml index dee110771..b6192ce69 100644 --- a/test-common/pom.xml +++ b/test-common/pom.xml @@ -11,7 +11,7 @@ org.opendaylight.odlparent bundle-parent - 3.1.6 + 4.0.9 @@ -25,14 +25,14 @@ org.opendaylight.controller mdsal-artifacts - 1.8.2-SNAPSHOT + 1.9.0-SNAPSHOT pom import org.opendaylight.yangtools yangtools-artifacts - 2.0.16 + 2.1.8 pom import 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 f0dc8f7ef..2b7a4d27b 100644 --- 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 moduleInfos) { this.moduleInfoBackedCntxt.addModuleInfos(moduleInfos); Optional 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 944c65b57..35ee08105 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 - 3.1.6 + 4.0.9 diff --git a/tests/stubmodels/pom.xml b/tests/stubmodels/pom.xml index 6c5962e10..c9d28e23a 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 - 0.13.2-SNAPSHOT + 3.0.6 diff --git a/tests/stubpce/pom.xml b/tests/stubpce/pom.xml index 15b0fe9c2..85fab8cb0 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 - 0.13.2-SNAPSHOT + 3.0.6 @@ -40,20 +40,20 @@ Author: Martial Coulibaly on behalf of Orange - + org.opendaylight.controller mdsal-artifacts - 1.8.2-SNAPSHOT + 1.9.0-SNAPSHOT import pom org.opendaylight.netconf netconf-artifacts - 1.5.2-SNAPSHOT + 1.6.0-SNAPSHOT import pom diff --git a/tests/stubrenderer/pom.xml b/tests/stubrenderer/pom.xml index d7f027d3a..23b111483 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 - 0.13.2-SNAPSHOT + 3.0.6 @@ -29,14 +29,14 @@ Author: Martial Coulibaly on behalf of Orange org.opendaylight.controller mdsal-artifacts - 1.8.2-SNAPSHOT + 1.9.0-SNAPSHOT import pom org.opendaylight.netconf netconf-artifacts - 1.5.2-SNAPSHOT + 1.6.0-SNAPSHOT import pom -- 2.36.6