From 301cd3bb40099b7483648cdf9228d6b0d3a00cf8 Mon Sep 17 00:00:00 2001 From: Gilles Thouenon Date: Thu, 13 Aug 2020 10:21:44 +0200 Subject: [PATCH] Bump projet dependencies to Aluminium - odlparent => 7.0.5 - mdsal => 6.0.4 - netconf => 1.9.0-SNAPSHOT - restconf => 1.12.0-SNAPSHOT - controller => 2.0.3 - lighty.io => 13.0.0 (not yet available on maven central) maybe 13.0.0-SNAPSHOT would be more indicated at that stage but it is not referenced the other option would be to build lighty-core master as before https://docs.opendaylight.org/projects/integration-distribution/en/latest/platform-versions.html https://docs.opendaylight.org/en/latest/release-notes/upgrade-process.html?highlight=upgrade#version-bump JIRA: TRNSPRTPCE-292 TRNSPRTPCE-296 TRNSPRTPCE-294 Signed-off-by: Gilles Thouenon Co-authored-by: manuedelf Co-authored-by: guillaume.lambert Change-Id: Ibe488f1822f39ece3c054c4dab9ceac253a2b555 --- api/pom.xml | 2 +- common/pom.xml | 16 ++++++++++++---- features/odl-transportpce-inventory/pom.xml | 2 +- features/odl-transportpce-tapi/pom.xml | 2 +- features/odl-transportpce/pom.xml | 10 +++++----- features/pom.xml | 2 +- inventory/pom.xml | 2 +- karaf/pom.xml | 2 +- lighty/pom.xml | 7 ++++++- networkmodel/pom.xml | 4 ++-- olm/pom.xml | 2 +- ordmodels/common/pom.xml | 2 +- ordmodels/device/pom.xml | 6 +++--- 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 +- tapi/pom.xml | 4 ++-- tapimodels/pom.xml | 2 +- test-common/pom.xml | 2 +- 23 files changed, 47 insertions(+), 34 deletions(-) diff --git a/api/pom.xml b/api/pom.xml index 0111724f0..340cb3036 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 - 5.0.14 + 6.0.4 diff --git a/common/pom.xml b/common/pom.xml index b52e7a824..227a51ca7 100644 --- a/common/pom.xml +++ b/common/pom.xml @@ -10,7 +10,7 @@ org.opendaylight.mdsal binding-parent - 5.0.14 + 6.0.4 @@ -24,14 +24,14 @@ org.opendaylight.netconf netconf-artifacts - 1.8.3-SNAPSHOT + 1.9.0-SNAPSHOT import pom org.opendaylight.mdsal mdsal-artifacts - 5.0.14 + 6.0.4 import pom @@ -57,7 +57,15 @@ org.opendaylight.mdsal mdsal-binding-dom-adapter - + + + org.opendaylight.mdsal + mdsal-dom-broker + + + org.opendaylight.mdsal + mdsal-dom-inmemory-datastore + com.google.code.findbugs diff --git a/features/odl-transportpce-inventory/pom.xml b/features/odl-transportpce-inventory/pom.xml index 2f022ef4b..40546eee2 100644 --- a/features/odl-transportpce-inventory/pom.xml +++ b/features/odl-transportpce-inventory/pom.xml @@ -9,7 +9,7 @@ org.opendaylight.odlparent single-feature-parent - 6.0.11 + 7.0.5 diff --git a/features/odl-transportpce-tapi/pom.xml b/features/odl-transportpce-tapi/pom.xml index ec1914622..4d7763c82 100644 --- a/features/odl-transportpce-tapi/pom.xml +++ b/features/odl-transportpce-tapi/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 - 6.0.11 + 7.0.5 diff --git a/features/odl-transportpce/pom.xml b/features/odl-transportpce/pom.xml index 21426fc3a..7c594cc19 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 - 6.0.11 + 7.0.5 @@ -24,9 +24,9 @@ and is available at http://www.eclipse.org/legal/epl-v10.html INTERNAL OpenDaylight :: transportpce - 1.11.3-SNAPSHOT - 1.8.3-SNAPSHOT - 1.11.3-SNAPSHOT + 2.0.3 + 1.9.0-SNAPSHOT + 1.12.0-SNAPSHOT etc/opendaylight/karaf @@ -90,7 +90,7 @@ and is available at http://www.eclipse.org/legal/epl-v10.html INTERNAL org.opendaylight.controller odl-mdsal-broker - ${mdsal.version} + ${controller.version} features xml diff --git a/features/pom.xml b/features/pom.xml index 38414c36f..dfc48804b 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 - 6.0.11 + 7.0.5 diff --git a/inventory/pom.xml b/inventory/pom.xml index 8d95239f1..52e8ab9f7 100644 --- a/inventory/pom.xml +++ b/inventory/pom.xml @@ -10,7 +10,7 @@ org.opendaylight.mdsal binding-parent - 5.0.14 + 6.0.4 diff --git a/karaf/pom.xml b/karaf/pom.xml index f26e645f5..67d7a565c 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 - 6.0.11 + 7.0.5 diff --git a/lighty/pom.xml b/lighty/pom.xml index 898e445fb..6e753fe2d 100644 --- a/lighty/pom.xml +++ b/lighty/pom.xml @@ -11,7 +11,12 @@ io.lighty.core lighty-app-parent - 12.1.0 + 13.0.0 + diff --git a/networkmodel/pom.xml b/networkmodel/pom.xml index c801e7572..9e9091ef3 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 - 6.0.11 + 7.0.5 @@ -27,7 +27,7 @@ and is available at http://www.eclipse.org/legal/epl-v10.html org.opendaylight.mdsal mdsal-artifacts - 5.0.14 + 6.0.4 import pom diff --git a/olm/pom.xml b/olm/pom.xml index 555b09eae..ed80430c8 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 - 5.0.14 + 6.0.4 diff --git a/ordmodels/common/pom.xml b/ordmodels/common/pom.xml index 3e479f163..5b59c2905 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 - 5.0.14 + 6.0.4 diff --git a/ordmodels/device/pom.xml b/ordmodels/device/pom.xml index 69fa2d74c..bb2780e5d 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 - 5.0.14 + 6.0.4 @@ -26,7 +26,7 @@ and is available at http://www.eclipse.org/legal/epl-v10.html org.opendaylight.netconf netconf-artifacts - 1.8.3-SNAPSHOT + 1.9.0-SNAPSHOT import pom @@ -49,7 +49,7 @@ and is available at http://www.eclipse.org/legal/epl-v10.html org.opendaylight.mdsal.model iana-afn-safi - + 2013.07.04.17.9 org.opendaylight.mdsal.binding.model.ietf diff --git a/ordmodels/network/pom.xml b/ordmodels/network/pom.xml index e93fd45fb..68752f13e 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 - 5.0.14 + 6.0.4 diff --git a/ordmodels/pom.xml b/ordmodels/pom.xml index cb16e2046..28cac4006 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 - 5.0.14 + 6.0.4 diff --git a/ordmodels/service/pom.xml b/ordmodels/service/pom.xml index 19ea23e13..98d53f883 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 - 5.0.14 + 6.0.4 diff --git a/pce/pom.xml b/pce/pom.xml index d9634e4aa..0ac84a94e 100644 --- a/pce/pom.xml +++ b/pce/pom.xml @@ -14,7 +14,7 @@ org.opendaylight.mdsal binding-parent - 5.0.14 + 6.0.4 diff --git a/pom.xml b/pom.xml index 71b43b243..d6077cba7 100644 --- a/pom.xml +++ b/pom.xml @@ -12,7 +12,7 @@ and is available at http://www.eclipse.org/legal/epl-v10.html INTERNAL org.opendaylight.odlparent odlparent - 6.0.11 + 7.0.5 diff --git a/renderer/pom.xml b/renderer/pom.xml index 5970e4db6..7a86abce5 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 - 5.0.14 + 6.0.4 diff --git a/servicehandler/pom.xml b/servicehandler/pom.xml index 7f880cacb..2d998ecca 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 - 5.0.14 + 6.0.4 diff --git a/tapi/pom.xml b/tapi/pom.xml index 9068208dd..dc585670b 100644 --- a/tapi/pom.xml +++ b/tapi/pom.xml @@ -15,7 +15,7 @@ Author: Martial Coulibaly on behalf of Orange org.opendaylight.mdsal binding-parent - 5.0.14 + 6.0.4 @@ -29,7 +29,7 @@ Author: Martial Coulibaly on behalf of Orange org.opendaylight.mdsal mdsal-artifacts - 5.0.14 + 6.0.4 import pom diff --git a/tapimodels/pom.xml b/tapimodels/pom.xml index 418376622..023f2119a 100644 --- a/tapimodels/pom.xml +++ b/tapimodels/pom.xml @@ -12,7 +12,7 @@ and is available at http://www.eclipse.org/legal/epl-v10.html org.opendaylight.mdsal binding-parent - 5.0.14 + 6.0.4 diff --git a/test-common/pom.xml b/test-common/pom.xml index 9b3820842..0d69e66fe 100644 --- a/test-common/pom.xml +++ b/test-common/pom.xml @@ -11,7 +11,7 @@ org.opendaylight.odlparent bundle-parent - 6.0.11 + 7.0.5 -- 2.36.6