From ba9d9f2abb562d33a9ef3f4b9521433f483fcf4a Mon Sep 17 00:00:00 2001 From: Robert Varga Date: Sun, 21 Sep 2025 01:51: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 - bgpcep-0.23.1 Disable: - l2switch - openflowplugin - transportpce - transportpce-models Change-Id: I267e42fa2370703ac1039d28e20cf827f3a8f502 Signed-off-by: Robert Varga (cherry picked from commit 02723c7d383a82728e1e82da978822eac72db9d9) --- 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 | 8 ++++---- artifacts/upstream/pom.xml | 2 +- artifacts/upstream/properties/pom.xml | 18 +++++++++--------- docs/platform-versions.rst | 8 ++++++++ features/pom.xml | 2 +- features/repos/index/pom.xml | 10 +++++----- features/repos/pom.xml | 2 +- features/repos/test/pom.xml | 2 +- features/singles/odl-integration-all/pom.xml | 2 +- .../pom.xml | 6 +++--- features/singles/pom.xml | 2 +- karaf-scripts/pom.xml | 2 +- karaf/pom.xml | 2 +- onap-karaf/pom.xml | 2 +- pom.xml | 2 +- 19 files changed, 43 insertions(+), 35 deletions(-) diff --git a/artifacts/all/pom.xml b/artifacts/all/pom.xml index b15b332c..c446ec78 100644 --- a/artifacts/all/pom.xml +++ b/artifacts/all/pom.xml @@ -12,7 +12,7 @@ org.opendaylight.odlparent odlparent-lite - 14.1.0 + 14.1.3 org.opendaylight.integration diff --git a/artifacts/distribution/pom.xml b/artifacts/distribution/pom.xml index e9a2d7f9..2e6245c2 100644 --- a/artifacts/distribution/pom.xml +++ b/artifacts/distribution/pom.xml @@ -12,7 +12,7 @@ org.opendaylight.odlparent odlparent-lite - 14.1.0 + 14.1.3 org.opendaylight.integration diff --git a/artifacts/pom.xml b/artifacts/pom.xml index afbc7e9e..c60a9ab8 100644 --- a/artifacts/pom.xml +++ b/artifacts/pom.xml @@ -12,7 +12,7 @@ org.opendaylight.odlparent odlparent-lite - 14.1.0 + 14.1.3 org.opendaylight.integration diff --git a/artifacts/upstream/all/pom.xml b/artifacts/upstream/all/pom.xml index 0df1d0d2..d754ed5b 100644 --- a/artifacts/upstream/all/pom.xml +++ b/artifacts/upstream/all/pom.xml @@ -12,7 +12,7 @@ org.opendaylight.odlparent odlparent-lite - 14.1.0 + 14.1.3 org.opendaylight.integration diff --git a/artifacts/upstream/artifacts/pom.xml b/artifacts/upstream/artifacts/pom.xml index 87c263e7..2c88ce50 100644 --- a/artifacts/upstream/artifacts/pom.xml +++ b/artifacts/upstream/artifacts/pom.xml @@ -143,7 +143,7 @@ l2switch - true + false @@ -228,7 +228,7 @@ openflowplugin - true + false @@ -276,7 +276,7 @@ transportpce-models - true + false @@ -293,7 +293,7 @@ transportpce - true + false diff --git a/artifacts/upstream/pom.xml b/artifacts/upstream/pom.xml index 2333c09d..f70f3f4b 100644 --- a/artifacts/upstream/pom.xml +++ b/artifacts/upstream/pom.xml @@ -12,7 +12,7 @@ org.opendaylight.odlparent odlparent-lite - 14.1.0 + 14.1.3 org.opendaylight.integration diff --git a/artifacts/upstream/properties/pom.xml b/artifacts/upstream/properties/pom.xml index dfcac02e..639a898a 100644 --- a/artifacts/upstream/properties/pom.xml +++ b/artifacts/upstream/properties/pom.xml @@ -12,7 +12,7 @@ org.opendaylight.odlparent odlparent-lite - 14.1.0 + 14.1.3 org.opendaylight.integration @@ -43,22 +43,22 @@ - 0.21.0 - 0.23.0 - 11.0.0 + 0.21.2 + 0.23.1 + 11.0.2 1.18.0-SNAPSHOT - 7.1.4 + 7.1.7 1.19.0-SNAPSHOT 2.0.0 1.22.0-SNAPSHOT - 14.0.13 - 9.0.0 - 14.1.0 + 14.0.18 + 9.0.1 + 14.1.3 0.20.0 1.21.0-SNAPSHOT 11.0.0 22.0.0 - 14.0.14 + 14.0.17 diff --git a/docs/platform-versions.rst b/docs/platform-versions.rst index e71a6ce5..4bb721e3 100644 --- a/docs/platform-versions.rst +++ b/docs/platform-versions.rst @@ -10,34 +10,42 @@ Platform versions * - Group - Artifact - 2025.03 Titanium GA + - 2025.03 Titanium SR1 * - org.opendaylight.odlparent - \* - 14.1.0 + - 14.1.3 * - org.opendaylight.infrautils - \* - 7.1.4 + - 7.1.7 * - org.opendaylight.yangtools - \* - 14.0.14 + - 14.0.17 * - org.opendaylight.mdsal - \* - 14.0.13 + - 14.0.18 * - org.opendaylight.controller - \* - 11.0.0 + - 11.0.2 * - org.opendaylight.aaa - \* - 0.21.0 + - 0.21.2 * - org.opendaylight.netconf - \* - 9.0.0 + - 9.0.1 .. 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 35358760..9a8159f0 100644 --- a/features/pom.xml +++ b/features/pom.xml @@ -12,7 +12,7 @@ org.opendaylight.odlparent odlparent-lite - 14.1.0 + 14.1.3 org.opendaylight.integration diff --git a/features/repos/index/pom.xml b/features/repos/index/pom.xml index 24ebe653..5cf7a850 100644 --- a/features/repos/index/pom.xml +++ b/features/repos/index/pom.xml @@ -12,7 +12,7 @@ org.opendaylight.odlparent feature-repo-parent - 14.1.0 + 14.1.3 org.opendaylight.integration @@ -170,7 +170,7 @@ l2switch - true + false @@ -269,7 +269,7 @@ openflowplugin - true + false @@ -311,7 +311,7 @@ transportpce-models - true + false @@ -326,7 +326,7 @@ transportpce - true + false diff --git a/features/repos/pom.xml b/features/repos/pom.xml index 613c97af..9a971acf 100644 --- a/features/repos/pom.xml +++ b/features/repos/pom.xml @@ -12,7 +12,7 @@ org.opendaylight.odlparent odlparent-lite - 14.1.0 + 14.1.3 org.opendaylight.integration diff --git a/features/repos/test/pom.xml b/features/repos/test/pom.xml index b4356727..15e0a5e6 100644 --- a/features/repos/test/pom.xml +++ b/features/repos/test/pom.xml @@ -12,7 +12,7 @@ org.opendaylight.odlparent feature-repo-parent - 14.1.0 + 14.1.3 org.opendaylight.integration diff --git a/features/singles/odl-integration-all/pom.xml b/features/singles/odl-integration-all/pom.xml index 47823063..c7ae21d7 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.1.0 + 14.1.3 org.opendaylight.integration diff --git a/features/singles/odl-integration-compatible-with-all/pom.xml b/features/singles/odl-integration-compatible-with-all/pom.xml index 3c2651db..04484126 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.1.0 + 14.1.3 org.opendaylight.integration @@ -133,7 +133,7 @@ l2switch - true + false @@ -184,7 +184,7 @@ openflowplugin - true + false diff --git a/features/singles/pom.xml b/features/singles/pom.xml index 489e24ce..fe5141d3 100644 --- a/features/singles/pom.xml +++ b/features/singles/pom.xml @@ -12,7 +12,7 @@ org.opendaylight.odlparent odlparent-lite - 14.1.0 + 14.1.3 org.opendaylight.integration diff --git a/karaf-scripts/pom.xml b/karaf-scripts/pom.xml index 3612f9a8..fd751919 100644 --- a/karaf-scripts/pom.xml +++ b/karaf-scripts/pom.xml @@ -12,7 +12,7 @@ org.opendaylight.odlparent odlparent-lite - 14.1.0 + 14.1.3 org.opendaylight.integration diff --git a/karaf/pom.xml b/karaf/pom.xml index 437f7663..99bae6b0 100644 --- a/karaf/pom.xml +++ b/karaf/pom.xml @@ -13,7 +13,7 @@ org.opendaylight.odlparent karaf4-parent - 14.1.0 + 14.1.3 org.opendaylight.integration diff --git a/onap-karaf/pom.xml b/onap-karaf/pom.xml index 47190339..56979a3d 100644 --- a/onap-karaf/pom.xml +++ b/onap-karaf/pom.xml @@ -4,7 +4,7 @@ org.opendaylight.odlparent karaf4-parent - 14.1.0 + 14.1.3 diff --git a/pom.xml b/pom.xml index 8c2b43c2..8d8a7646 100644 --- a/pom.xml +++ b/pom.xml @@ -12,7 +12,7 @@ org.opendaylight.odlparent odlparent-lite - 14.1.0 + 14.1.3 org.opendaylight.integration -- 2.34.1 From d1c56be97f11b8ceb59f83691763e4ac12f0eb2b Mon Sep 17 00:00:00 2001 From: Robert Varga Date: Mon, 22 Sep 2025 09:03:18 +0200 Subject: [PATCH 2/3] Enable openflowplugin Bump to version 0.20.1 and enable. Change-Id: I4dc7e587f64ff689f6d27fdda2d8f7f33c861eaa Signed-off-by: Robert Varga (cherry picked from commit a3a87f0d31721c94b21cdd621d0288142eb02f57) --- artifacts/upstream/artifacts/pom.xml | 2 +- artifacts/upstream/properties/pom.xml | 2 +- features/repos/index/pom.xml | 2 +- features/singles/odl-integration-compatible-with-all/pom.xml | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/artifacts/upstream/artifacts/pom.xml b/artifacts/upstream/artifacts/pom.xml index 2c88ce50..4f50b0db 100644 --- a/artifacts/upstream/artifacts/pom.xml +++ b/artifacts/upstream/artifacts/pom.xml @@ -228,7 +228,7 @@ openflowplugin - false + true diff --git a/artifacts/upstream/properties/pom.xml b/artifacts/upstream/properties/pom.xml index 639a898a..88d0afa8 100644 --- a/artifacts/upstream/properties/pom.xml +++ b/artifacts/upstream/properties/pom.xml @@ -54,7 +54,7 @@ 14.0.18 9.0.1 14.1.3 - 0.20.0 + 0.20.1 1.21.0-SNAPSHOT 11.0.0 22.0.0 diff --git a/features/repos/index/pom.xml b/features/repos/index/pom.xml index 5cf7a850..69d9f77d 100644 --- a/features/repos/index/pom.xml +++ b/features/repos/index/pom.xml @@ -269,7 +269,7 @@ openflowplugin - false + true diff --git a/features/singles/odl-integration-compatible-with-all/pom.xml b/features/singles/odl-integration-compatible-with-all/pom.xml index 04484126..8c3c4937 100644 --- a/features/singles/odl-integration-compatible-with-all/pom.xml +++ b/features/singles/odl-integration-compatible-with-all/pom.xml @@ -184,7 +184,7 @@ openflowplugin - false + true -- 2.34.1 From 65f75129dd2f2fd65d3c198e7ea36a7cc6f7c7a9 Mon Sep 17 00:00:00 2001 From: jenkins-releng Date: Mon, 29 Sep 2025 12:05:26 +0000 Subject: [PATCH 3/3] 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 c446ec78..e8ff27aa 100644 --- a/artifacts/all/pom.xml +++ b/artifacts/all/pom.xml @@ -17,7 +17,7 @@ org.opendaylight.integration all-artifacts - 0.23.0-SNAPSHOT + 0.23.0 pom diff --git a/artifacts/distribution/pom.xml b/artifacts/distribution/pom.xml index 2e6245c2..0b659bd8 100644 --- a/artifacts/distribution/pom.xml +++ b/artifacts/distribution/pom.xml @@ -17,7 +17,7 @@ org.opendaylight.integration distribution-artifacts - 0.23.0-SNAPSHOT + 0.23.0 pom diff --git a/artifacts/pom.xml b/artifacts/pom.xml index c60a9ab8..cfb54e6b 100644 --- a/artifacts/pom.xml +++ b/artifacts/pom.xml @@ -17,7 +17,7 @@ org.opendaylight.integration artifacts-aggregator - 0.23.0-SNAPSHOT + 0.23.0 pom diff --git a/artifacts/upstream/all/pom.xml b/artifacts/upstream/all/pom.xml index d754ed5b..7874f136 100644 --- a/artifacts/upstream/all/pom.xml +++ b/artifacts/upstream/all/pom.xml @@ -17,7 +17,7 @@ org.opendaylight.integration upstream-all-artifacts - 0.23.0-SNAPSHOT + 0.23.0 pom diff --git a/artifacts/upstream/artifacts/pom.xml b/artifacts/upstream/artifacts/pom.xml index 4f50b0db..8c76954e 100644 --- a/artifacts/upstream/artifacts/pom.xml +++ b/artifacts/upstream/artifacts/pom.xml @@ -12,7 +12,7 @@ org.opendaylight.integration properties - 0.23.0-SNAPSHOT + 0.23.0 ../properties artifact-artifacts diff --git a/artifacts/upstream/other/pom.xml b/artifacts/upstream/other/pom.xml index 49a73dc4..2d7e7bd8 100644 --- a/artifacts/upstream/other/pom.xml +++ b/artifacts/upstream/other/pom.xml @@ -14,7 +14,7 @@ org.opendaylight.integration properties - 0.23.0-SNAPSHOT + 0.23.0 ../properties other-artifacts diff --git a/artifacts/upstream/pom.xml b/artifacts/upstream/pom.xml index f70f3f4b..a98fadce 100644 --- a/artifacts/upstream/pom.xml +++ b/artifacts/upstream/pom.xml @@ -17,7 +17,7 @@ org.opendaylight.integration upstream-aggregator - 0.23.0-SNAPSHOT + 0.23.0 pom diff --git a/artifacts/upstream/properties/pom.xml b/artifacts/upstream/properties/pom.xml index 88d0afa8..ae2c995c 100644 --- a/artifacts/upstream/properties/pom.xml +++ b/artifacts/upstream/properties/pom.xml @@ -17,7 +17,7 @@ org.opendaylight.integration properties - 0.23.0-SNAPSHOT + 0.23.0 pom diff --git a/features/repos/index/pom.xml b/features/repos/index/pom.xml index 69d9f77d..7bdca8f9 100644 --- a/features/repos/index/pom.xml +++ b/features/repos/index/pom.xml @@ -17,7 +17,7 @@ org.opendaylight.integration features-index - 0.23.0-SNAPSHOT + 0.23.0 feature diff --git a/features/repos/pom.xml b/features/repos/pom.xml index 9a971acf..8f4fe06f 100644 --- a/features/repos/pom.xml +++ b/features/repos/pom.xml @@ -17,7 +17,7 @@ org.opendaylight.integration repos-aggregator - 0.23.0-SNAPSHOT + 0.23.0 pom diff --git a/features/repos/test/pom.xml b/features/repos/test/pom.xml index 15e0a5e6..17efab5e 100644 --- a/features/repos/test/pom.xml +++ b/features/repos/test/pom.xml @@ -17,7 +17,7 @@ org.opendaylight.integration features-test - 0.23.0-SNAPSHOT + 0.23.0 feature diff --git a/features/singles/odl-integration-all/pom.xml b/features/singles/odl-integration-all/pom.xml index c7ae21d7..cb800295 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.23.0-SNAPSHOT + 0.23.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 8c3c4937..df2eff1c 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.23.0-SNAPSHOT + 0.23.0 feature diff --git a/features/singles/pom.xml b/features/singles/pom.xml index fe5141d3..c6b58028 100644 --- a/features/singles/pom.xml +++ b/features/singles/pom.xml @@ -17,7 +17,7 @@ org.opendaylight.integration singles-aggregator - 0.23.0-SNAPSHOT + 0.23.0 pom diff --git a/karaf-scripts/pom.xml b/karaf-scripts/pom.xml index fd751919..8f4264c1 100644 --- a/karaf-scripts/pom.xml +++ b/karaf-scripts/pom.xml @@ -17,7 +17,7 @@ org.opendaylight.integration karaf-scripts - 0.23.0-SNAPSHOT + 0.23.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 99bae6b0..be921181 100644 --- a/karaf/pom.xml +++ b/karaf/pom.xml @@ -18,7 +18,7 @@ org.opendaylight.integration karaf - 0.23.0-SNAPSHOT + 0.23.0 pom @@ -43,7 +43,7 @@ org.opendaylight.integration all-artifacts - 0.23.0-SNAPSHOT + 0.23.0 import pom @@ -97,7 +97,7 @@ org.opendaylight.integration karaf-scripts - 0.23.0-SNAPSHOT + 0.23.0 test diff --git a/onap-karaf/pom.xml b/onap-karaf/pom.xml index 56979a3d..5cf13109 100644 --- a/onap-karaf/pom.xml +++ b/onap-karaf/pom.xml @@ -10,7 +10,7 @@ org.opendaylight.integration onap-karaf - 0.23.0-SNAPSHOT + 0.23.0 pom ODL :: integration :: ${project.artifactId} 4.0.0 diff --git a/pom.xml b/pom.xml index 8d8a7646..339902cf 100644 --- a/pom.xml +++ b/pom.xml @@ -17,7 +17,7 @@ org.opendaylight.integration distribution-aggregator - 0.23.0-SNAPSHOT + 0.23.0 pom Integration/Distribution -- 2.34.1