From 37f464906f457f383de0ce4714f73af410b57cc6 Mon Sep 17 00:00:00 2001 From: Robert Varga Date: Sun, 21 Sep 2025 00:20:28 +0200 Subject: [PATCH 1/3] Bump upstreams Adopt: - odlparent-14.1.3 - infrautils-7.1.7 - yangtools-14.0.17 - mdsal-14.0.18 - controller-11.0.2 - netconf-9.0.1 Change-Id: I5202be49c8ca192ce95bad000a3a334852c0909e Signed-off-by: Robert Varga --- artifacts/pom.xml | 2 +- commons/parent/pom.xml | 6 +++--- features/features-lispflowmapping/pom.xml | 2 +- features/odl-lispflowmapping-inmemorydb/pom.xml | 4 ++-- features/odl-lispflowmapping-mappingservice-shell/pom.xml | 2 +- features/odl-lispflowmapping-mappingservice/pom.xml | 4 ++-- features/odl-lispflowmapping-models/pom.xml | 4 ++-- features/odl-lispflowmapping-msmr/pom.xml | 2 +- features/odl-lispflowmapping-southbound/pom.xml | 6 +++--- features/pom.xml | 2 +- integrationtest/pom.xml | 2 +- lispflowmapping-karaf/pom.xml | 2 +- mappingservice/api/pom.xml | 2 +- mappingservice/lisp-proto/pom.xml | 2 +- mappingservice/pom.xml | 4 ++-- 15 files changed, 23 insertions(+), 23 deletions(-) diff --git a/artifacts/pom.xml b/artifacts/pom.xml index 48e0350c..a33a3962 100644 --- a/artifacts/pom.xml +++ b/artifacts/pom.xml @@ -12,7 +12,7 @@ and is available at http://www.eclipse.org/legal/epl-v10.html org.opendaylight.odlparent odlparent-lite - 14.1.0 + 14.1.3 diff --git a/commons/parent/pom.xml b/commons/parent/pom.xml index 662bb104..ca1567f5 100644 --- a/commons/parent/pom.xml +++ b/commons/parent/pom.xml @@ -15,7 +15,7 @@ for plugin configuration etc. --> org.opendaylight.odlparent odlparent - 14.1.0 + 14.1.3 @@ -45,14 +45,14 @@ org.opendaylight.mdsal mdsal-artifacts - 14.0.13 + 14.0.18 pom import org.opendaylight.controller controller-artifacts - 11.0.0 + 11.0.2 pom import diff --git a/features/features-lispflowmapping/pom.xml b/features/features-lispflowmapping/pom.xml index d39abd37..74d6e475 100644 --- a/features/features-lispflowmapping/pom.xml +++ b/features/features-lispflowmapping/pom.xml @@ -12,7 +12,7 @@ and is available at http://www.eclipse.org/legal/epl-v10.html org.opendaylight.odlparent feature-repo-parent - 14.1.0 + 14.1.3 diff --git a/features/odl-lispflowmapping-inmemorydb/pom.xml b/features/odl-lispflowmapping-inmemorydb/pom.xml index 330d034a..27c350c4 100644 --- a/features/odl-lispflowmapping-inmemorydb/pom.xml +++ b/features/odl-lispflowmapping-inmemorydb/pom.xml @@ -12,7 +12,7 @@ and is available at http://www.eclipse.org/legal/epl-v10.html org.opendaylight.odlparent single-feature-parent - 14.1.0 + 14.1.3 @@ -29,7 +29,7 @@ and is available at http://www.eclipse.org/legal/epl-v10.html org.opendaylight.controller controller-artifacts - 11.0.0 + 11.0.2 pom import diff --git a/features/odl-lispflowmapping-mappingservice-shell/pom.xml b/features/odl-lispflowmapping-mappingservice-shell/pom.xml index 07f29fbf..72641e89 100644 --- a/features/odl-lispflowmapping-mappingservice-shell/pom.xml +++ b/features/odl-lispflowmapping-mappingservice-shell/pom.xml @@ -12,7 +12,7 @@ and is available at http://www.eclipse.org/legal/epl-v10.html org.opendaylight.odlparent single-feature-parent - 14.1.0 + 14.1.3 diff --git a/features/odl-lispflowmapping-mappingservice/pom.xml b/features/odl-lispflowmapping-mappingservice/pom.xml index e85a9ede..729947b7 100644 --- a/features/odl-lispflowmapping-mappingservice/pom.xml +++ b/features/odl-lispflowmapping-mappingservice/pom.xml @@ -12,7 +12,7 @@ and is available at http://www.eclipse.org/legal/epl-v10.html org.opendaylight.odlparent single-feature-parent - 14.1.0 + 14.1.3 @@ -29,7 +29,7 @@ and is available at http://www.eclipse.org/legal/epl-v10.html org.opendaylight.netconf netconf-artifacts - 9.0.0 + 9.0.1 import pom diff --git a/features/odl-lispflowmapping-models/pom.xml b/features/odl-lispflowmapping-models/pom.xml index d31cda3d..1118c051 100644 --- a/features/odl-lispflowmapping-models/pom.xml +++ b/features/odl-lispflowmapping-models/pom.xml @@ -12,7 +12,7 @@ and is available at http://www.eclipse.org/legal/epl-v10.html org.opendaylight.odlparent single-feature-parent - 14.1.0 + 14.1.3 @@ -29,7 +29,7 @@ and is available at http://www.eclipse.org/legal/epl-v10.html org.opendaylight.mdsal mdsal-artifacts - 14.0.13 + 14.0.18 pom import diff --git a/features/odl-lispflowmapping-msmr/pom.xml b/features/odl-lispflowmapping-msmr/pom.xml index 77d96925..8b33f48c 100644 --- a/features/odl-lispflowmapping-msmr/pom.xml +++ b/features/odl-lispflowmapping-msmr/pom.xml @@ -12,7 +12,7 @@ and is available at http://www.eclipse.org/legal/epl-v10.html org.opendaylight.odlparent single-feature-parent - 14.1.0 + 14.1.3 diff --git a/features/odl-lispflowmapping-southbound/pom.xml b/features/odl-lispflowmapping-southbound/pom.xml index 2f118233..b086424a 100644 --- a/features/odl-lispflowmapping-southbound/pom.xml +++ b/features/odl-lispflowmapping-southbound/pom.xml @@ -12,7 +12,7 @@ and is available at http://www.eclipse.org/legal/epl-v10.html org.opendaylight.odlparent single-feature-parent - 14.1.0 + 14.1.3 @@ -29,14 +29,14 @@ and is available at http://www.eclipse.org/legal/epl-v10.html org.opendaylight.controller controller-artifacts - 11.0.0 + 11.0.2 import pom org.opendaylight.netconf netconf-artifacts - 9.0.0 + 9.0.1 import pom diff --git a/features/pom.xml b/features/pom.xml index edd61831..d89c2c25 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 org.opendaylight.odlparent odlparent-lite - 14.1.0 + 14.1.3 diff --git a/integrationtest/pom.xml b/integrationtest/pom.xml index d50dd967..3ab56f14 100644 --- a/integrationtest/pom.xml +++ b/integrationtest/pom.xml @@ -11,7 +11,7 @@ and is available at http://www.eclipse.org/legal/epl-v10.html org.opendaylight.controller mdsal-it-parent - 11.0.0 + 11.0.2 diff --git a/lispflowmapping-karaf/pom.xml b/lispflowmapping-karaf/pom.xml index 8fb4d040..2f235dd4 100644 --- a/lispflowmapping-karaf/pom.xml +++ b/lispflowmapping-karaf/pom.xml @@ -12,7 +12,7 @@ and is available at http://www.eclipse.org/legal/epl-v10.html org.opendaylight.odlparent karaf4-parent - 14.1.0 + 14.1.3 diff --git a/mappingservice/api/pom.xml b/mappingservice/api/pom.xml index 5689c80e..97c18e95 100644 --- a/mappingservice/api/pom.xml +++ b/mappingservice/api/pom.xml @@ -5,7 +5,7 @@ org.opendaylight.mdsal binding-parent - 14.0.13 + 14.0.18 diff --git a/mappingservice/lisp-proto/pom.xml b/mappingservice/lisp-proto/pom.xml index 9fca04dd..b8104702 100644 --- a/mappingservice/lisp-proto/pom.xml +++ b/mappingservice/lisp-proto/pom.xml @@ -12,7 +12,7 @@ and is available at http://www.eclipse.org/legal/epl-v10.html org.opendaylight.mdsal binding-parent - 14.0.13 + 14.0.18 diff --git a/mappingservice/pom.xml b/mappingservice/pom.xml index 4c0f5125..97bbade6 100644 --- a/mappingservice/pom.xml +++ b/mappingservice/pom.xml @@ -5,7 +5,7 @@ org.opendaylight.odlparent odlparent - 14.1.0 + 14.1.3 @@ -38,7 +38,7 @@ org.opendaylight.mdsal mdsal-artifacts - 14.0.13 + 14.0.18 pom import -- 2.34.1 From 638e3e4f9753d987c12e1eaa7d7170505271b748 Mon Sep 17 00:00:00 2001 From: Robert Varga Date: Sun, 21 Sep 2025 00:28:32 +0200 Subject: [PATCH 2/3] Remove javadoc downgrade Let's see if we still need this with javadoc-3.11.2. Change-Id: Ie961986d062a5a5becfd8103e4721c91ae2b8db2 Signed-off-by: Robert Varga --- pom.xml | 10 ---------- 1 file changed, 10 deletions(-) diff --git a/pom.xml b/pom.xml index f58e5c29..b716660d 100644 --- a/pom.xml +++ b/pom.xml @@ -25,16 +25,6 @@ - - - - - maven-javadoc-plugin - 3.0.1 - - - - diff --git a/commons/build_tools/pom.xml b/commons/build_tools/pom.xml index d791ecd9..bf25b68f 100644 --- a/commons/build_tools/pom.xml +++ b/commons/build_tools/pom.xml @@ -5,7 +5,7 @@ org.opendaylight.lispflowmapping lispflowmapping-commons - 1.21.1-SNAPSHOT + 1.21.1 ../parent diff --git a/commons/parent/pom.xml b/commons/parent/pom.xml index ca1567f5..b8077cce 100644 --- a/commons/parent/pom.xml +++ b/commons/parent/pom.xml @@ -21,7 +21,7 @@ org.opendaylight.lispflowmapping lispflowmapping-commons - 1.21.1-SNAPSHOT + 1.21.1 pom @@ -30,9 +30,9 @@ 1.0.0 0.5.0 - 1.21.1-SNAPSHOT - 0.24.1-SNAPSHOT - 0.28.1-SNAPSHOT + 1.21.1 + 0.24.1 + 0.28.1 src/main/yang-gen-sal 0.5.0 src/main/yang diff --git a/features/features-lispflowmapping/pom.xml b/features/features-lispflowmapping/pom.xml index 74d6e475..290c3fec 100644 --- a/features/features-lispflowmapping/pom.xml +++ b/features/features-lispflowmapping/pom.xml @@ -18,7 +18,7 @@ and is available at http://www.eclipse.org/legal/epl-v10.html org.opendaylight.lispflowmapping features-lispflowmapping - 1.21.1-SNAPSHOT + 1.21.1 feature diff --git a/features/odl-lispflowmapping-inmemorydb/pom.xml b/features/odl-lispflowmapping-inmemorydb/pom.xml index 27c350c4..a894f925 100644 --- a/features/odl-lispflowmapping-inmemorydb/pom.xml +++ b/features/odl-lispflowmapping-inmemorydb/pom.xml @@ -18,7 +18,7 @@ and is available at http://www.eclipse.org/legal/epl-v10.html org.opendaylight.lispflowmapping odl-lispflowmapping-inmemorydb - 1.21.1-SNAPSHOT + 1.21.1 feature diff --git a/features/odl-lispflowmapping-mappingservice-shell/pom.xml b/features/odl-lispflowmapping-mappingservice-shell/pom.xml index 72641e89..900d9cf2 100644 --- a/features/odl-lispflowmapping-mappingservice-shell/pom.xml +++ b/features/odl-lispflowmapping-mappingservice-shell/pom.xml @@ -18,7 +18,7 @@ and is available at http://www.eclipse.org/legal/epl-v10.html org.opendaylight.lispflowmapping odl-lispflowmapping-mappingservice-shell - 1.21.1-SNAPSHOT + 1.21.1 feature diff --git a/features/odl-lispflowmapping-mappingservice/pom.xml b/features/odl-lispflowmapping-mappingservice/pom.xml index 729947b7..4113a31d 100644 --- a/features/odl-lispflowmapping-mappingservice/pom.xml +++ b/features/odl-lispflowmapping-mappingservice/pom.xml @@ -18,7 +18,7 @@ and is available at http://www.eclipse.org/legal/epl-v10.html org.opendaylight.lispflowmapping odl-lispflowmapping-mappingservice - 1.21.1-SNAPSHOT + 1.21.1 feature diff --git a/features/odl-lispflowmapping-models/pom.xml b/features/odl-lispflowmapping-models/pom.xml index 1118c051..ce888d67 100644 --- a/features/odl-lispflowmapping-models/pom.xml +++ b/features/odl-lispflowmapping-models/pom.xml @@ -18,7 +18,7 @@ and is available at http://www.eclipse.org/legal/epl-v10.html org.opendaylight.lispflowmapping odl-lispflowmapping-models - 1.21.1-SNAPSHOT + 1.21.1 feature diff --git a/features/odl-lispflowmapping-msmr/pom.xml b/features/odl-lispflowmapping-msmr/pom.xml index 8b33f48c..219455fd 100644 --- a/features/odl-lispflowmapping-msmr/pom.xml +++ b/features/odl-lispflowmapping-msmr/pom.xml @@ -18,7 +18,7 @@ and is available at http://www.eclipse.org/legal/epl-v10.html org.opendaylight.lispflowmapping odl-lispflowmapping-msmr - 1.21.1-SNAPSHOT + 1.21.1 feature diff --git a/features/odl-lispflowmapping-southbound/pom.xml b/features/odl-lispflowmapping-southbound/pom.xml index b086424a..34c8734b 100644 --- a/features/odl-lispflowmapping-southbound/pom.xml +++ b/features/odl-lispflowmapping-southbound/pom.xml @@ -18,7 +18,7 @@ and is available at http://www.eclipse.org/legal/epl-v10.html org.opendaylight.lispflowmapping odl-lispflowmapping-southbound - 1.21.1-SNAPSHOT + 1.21.1 feature diff --git a/features/pom.xml b/features/pom.xml index d89c2c25..a2fe6ad2 100644 --- a/features/pom.xml +++ b/features/pom.xml @@ -18,7 +18,7 @@ and is available at http://www.eclipse.org/legal/epl-v10.html org.opendaylight.lispflowmapping features-aggregator - 1.21.1-SNAPSHOT + 1.21.1 pom diff --git a/integrationtest/pom.xml b/integrationtest/pom.xml index 3ab56f14..a6f8e377 100644 --- a/integrationtest/pom.xml +++ b/integrationtest/pom.xml @@ -18,7 +18,7 @@ and is available at http://www.eclipse.org/legal/epl-v10.html 4.0.0 org.opendaylight.lispflowmapping mappingservice.integrationtest - 1.21.1-SNAPSHOT + 1.21.1 bundle @@ -28,7 +28,7 @@ and is available at http://www.eclipse.org/legal/epl-v10.html false org.opendaylight.lispflowmapping lispflowmapping-karaf - 1.21.1-SNAPSHOT + 1.21.1 zip diff --git a/lispflowmapping-karaf/pom.xml b/lispflowmapping-karaf/pom.xml index 2f235dd4..a422b068 100644 --- a/lispflowmapping-karaf/pom.xml +++ b/lispflowmapping-karaf/pom.xml @@ -18,7 +18,7 @@ and is available at http://www.eclipse.org/legal/epl-v10.html org.opendaylight.lispflowmapping lispflowmapping-karaf - 1.21.1-SNAPSHOT + 1.21.1 pom diff --git a/mappingservice/api/pom.xml b/mappingservice/api/pom.xml index 97c18e95..069e788a 100644 --- a/mappingservice/api/pom.xml +++ b/mappingservice/api/pom.xml @@ -11,7 +11,7 @@ org.opendaylight.lispflowmapping mappingservice.api - 1.21.1-SNAPSHOT + 1.21.1 bundle diff --git a/mappingservice/config/pom.xml b/mappingservice/config/pom.xml index 95ae9fe0..c0910403 100644 --- a/mappingservice/config/pom.xml +++ b/mappingservice/config/pom.xml @@ -5,7 +5,7 @@ org.opendaylight.lispflowmapping mappingservice-parent - 1.21.1-SNAPSHOT + 1.21.1 mappingservice.config @@ -22,7 +22,7 @@ org.opendaylight.lispflowmapping mappingservice.api - 1.21.1-SNAPSHOT + 1.21.1 diff --git a/mappingservice/dsbackend/pom.xml b/mappingservice/dsbackend/pom.xml index 0a926d12..b57fa0f4 100644 --- a/mappingservice/dsbackend/pom.xml +++ b/mappingservice/dsbackend/pom.xml @@ -13,7 +13,7 @@ org.opendaylight.lispflowmapping mappingservice-parent - 1.21.1-SNAPSHOT + 1.21.1 mappingservice.dsbackend diff --git a/mappingservice/implementation/pom.xml b/mappingservice/implementation/pom.xml index a6994680..ab50e862 100644 --- a/mappingservice/implementation/pom.xml +++ b/mappingservice/implementation/pom.xml @@ -5,7 +5,7 @@ org.opendaylight.lispflowmapping mappingservice-parent - 1.21.1-SNAPSHOT + 1.21.1 mappingservice.implementation diff --git a/mappingservice/inmemorydb/pom.xml b/mappingservice/inmemorydb/pom.xml index 087da1b6..d9046547 100644 --- a/mappingservice/inmemorydb/pom.xml +++ b/mappingservice/inmemorydb/pom.xml @@ -5,7 +5,7 @@ org.opendaylight.lispflowmapping mappingservice-parent - 1.21.1-SNAPSHOT + 1.21.1 mappingservice.inmemorydb diff --git a/mappingservice/lisp-proto/pom.xml b/mappingservice/lisp-proto/pom.xml index b8104702..76e9e74c 100644 --- a/mappingservice/lisp-proto/pom.xml +++ b/mappingservice/lisp-proto/pom.xml @@ -18,7 +18,7 @@ and is available at http://www.eclipse.org/legal/epl-v10.html org.opendaylight.lispflowmapping mappingservice.lisp-proto - 1.21.1-SNAPSHOT + 1.21.1 bundle diff --git a/mappingservice/mapcache/pom.xml b/mappingservice/mapcache/pom.xml index e5083a2d..5c401f16 100644 --- a/mappingservice/mapcache/pom.xml +++ b/mappingservice/mapcache/pom.xml @@ -5,7 +5,7 @@ org.opendaylight.lispflowmapping mappingservice-parent - 1.21.1-SNAPSHOT + 1.21.1 mappingservice.mapcache diff --git a/mappingservice/pom.xml b/mappingservice/pom.xml index 97bbade6..13958b5b 100644 --- a/mappingservice/pom.xml +++ b/mappingservice/pom.xml @@ -11,7 +11,7 @@ org.opendaylight.lispflowmapping mappingservice-parent - 1.21.1-SNAPSHOT + 1.21.1 pom diff --git a/mappingservice/shell/pom.xml b/mappingservice/shell/pom.xml index 21bd18ac..60a732f2 100644 --- a/mappingservice/shell/pom.xml +++ b/mappingservice/shell/pom.xml @@ -5,7 +5,7 @@ org.opendaylight.lispflowmapping mappingservice-parent - 1.21.1-SNAPSHOT + 1.21.1 mappingservice.shell diff --git a/mappingservice/southbound/pom.xml b/mappingservice/southbound/pom.xml index 5eb72859..1df5422b 100644 --- a/mappingservice/southbound/pom.xml +++ b/mappingservice/southbound/pom.xml @@ -5,7 +5,7 @@ org.opendaylight.lispflowmapping mappingservice-parent - 1.21.1-SNAPSHOT + 1.21.1 mappingservice.southbound diff --git a/pom.xml b/pom.xml index b716660d..0c11baeb 100644 --- a/pom.xml +++ b/pom.xml @@ -5,7 +5,7 @@ org.opendaylight.lispflowmapping lispflowmapping-commons - 1.21.1-SNAPSHOT + 1.21.1 commons/parent -- 2.34.1