From 6d9ba562f3f38dfbfecab75ff42eb80654e64ad9 Mon Sep 17 00:00:00 2001 From: Robert Varga Date: Mon, 2 Sep 2024 20:27:38 +0200 Subject: [PATCH 1/2] Bump upstreams Adopt: - odlparent-13.1.4 - infrautils-6.0.10 - yangtools-13.0.7 - mdsal-13.0.6 - controller-9.0.5 - aaa-0.19.6 - netconf-7.0.8 - bgpcep-0.21.8 Change-Id: I8dcfc432cccac5a63db9725fd923ef0d0c4c79e0 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 +++++++++--------- 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 +- 18 files changed, 31 insertions(+), 31 deletions(-) diff --git a/artifacts/all/pom.xml b/artifacts/all/pom.xml index eb111e4c..806cfea4 100644 --- a/artifacts/all/pom.xml +++ b/artifacts/all/pom.xml @@ -12,7 +12,7 @@ org.opendaylight.odlparent odlparent-lite - 13.1.3 + 13.1.4 org.opendaylight.integration diff --git a/artifacts/distribution/pom.xml b/artifacts/distribution/pom.xml index 599dc088..e4074026 100644 --- a/artifacts/distribution/pom.xml +++ b/artifacts/distribution/pom.xml @@ -12,7 +12,7 @@ org.opendaylight.odlparent odlparent-lite - 13.1.3 + 13.1.4 org.opendaylight.integration diff --git a/artifacts/pom.xml b/artifacts/pom.xml index f556b503..7a650a42 100644 --- a/artifacts/pom.xml +++ b/artifacts/pom.xml @@ -12,7 +12,7 @@ org.opendaylight.odlparent odlparent-lite - 13.1.3 + 13.1.4 org.opendaylight.integration diff --git a/artifacts/upstream/all/pom.xml b/artifacts/upstream/all/pom.xml index d23576d6..d4218c2c 100644 --- a/artifacts/upstream/all/pom.xml +++ b/artifacts/upstream/all/pom.xml @@ -12,7 +12,7 @@ org.opendaylight.odlparent odlparent-lite - 13.1.3 + 13.1.4 org.opendaylight.integration diff --git a/artifacts/upstream/artifacts/pom.xml b/artifacts/upstream/artifacts/pom.xml index 33ba0810..b8b797d7 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 ca6a52af..979427da 100644 --- a/artifacts/upstream/pom.xml +++ b/artifacts/upstream/pom.xml @@ -12,7 +12,7 @@ org.opendaylight.odlparent odlparent-lite - 13.1.3 + 13.1.4 org.opendaylight.integration diff --git a/artifacts/upstream/properties/pom.xml b/artifacts/upstream/properties/pom.xml index ae8303ef..1d5543a8 100644 --- a/artifacts/upstream/properties/pom.xml +++ b/artifacts/upstream/properties/pom.xml @@ -12,7 +12,7 @@ org.opendaylight.odlparent odlparent-lite - 13.1.3 + 13.1.4 org.opendaylight.integration @@ -43,22 +43,22 @@ - 0.19.5 - 0.21.7 - 9.0.4 + 0.19.6 + 0.21.8 + 9.0.5 1.15.2-SNAPSHOT - 6.0.9 + 6.0.10 1.16.2-SNAPSHOT 1.19.2-SNAPSHOT - 13.0.4 - 7.0.7 - 13.1.3 + 13.0.6 + 7.0.8 + 13.1.4 0.18.2-SNAPSHOT 1.18.2-SNAPSHOT 0.13.2-SNAPSHOT 9.1.2 20.1.2 - 13.0.6 + 13.0.7 diff --git a/features/pom.xml b/features/pom.xml index e5e9ae35..3a1e6665 100644 --- a/features/pom.xml +++ b/features/pom.xml @@ -12,7 +12,7 @@ org.opendaylight.odlparent odlparent-lite - 13.1.3 + 13.1.4 org.opendaylight.integration diff --git a/features/repos/index/pom.xml b/features/repos/index/pom.xml index c02818fe..c6bd1265 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.3 + 13.1.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 fc153141..35bafb50 100644 --- a/features/repos/pom.xml +++ b/features/repos/pom.xml @@ -12,7 +12,7 @@ org.opendaylight.odlparent odlparent-lite - 13.1.3 + 13.1.4 org.opendaylight.integration diff --git a/features/repos/test/pom.xml b/features/repos/test/pom.xml index 23decdab..0bdff7b3 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.3 + 13.1.4 org.opendaylight.integration diff --git a/features/singles/odl-integration-all/pom.xml b/features/singles/odl-integration-all/pom.xml index 1b721a21..2b865e0e 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.3 + 13.1.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 5d279544..c8bb1ce4 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.3 + 13.1.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 a037f68d..6cb8e7a5 100644 --- a/features/singles/pom.xml +++ b/features/singles/pom.xml @@ -12,7 +12,7 @@ org.opendaylight.odlparent odlparent-lite - 13.1.3 + 13.1.4 org.opendaylight.integration diff --git a/karaf-scripts/pom.xml b/karaf-scripts/pom.xml index 26e4e01e..4085a24a 100644 --- a/karaf-scripts/pom.xml +++ b/karaf-scripts/pom.xml @@ -12,7 +12,7 @@ org.opendaylight.odlparent odlparent-lite - 13.1.3 + 13.1.4 org.opendaylight.integration diff --git a/karaf/pom.xml b/karaf/pom.xml index 452a67e7..6b1dc9e4 100644 --- a/karaf/pom.xml +++ b/karaf/pom.xml @@ -13,7 +13,7 @@ org.opendaylight.odlparent karaf4-parent - 13.1.3 + 13.1.4 org.opendaylight.integration diff --git a/onap-karaf/pom.xml b/onap-karaf/pom.xml index 7b83a2bb..a4d74b07 100644 --- a/onap-karaf/pom.xml +++ b/onap-karaf/pom.xml @@ -4,7 +4,7 @@ org.opendaylight.odlparent karaf4-parent - 13.1.3 + 13.1.4 diff --git a/pom.xml b/pom.xml index f4b3292a..7f30201e 100644 --- a/pom.xml +++ b/pom.xml @@ -12,7 +12,7 @@ org.opendaylight.odlparent odlparent-lite - 13.1.3 + 13.1.4 org.opendaylight.integration -- 2.43.0 From aad6220c66ece9155c31877bef6aa351397e45d5 Mon Sep 17 00:00:00 2001 From: jenkins-releng Date: Mon, 2 Sep 2024 20:18:06 +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 806cfea4..05de5cda 100644 --- a/artifacts/all/pom.xml +++ b/artifacts/all/pom.xml @@ -17,7 +17,7 @@ org.opendaylight.integration all-artifacts - 0.20.2-SNAPSHOT + 0.20.2 pom diff --git a/artifacts/distribution/pom.xml b/artifacts/distribution/pom.xml index e4074026..afb54e2a 100644 --- a/artifacts/distribution/pom.xml +++ b/artifacts/distribution/pom.xml @@ -17,7 +17,7 @@ org.opendaylight.integration distribution-artifacts - 0.20.2-SNAPSHOT + 0.20.2 pom diff --git a/artifacts/pom.xml b/artifacts/pom.xml index 7a650a42..379027e8 100644 --- a/artifacts/pom.xml +++ b/artifacts/pom.xml @@ -17,7 +17,7 @@ org.opendaylight.integration artifacts-aggregator - 0.20.2-SNAPSHOT + 0.20.2 pom diff --git a/artifacts/upstream/all/pom.xml b/artifacts/upstream/all/pom.xml index d4218c2c..1b1aee9e 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.2-SNAPSHOT + 0.20.2 pom diff --git a/artifacts/upstream/artifacts/pom.xml b/artifacts/upstream/artifacts/pom.xml index b8b797d7..27fce777 100644 --- a/artifacts/upstream/artifacts/pom.xml +++ b/artifacts/upstream/artifacts/pom.xml @@ -14,7 +14,7 @@ org.opendaylight.integration properties - 0.20.2-SNAPSHOT + 0.20.2 ../properties artifact-artifacts diff --git a/artifacts/upstream/other/pom.xml b/artifacts/upstream/other/pom.xml index fd72cd00..a24dc976 100644 --- a/artifacts/upstream/other/pom.xml +++ b/artifacts/upstream/other/pom.xml @@ -14,7 +14,7 @@ org.opendaylight.integration properties - 0.20.2-SNAPSHOT + 0.20.2 ../properties other-artifacts diff --git a/artifacts/upstream/pom.xml b/artifacts/upstream/pom.xml index 979427da..23fb7419 100644 --- a/artifacts/upstream/pom.xml +++ b/artifacts/upstream/pom.xml @@ -17,7 +17,7 @@ org.opendaylight.integration upstream-aggregator - 0.20.2-SNAPSHOT + 0.20.2 pom diff --git a/artifacts/upstream/properties/pom.xml b/artifacts/upstream/properties/pom.xml index 1d5543a8..5e022997 100644 --- a/artifacts/upstream/properties/pom.xml +++ b/artifacts/upstream/properties/pom.xml @@ -17,7 +17,7 @@ org.opendaylight.integration properties - 0.20.2-SNAPSHOT + 0.20.2 pom diff --git a/features/repos/index/pom.xml b/features/repos/index/pom.xml index c6bd1265..df367b04 100644 --- a/features/repos/index/pom.xml +++ b/features/repos/index/pom.xml @@ -17,7 +17,7 @@ org.opendaylight.integration features-index - 0.20.2-SNAPSHOT + 0.20.2 feature diff --git a/features/repos/pom.xml b/features/repos/pom.xml index 35bafb50..2b16a964 100644 --- a/features/repos/pom.xml +++ b/features/repos/pom.xml @@ -17,7 +17,7 @@ org.opendaylight.integration repos-aggregator - 0.20.2-SNAPSHOT + 0.20.2 pom diff --git a/features/repos/test/pom.xml b/features/repos/test/pom.xml index 0bdff7b3..74f602f3 100644 --- a/features/repos/test/pom.xml +++ b/features/repos/test/pom.xml @@ -17,7 +17,7 @@ org.opendaylight.integration features-test - 0.20.2-SNAPSHOT + 0.20.2 feature diff --git a/features/singles/odl-integration-all/pom.xml b/features/singles/odl-integration-all/pom.xml index 2b865e0e..8286695e 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.2-SNAPSHOT + 0.20.2 feature diff --git a/features/singles/odl-integration-compatible-with-all/pom.xml b/features/singles/odl-integration-compatible-with-all/pom.xml index c8bb1ce4..7750a20c 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.2-SNAPSHOT + 0.20.2 feature diff --git a/features/singles/pom.xml b/features/singles/pom.xml index 6cb8e7a5..78e29355 100644 --- a/features/singles/pom.xml +++ b/features/singles/pom.xml @@ -17,7 +17,7 @@ org.opendaylight.integration singles-aggregator - 0.20.2-SNAPSHOT + 0.20.2 pom diff --git a/karaf-scripts/pom.xml b/karaf-scripts/pom.xml index 4085a24a..be71177b 100644 --- a/karaf-scripts/pom.xml +++ b/karaf-scripts/pom.xml @@ -17,7 +17,7 @@ org.opendaylight.integration karaf-scripts - 0.20.2-SNAPSHOT + 0.20.2 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 6b1dc9e4..0ff3cc7f 100644 --- a/karaf/pom.xml +++ b/karaf/pom.xml @@ -18,7 +18,7 @@ org.opendaylight.integration karaf - 0.20.2-SNAPSHOT + 0.20.2 pom @@ -43,7 +43,7 @@ org.opendaylight.integration all-artifacts - 0.20.2-SNAPSHOT + 0.20.2 import pom @@ -97,7 +97,7 @@ org.opendaylight.integration karaf-scripts - 0.20.2-SNAPSHOT + 0.20.2 test diff --git a/onap-karaf/pom.xml b/onap-karaf/pom.xml index a4d74b07..9ecd554b 100644 --- a/onap-karaf/pom.xml +++ b/onap-karaf/pom.xml @@ -10,7 +10,7 @@ org.opendaylight.integration onap-karaf - 0.20.2-SNAPSHOT + 0.20.2 pom ODL :: integration :: ${project.artifactId} 4.0.0 diff --git a/pom.xml b/pom.xml index 7f30201e..ea463516 100644 --- a/pom.xml +++ b/pom.xml @@ -17,7 +17,7 @@ org.opendaylight.integration distribution-aggregator - 0.20.2-SNAPSHOT + 0.20.2 pom Integration/Distribution -- 2.43.0