From baa17c2b82244256d49de412eead048e2648d90e Mon Sep 17 00:00:00 2001 From: Robert Varga Date: Thu, 24 Oct 2024 23:13:23 +0200 Subject: [PATCH 1/2] Bump upstreams Adopt: - odlparent-14.0.4 - infrautils-7.0.4 - yangtools-14.0.5 - mdsal-14.0.4 - controller-10.0.4 - aaa-0.20.3 - netconf-8.0.3 - bgpcep-0.22.5 Change-Id: I6c6c354dfcfe526fa72a8752ec745441375cf03d 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 c69bd218..3478bf20 100644 --- a/artifacts/all/pom.xml +++ b/artifacts/all/pom.xml @@ -12,7 +12,7 @@ org.opendaylight.odlparent odlparent-lite - 14.0.3 + 14.0.4 org.opendaylight.integration diff --git a/artifacts/distribution/pom.xml b/artifacts/distribution/pom.xml index 5429df4a..6c9bfec3 100644 --- a/artifacts/distribution/pom.xml +++ b/artifacts/distribution/pom.xml @@ -12,7 +12,7 @@ org.opendaylight.odlparent odlparent-lite - 14.0.3 + 14.0.4 org.opendaylight.integration diff --git a/artifacts/pom.xml b/artifacts/pom.xml index ee0b7fed..af4806ac 100644 --- a/artifacts/pom.xml +++ b/artifacts/pom.xml @@ -12,7 +12,7 @@ org.opendaylight.odlparent odlparent-lite - 14.0.3 + 14.0.4 org.opendaylight.integration diff --git a/artifacts/upstream/all/pom.xml b/artifacts/upstream/all/pom.xml index dc73d2ff..e144b2f9 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.0.4 org.opendaylight.integration diff --git a/artifacts/upstream/artifacts/pom.xml b/artifacts/upstream/artifacts/pom.xml index 32c5999b..7369f51c 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 4c09c931..d8cdd428 100644 --- a/artifacts/upstream/pom.xml +++ b/artifacts/upstream/pom.xml @@ -12,7 +12,7 @@ org.opendaylight.odlparent odlparent-lite - 14.0.3 + 14.0.4 org.opendaylight.integration diff --git a/artifacts/upstream/properties/pom.xml b/artifacts/upstream/properties/pom.xml index 56cdd2f0..3741c471 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.0.4 org.opendaylight.integration @@ -43,22 +43,22 @@ - 0.20.1 - 0.22.4 - 10.0.2 + 0.20.3 + 0.22.5 + 10.0.4 1.16.1-SNAPSHOT - 7.0.3 + 7.0.4 1.17.1-SNAPSHOT 1.20.1-SNAPSHOT - 14.0.2 - 8.0.2 - 14.0.3 + 14.0.4 + 8.0.3 + 14.0.4 0.19.1-SNAPSHOT 1.19.1-SNAPSHOT 0.14.1-SNAPSHOT 10.0.1 21.0.0 - 14.0.4 + 14.0.5 diff --git a/docs/platform-versions.rst b/docs/platform-versions.rst index 66e4027a..28b00d5e 100644 --- a/docs/platform-versions.rst +++ b/docs/platform-versions.rst @@ -10,34 +10,42 @@ Platform versions * - Group - Artifact - 2024.09 Scandium GA + - 2024.09 Scandium SR1 * - org.opendaylight.odlparent - \* - 14.0.3 + - 14.0.4 * - org.opendaylight.infrautils - \* - 7.0.3 + - 7.0.4 * - org.opendaylight.yangtools - \* - 14.0.4 + - 14.0.5 * - org.opendaylight.mdsal - \* - 14.0.2 + - 14.0.4 * - org.opendaylight.controller - \* - 10.0.2 + - 10.0.4 * - org.opendaylight.aaa - \* - 0.20.1 + - 0.20.3 * - org.opendaylight.netconf - \* - 8.0.2 + - 8.0.3 .. 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 506f29d6..0ced49a8 100644 --- a/features/pom.xml +++ b/features/pom.xml @@ -12,7 +12,7 @@ org.opendaylight.odlparent odlparent-lite - 14.0.3 + 14.0.4 org.opendaylight.integration diff --git a/features/repos/index/pom.xml b/features/repos/index/pom.xml index a6419b85..49221291 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.0.4 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 0d65660a..5ffb9593 100644 --- a/features/repos/pom.xml +++ b/features/repos/pom.xml @@ -12,7 +12,7 @@ org.opendaylight.odlparent odlparent-lite - 14.0.3 + 14.0.4 org.opendaylight.integration diff --git a/features/repos/test/pom.xml b/features/repos/test/pom.xml index 2fa2d6f2..4b101e3f 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.0.4 org.opendaylight.integration diff --git a/features/singles/odl-integration-all/pom.xml b/features/singles/odl-integration-all/pom.xml index 771b9d26..bd1c3dc9 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.0.4 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 f7f0247f..35c823eb 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.0.4 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 c34043f6..8303be3e 100644 --- a/features/singles/pom.xml +++ b/features/singles/pom.xml @@ -12,7 +12,7 @@ org.opendaylight.odlparent odlparent-lite - 14.0.3 + 14.0.4 org.opendaylight.integration diff --git a/karaf-scripts/pom.xml b/karaf-scripts/pom.xml index 6df1b88b..9f51a1ef 100644 --- a/karaf-scripts/pom.xml +++ b/karaf-scripts/pom.xml @@ -12,7 +12,7 @@ org.opendaylight.odlparent odlparent-lite - 14.0.3 + 14.0.4 org.opendaylight.integration diff --git a/karaf/pom.xml b/karaf/pom.xml index 29c7ae31..afac95fe 100644 --- a/karaf/pom.xml +++ b/karaf/pom.xml @@ -13,7 +13,7 @@ org.opendaylight.odlparent karaf4-parent - 14.0.3 + 14.0.4 org.opendaylight.integration diff --git a/onap-karaf/pom.xml b/onap-karaf/pom.xml index 56297769..aae37221 100644 --- a/onap-karaf/pom.xml +++ b/onap-karaf/pom.xml @@ -4,7 +4,7 @@ org.opendaylight.odlparent karaf4-parent - 14.0.3 + 14.0.4 diff --git a/pom.xml b/pom.xml index dec640fd..201bad74 100644 --- a/pom.xml +++ b/pom.xml @@ -12,7 +12,7 @@ org.opendaylight.odlparent odlparent-lite - 14.0.3 + 14.0.4 org.opendaylight.integration -- 2.43.0 From 5cd92fb5dba72bc7625d6ee55ae310bd1e41923a Mon Sep 17 00:00:00 2001 From: jenkins-releng Date: Thu, 24 Oct 2024 21:20:13 +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 3478bf20..c21d0f6f 100644 --- a/artifacts/all/pom.xml +++ b/artifacts/all/pom.xml @@ -17,7 +17,7 @@ org.opendaylight.integration all-artifacts - 0.21.1-SNAPSHOT + 0.21.1 pom diff --git a/artifacts/distribution/pom.xml b/artifacts/distribution/pom.xml index 6c9bfec3..6f1fd443 100644 --- a/artifacts/distribution/pom.xml +++ b/artifacts/distribution/pom.xml @@ -17,7 +17,7 @@ org.opendaylight.integration distribution-artifacts - 0.21.1-SNAPSHOT + 0.21.1 pom diff --git a/artifacts/pom.xml b/artifacts/pom.xml index af4806ac..54bfaef3 100644 --- a/artifacts/pom.xml +++ b/artifacts/pom.xml @@ -17,7 +17,7 @@ org.opendaylight.integration artifacts-aggregator - 0.21.1-SNAPSHOT + 0.21.1 pom diff --git a/artifacts/upstream/all/pom.xml b/artifacts/upstream/all/pom.xml index e144b2f9..11b298cf 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.1-SNAPSHOT + 0.21.1 pom diff --git a/artifacts/upstream/artifacts/pom.xml b/artifacts/upstream/artifacts/pom.xml index 7369f51c..359c83b5 100644 --- a/artifacts/upstream/artifacts/pom.xml +++ b/artifacts/upstream/artifacts/pom.xml @@ -14,7 +14,7 @@ org.opendaylight.integration properties - 0.21.1-SNAPSHOT + 0.21.1 ../properties artifact-artifacts diff --git a/artifacts/upstream/other/pom.xml b/artifacts/upstream/other/pom.xml index 40af6bfd..9a3324d1 100644 --- a/artifacts/upstream/other/pom.xml +++ b/artifacts/upstream/other/pom.xml @@ -14,7 +14,7 @@ org.opendaylight.integration properties - 0.21.1-SNAPSHOT + 0.21.1 ../properties other-artifacts diff --git a/artifacts/upstream/pom.xml b/artifacts/upstream/pom.xml index d8cdd428..12b6a7f9 100644 --- a/artifacts/upstream/pom.xml +++ b/artifacts/upstream/pom.xml @@ -17,7 +17,7 @@ org.opendaylight.integration upstream-aggregator - 0.21.1-SNAPSHOT + 0.21.1 pom diff --git a/artifacts/upstream/properties/pom.xml b/artifacts/upstream/properties/pom.xml index 3741c471..444b2a9f 100644 --- a/artifacts/upstream/properties/pom.xml +++ b/artifacts/upstream/properties/pom.xml @@ -17,7 +17,7 @@ org.opendaylight.integration properties - 0.21.1-SNAPSHOT + 0.21.1 pom diff --git a/features/repos/index/pom.xml b/features/repos/index/pom.xml index 49221291..537c9faa 100644 --- a/features/repos/index/pom.xml +++ b/features/repos/index/pom.xml @@ -17,7 +17,7 @@ org.opendaylight.integration features-index - 0.21.1-SNAPSHOT + 0.21.1 feature diff --git a/features/repos/pom.xml b/features/repos/pom.xml index 5ffb9593..b1a31b09 100644 --- a/features/repos/pom.xml +++ b/features/repos/pom.xml @@ -17,7 +17,7 @@ org.opendaylight.integration repos-aggregator - 0.21.1-SNAPSHOT + 0.21.1 pom diff --git a/features/repos/test/pom.xml b/features/repos/test/pom.xml index 4b101e3f..2fbbd403 100644 --- a/features/repos/test/pom.xml +++ b/features/repos/test/pom.xml @@ -17,7 +17,7 @@ org.opendaylight.integration features-test - 0.21.1-SNAPSHOT + 0.21.1 feature diff --git a/features/singles/odl-integration-all/pom.xml b/features/singles/odl-integration-all/pom.xml index bd1c3dc9..df29633b 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.1-SNAPSHOT + 0.21.1 feature diff --git a/features/singles/odl-integration-compatible-with-all/pom.xml b/features/singles/odl-integration-compatible-with-all/pom.xml index 35c823eb..e12fd775 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.1-SNAPSHOT + 0.21.1 feature diff --git a/features/singles/pom.xml b/features/singles/pom.xml index 8303be3e..29ae2af2 100644 --- a/features/singles/pom.xml +++ b/features/singles/pom.xml @@ -17,7 +17,7 @@ org.opendaylight.integration singles-aggregator - 0.21.1-SNAPSHOT + 0.21.1 pom diff --git a/karaf-scripts/pom.xml b/karaf-scripts/pom.xml index 9f51a1ef..a8581317 100644 --- a/karaf-scripts/pom.xml +++ b/karaf-scripts/pom.xml @@ -17,7 +17,7 @@ org.opendaylight.integration karaf-scripts - 0.21.1-SNAPSHOT + 0.21.1 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 afac95fe..be500db6 100644 --- a/karaf/pom.xml +++ b/karaf/pom.xml @@ -18,7 +18,7 @@ org.opendaylight.integration karaf - 0.21.1-SNAPSHOT + 0.21.1 pom @@ -43,7 +43,7 @@ org.opendaylight.integration all-artifacts - 0.21.1-SNAPSHOT + 0.21.1 import pom @@ -97,7 +97,7 @@ org.opendaylight.integration karaf-scripts - 0.21.1-SNAPSHOT + 0.21.1 test diff --git a/onap-karaf/pom.xml b/onap-karaf/pom.xml index aae37221..d8b857e2 100644 --- a/onap-karaf/pom.xml +++ b/onap-karaf/pom.xml @@ -10,7 +10,7 @@ org.opendaylight.integration onap-karaf - 0.21.1-SNAPSHOT + 0.21.1 pom ODL :: integration :: ${project.artifactId} 4.0.0 diff --git a/pom.xml b/pom.xml index 201bad74..ec9282c9 100644 --- a/pom.xml +++ b/pom.xml @@ -17,7 +17,7 @@ org.opendaylight.integration distribution-aggregator - 0.21.1-SNAPSHOT + 0.21.1 pom Integration/Distribution -- 2.43.0