From 204aa963c23b5ea5b4963e4419e1b85894cc5455 Mon Sep 17 00:00:00 2001 From: Robert Varga Date: Thu, 10 Jul 2025 01:48:09 +0200 Subject: [PATCH 1/2] Bump upstreams for 2025.03 Titanium Adopt: - odlparent-14.1.0 - infrautils-7.1.4 - yangtools-14.0.14 - mdsal-14.0.13 - controller-11.0.0 - aaa-0.21.0 - netconf-9.0.0 - bgpcep-0.23.0 - openflowplugin-0.20.0 Also disables transportpce(-models). Change-Id: Ie5db39e9c548a4d83bc0591d089d55955381c94a Signed-off-by: Robert Varga --- artifacts/all/pom.xml | 2 +- artifacts/distribution/pom.xml | 2 +- artifacts/pom.xml | 2 +- artifacts/upstream/all/pom.xml | 2 +- artifacts/upstream/artifacts/pom.xml | 25 +++---------------- artifacts/upstream/pom.xml | 2 +- artifacts/upstream/properties/pom.xml | 19 +++++++------- docs/platform-versions.rst | 14 +++++------ features/pom.xml | 2 +- features/repos/index/pom.xml | 21 +++------------- features/repos/pom.xml | 2 +- features/repos/test/pom.xml | 2 +- features/singles/odl-integration-all/pom.xml | 23 +---------------- .../pom.xml | 6 ++--- features/singles/pom.xml | 2 +- karaf-scripts/pom.xml | 2 +- karaf/pom.xml | 2 +- onap-karaf/pom.xml | 2 +- opendaylight/pom.xml | 4 +-- pom.xml | 2 +- 20 files changed, 41 insertions(+), 97 deletions(-) diff --git a/artifacts/all/pom.xml b/artifacts/all/pom.xml index 391df1d8..2641efef 100644 --- a/artifacts/all/pom.xml +++ b/artifacts/all/pom.xml @@ -12,7 +12,7 @@ org.opendaylight.odlparent odlparent-lite - 14.0.3 + 14.1.0 org.opendaylight.integration diff --git a/artifacts/distribution/pom.xml b/artifacts/distribution/pom.xml index 92797a5f..a1c5ac40 100644 --- a/artifacts/distribution/pom.xml +++ b/artifacts/distribution/pom.xml @@ -12,7 +12,7 @@ org.opendaylight.odlparent odlparent-lite - 14.0.3 + 14.1.0 org.opendaylight.integration diff --git a/artifacts/pom.xml b/artifacts/pom.xml index 49efc6da..7fed4c75 100644 --- a/artifacts/pom.xml +++ b/artifacts/pom.xml @@ -12,7 +12,7 @@ org.opendaylight.odlparent odlparent-lite - 14.0.3 + 14.1.0 org.opendaylight.integration diff --git a/artifacts/upstream/all/pom.xml b/artifacts/upstream/all/pom.xml index b72cdfa0..d02e8175 100644 --- a/artifacts/upstream/all/pom.xml +++ b/artifacts/upstream/all/pom.xml @@ -12,7 +12,7 @@ org.opendaylight.odlparent odlparent-lite - 14.0.3 + 14.1.0 org.opendaylight.integration diff --git a/artifacts/upstream/artifacts/pom.xml b/artifacts/upstream/artifacts/pom.xml index 1eeebce4..800115b7 100644 --- a/artifacts/upstream/artifacts/pom.xml +++ b/artifacts/upstream/artifacts/pom.xml @@ -7,9 +7,7 @@ terms of the Eclipse Public License v1.0 which accompanies this distribution, and is available at http://www.eclipse.org/legal/epl-v10.html --> - + 4.0.0 org.opendaylight.integration @@ -258,27 +256,10 @@ - - serviceutils - - true - - - - - org.opendaylight.serviceutils - serviceutils-artifacts - ${serviceutils.version} - pom - import - - - - transportpce-models - true + false @@ -295,7 +276,7 @@ transportpce - true + false diff --git a/artifacts/upstream/pom.xml b/artifacts/upstream/pom.xml index 3bb4695e..cbb39766 100644 --- a/artifacts/upstream/pom.xml +++ b/artifacts/upstream/pom.xml @@ -12,7 +12,7 @@ org.opendaylight.odlparent odlparent-lite - 14.0.3 + 14.1.0 org.opendaylight.integration diff --git a/artifacts/upstream/properties/pom.xml b/artifacts/upstream/properties/pom.xml index 584f6aa2..1d1bcdec 100644 --- a/artifacts/upstream/properties/pom.xml +++ b/artifacts/upstream/properties/pom.xml @@ -12,7 +12,7 @@ org.opendaylight.odlparent odlparent-lite - 14.0.3 + 14.1.0 org.opendaylight.integration @@ -43,22 +43,21 @@ - 0.20.1 - 0.22.4 - 10.0.2 + 0.21.0 + 0.23.0 + 11.0.0 1.17.0-SNAPSHOT - 7.0.3 + 7.1.4 1.18.0-SNAPSHOT 1.21.0-SNAPSHOT - 14.0.2 + 14.0.13 8.0.2 - 14.0.3 - 0.19.0 + 14.1.0 + 0.20.0 1.20.0-SNAPSHOT - 0.14.0 10.0.1 21.0.0 - 14.0.4 + 14.0.14 diff --git a/docs/platform-versions.rst b/docs/platform-versions.rst index 2a6a4799..e71a6ce5 100644 --- a/docs/platform-versions.rst +++ b/docs/platform-versions.rst @@ -13,31 +13,31 @@ Platform versions * - org.opendaylight.odlparent - \* - - 14.0.3 + - 14.1.0 * - org.opendaylight.infrautils - \* - - 7.0.3 + - 7.1.4 * - org.opendaylight.yangtools - \* - - 14.0.4 + - 14.0.14 * - org.opendaylight.mdsal - \* - - 14.0.2 + - 14.0.13 * - org.opendaylight.controller - \* - - 10.0.2 + - 11.0.0 * - org.opendaylight.aaa - \* - - 0.20.1 + - 0.21.0 * - org.opendaylight.netconf - \* - - 8.0.2 + - 9.0.0 .. note:: Most projects get their YANG Tools version via MD-SAL. ${project}-artifacts are maven `bill of materials `__ diff --git a/features/pom.xml b/features/pom.xml index 53bdd198..4fa38499 100644 --- a/features/pom.xml +++ b/features/pom.xml @@ -12,7 +12,7 @@ org.opendaylight.odlparent odlparent-lite - 14.0.3 + 14.1.0 org.opendaylight.integration diff --git a/features/repos/index/pom.xml b/features/repos/index/pom.xml index 3346685c..11c9c2d1 100644 --- a/features/repos/index/pom.xml +++ b/features/repos/index/pom.xml @@ -12,7 +12,7 @@ org.opendaylight.odlparent feature-repo-parent - 14.0.3 + 14.1.0 org.opendaylight.integration @@ -298,26 +298,11 @@ - - - serviceutils - - true - - - - org.opendaylight.serviceutils - serviceutils-features - features - xml - - - transportpce-models - true + false @@ -332,7 +317,7 @@ transportpce - true + false diff --git a/features/repos/pom.xml b/features/repos/pom.xml index 4ebd4e86..b8459901 100644 --- a/features/repos/pom.xml +++ b/features/repos/pom.xml @@ -12,7 +12,7 @@ org.opendaylight.odlparent odlparent-lite - 14.0.3 + 14.1.0 org.opendaylight.integration diff --git a/features/repos/test/pom.xml b/features/repos/test/pom.xml index 5eaddbbb..bf5740fb 100644 --- a/features/repos/test/pom.xml +++ b/features/repos/test/pom.xml @@ -12,7 +12,7 @@ org.opendaylight.odlparent feature-repo-parent - 14.0.3 + 14.1.0 org.opendaylight.integration diff --git a/features/singles/odl-integration-all/pom.xml b/features/singles/odl-integration-all/pom.xml index 55277dc8..7acf91dd 100644 --- a/features/singles/odl-integration-all/pom.xml +++ b/features/singles/odl-integration-all/pom.xml @@ -11,7 +11,7 @@ org.opendaylight.odlparent single-feature-parent - 14.0.3 + 14.1.0 org.opendaylight.integration @@ -98,26 +98,5 @@ - - - serviceutils - - true - - - - org.opendaylight.serviceutils - odl-serviceutils-srm - xml - features - - - org.opendaylight.serviceutils - odl-serviceutils-tools - xml - features - - - diff --git a/features/singles/odl-integration-compatible-with-all/pom.xml b/features/singles/odl-integration-compatible-with-all/pom.xml index 311b8056..0290b457 100644 --- a/features/singles/odl-integration-compatible-with-all/pom.xml +++ b/features/singles/odl-integration-compatible-with-all/pom.xml @@ -11,7 +11,7 @@ org.opendaylight.odlparent single-feature-parent - 14.0.3 + 14.1.0 org.opendaylight.integration @@ -217,7 +217,7 @@ transportpce - true + false @@ -256,7 +256,7 @@ transportpce-models - true + false diff --git a/features/singles/pom.xml b/features/singles/pom.xml index 27dc004a..c3bd0e65 100644 --- a/features/singles/pom.xml +++ b/features/singles/pom.xml @@ -12,7 +12,7 @@ org.opendaylight.odlparent odlparent-lite - 14.0.3 + 14.1.0 org.opendaylight.integration diff --git a/karaf-scripts/pom.xml b/karaf-scripts/pom.xml index 7daba984..4f2c42b3 100644 --- a/karaf-scripts/pom.xml +++ b/karaf-scripts/pom.xml @@ -12,7 +12,7 @@ org.opendaylight.odlparent odlparent-lite - 14.0.3 + 14.1.0 org.opendaylight.integration diff --git a/karaf/pom.xml b/karaf/pom.xml index 5c92973c..036a796e 100644 --- a/karaf/pom.xml +++ b/karaf/pom.xml @@ -13,7 +13,7 @@ org.opendaylight.odlparent karaf4-parent - 14.0.3 + 14.1.0 org.opendaylight.integration diff --git a/onap-karaf/pom.xml b/onap-karaf/pom.xml index b1a6223c..97e2ff73 100644 --- a/onap-karaf/pom.xml +++ b/onap-karaf/pom.xml @@ -4,7 +4,7 @@ org.opendaylight.odlparent karaf4-parent - 14.0.3 + 14.1.0 diff --git a/opendaylight/pom.xml b/opendaylight/pom.xml index f2e4861f..d72b6d89 100644 --- a/opendaylight/pom.xml +++ b/opendaylight/pom.xml @@ -14,12 +14,12 @@ org.opendaylight.integration karaf - 0.19.0-SNAPSHOT + 0.20.0-SNAPSHOT org.opendaylight.integration opendaylight - 0.19.0-SNAPSHOT + 0.20.0-SNAPSHOT pom ODL :: integration :: ${project.artifactId} The actual Karaf archive building sub-project. diff --git a/pom.xml b/pom.xml index 436b67ed..97114eb7 100644 --- a/pom.xml +++ b/pom.xml @@ -12,7 +12,7 @@ org.opendaylight.odlparent odlparent-lite - 14.0.3 + 14.1.0 org.opendaylight.integration -- 2.34.1 From d894afbd4ca1355db136a1540d36c2a485ad19fb Mon Sep 17 00:00:00 2001 From: jenkins-releng Date: Thu, 10 Jul 2025 00:55:30 +0000 Subject: [PATCH 2/2] Release Validate --- artifacts/all/pom.xml | 2 +- artifacts/distribution/pom.xml | 2 +- artifacts/pom.xml | 2 +- artifacts/upstream/all/pom.xml | 2 +- artifacts/upstream/artifacts/pom.xml | 2 +- artifacts/upstream/other/pom.xml | 2 +- artifacts/upstream/pom.xml | 2 +- artifacts/upstream/properties/pom.xml | 10 +++++----- features/pom.xml | 2 +- features/repos/index/pom.xml | 2 +- features/repos/pom.xml | 2 +- features/repos/test/pom.xml | 2 +- features/singles/odl-integration-all/pom.xml | 2 +- .../odl-integration-compatible-with-all/pom.xml | 2 +- features/singles/pom.xml | 2 +- karaf-scripts/pom.xml | 2 +- karaf/pom.xml | 6 +++--- onap-karaf/pom.xml | 2 +- pom.xml | 2 +- 19 files changed, 25 insertions(+), 25 deletions(-) diff --git a/artifacts/all/pom.xml b/artifacts/all/pom.xml index 2641efef..9cd7ba44 100644 --- a/artifacts/all/pom.xml +++ b/artifacts/all/pom.xml @@ -17,7 +17,7 @@ org.opendaylight.integration all-artifacts - 0.22.0-SNAPSHOT + 0.22.0 pom diff --git a/artifacts/distribution/pom.xml b/artifacts/distribution/pom.xml index a1c5ac40..47180b03 100644 --- a/artifacts/distribution/pom.xml +++ b/artifacts/distribution/pom.xml @@ -17,7 +17,7 @@ org.opendaylight.integration distribution-artifacts - 0.22.0-SNAPSHOT + 0.22.0 pom diff --git a/artifacts/pom.xml b/artifacts/pom.xml index 7fed4c75..82a1145a 100644 --- a/artifacts/pom.xml +++ b/artifacts/pom.xml @@ -17,7 +17,7 @@ org.opendaylight.integration artifacts-aggregator - 0.22.0-SNAPSHOT + 0.22.0 pom diff --git a/artifacts/upstream/all/pom.xml b/artifacts/upstream/all/pom.xml index d02e8175..890162d5 100644 --- a/artifacts/upstream/all/pom.xml +++ b/artifacts/upstream/all/pom.xml @@ -17,7 +17,7 @@ org.opendaylight.integration upstream-all-artifacts - 0.22.0-SNAPSHOT + 0.22.0 pom diff --git a/artifacts/upstream/artifacts/pom.xml b/artifacts/upstream/artifacts/pom.xml index 800115b7..e5746709 100644 --- a/artifacts/upstream/artifacts/pom.xml +++ b/artifacts/upstream/artifacts/pom.xml @@ -12,7 +12,7 @@ org.opendaylight.integration properties - 0.22.0-SNAPSHOT + 0.22.0 ../properties artifact-artifacts diff --git a/artifacts/upstream/other/pom.xml b/artifacts/upstream/other/pom.xml index 770815a5..d32d723a 100644 --- a/artifacts/upstream/other/pom.xml +++ b/artifacts/upstream/other/pom.xml @@ -14,7 +14,7 @@ org.opendaylight.integration properties - 0.22.0-SNAPSHOT + 0.22.0 ../properties other-artifacts diff --git a/artifacts/upstream/pom.xml b/artifacts/upstream/pom.xml index cbb39766..1e9831c3 100644 --- a/artifacts/upstream/pom.xml +++ b/artifacts/upstream/pom.xml @@ -17,7 +17,7 @@ org.opendaylight.integration upstream-aggregator - 0.22.0-SNAPSHOT + 0.22.0 pom diff --git a/artifacts/upstream/properties/pom.xml b/artifacts/upstream/properties/pom.xml index 1d1bcdec..eecd2fc5 100644 --- a/artifacts/upstream/properties/pom.xml +++ b/artifacts/upstream/properties/pom.xml @@ -17,7 +17,7 @@ org.opendaylight.integration properties - 0.22.0-SNAPSHOT + 0.22.0 pom diff --git a/features/repos/index/pom.xml b/features/repos/index/pom.xml index 11c9c2d1..762246f5 100644 --- a/features/repos/index/pom.xml +++ b/features/repos/index/pom.xml @@ -17,7 +17,7 @@ org.opendaylight.integration features-index - 0.22.0-SNAPSHOT + 0.22.0 feature diff --git a/features/repos/pom.xml b/features/repos/pom.xml index b8459901..8f1e3a6e 100644 --- a/features/repos/pom.xml +++ b/features/repos/pom.xml @@ -17,7 +17,7 @@ org.opendaylight.integration repos-aggregator - 0.22.0-SNAPSHOT + 0.22.0 pom diff --git a/features/repos/test/pom.xml b/features/repos/test/pom.xml index bf5740fb..0abac53e 100644 --- a/features/repos/test/pom.xml +++ b/features/repos/test/pom.xml @@ -17,7 +17,7 @@ org.opendaylight.integration features-test - 0.22.0-SNAPSHOT + 0.22.0 feature diff --git a/features/singles/odl-integration-all/pom.xml b/features/singles/odl-integration-all/pom.xml index 7acf91dd..a34e3c8a 100644 --- a/features/singles/odl-integration-all/pom.xml +++ b/features/singles/odl-integration-all/pom.xml @@ -17,7 +17,7 @@ org.opendaylight.integration odl-integration-all - 0.22.0-SNAPSHOT + 0.22.0 feature diff --git a/features/singles/odl-integration-compatible-with-all/pom.xml b/features/singles/odl-integration-compatible-with-all/pom.xml index 0290b457..f388ee5e 100644 --- a/features/singles/odl-integration-compatible-with-all/pom.xml +++ b/features/singles/odl-integration-compatible-with-all/pom.xml @@ -17,7 +17,7 @@ org.opendaylight.integration odl-integration-compatible-with-all - 0.22.0-SNAPSHOT + 0.22.0 feature diff --git a/features/singles/pom.xml b/features/singles/pom.xml index c3bd0e65..5dce7552 100644 --- a/features/singles/pom.xml +++ b/features/singles/pom.xml @@ -17,7 +17,7 @@ org.opendaylight.integration singles-aggregator - 0.22.0-SNAPSHOT + 0.22.0 pom diff --git a/karaf-scripts/pom.xml b/karaf-scripts/pom.xml index 4f2c42b3..7314ce68 100644 --- a/karaf-scripts/pom.xml +++ b/karaf-scripts/pom.xml @@ -17,7 +17,7 @@ org.opendaylight.integration karaf-scripts - 0.22.0-SNAPSHOT + 0.22.0 jar ODL :: integration :: Karaf :: Scripts :: ${project.artifactId} The actual Karaf archive building sub-project. diff --git a/karaf/pom.xml b/karaf/pom.xml index 036a796e..6a2fd8e4 100644 --- a/karaf/pom.xml +++ b/karaf/pom.xml @@ -18,7 +18,7 @@ org.opendaylight.integration karaf - 0.22.0-SNAPSHOT + 0.22.0 pom @@ -43,7 +43,7 @@ org.opendaylight.integration all-artifacts - 0.22.0-SNAPSHOT + 0.22.0 import pom @@ -97,7 +97,7 @@ org.opendaylight.integration karaf-scripts - 0.22.0-SNAPSHOT + 0.22.0 test diff --git a/onap-karaf/pom.xml b/onap-karaf/pom.xml index 97e2ff73..7deb4687 100644 --- a/onap-karaf/pom.xml +++ b/onap-karaf/pom.xml @@ -10,7 +10,7 @@ org.opendaylight.integration onap-karaf - 0.22.0-SNAPSHOT + 0.22.0 pom ODL :: integration :: ${project.artifactId} 4.0.0 diff --git a/pom.xml b/pom.xml index 97114eb7..1d29696f 100644 --- a/pom.xml +++ b/pom.xml @@ -17,7 +17,7 @@ org.opendaylight.integration distribution-aggregator - 0.22.0-SNAPSHOT + 0.22.0 pom Integration/Distribution -- 2.34.1