From cf7c2ca4eb5528b7c0cf0a0490b9c80b92080e6c Mon Sep 17 00:00:00 2001 From: Robert Varga Date: Thu, 8 Aug 2024 10:52:03 +0200 Subject: [PATCH 1/2] WIP: Bump upstreams for 2024.09 Scandium Adopt: - odlparent-14.0.2 - infrautils-7.0.2 - yangtools-14.0.2 - mdsal-14.0.1 - controller-10.0.1 - aaa-0.20.0 - netconf-8.0.0 - bgpcep-0.22.0-SNAPSHOT // FIXME: non-snapshots // FIXME: tpce deactivation Change-Id: I01fde0d35ba293c6cfb451f41f52f085bbb57f81 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/pom.xml | 2 +- artifacts/upstream/properties/pom.xml | 18 +++++++++--------- docs/platform-versions.rst | 16 ++++++++-------- 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 +- .../pom.xml | 2 +- features/singles/pom.xml | 2 +- karaf-scripts/pom.xml | 2 +- karaf/pom.xml | 2 +- onap-karaf/pom.xml | 2 +- pom.xml | 2 +- 18 files changed, 33 insertions(+), 33 deletions(-) diff --git a/artifacts/all/pom.xml b/artifacts/all/pom.xml index 5fcb5e8c..b2030e14 100644 --- a/artifacts/all/pom.xml +++ b/artifacts/all/pom.xml @@ -12,7 +12,7 @@ org.opendaylight.odlparent odlparent-lite - 13.0.11 + 14.0.2 org.opendaylight.integration diff --git a/artifacts/distribution/pom.xml b/artifacts/distribution/pom.xml index 130898a0..fe86d4d1 100644 --- a/artifacts/distribution/pom.xml +++ b/artifacts/distribution/pom.xml @@ -12,7 +12,7 @@ org.opendaylight.odlparent odlparent-lite - 13.0.11 + 14.0.2 org.opendaylight.integration diff --git a/artifacts/pom.xml b/artifacts/pom.xml index 2d33ba70..e7980b10 100644 --- a/artifacts/pom.xml +++ b/artifacts/pom.xml @@ -12,7 +12,7 @@ org.opendaylight.odlparent odlparent-lite - 13.0.11 + 14.0.2 org.opendaylight.integration diff --git a/artifacts/upstream/all/pom.xml b/artifacts/upstream/all/pom.xml index 25c2a187..6f5babe4 100644 --- a/artifacts/upstream/all/pom.xml +++ b/artifacts/upstream/all/pom.xml @@ -12,7 +12,7 @@ org.opendaylight.odlparent odlparent-lite - 13.0.11 + 14.0.2 org.opendaylight.integration diff --git a/artifacts/upstream/pom.xml b/artifacts/upstream/pom.xml index 9f178b26..bcd2c796 100644 --- a/artifacts/upstream/pom.xml +++ b/artifacts/upstream/pom.xml @@ -12,7 +12,7 @@ org.opendaylight.odlparent odlparent-lite - 13.0.11 + 14.0.2 org.opendaylight.integration diff --git a/artifacts/upstream/properties/pom.xml b/artifacts/upstream/properties/pom.xml index 78e60df0..d321f531 100644 --- a/artifacts/upstream/properties/pom.xml +++ b/artifacts/upstream/properties/pom.xml @@ -12,7 +12,7 @@ org.opendaylight.odlparent odlparent-lite - 13.0.11 + 14.0.2 org.opendaylight.integration @@ -43,22 +43,22 @@ - 0.19.3 - 0.21.4 - 9.0.2 + 0.20.0 + 0.22.0-SNAPSHOT + 10.0.1 1.16.0-SNAPSHOT - 6.0.6 + 7.0.1 1.17.0-SNAPSHOT 1.20.0-SNAPSHOT - 13.0.1 - 7.0.4 - 13.0.11 + 14.0.1 + 8.0.0 + 14.0.2 0.19.0-SNAPSHOT 1.19.0-SNAPSHOT 0.14.0-SNAPSHOT 9.0.0 20.0.0 - 13.0.2 + 14.0.2 diff --git a/docs/platform-versions.rst b/docs/platform-versions.rst index 1684a01e..bff910d3 100644 --- a/docs/platform-versions.rst +++ b/docs/platform-versions.rst @@ -9,35 +9,35 @@ Platform versions * - Group - Artifact - - 2024.03 Calcium Development + - 2024.09 Scandium GA * - org.opendaylight.odlparent - \* - - 13.0.11 + - 14.0.2 * - org.opendaylight.infrautils - \* - - 6.0.6 + - 7.0.2 * - org.opendaylight.yangtools - \* - - 13.0.2 + - 14.0.2 * - org.opendaylight.mdsal - \* - - 13.0.1 + - 14.0.1 * - org.opendaylight.controller - \* - - 9.0.2 + - 10.0.1 * - org.opendaylight.aaa - \* - - 0.19.3 + - 0.20.0 * - org.opendaylight.netconf - \* - - 7.0.4 + - 8.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 c9b9a695..a49992d5 100644 --- a/features/pom.xml +++ b/features/pom.xml @@ -12,7 +12,7 @@ org.opendaylight.odlparent odlparent-lite - 13.0.11 + 14.0.2 org.opendaylight.integration diff --git a/features/repos/index/pom.xml b/features/repos/index/pom.xml index 147bbac1..f39c20b9 100644 --- a/features/repos/index/pom.xml +++ b/features/repos/index/pom.xml @@ -12,7 +12,7 @@ org.opendaylight.odlparent feature-repo-parent - 13.0.11 + 14.0.2 org.opendaylight.integration diff --git a/features/repos/pom.xml b/features/repos/pom.xml index a31f4d0a..8d10c8cd 100644 --- a/features/repos/pom.xml +++ b/features/repos/pom.xml @@ -12,7 +12,7 @@ org.opendaylight.odlparent odlparent-lite - 13.0.11 + 14.0.2 org.opendaylight.integration diff --git a/features/repos/test/pom.xml b/features/repos/test/pom.xml index 2bf4e187..82d3603a 100644 --- a/features/repos/test/pom.xml +++ b/features/repos/test/pom.xml @@ -12,7 +12,7 @@ org.opendaylight.odlparent feature-repo-parent - 13.0.11 + 14.0.2 org.opendaylight.integration diff --git a/features/singles/odl-integration-all/pom.xml b/features/singles/odl-integration-all/pom.xml index 664ce76b..96b8e3e7 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 - 13.0.11 + 14.0.2 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 621c1b9c..0ae22efd 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 - 13.0.11 + 14.0.2 org.opendaylight.integration diff --git a/features/singles/pom.xml b/features/singles/pom.xml index ec139212..268ad10c 100644 --- a/features/singles/pom.xml +++ b/features/singles/pom.xml @@ -12,7 +12,7 @@ org.opendaylight.odlparent odlparent-lite - 13.0.11 + 14.0.2 org.opendaylight.integration diff --git a/karaf-scripts/pom.xml b/karaf-scripts/pom.xml index 15fd2c62..653c388c 100644 --- a/karaf-scripts/pom.xml +++ b/karaf-scripts/pom.xml @@ -12,7 +12,7 @@ org.opendaylight.odlparent odlparent-lite - 13.0.11 + 14.0.2 org.opendaylight.integration diff --git a/karaf/pom.xml b/karaf/pom.xml index 131ed57d..b0a67d1e 100644 --- a/karaf/pom.xml +++ b/karaf/pom.xml @@ -13,7 +13,7 @@ org.opendaylight.odlparent karaf4-parent - 13.0.11 + 14.0.2 org.opendaylight.integration diff --git a/onap-karaf/pom.xml b/onap-karaf/pom.xml index 580188bb..4b805788 100644 --- a/onap-karaf/pom.xml +++ b/onap-karaf/pom.xml @@ -4,7 +4,7 @@ org.opendaylight.odlparent karaf4-parent - 13.0.11 + 14.0.2 diff --git a/pom.xml b/pom.xml index 24c06b09..c2f86f13 100644 --- a/pom.xml +++ b/pom.xml @@ -12,7 +12,7 @@ org.opendaylight.odlparent odlparent-lite - 13.0.11 + 14.0.2 org.opendaylight.integration -- 2.43.0 From b91fa2ba36403d79b360e52d058e0c51797dbc6d Mon Sep 17 00:00:00 2001 From: jenkins-releng Date: Fri, 9 Aug 2024 09:03:49 +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 | 16 ++++++++-------- 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, 28 insertions(+), 28 deletions(-) diff --git a/artifacts/all/pom.xml b/artifacts/all/pom.xml index b2030e14..ef0138dd 100644 --- a/artifacts/all/pom.xml +++ b/artifacts/all/pom.xml @@ -17,7 +17,7 @@ org.opendaylight.integration all-artifacts - 0.21.0-SNAPSHOT + 0.21.0 pom diff --git a/artifacts/distribution/pom.xml b/artifacts/distribution/pom.xml index fe86d4d1..c47776df 100644 --- a/artifacts/distribution/pom.xml +++ b/artifacts/distribution/pom.xml @@ -17,7 +17,7 @@ org.opendaylight.integration distribution-artifacts - 0.21.0-SNAPSHOT + 0.21.0 pom diff --git a/artifacts/pom.xml b/artifacts/pom.xml index e7980b10..5e70324a 100644 --- a/artifacts/pom.xml +++ b/artifacts/pom.xml @@ -17,7 +17,7 @@ org.opendaylight.integration artifacts-aggregator - 0.21.0-SNAPSHOT + 0.21.0 pom diff --git a/artifacts/upstream/all/pom.xml b/artifacts/upstream/all/pom.xml index 6f5babe4..4a50c157 100644 --- a/artifacts/upstream/all/pom.xml +++ b/artifacts/upstream/all/pom.xml @@ -17,7 +17,7 @@ org.opendaylight.integration upstream-all-artifacts - 0.21.0-SNAPSHOT + 0.21.0 pom diff --git a/artifacts/upstream/artifacts/pom.xml b/artifacts/upstream/artifacts/pom.xml index 4f36ffce..da4a6db3 100644 --- a/artifacts/upstream/artifacts/pom.xml +++ b/artifacts/upstream/artifacts/pom.xml @@ -14,7 +14,7 @@ org.opendaylight.integration properties - 0.21.0-SNAPSHOT + 0.21.0 ../properties artifact-artifacts diff --git a/artifacts/upstream/other/pom.xml b/artifacts/upstream/other/pom.xml index ce95b825..9830f786 100644 --- a/artifacts/upstream/other/pom.xml +++ b/artifacts/upstream/other/pom.xml @@ -14,7 +14,7 @@ org.opendaylight.integration properties - 0.21.0-SNAPSHOT + 0.21.0 ../properties other-artifacts diff --git a/artifacts/upstream/pom.xml b/artifacts/upstream/pom.xml index bcd2c796..00d4bf31 100644 --- a/artifacts/upstream/pom.xml +++ b/artifacts/upstream/pom.xml @@ -17,7 +17,7 @@ org.opendaylight.integration upstream-aggregator - 0.21.0-SNAPSHOT + 0.21.0 pom diff --git a/artifacts/upstream/properties/pom.xml b/artifacts/upstream/properties/pom.xml index d321f531..5ebe6719 100644 --- a/artifacts/upstream/properties/pom.xml +++ b/artifacts/upstream/properties/pom.xml @@ -17,7 +17,7 @@ org.opendaylight.integration properties - 0.21.0-SNAPSHOT + 0.21.0 pom 0.20.0 - 0.22.0-SNAPSHOT + 0.22.0 10.0.1 - 1.16.0-SNAPSHOT + 1.16.0 7.0.1 - 1.17.0-SNAPSHOT - 1.20.0-SNAPSHOT + 1.17.0 + 1.20.0 14.0.1 8.0.0 14.0.2 - 0.19.0-SNAPSHOT - 1.19.0-SNAPSHOT - 0.14.0-SNAPSHOT + 0.19.0 + 1.19.0 + 0.14.0 9.0.0 20.0.0 14.0.2 diff --git a/features/pom.xml b/features/pom.xml index a49992d5..ca26035c 100644 --- a/features/pom.xml +++ b/features/pom.xml @@ -17,7 +17,7 @@ org.opendaylight.integration features-aggregator - 0.21.0-SNAPSHOT + 0.21.0 pom diff --git a/features/repos/index/pom.xml b/features/repos/index/pom.xml index f39c20b9..c3854828 100644 --- a/features/repos/index/pom.xml +++ b/features/repos/index/pom.xml @@ -17,7 +17,7 @@ org.opendaylight.integration features-index - 0.21.0-SNAPSHOT + 0.21.0 feature diff --git a/features/repos/pom.xml b/features/repos/pom.xml index 8d10c8cd..be596bdf 100644 --- a/features/repos/pom.xml +++ b/features/repos/pom.xml @@ -17,7 +17,7 @@ org.opendaylight.integration repos-aggregator - 0.21.0-SNAPSHOT + 0.21.0 pom diff --git a/features/repos/test/pom.xml b/features/repos/test/pom.xml index 82d3603a..884eae59 100644 --- a/features/repos/test/pom.xml +++ b/features/repos/test/pom.xml @@ -17,7 +17,7 @@ org.opendaylight.integration features-test - 0.21.0-SNAPSHOT + 0.21.0 feature diff --git a/features/singles/odl-integration-all/pom.xml b/features/singles/odl-integration-all/pom.xml index 96b8e3e7..7da85a76 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.21.0-SNAPSHOT + 0.21.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 0ae22efd..b2347a2d 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.21.0-SNAPSHOT + 0.21.0 feature diff --git a/features/singles/pom.xml b/features/singles/pom.xml index 268ad10c..8d4502c7 100644 --- a/features/singles/pom.xml +++ b/features/singles/pom.xml @@ -17,7 +17,7 @@ org.opendaylight.integration singles-aggregator - 0.21.0-SNAPSHOT + 0.21.0 pom diff --git a/karaf-scripts/pom.xml b/karaf-scripts/pom.xml index 653c388c..5952fabd 100644 --- a/karaf-scripts/pom.xml +++ b/karaf-scripts/pom.xml @@ -17,7 +17,7 @@ org.opendaylight.integration karaf-scripts - 0.21.0-SNAPSHOT + 0.21.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 b0a67d1e..c01b2620 100644 --- a/karaf/pom.xml +++ b/karaf/pom.xml @@ -18,7 +18,7 @@ org.opendaylight.integration karaf - 0.21.0-SNAPSHOT + 0.21.0 pom @@ -43,7 +43,7 @@ org.opendaylight.integration all-artifacts - 0.21.0-SNAPSHOT + 0.21.0 import pom @@ -97,7 +97,7 @@ org.opendaylight.integration karaf-scripts - 0.21.0-SNAPSHOT + 0.21.0 test diff --git a/onap-karaf/pom.xml b/onap-karaf/pom.xml index 4b805788..3e2e9e97 100644 --- a/onap-karaf/pom.xml +++ b/onap-karaf/pom.xml @@ -10,7 +10,7 @@ org.opendaylight.integration onap-karaf - 0.21.0-SNAPSHOT + 0.21.0 pom ODL :: integration :: ${project.artifactId} 4.0.0 diff --git a/pom.xml b/pom.xml index c2f86f13..af3e7fd9 100644 --- a/pom.xml +++ b/pom.xml @@ -17,7 +17,7 @@ org.opendaylight.integration distribution-aggregator - 0.21.0-SNAPSHOT + 0.21.0 pom Integration/Distribution -- 2.43.0