From 49c99567156949d3a56b3fab40843d0195e1e46b Mon Sep 17 00:00:00 2001 From: Robert Varga Date: Mon, 9 Dec 2024 11:05:28 +0100 Subject: [PATCH 1/2] Bump upstreams Adopt: - odlparent-13.1.5 - infrautils-6.0.11 - yangtools-13.0.8 - mdsal-13.0.7 - controller-9.0.6 - aaa-0.19.8 - netconf-7.0.11 - bgpcep-0.21.11 Change-Id: I2189366eb7b618dea88fd9cd8208420f3fe9785a 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 | 4 ++-- 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 | 6 +++--- 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, 39 insertions(+), 31 deletions(-) diff --git a/artifacts/all/pom.xml b/artifacts/all/pom.xml index 4b6a2baa..d400f81c 100644 --- a/artifacts/all/pom.xml +++ b/artifacts/all/pom.xml @@ -12,7 +12,7 @@ org.opendaylight.odlparent odlparent-lite - 13.1.4 + 13.1.5 org.opendaylight.integration diff --git a/artifacts/distribution/pom.xml b/artifacts/distribution/pom.xml index 51560042..c0d72fdd 100644 --- a/artifacts/distribution/pom.xml +++ b/artifacts/distribution/pom.xml @@ -12,7 +12,7 @@ org.opendaylight.odlparent odlparent-lite - 13.1.4 + 13.1.5 org.opendaylight.integration diff --git a/artifacts/pom.xml b/artifacts/pom.xml index e42b3570..f10947e6 100644 --- a/artifacts/pom.xml +++ b/artifacts/pom.xml @@ -12,7 +12,7 @@ org.opendaylight.odlparent odlparent-lite - 13.1.4 + 13.1.5 org.opendaylight.integration diff --git a/artifacts/upstream/all/pom.xml b/artifacts/upstream/all/pom.xml index dfbdc0ef..18507a00 100644 --- a/artifacts/upstream/all/pom.xml +++ b/artifacts/upstream/all/pom.xml @@ -12,7 +12,7 @@ org.opendaylight.odlparent odlparent-lite - 13.1.4 + 13.1.5 org.opendaylight.integration diff --git a/artifacts/upstream/artifacts/pom.xml b/artifacts/upstream/artifacts/pom.xml index ba4111a0..a8939320 100644 --- a/artifacts/upstream/artifacts/pom.xml +++ b/artifacts/upstream/artifacts/pom.xml @@ -278,7 +278,7 @@ transportpce-models - true + false @@ -295,7 +295,7 @@ transportpce - true + false diff --git a/artifacts/upstream/pom.xml b/artifacts/upstream/pom.xml index 70a6ab18..73bacd5b 100644 --- a/artifacts/upstream/pom.xml +++ b/artifacts/upstream/pom.xml @@ -12,7 +12,7 @@ org.opendaylight.odlparent odlparent-lite - 13.1.4 + 13.1.5 org.opendaylight.integration diff --git a/artifacts/upstream/properties/pom.xml b/artifacts/upstream/properties/pom.xml index ee5b7341..1106c5ce 100644 --- a/artifacts/upstream/properties/pom.xml +++ b/artifacts/upstream/properties/pom.xml @@ -12,7 +12,7 @@ org.opendaylight.odlparent odlparent-lite - 13.1.4 + 13.1.5 org.opendaylight.integration @@ -43,22 +43,22 @@ - 0.19.6 - 0.21.10 - 9.0.5 + 0.19.8 + 0.21.11 + 9.0.6 1.15.3-SNAPSHOT - 6.0.10 + 6.0.11 1.16.3-SNAPSHOT 1.19.3-SNAPSHOT - 13.0.6 - 7.0.10 - 13.1.4 + 13.0.7 + 7.0.11 + 13.1.5 0.18.3-SNAPSHOT 1.18.3-SNAPSHOT 0.13.3-SNAPSHOT 9.2.0 20.2.1 - 13.0.7 + 13.0.8 diff --git a/docs/platform-versions.rst b/docs/platform-versions.rst index 5ede8d84..6f340fa2 100644 --- a/docs/platform-versions.rst +++ b/docs/platform-versions.rst @@ -12,48 +12,56 @@ Platform versions - 2024.03 Calcium GA - 2024.03 Calcium SR1 - 2024.03 Calcium SR2 + - 2024.03 Calcium SR3 * - org.opendaylight.odlparent - \* - 13.0.11 - 13.1.3 - 13.1.4 + - 13.1.5 * - org.opendaylight.infrautils - \* - 6.0.6 - 6.0.9 - 6.0.10 + - 6.0.11 * - org.opendaylight.yangtools - \* - 13.0.2 - 13.0.6 - 13.0.7 + - 13.0.8 * - org.opendaylight.mdsal - \* - 13.0.1 - 13.0.4 - 13.0.6 + - 13.0.7 * - org.opendaylight.controller - \* - 9.0.2 - 9.0.4 - 9.0.5 + - 9.0.6 * - org.opendaylight.aaa - \* - 0.19.3 - 0.19.5 - 0.19.6 + - 0.19.8 * - org.opendaylight.netconf - \* - 7.0.4 - 7.0.7 - 7.0.10 + - 7.0.11 .. 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 a2c9eeff..46fb4cd3 100644 --- a/features/pom.xml +++ b/features/pom.xml @@ -12,7 +12,7 @@ org.opendaylight.odlparent odlparent-lite - 13.1.4 + 13.1.5 org.opendaylight.integration diff --git a/features/repos/index/pom.xml b/features/repos/index/pom.xml index 431cf656..9b172a3c 100644 --- a/features/repos/index/pom.xml +++ b/features/repos/index/pom.xml @@ -12,7 +12,7 @@ org.opendaylight.odlparent feature-repo-parent - 13.1.4 + 13.1.5 org.opendaylight.integration @@ -317,7 +317,7 @@ transportpce-models - true + false @@ -332,7 +332,7 @@ transportpce - true + false diff --git a/features/repos/pom.xml b/features/repos/pom.xml index f8c1a5e1..be58dee9 100644 --- a/features/repos/pom.xml +++ b/features/repos/pom.xml @@ -12,7 +12,7 @@ org.opendaylight.odlparent odlparent-lite - 13.1.4 + 13.1.5 org.opendaylight.integration diff --git a/features/repos/test/pom.xml b/features/repos/test/pom.xml index 8c540a85..9d7a7597 100644 --- a/features/repos/test/pom.xml +++ b/features/repos/test/pom.xml @@ -12,7 +12,7 @@ org.opendaylight.odlparent feature-repo-parent - 13.1.4 + 13.1.5 org.opendaylight.integration diff --git a/features/singles/odl-integration-all/pom.xml b/features/singles/odl-integration-all/pom.xml index 7d8c7db5..02af5df1 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.1.4 + 13.1.5 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 427ccafc..fbb3759d 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.1.4 + 13.1.5 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 7499fe72..b4e4b954 100644 --- a/features/singles/pom.xml +++ b/features/singles/pom.xml @@ -12,7 +12,7 @@ org.opendaylight.odlparent odlparent-lite - 13.1.4 + 13.1.5 org.opendaylight.integration diff --git a/karaf-scripts/pom.xml b/karaf-scripts/pom.xml index 781d9dc2..77a84994 100644 --- a/karaf-scripts/pom.xml +++ b/karaf-scripts/pom.xml @@ -12,7 +12,7 @@ org.opendaylight.odlparent odlparent-lite - 13.1.4 + 13.1.5 org.opendaylight.integration diff --git a/karaf/pom.xml b/karaf/pom.xml index 3dc64ef2..fbf07514 100644 --- a/karaf/pom.xml +++ b/karaf/pom.xml @@ -13,7 +13,7 @@ org.opendaylight.odlparent karaf4-parent - 13.1.4 + 13.1.5 org.opendaylight.integration diff --git a/onap-karaf/pom.xml b/onap-karaf/pom.xml index fc66b008..a55993f0 100644 --- a/onap-karaf/pom.xml +++ b/onap-karaf/pom.xml @@ -4,7 +4,7 @@ org.opendaylight.odlparent karaf4-parent - 13.1.4 + 13.1.5 diff --git a/pom.xml b/pom.xml index 1e9471fa..e631a889 100644 --- a/pom.xml +++ b/pom.xml @@ -12,7 +12,7 @@ org.opendaylight.odlparent odlparent-lite - 13.1.4 + 13.1.5 org.opendaylight.integration -- 2.43.0 From 25a038a4d77a72ef1737f8bf3a900e94ecf637fb Mon Sep 17 00:00:00 2001 From: jenkins-releng Date: Mon, 9 Dec 2024 10:12:01 +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 | 14 +++++++------- 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, 27 insertions(+), 27 deletions(-) diff --git a/artifacts/all/pom.xml b/artifacts/all/pom.xml index d400f81c..e56aec74 100644 --- a/artifacts/all/pom.xml +++ b/artifacts/all/pom.xml @@ -17,7 +17,7 @@ org.opendaylight.integration all-artifacts - 0.20.3-SNAPSHOT + 0.20.3 pom diff --git a/artifacts/distribution/pom.xml b/artifacts/distribution/pom.xml index c0d72fdd..dcb41e5d 100644 --- a/artifacts/distribution/pom.xml +++ b/artifacts/distribution/pom.xml @@ -17,7 +17,7 @@ org.opendaylight.integration distribution-artifacts - 0.20.3-SNAPSHOT + 0.20.3 pom diff --git a/artifacts/pom.xml b/artifacts/pom.xml index f10947e6..eccd7a73 100644 --- a/artifacts/pom.xml +++ b/artifacts/pom.xml @@ -17,7 +17,7 @@ org.opendaylight.integration artifacts-aggregator - 0.20.3-SNAPSHOT + 0.20.3 pom diff --git a/artifacts/upstream/all/pom.xml b/artifacts/upstream/all/pom.xml index 18507a00..d5da9780 100644 --- a/artifacts/upstream/all/pom.xml +++ b/artifacts/upstream/all/pom.xml @@ -17,7 +17,7 @@ org.opendaylight.integration upstream-all-artifacts - 0.20.3-SNAPSHOT + 0.20.3 pom diff --git a/artifacts/upstream/artifacts/pom.xml b/artifacts/upstream/artifacts/pom.xml index a8939320..fcfdf10f 100644 --- a/artifacts/upstream/artifacts/pom.xml +++ b/artifacts/upstream/artifacts/pom.xml @@ -14,7 +14,7 @@ org.opendaylight.integration properties - 0.20.3-SNAPSHOT + 0.20.3 ../properties artifact-artifacts diff --git a/artifacts/upstream/other/pom.xml b/artifacts/upstream/other/pom.xml index e529a85e..4ae3afdf 100644 --- a/artifacts/upstream/other/pom.xml +++ b/artifacts/upstream/other/pom.xml @@ -14,7 +14,7 @@ org.opendaylight.integration properties - 0.20.3-SNAPSHOT + 0.20.3 ../properties other-artifacts diff --git a/artifacts/upstream/pom.xml b/artifacts/upstream/pom.xml index 73bacd5b..c9eeeac3 100644 --- a/artifacts/upstream/pom.xml +++ b/artifacts/upstream/pom.xml @@ -17,7 +17,7 @@ org.opendaylight.integration upstream-aggregator - 0.20.3-SNAPSHOT + 0.20.3 pom diff --git a/artifacts/upstream/properties/pom.xml b/artifacts/upstream/properties/pom.xml index 1106c5ce..fd8b03f4 100644 --- a/artifacts/upstream/properties/pom.xml +++ b/artifacts/upstream/properties/pom.xml @@ -17,7 +17,7 @@ org.opendaylight.integration properties - 0.20.3-SNAPSHOT + 0.20.3 pom diff --git a/features/repos/index/pom.xml b/features/repos/index/pom.xml index 9b172a3c..e7c5d2db 100644 --- a/features/repos/index/pom.xml +++ b/features/repos/index/pom.xml @@ -17,7 +17,7 @@ org.opendaylight.integration features-index - 0.20.3-SNAPSHOT + 0.20.3 feature diff --git a/features/repos/pom.xml b/features/repos/pom.xml index be58dee9..107fb483 100644 --- a/features/repos/pom.xml +++ b/features/repos/pom.xml @@ -17,7 +17,7 @@ org.opendaylight.integration repos-aggregator - 0.20.3-SNAPSHOT + 0.20.3 pom diff --git a/features/repos/test/pom.xml b/features/repos/test/pom.xml index 9d7a7597..efdf0256 100644 --- a/features/repos/test/pom.xml +++ b/features/repos/test/pom.xml @@ -17,7 +17,7 @@ org.opendaylight.integration features-test - 0.20.3-SNAPSHOT + 0.20.3 feature diff --git a/features/singles/odl-integration-all/pom.xml b/features/singles/odl-integration-all/pom.xml index 02af5df1..74e2ec39 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.20.3-SNAPSHOT + 0.20.3 feature diff --git a/features/singles/odl-integration-compatible-with-all/pom.xml b/features/singles/odl-integration-compatible-with-all/pom.xml index fbb3759d..010113e6 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.20.3-SNAPSHOT + 0.20.3 feature diff --git a/features/singles/pom.xml b/features/singles/pom.xml index b4e4b954..e83a74ad 100644 --- a/features/singles/pom.xml +++ b/features/singles/pom.xml @@ -17,7 +17,7 @@ org.opendaylight.integration singles-aggregator - 0.20.3-SNAPSHOT + 0.20.3 pom diff --git a/karaf-scripts/pom.xml b/karaf-scripts/pom.xml index 77a84994..ce35bc46 100644 --- a/karaf-scripts/pom.xml +++ b/karaf-scripts/pom.xml @@ -17,7 +17,7 @@ org.opendaylight.integration karaf-scripts - 0.20.3-SNAPSHOT + 0.20.3 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 fbf07514..a328d288 100644 --- a/karaf/pom.xml +++ b/karaf/pom.xml @@ -18,7 +18,7 @@ org.opendaylight.integration karaf - 0.20.3-SNAPSHOT + 0.20.3 pom @@ -43,7 +43,7 @@ org.opendaylight.integration all-artifacts - 0.20.3-SNAPSHOT + 0.20.3 import pom @@ -97,7 +97,7 @@ org.opendaylight.integration karaf-scripts - 0.20.3-SNAPSHOT + 0.20.3 test diff --git a/onap-karaf/pom.xml b/onap-karaf/pom.xml index a55993f0..fa92dea6 100644 --- a/onap-karaf/pom.xml +++ b/onap-karaf/pom.xml @@ -10,7 +10,7 @@ org.opendaylight.integration onap-karaf - 0.20.3-SNAPSHOT + 0.20.3 pom ODL :: integration :: ${project.artifactId} 4.0.0 diff --git a/pom.xml b/pom.xml index e631a889..f964aaf1 100644 --- a/pom.xml +++ b/pom.xml @@ -17,7 +17,7 @@ org.opendaylight.integration distribution-aggregator - 0.20.3-SNAPSHOT + 0.20.3 pom Integration/Distribution -- 2.43.0