From d59a3baa11500697fd887fdf7a07fba3cd09e7c5 Mon Sep 17 00:00:00 2001 From: Robert Varga Date: Wed, 20 Mar 2024 01:24:18 +0100 Subject: [PATCH 1/2] Bump upstreams Adopt: - odlparent-13.0.11 - infrautils-6.0.6 - yangtools-11.0.6 - mdsal-12.0.5 - controller-8.0.5 - aaa-0.18.5 - netconf-6.0.7 - bgpcep-0.20.7 Change-Id: I443abc3c036b5171da355c27eff8e6945fd236e4 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 | 8 ++++++++ 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(+), 25 deletions(-) diff --git a/artifacts/all/pom.xml b/artifacts/all/pom.xml index 8fdda85d..73cca3f1 100644 --- a/artifacts/all/pom.xml +++ b/artifacts/all/pom.xml @@ -12,7 +12,7 @@ org.opendaylight.odlparent odlparent-lite - 13.0.10 + 13.0.11 org.opendaylight.integration diff --git a/artifacts/distribution/pom.xml b/artifacts/distribution/pom.xml index c2e7224d..112a123e 100644 --- a/artifacts/distribution/pom.xml +++ b/artifacts/distribution/pom.xml @@ -12,7 +12,7 @@ org.opendaylight.odlparent odlparent-lite - 13.0.10 + 13.0.11 org.opendaylight.integration diff --git a/artifacts/pom.xml b/artifacts/pom.xml index fbff9a23..9afcf0b6 100644 --- a/artifacts/pom.xml +++ b/artifacts/pom.xml @@ -12,7 +12,7 @@ org.opendaylight.odlparent odlparent-lite - 13.0.10 + 13.0.11 org.opendaylight.integration diff --git a/artifacts/upstream/all/pom.xml b/artifacts/upstream/all/pom.xml index 1675a8af..8f390ffd 100644 --- a/artifacts/upstream/all/pom.xml +++ b/artifacts/upstream/all/pom.xml @@ -12,7 +12,7 @@ org.opendaylight.odlparent odlparent-lite - 13.0.10 + 13.0.11 org.opendaylight.integration diff --git a/artifacts/upstream/pom.xml b/artifacts/upstream/pom.xml index 9f849cd6..cc9b456e 100644 --- a/artifacts/upstream/pom.xml +++ b/artifacts/upstream/pom.xml @@ -12,7 +12,7 @@ org.opendaylight.odlparent odlparent-lite - 13.0.10 + 13.0.11 org.opendaylight.integration diff --git a/artifacts/upstream/properties/pom.xml b/artifacts/upstream/properties/pom.xml index 72fdad93..77368c1b 100644 --- a/artifacts/upstream/properties/pom.xml +++ b/artifacts/upstream/properties/pom.xml @@ -12,7 +12,7 @@ org.opendaylight.odlparent odlparent-lite - 13.0.10 + 13.0.11 org.opendaylight.integration @@ -43,22 +43,22 @@ - 0.18.4 - 0.20.6 - 8.0.4 + 0.18.5 + 0.20.7 + 8.0.5 1.14.3-SNAPSHOT - 6.0.5 + 6.0.6 1.15.3-SNAPSHOT 1.18.3-SNAPSHOT - 12.0.4 - 6.0.6 - 13.0.10 + 12.0.5 + 6.0.7 + 13.0.11 0.17.3-SNAPSHOT 1.17.3-SNAPSHOT 0.12.3-SNAPSHOT 8.2.0 19.2.0 - 11.0.5 + 11.0.6 diff --git a/docs/platform-versions.rst b/docs/platform-versions.rst index 5d419b22..a42ead7f 100644 --- a/docs/platform-versions.rst +++ b/docs/platform-versions.rst @@ -12,48 +12,56 @@ Platform versions - 2023.09 Potassium GA - 2023.09 Potassium SR1 - 2023.09 Potassium SR2 + - 2023.09 Potassium SR3 * - org.opendaylight.odlparent - \* - 13.0.4 - 13.0.7 - 13.0.10 + - 13.0.11 * - org.opendaylight.infrautils - \* - 6.0.2 - 6.0.4 - 6.0.5 + - 6.0.6 * - org.opendaylight.yangtools - \* - 11.0.2 - 11.0.4 - 11.0.5 + - 11.0.6 * - org.opendaylight.mdsal - \* - 12.0.2 - 12.0.3 - 12.0.4 + - 12.0.5 * - org.opendaylight.controller - \* - 8.0.2 - 8.0.3 - 8.0.4 + - 8.0.5 * - org.opendaylight.aaa - \* - 0.18.2 - 0.18.3 - 0.18.4 + - 0.18.5 * - org.opendaylight.netconf - \* - 6.0.4 - 6.0.5 - 6.0.6 + - 6.0.7 .. 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 7bc8ee18..a5e3d00a 100644 --- a/features/pom.xml +++ b/features/pom.xml @@ -12,7 +12,7 @@ org.opendaylight.odlparent odlparent-lite - 13.0.10 + 13.0.11 org.opendaylight.integration diff --git a/features/repos/index/pom.xml b/features/repos/index/pom.xml index 0569b20b..28310115 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.10 + 13.0.11 org.opendaylight.integration diff --git a/features/repos/pom.xml b/features/repos/pom.xml index ead5f339..51dc9f5d 100644 --- a/features/repos/pom.xml +++ b/features/repos/pom.xml @@ -12,7 +12,7 @@ org.opendaylight.odlparent odlparent-lite - 13.0.10 + 13.0.11 org.opendaylight.integration diff --git a/features/repos/test/pom.xml b/features/repos/test/pom.xml index de271312..dfc5cf7a 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.10 + 13.0.11 org.opendaylight.integration diff --git a/features/singles/odl-integration-all/pom.xml b/features/singles/odl-integration-all/pom.xml index e8566de2..f5535449 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.10 + 13.0.11 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 139509cf..37838c87 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.10 + 13.0.11 org.opendaylight.integration diff --git a/features/singles/pom.xml b/features/singles/pom.xml index 368f61a9..aff6e87c 100644 --- a/features/singles/pom.xml +++ b/features/singles/pom.xml @@ -12,7 +12,7 @@ org.opendaylight.odlparent odlparent-lite - 13.0.10 + 13.0.11 org.opendaylight.integration diff --git a/karaf-scripts/pom.xml b/karaf-scripts/pom.xml index c817cd3a..9cfc9e32 100644 --- a/karaf-scripts/pom.xml +++ b/karaf-scripts/pom.xml @@ -12,7 +12,7 @@ org.opendaylight.odlparent odlparent-lite - 13.0.10 + 13.0.11 org.opendaylight.integration diff --git a/karaf/pom.xml b/karaf/pom.xml index 6baeb5da..d85bf51f 100644 --- a/karaf/pom.xml +++ b/karaf/pom.xml @@ -13,7 +13,7 @@ org.opendaylight.odlparent karaf4-parent - 13.0.10 + 13.0.11 org.opendaylight.integration diff --git a/onap-karaf/pom.xml b/onap-karaf/pom.xml index 2feab081..e5d25b22 100644 --- a/onap-karaf/pom.xml +++ b/onap-karaf/pom.xml @@ -4,7 +4,7 @@ org.opendaylight.odlparent karaf4-parent - 13.0.10 + 13.0.11 diff --git a/pom.xml b/pom.xml index 1174e506..d5fd19ba 100644 --- a/pom.xml +++ b/pom.xml @@ -12,7 +12,7 @@ org.opendaylight.odlparent odlparent-lite - 13.0.10 + 13.0.11 org.opendaylight.integration -- 2.43.0 From faf848a8da009ce86fd8ddb99c958a60a81371d4 Mon Sep 17 00:00:00 2001 From: jenkins-releng Date: Wed, 20 Mar 2024 06:46:29 +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 73cca3f1..a3ea3d14 100644 --- a/artifacts/all/pom.xml +++ b/artifacts/all/pom.xml @@ -17,7 +17,7 @@ org.opendaylight.integration all-artifacts - 0.19.3-SNAPSHOT + 0.19.3 pom diff --git a/artifacts/distribution/pom.xml b/artifacts/distribution/pom.xml index 112a123e..7028f0fb 100644 --- a/artifacts/distribution/pom.xml +++ b/artifacts/distribution/pom.xml @@ -17,7 +17,7 @@ org.opendaylight.integration distribution-artifacts - 0.19.3-SNAPSHOT + 0.19.3 pom diff --git a/artifacts/pom.xml b/artifacts/pom.xml index 9afcf0b6..9ab9319b 100644 --- a/artifacts/pom.xml +++ b/artifacts/pom.xml @@ -17,7 +17,7 @@ org.opendaylight.integration artifacts-aggregator - 0.19.3-SNAPSHOT + 0.19.3 pom diff --git a/artifacts/upstream/all/pom.xml b/artifacts/upstream/all/pom.xml index 8f390ffd..305d1cec 100644 --- a/artifacts/upstream/all/pom.xml +++ b/artifacts/upstream/all/pom.xml @@ -17,7 +17,7 @@ org.opendaylight.integration upstream-all-artifacts - 0.19.3-SNAPSHOT + 0.19.3 pom diff --git a/artifacts/upstream/artifacts/pom.xml b/artifacts/upstream/artifacts/pom.xml index 063396c0..269c84fa 100644 --- a/artifacts/upstream/artifacts/pom.xml +++ b/artifacts/upstream/artifacts/pom.xml @@ -14,7 +14,7 @@ org.opendaylight.integration properties - 0.19.3-SNAPSHOT + 0.19.3 ../properties artifact-artifacts diff --git a/artifacts/upstream/other/pom.xml b/artifacts/upstream/other/pom.xml index 7f53d021..2834b972 100644 --- a/artifacts/upstream/other/pom.xml +++ b/artifacts/upstream/other/pom.xml @@ -14,7 +14,7 @@ org.opendaylight.integration properties - 0.19.3-SNAPSHOT + 0.19.3 ../properties other-artifacts diff --git a/artifacts/upstream/pom.xml b/artifacts/upstream/pom.xml index cc9b456e..79a2be30 100644 --- a/artifacts/upstream/pom.xml +++ b/artifacts/upstream/pom.xml @@ -17,7 +17,7 @@ org.opendaylight.integration upstream-aggregator - 0.19.3-SNAPSHOT + 0.19.3 pom diff --git a/artifacts/upstream/properties/pom.xml b/artifacts/upstream/properties/pom.xml index 77368c1b..3e9a8213 100644 --- a/artifacts/upstream/properties/pom.xml +++ b/artifacts/upstream/properties/pom.xml @@ -17,7 +17,7 @@ org.opendaylight.integration properties - 0.19.3-SNAPSHOT + 0.19.3 pom diff --git a/features/repos/index/pom.xml b/features/repos/index/pom.xml index 28310115..8373b69e 100644 --- a/features/repos/index/pom.xml +++ b/features/repos/index/pom.xml @@ -17,7 +17,7 @@ org.opendaylight.integration features-index - 0.19.3-SNAPSHOT + 0.19.3 feature diff --git a/features/repos/pom.xml b/features/repos/pom.xml index 51dc9f5d..7798a362 100644 --- a/features/repos/pom.xml +++ b/features/repos/pom.xml @@ -17,7 +17,7 @@ org.opendaylight.integration repos-aggregator - 0.19.3-SNAPSHOT + 0.19.3 pom diff --git a/features/repos/test/pom.xml b/features/repos/test/pom.xml index dfc5cf7a..0380f1b1 100644 --- a/features/repos/test/pom.xml +++ b/features/repos/test/pom.xml @@ -17,7 +17,7 @@ org.opendaylight.integration features-test - 0.19.3-SNAPSHOT + 0.19.3 feature diff --git a/features/singles/odl-integration-all/pom.xml b/features/singles/odl-integration-all/pom.xml index f5535449..b1858968 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.19.3-SNAPSHOT + 0.19.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 37838c87..6c478b99 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.19.3-SNAPSHOT + 0.19.3 feature diff --git a/features/singles/pom.xml b/features/singles/pom.xml index aff6e87c..bfb9180d 100644 --- a/features/singles/pom.xml +++ b/features/singles/pom.xml @@ -17,7 +17,7 @@ org.opendaylight.integration singles-aggregator - 0.19.3-SNAPSHOT + 0.19.3 pom diff --git a/karaf-scripts/pom.xml b/karaf-scripts/pom.xml index 9cfc9e32..d1cf4005 100644 --- a/karaf-scripts/pom.xml +++ b/karaf-scripts/pom.xml @@ -17,7 +17,7 @@ org.opendaylight.integration karaf-scripts - 0.19.3-SNAPSHOT + 0.19.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 d85bf51f..84f9e015 100644 --- a/karaf/pom.xml +++ b/karaf/pom.xml @@ -18,7 +18,7 @@ org.opendaylight.integration karaf - 0.19.3-SNAPSHOT + 0.19.3 pom @@ -43,7 +43,7 @@ org.opendaylight.integration all-artifacts - 0.19.3-SNAPSHOT + 0.19.3 import pom @@ -97,7 +97,7 @@ org.opendaylight.integration karaf-scripts - 0.19.3-SNAPSHOT + 0.19.3 test diff --git a/onap-karaf/pom.xml b/onap-karaf/pom.xml index e5d25b22..fac4d605 100644 --- a/onap-karaf/pom.xml +++ b/onap-karaf/pom.xml @@ -10,7 +10,7 @@ org.opendaylight.integration onap-karaf - 0.19.3-SNAPSHOT + 0.19.3 pom ODL :: integration :: ${project.artifactId} 4.0.0 diff --git a/pom.xml b/pom.xml index d5fd19ba..7673bf23 100644 --- a/pom.xml +++ b/pom.xml @@ -17,7 +17,7 @@ org.opendaylight.integration distribution-aggregator - 0.19.3-SNAPSHOT + 0.19.3 pom Integration/Distribution -- 2.43.0