From f9181699697065e7bb3f79187175570974969c6f Mon Sep 17 00:00:00 2001 From: Robert Varga Date: Mon, 29 Sep 2025 18:55:40 +0200 Subject: [PATCH 1/2] WIP: Bump upstreams Adopt: - ietf-1.0.0 - mdsal-15.0.0 - controller-12.0.0 - aaa-0.22.0 - netconf-10.0.0-SNAPSHOT Change-Id: I909e9209ab4345e81647fcc560950205f859a6e0 Signed-off-by: Robert Varga --- commons/parent/pom.xml | 4 ++-- features/odl-lispflowmapping-inmemorydb/pom.xml | 2 +- .../src/main/feature/feature.xml | 2 +- features/odl-lispflowmapping-mappingservice/pom.xml | 2 +- .../src/main/feature/feature.xml | 2 +- features/odl-lispflowmapping-models/pom.xml | 10 +++++----- .../src/main/feature/feature.xml | 2 +- features/odl-lispflowmapping-southbound/pom.xml | 4 ++-- .../src/main/feature/feature.xml | 6 +++--- integrationtest/pom.xml | 2 +- mappingservice/api/pom.xml | 4 ++-- mappingservice/lisp-proto/pom.xml | 6 +++--- mappingservice/pom.xml | 2 +- 13 files changed, 24 insertions(+), 24 deletions(-) diff --git a/commons/parent/pom.xml b/commons/parent/pom.xml index 9d0ecf97..2c22d770 100644 --- a/commons/parent/pom.xml +++ b/commons/parent/pom.xml @@ -37,14 +37,14 @@ org.opendaylight.mdsal mdsal-artifacts - 14.0.18 + 15.0.0 pom import org.opendaylight.controller controller-artifacts - 11.0.2 + 12.0.0 pom import diff --git a/features/odl-lispflowmapping-inmemorydb/pom.xml b/features/odl-lispflowmapping-inmemorydb/pom.xml index f7790cda..6e29e35c 100644 --- a/features/odl-lispflowmapping-inmemorydb/pom.xml +++ b/features/odl-lispflowmapping-inmemorydb/pom.xml @@ -29,7 +29,7 @@ and is available at http://www.eclipse.org/legal/epl-v10.html org.opendaylight.controller controller-artifacts - 11.0.2 + 12.0.0 pom import diff --git a/features/odl-lispflowmapping-inmemorydb/src/main/feature/feature.xml b/features/odl-lispflowmapping-inmemorydb/src/main/feature/feature.xml index f631fe43..61b7c411 100644 --- a/features/odl-lispflowmapping-inmemorydb/src/main/feature/feature.xml +++ b/features/odl-lispflowmapping-inmemorydb/src/main/feature/feature.xml @@ -8,6 +8,6 @@ and is available at http://www.eclipse.org/legal/epl-v10.html INTERNAL --> - odl-mdsal-broker + odl-mdsal-broker diff --git a/features/odl-lispflowmapping-mappingservice/pom.xml b/features/odl-lispflowmapping-mappingservice/pom.xml index c4126ac4..4412d632 100644 --- a/features/odl-lispflowmapping-mappingservice/pom.xml +++ b/features/odl-lispflowmapping-mappingservice/pom.xml @@ -29,7 +29,7 @@ and is available at http://www.eclipse.org/legal/epl-v10.html org.opendaylight.netconf netconf-artifacts - 9.0.1 + 10.0.0-SNAPSHOT import pom diff --git a/features/odl-lispflowmapping-mappingservice/src/main/feature/feature.xml b/features/odl-lispflowmapping-mappingservice/src/main/feature/feature.xml index 0b1025ca..ddad5185 100644 --- a/features/odl-lispflowmapping-mappingservice/src/main/feature/feature.xml +++ b/features/odl-lispflowmapping-mappingservice/src/main/feature/feature.xml @@ -8,6 +8,6 @@ and is available at http://www.eclipse.org/legal/epl-v10.html INTERNAL --> - odl-restconf + odl-restconf diff --git a/features/odl-lispflowmapping-models/pom.xml b/features/odl-lispflowmapping-models/pom.xml index 0be171cc..dcb0c568 100644 --- a/features/odl-lispflowmapping-models/pom.xml +++ b/features/odl-lispflowmapping-models/pom.xml @@ -27,9 +27,9 @@ and is available at http://www.eclipse.org/legal/epl-v10.html - org.opendaylight.mdsal - mdsal-artifacts - 14.0.18 + org.opendaylight.ietf + ietf-artifacts + 1.0.0 pom import @@ -44,8 +44,8 @@ and is available at http://www.eclipse.org/legal/epl-v10.html features - org.opendaylight.mdsal.model - odl-mdsal-model-rfc6991 + org.opendaylight.ietf + odl-ietf-model-rfc6991 xml features diff --git a/features/odl-lispflowmapping-models/src/main/feature/feature.xml b/features/odl-lispflowmapping-models/src/main/feature/feature.xml index 8cc800e0..0864e97b 100644 --- a/features/odl-lispflowmapping-models/src/main/feature/feature.xml +++ b/features/odl-lispflowmapping-models/src/main/feature/feature.xml @@ -9,6 +9,6 @@ and is available at http://www.eclipse.org/legal/epl-v10.html INTERNAL odl-apache-commons-lang3 - odl-mdsal-model-rfc6991 + odl-ietf-model-rfc6991 diff --git a/features/odl-lispflowmapping-southbound/pom.xml b/features/odl-lispflowmapping-southbound/pom.xml index 070bec33..00984875 100644 --- a/features/odl-lispflowmapping-southbound/pom.xml +++ b/features/odl-lispflowmapping-southbound/pom.xml @@ -29,14 +29,14 @@ and is available at http://www.eclipse.org/legal/epl-v10.html org.opendaylight.controller controller-artifacts - 11.0.2 + 12.0.0 import pom org.opendaylight.netconf netconf-artifacts - 9.0.1 + 10.0.0-SNAPSHOT import pom diff --git a/features/odl-lispflowmapping-southbound/src/main/feature/feature.xml b/features/odl-lispflowmapping-southbound/src/main/feature/feature.xml index 55abe6f2..43071498 100644 --- a/features/odl-lispflowmapping-southbound/src/main/feature/feature.xml +++ b/features/odl-lispflowmapping-southbound/src/main/feature/feature.xml @@ -8,8 +8,8 @@ and is available at http://www.eclipse.org/legal/epl-v10.html INTERNAL --> - odl-netty-4 - odl-mdsal-broker - odl-restconf + odl-netty-4 + odl-mdsal-broker + odl-restconf diff --git a/integrationtest/pom.xml b/integrationtest/pom.xml index dfd51c82..f8e7427d 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.2 + 12.0.0 diff --git a/mappingservice/api/pom.xml b/mappingservice/api/pom.xml index 81fad0e5..21057b54 100644 --- a/mappingservice/api/pom.xml +++ b/mappingservice/api/pom.xml @@ -5,7 +5,7 @@ org.opendaylight.mdsal binding-parent - 14.0.18 + 15.0.0 @@ -32,7 +32,7 @@ yang-ext - org.opendaylight.mdsal.binding.model.ietf + org.opendaylight.ietf.model rfc6991-ietf-inet-types diff --git a/mappingservice/lisp-proto/pom.xml b/mappingservice/lisp-proto/pom.xml index 863ac73f..9632394a 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.18 + 15.0.0 @@ -31,11 +31,11 @@ and is available at http://www.eclipse.org/legal/epl-v10.html - org.opendaylight.mdsal.binding.model.ietf + org.opendaylight.ietf.model rfc6991-ietf-inet-types - org.opendaylight.mdsal.binding.model.ietf + org.opendaylight.ietf.model rfc6991-ietf-yang-types diff --git a/mappingservice/pom.xml b/mappingservice/pom.xml index 7e1ff348..d6e695f1 100644 --- a/mappingservice/pom.xml +++ b/mappingservice/pom.xml @@ -37,7 +37,7 @@ org.opendaylight.mdsal mdsal-artifacts - 14.0.18 + 15.0.0 pom import -- 2.34.1 From e7d321ceabf755ef36bd0bb1e38448255f3a8c3b Mon Sep 17 00:00:00 2001 From: jenkins-releng Date: Mon, 29 Sep 2025 17:01:08 +0000 Subject: [PATCH 2/2] Release Validate --- artifacts/pom.xml | 2 +- commons/build_tools/pom.xml | 2 +- commons/parent/pom.xml | 4 ++-- features/features-lispflowmapping/pom.xml | 2 +- features/odl-lispflowmapping-inmemorydb/pom.xml | 2 +- features/odl-lispflowmapping-mappingservice-shell/pom.xml | 2 +- features/odl-lispflowmapping-mappingservice/pom.xml | 4 ++-- features/odl-lispflowmapping-models/pom.xml | 2 +- features/odl-lispflowmapping-msmr/pom.xml | 2 +- features/odl-lispflowmapping-southbound/pom.xml | 4 ++-- features/pom.xml | 2 +- integrationtest/pom.xml | 4 ++-- lispflowmapping-karaf/pom.xml | 2 +- mappingservice/api/pom.xml | 2 +- mappingservice/dsbackend/pom.xml | 2 +- mappingservice/implementation/pom.xml | 2 +- mappingservice/inmemorydb/pom.xml | 2 +- mappingservice/lisp-proto/pom.xml | 2 +- mappingservice/mapcache/pom.xml | 2 +- mappingservice/pom.xml | 2 +- mappingservice/shell/pom.xml | 2 +- mappingservice/southbound/pom.xml | 2 +- pom.xml | 2 +- 23 files changed, 27 insertions(+), 27 deletions(-) diff --git a/artifacts/pom.xml b/artifacts/pom.xml index bba62d1d..ddb60391 100644 --- a/artifacts/pom.xml +++ b/artifacts/pom.xml @@ -18,7 +18,7 @@ and is available at http://www.eclipse.org/legal/epl-v10.html org.opendaylight.lispflowmapping lispflowmapping-artifacts - 1.22.0-SNAPSHOT + 1.22.0 pom diff --git a/commons/build_tools/pom.xml b/commons/build_tools/pom.xml index 4363358c..fbea2023 100644 --- a/commons/build_tools/pom.xml +++ b/commons/build_tools/pom.xml @@ -5,7 +5,7 @@ org.opendaylight.lispflowmapping lispflowmapping-commons - 1.22.0-SNAPSHOT + 1.22.0 ../parent diff --git a/commons/parent/pom.xml b/commons/parent/pom.xml index 2c22d770..f8c93816 100644 --- a/commons/parent/pom.xml +++ b/commons/parent/pom.xml @@ -21,7 +21,7 @@ org.opendaylight.lispflowmapping lispflowmapping-commons - 1.22.0-SNAPSHOT + 1.22.0 pom @@ -51,7 +51,7 @@ org.opendaylight.lispflowmapping lispflowmapping-artifacts - 1.22.0-SNAPSHOT + 1.22.0 pom import diff --git a/features/features-lispflowmapping/pom.xml b/features/features-lispflowmapping/pom.xml index 584cdfc8..aa7811c6 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.22.0-SNAPSHOT + 1.22.0 feature diff --git a/features/odl-lispflowmapping-inmemorydb/pom.xml b/features/odl-lispflowmapping-inmemorydb/pom.xml index 6e29e35c..2caeeeda 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.22.0-SNAPSHOT + 1.22.0 feature diff --git a/features/odl-lispflowmapping-mappingservice-shell/pom.xml b/features/odl-lispflowmapping-mappingservice-shell/pom.xml index faa733df..11ed0daa 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.22.0-SNAPSHOT + 1.22.0 feature diff --git a/features/odl-lispflowmapping-mappingservice/pom.xml b/features/odl-lispflowmapping-mappingservice/pom.xml index 4412d632..f306a7da 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.22.0-SNAPSHOT + 1.22.0 feature @@ -29,7 +29,7 @@ and is available at http://www.eclipse.org/legal/epl-v10.html org.opendaylight.netconf netconf-artifacts - 10.0.0-SNAPSHOT + 10.0.0 import pom diff --git a/features/odl-lispflowmapping-models/pom.xml b/features/odl-lispflowmapping-models/pom.xml index dcb0c568..89a21e87 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.22.0-SNAPSHOT + 1.22.0 feature diff --git a/features/odl-lispflowmapping-msmr/pom.xml b/features/odl-lispflowmapping-msmr/pom.xml index 7624ac86..93b4e719 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.22.0-SNAPSHOT + 1.22.0 feature diff --git a/features/odl-lispflowmapping-southbound/pom.xml b/features/odl-lispflowmapping-southbound/pom.xml index 00984875..45e576e5 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.22.0-SNAPSHOT + 1.22.0 feature @@ -36,7 +36,7 @@ and is available at http://www.eclipse.org/legal/epl-v10.html org.opendaylight.netconf netconf-artifacts - 10.0.0-SNAPSHOT + 10.0.0 import pom diff --git a/features/pom.xml b/features/pom.xml index 6cf21d8a..7a84ef98 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.22.0-SNAPSHOT + 1.22.0 pom diff --git a/integrationtest/pom.xml b/integrationtest/pom.xml index f8e7427d..2a6bcb25 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.22.0-SNAPSHOT + 1.22.0 bundle @@ -28,7 +28,7 @@ and is available at http://www.eclipse.org/legal/epl-v10.html false org.opendaylight.lispflowmapping lispflowmapping-karaf - 1.22.0-SNAPSHOT + 1.22.0 zip diff --git a/lispflowmapping-karaf/pom.xml b/lispflowmapping-karaf/pom.xml index b934d46a..358dff0c 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.22.0-SNAPSHOT + 1.22.0 pom diff --git a/mappingservice/api/pom.xml b/mappingservice/api/pom.xml index 21057b54..cfde717c 100644 --- a/mappingservice/api/pom.xml +++ b/mappingservice/api/pom.xml @@ -11,7 +11,7 @@ org.opendaylight.lispflowmapping mappingservice.api - 1.22.0-SNAPSHOT + 1.22.0 bundle diff --git a/mappingservice/dsbackend/pom.xml b/mappingservice/dsbackend/pom.xml index ca3b05b3..fb5e978d 100644 --- a/mappingservice/dsbackend/pom.xml +++ b/mappingservice/dsbackend/pom.xml @@ -13,7 +13,7 @@ org.opendaylight.lispflowmapping mappingservice-parent - 1.22.0-SNAPSHOT + 1.22.0 mappingservice.dsbackend diff --git a/mappingservice/implementation/pom.xml b/mappingservice/implementation/pom.xml index cc850fc4..4e7218ac 100644 --- a/mappingservice/implementation/pom.xml +++ b/mappingservice/implementation/pom.xml @@ -5,7 +5,7 @@ org.opendaylight.lispflowmapping mappingservice-parent - 1.22.0-SNAPSHOT + 1.22.0 mappingservice.implementation diff --git a/mappingservice/inmemorydb/pom.xml b/mappingservice/inmemorydb/pom.xml index 2632e844..57d6fbd6 100644 --- a/mappingservice/inmemorydb/pom.xml +++ b/mappingservice/inmemorydb/pom.xml @@ -5,7 +5,7 @@ org.opendaylight.lispflowmapping mappingservice-parent - 1.22.0-SNAPSHOT + 1.22.0 mappingservice.inmemorydb diff --git a/mappingservice/lisp-proto/pom.xml b/mappingservice/lisp-proto/pom.xml index 9632394a..bae9add7 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.22.0-SNAPSHOT + 1.22.0 bundle diff --git a/mappingservice/mapcache/pom.xml b/mappingservice/mapcache/pom.xml index 92459179..720d72ed 100644 --- a/mappingservice/mapcache/pom.xml +++ b/mappingservice/mapcache/pom.xml @@ -5,7 +5,7 @@ org.opendaylight.lispflowmapping mappingservice-parent - 1.22.0-SNAPSHOT + 1.22.0 mappingservice.mapcache diff --git a/mappingservice/pom.xml b/mappingservice/pom.xml index d6e695f1..f4ea044e 100644 --- a/mappingservice/pom.xml +++ b/mappingservice/pom.xml @@ -11,7 +11,7 @@ org.opendaylight.lispflowmapping mappingservice-parent - 1.22.0-SNAPSHOT + 1.22.0 pom diff --git a/mappingservice/shell/pom.xml b/mappingservice/shell/pom.xml index 6cf1bf7e..2ad2a0c7 100644 --- a/mappingservice/shell/pom.xml +++ b/mappingservice/shell/pom.xml @@ -5,7 +5,7 @@ org.opendaylight.lispflowmapping mappingservice-parent - 1.22.0-SNAPSHOT + 1.22.0 mappingservice.shell diff --git a/mappingservice/southbound/pom.xml b/mappingservice/southbound/pom.xml index 0b5d95de..cea085d7 100644 --- a/mappingservice/southbound/pom.xml +++ b/mappingservice/southbound/pom.xml @@ -5,7 +5,7 @@ org.opendaylight.lispflowmapping mappingservice-parent - 1.22.0-SNAPSHOT + 1.22.0 mappingservice.southbound diff --git a/pom.xml b/pom.xml index ba7c8b66..90bab88f 100644 --- a/pom.xml +++ b/pom.xml @@ -5,7 +5,7 @@ org.opendaylight.lispflowmapping lispflowmapping-commons - 1.22.0-SNAPSHOT + 1.22.0 commons/parent -- 2.34.1