From 5dfae917927e806237e24aab751729d53ede05e8 Mon Sep 17 00:00:00 2001 From: jenkins-releng Date: Mon, 19 Aug 2024 03:11:07 +0000 Subject: [PATCH 1/5] Update .gitreview to stable/scandium Change-Id: I09fef20c2e4c090d6ec707e91b656842d42dc2c9 Signed-off-by: jenkins-releng --- .gitreview | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitreview b/.gitreview index b29ae3a1..479fac46 100644 --- a/.gitreview +++ b/.gitreview @@ -2,4 +2,4 @@ host=git.opendaylight.org port=29418 project=integration/distribution.git -defaultbranch=master +defaultbranch=stable/scandium -- 2.43.0 From 8ecce1bfbaadbfdd2efdb07f3127b0edb2590bd5 Mon Sep 17 00:00:00 2001 From: Robert Varga Date: Wed, 4 Sep 2024 10:21:11 +0200 Subject: [PATCH 2/5] Bump upstreams Adopt: - odlparent-14.0.3 - infrautils-7.0.3 - yangtools-14.0.4 - mdsal-14.0.2 - controller-10.0.2 - aaa-0.20.1 - netconf-8.0.1 - bgpcep-0.22.1 Change-Id: Idadc2d76bb78e713bc476005e376fba2109b4b39 Signed-off-by: Robert Varga (cherry picked from commit 13f6fed5bb5abea22586804849b963ef69b0f38f) --- 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 | 16 ++++++++-------- docs/platform-versions.rst | 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 | 2 +- onap-karaf/pom.xml | 2 +- pom.xml | 2 +- 18 files changed, 31 insertions(+), 31 deletions(-) diff --git a/artifacts/all/pom.xml b/artifacts/all/pom.xml index b2030e14..28e42a55 100644 --- a/artifacts/all/pom.xml +++ b/artifacts/all/pom.xml @@ -12,7 +12,7 @@ org.opendaylight.odlparent odlparent-lite - 14.0.2 + 14.0.3 org.opendaylight.integration diff --git a/artifacts/distribution/pom.xml b/artifacts/distribution/pom.xml index fe86d4d1..376167c2 100644 --- a/artifacts/distribution/pom.xml +++ b/artifacts/distribution/pom.xml @@ -12,7 +12,7 @@ org.opendaylight.odlparent odlparent-lite - 14.0.2 + 14.0.3 org.opendaylight.integration diff --git a/artifacts/pom.xml b/artifacts/pom.xml index e7980b10..b6ab511a 100644 --- a/artifacts/pom.xml +++ b/artifacts/pom.xml @@ -12,7 +12,7 @@ org.opendaylight.odlparent odlparent-lite - 14.0.2 + 14.0.3 org.opendaylight.integration diff --git a/artifacts/upstream/all/pom.xml b/artifacts/upstream/all/pom.xml index 6f5babe4..7bbf8887 100644 --- a/artifacts/upstream/all/pom.xml +++ b/artifacts/upstream/all/pom.xml @@ -12,7 +12,7 @@ org.opendaylight.odlparent odlparent-lite - 14.0.2 + 14.0.3 org.opendaylight.integration diff --git a/artifacts/upstream/pom.xml b/artifacts/upstream/pom.xml index bcd2c796..7b0c542a 100644 --- a/artifacts/upstream/pom.xml +++ b/artifacts/upstream/pom.xml @@ -12,7 +12,7 @@ org.opendaylight.odlparent odlparent-lite - 14.0.2 + 14.0.3 org.opendaylight.integration diff --git a/artifacts/upstream/properties/pom.xml b/artifacts/upstream/properties/pom.xml index 4090e1ea..b768164f 100644 --- a/artifacts/upstream/properties/pom.xml +++ b/artifacts/upstream/properties/pom.xml @@ -12,7 +12,7 @@ org.opendaylight.odlparent odlparent-lite - 14.0.2 + 14.0.3 org.opendaylight.integration @@ -43,22 +43,22 @@ - 0.20.0 - 0.22.0 - 10.0.1 + 0.20.1 + 0.22.1 + 10.0.2 1.16.0-SNAPSHOT - 7.0.2 + 7.0.3 1.17.0-SNAPSHOT 1.20.0-SNAPSHOT - 14.0.1 + 14.0.2 8.0.0 - 14.0.2 + 14.0.3 0.19.0-SNAPSHOT 1.19.0-SNAPSHOT 0.14.0-SNAPSHOT 9.0.0 20.0.0 - 14.0.2 + 14.0.4 diff --git a/docs/platform-versions.rst b/docs/platform-versions.rst index bff910d3..f5245819 100644 --- a/docs/platform-versions.rst +++ b/docs/platform-versions.rst @@ -13,31 +13,31 @@ Platform versions * - org.opendaylight.odlparent - \* - - 14.0.2 + - 14.0.3 * - org.opendaylight.infrautils - \* - - 7.0.2 + - 7.0.3 * - org.opendaylight.yangtools - \* - - 14.0.2 + - 14.0.4 * - org.opendaylight.mdsal - \* - - 14.0.1 + - 14.0.2 * - org.opendaylight.controller - \* - - 10.0.1 + - 10.0.2 * - org.opendaylight.aaa - \* - - 0.20.0 + - 0.20.1 * - org.opendaylight.netconf - \* - - 8.0.0 + - 8.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 a49992d5..cb178dc5 100644 --- a/features/pom.xml +++ b/features/pom.xml @@ -12,7 +12,7 @@ org.opendaylight.odlparent odlparent-lite - 14.0.2 + 14.0.3 org.opendaylight.integration diff --git a/features/repos/index/pom.xml b/features/repos/index/pom.xml index f27a65a6..c42b4682 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.2 + 14.0.3 org.opendaylight.integration diff --git a/features/repos/pom.xml b/features/repos/pom.xml index 8d10c8cd..2bc22e4e 100644 --- a/features/repos/pom.xml +++ b/features/repos/pom.xml @@ -12,7 +12,7 @@ org.opendaylight.odlparent odlparent-lite - 14.0.2 + 14.0.3 org.opendaylight.integration diff --git a/features/repos/test/pom.xml b/features/repos/test/pom.xml index 82d3603a..fb4401c4 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.2 + 14.0.3 org.opendaylight.integration diff --git a/features/singles/odl-integration-all/pom.xml b/features/singles/odl-integration-all/pom.xml index 96b8e3e7..6421b75f 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.2 + 14.0.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 1ba3eb58..5718c0f3 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.2 + 14.0.3 org.opendaylight.integration diff --git a/features/singles/pom.xml b/features/singles/pom.xml index 268ad10c..09daadd6 100644 --- a/features/singles/pom.xml +++ b/features/singles/pom.xml @@ -12,7 +12,7 @@ org.opendaylight.odlparent odlparent-lite - 14.0.2 + 14.0.3 org.opendaylight.integration diff --git a/karaf-scripts/pom.xml b/karaf-scripts/pom.xml index 653c388c..52228122 100644 --- a/karaf-scripts/pom.xml +++ b/karaf-scripts/pom.xml @@ -12,7 +12,7 @@ org.opendaylight.odlparent odlparent-lite - 14.0.2 + 14.0.3 org.opendaylight.integration diff --git a/karaf/pom.xml b/karaf/pom.xml index b0a67d1e..015e7797 100644 --- a/karaf/pom.xml +++ b/karaf/pom.xml @@ -13,7 +13,7 @@ org.opendaylight.odlparent karaf4-parent - 14.0.2 + 14.0.3 org.opendaylight.integration diff --git a/onap-karaf/pom.xml b/onap-karaf/pom.xml index 4b805788..10ed0944 100644 --- a/onap-karaf/pom.xml +++ b/onap-karaf/pom.xml @@ -4,7 +4,7 @@ org.opendaylight.odlparent karaf4-parent - 14.0.2 + 14.0.3 diff --git a/pom.xml b/pom.xml index c2f86f13..c384d32f 100644 --- a/pom.xml +++ b/pom.xml @@ -12,7 +12,7 @@ org.opendaylight.odlparent odlparent-lite - 14.0.2 + 14.0.3 org.opendaylight.integration -- 2.43.0 From 7f02a32b4d253464c9f0d324b180105342e7534a Mon Sep 17 00:00:00 2001 From: Gilles Thouenon Date: Sun, 8 Sep 2024 17:42:39 +0200 Subject: [PATCH 3/5] Bump transportpce versions Adopt: - netconf-8.0.1 - transportpce-models-21.0.0 - transportpce-10.0.0 Change-Id: If7d13dfdff27ec7ce84e1377d8977a54f30e4698 Signed-off-by: Gilles Thouenon --- artifacts/upstream/artifacts/pom.xml | 4 ++-- artifacts/upstream/properties/pom.xml | 6 +++--- features/repos/index/pom.xml | 4 ++-- .../singles/odl-integration-compatible-with-all/pom.xml | 4 ++-- 4 files changed, 9 insertions(+), 9 deletions(-) diff --git a/artifacts/upstream/artifacts/pom.xml b/artifacts/upstream/artifacts/pom.xml index 9b19a820..4f36ffce 100644 --- a/artifacts/upstream/artifacts/pom.xml +++ b/artifacts/upstream/artifacts/pom.xml @@ -278,7 +278,7 @@ transportpce-models - false + true @@ -295,7 +295,7 @@ transportpce - false + true diff --git a/artifacts/upstream/properties/pom.xml b/artifacts/upstream/properties/pom.xml index b768164f..6421bf47 100644 --- a/artifacts/upstream/properties/pom.xml +++ b/artifacts/upstream/properties/pom.xml @@ -51,13 +51,13 @@ 1.17.0-SNAPSHOT 1.20.0-SNAPSHOT 14.0.2 - 8.0.0 + 8.0.1 14.0.3 0.19.0-SNAPSHOT 1.19.0-SNAPSHOT 0.14.0-SNAPSHOT - 9.0.0 - 20.0.0 + 10.0.0 + 21.0.0 14.0.4 diff --git a/features/repos/index/pom.xml b/features/repos/index/pom.xml index c42b4682..3f719ef3 100644 --- a/features/repos/index/pom.xml +++ b/features/repos/index/pom.xml @@ -317,7 +317,7 @@ transportpce-models - false + true @@ -332,7 +332,7 @@ transportpce - 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 5718c0f3..df1a7ea5 100644 --- a/features/singles/odl-integration-compatible-with-all/pom.xml +++ b/features/singles/odl-integration-compatible-with-all/pom.xml @@ -217,7 +217,7 @@ transportpce - false + true @@ -256,7 +256,7 @@ transportpce-models - false + true -- 2.43.0 From 654ba3208daeec92fa686b3ce915c04fe6cd62d3 Mon Sep 17 00:00:00 2001 From: Robert Varga Date: Fri, 20 Sep 2024 07:28:48 +0200 Subject: [PATCH 4/5] Update upstreams Adopt: - netconf-8.0.2 - bgpcep-0.22.2 Change-Id: Iece66b73fb27a1e3eeccb0904c1432b7b1266ea2 Signed-off-by: Robert Varga --- artifacts/upstream/artifacts/pom.xml | 4 ++-- artifacts/upstream/properties/pom.xml | 4 ++-- docs/platform-versions.rst | 2 +- features/repos/index/pom.xml | 4 ++-- features/singles/odl-integration-compatible-with-all/pom.xml | 4 ++-- 5 files changed, 9 insertions(+), 9 deletions(-) diff --git a/artifacts/upstream/artifacts/pom.xml b/artifacts/upstream/artifacts/pom.xml index 4f36ffce..9b19a820 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/properties/pom.xml b/artifacts/upstream/properties/pom.xml index 6421bf47..6ac2681d 100644 --- a/artifacts/upstream/properties/pom.xml +++ b/artifacts/upstream/properties/pom.xml @@ -44,14 +44,14 @@ 0.20.1 - 0.22.1 + 0.22.2 10.0.2 1.16.0-SNAPSHOT 7.0.3 1.17.0-SNAPSHOT 1.20.0-SNAPSHOT 14.0.2 - 8.0.1 + 8.0.2 14.0.3 0.19.0-SNAPSHOT 1.19.0-SNAPSHOT diff --git a/docs/platform-versions.rst b/docs/platform-versions.rst index f5245819..66e4027a 100644 --- a/docs/platform-versions.rst +++ b/docs/platform-versions.rst @@ -37,7 +37,7 @@ Platform versions * - org.opendaylight.netconf - \* - - 8.0.1 + - 8.0.2 .. note:: Most projects get their YANG Tools version via MD-SAL. ${project}-artifacts are maven `bill of materials `__ diff --git a/features/repos/index/pom.xml b/features/repos/index/pom.xml index 3f719ef3..c42b4682 100644 --- a/features/repos/index/pom.xml +++ b/features/repos/index/pom.xml @@ -317,7 +317,7 @@ transportpce-models - true + false @@ -332,7 +332,7 @@ transportpce - true + false diff --git a/features/singles/odl-integration-compatible-with-all/pom.xml b/features/singles/odl-integration-compatible-with-all/pom.xml index df1a7ea5..5718c0f3 100644 --- a/features/singles/odl-integration-compatible-with-all/pom.xml +++ b/features/singles/odl-integration-compatible-with-all/pom.xml @@ -217,7 +217,7 @@ transportpce - true + false @@ -256,7 +256,7 @@ transportpce-models - true + false -- 2.43.0 From f8193fb2eaf67e74c868d1b67d829d38782692e2 Mon Sep 17 00:00:00 2001 From: jenkins-releng Date: Fri, 20 Sep 2024 05:34:29 +0000 Subject: [PATCH 5/5] 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 28e42a55..badc6edf 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 376167c2..b3eb758d 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 b6ab511a..04e357d8 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 7bbf8887..8e301d14 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 9b19a820..22d1403d 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 7b0c542a..4bf1c961 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 6ac2681d..0cad0037 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 diff --git a/features/repos/index/pom.xml b/features/repos/index/pom.xml index c42b4682..e6e27462 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 2bc22e4e..56af7472 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 fb4401c4..8e4345fb 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 6421b75f..8f85a6bb 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 5718c0f3..73321854 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 09daadd6..4e07f679 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 52228122..ce36e99b 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 015e7797..d64b6b10 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 10ed0944..2ef18f30 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 c384d32f..66c76440 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