From ff9182bae42d0068b04f6b724d8f64cfb9451329 Mon Sep 17 00:00:00 2001 From: Robert Varga Date: Fri, 7 Feb 2025 18:14:42 +0100 Subject: [PATCH 1/2] Pin serviceutils/ofp to Scandium versions Service Utils has only one user, which is OpenFlow Plugin. That user wants to get out of autorelease, so this patch enables it do do so. We pin OFP to Scandium release, which matches our current surroundings. This means that distribution does not require OFP to be part of autorelease. We remove any mention of serviceutils, as it is not coming back and all we need from it we get transitively from OFP features. Change-Id: I31018717fd1375f20539d8956776785a92291828 Signed-off-by: Robert Varga --- artifacts/upstream/artifacts/pom.xml | 17 ---------------- artifacts/upstream/properties/pom.xml | 3 +-- features/repos/index/pom.xml | 15 -------------- features/singles/odl-integration-all/pom.xml | 21 -------------------- 4 files changed, 1 insertion(+), 55 deletions(-) diff --git a/artifacts/upstream/artifacts/pom.xml b/artifacts/upstream/artifacts/pom.xml index 1eeebce4..507b2591 100644 --- a/artifacts/upstream/artifacts/pom.xml +++ b/artifacts/upstream/artifacts/pom.xml @@ -258,23 +258,6 @@ - - serviceutils - - true - - - - - org.opendaylight.serviceutils - serviceutils-artifacts - ${serviceutils.version} - pom - import - - - - transportpce-models diff --git a/artifacts/upstream/properties/pom.xml b/artifacts/upstream/properties/pom.xml index 64685893..d6008dd9 100644 --- a/artifacts/upstream/properties/pom.xml +++ b/artifacts/upstream/properties/pom.xml @@ -53,9 +53,8 @@ 14.0.2 8.0.2 14.0.3 - 0.20.0-SNAPSHOT + 0.19.0 1.20.0-SNAPSHOT - 0.15.0-SNAPSHOT 10.0.1 21.0.0 14.0.4 diff --git a/features/repos/index/pom.xml b/features/repos/index/pom.xml index 3346685c..69ee6977 100644 --- a/features/repos/index/pom.xml +++ b/features/repos/index/pom.xml @@ -298,21 +298,6 @@ - - - serviceutils - - true - - - - org.opendaylight.serviceutils - serviceutils-features - features - xml - - - transportpce-models diff --git a/features/singles/odl-integration-all/pom.xml b/features/singles/odl-integration-all/pom.xml index 55277dc8..b5e518fe 100644 --- a/features/singles/odl-integration-all/pom.xml +++ b/features/singles/odl-integration-all/pom.xml @@ -98,26 +98,5 @@ - - - serviceutils - - true - - - - org.opendaylight.serviceutils - odl-serviceutils-srm - xml - features - - - org.opendaylight.serviceutils - odl-serviceutils-tools - xml - features - - - -- 2.43.0 From b7cd164031f5c4e72dad1e549c2f47c15fa6652d Mon Sep 17 00:00:00 2001 From: jenkins-releng Date: Fri, 7 Feb 2025 17:21:55 +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 | 10 +++++----- 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, 25 insertions(+), 25 deletions(-) diff --git a/artifacts/all/pom.xml b/artifacts/all/pom.xml index 391df1d8..d4aec406 100644 --- a/artifacts/all/pom.xml +++ b/artifacts/all/pom.xml @@ -17,7 +17,7 @@ org.opendaylight.integration all-artifacts - 0.22.0-SNAPSHOT + 0.22.0 pom diff --git a/artifacts/distribution/pom.xml b/artifacts/distribution/pom.xml index 92797a5f..961c7404 100644 --- a/artifacts/distribution/pom.xml +++ b/artifacts/distribution/pom.xml @@ -17,7 +17,7 @@ org.opendaylight.integration distribution-artifacts - 0.22.0-SNAPSHOT + 0.22.0 pom diff --git a/artifacts/pom.xml b/artifacts/pom.xml index 49efc6da..03345178 100644 --- a/artifacts/pom.xml +++ b/artifacts/pom.xml @@ -17,7 +17,7 @@ org.opendaylight.integration artifacts-aggregator - 0.22.0-SNAPSHOT + 0.22.0 pom diff --git a/artifacts/upstream/all/pom.xml b/artifacts/upstream/all/pom.xml index b72cdfa0..b8ebc1c1 100644 --- a/artifacts/upstream/all/pom.xml +++ b/artifacts/upstream/all/pom.xml @@ -17,7 +17,7 @@ org.opendaylight.integration upstream-all-artifacts - 0.22.0-SNAPSHOT + 0.22.0 pom diff --git a/artifacts/upstream/artifacts/pom.xml b/artifacts/upstream/artifacts/pom.xml index 507b2591..a97e4176 100644 --- a/artifacts/upstream/artifacts/pom.xml +++ b/artifacts/upstream/artifacts/pom.xml @@ -14,7 +14,7 @@ org.opendaylight.integration properties - 0.22.0-SNAPSHOT + 0.22.0 ../properties artifact-artifacts diff --git a/artifacts/upstream/other/pom.xml b/artifacts/upstream/other/pom.xml index 770815a5..d32d723a 100644 --- a/artifacts/upstream/other/pom.xml +++ b/artifacts/upstream/other/pom.xml @@ -14,7 +14,7 @@ org.opendaylight.integration properties - 0.22.0-SNAPSHOT + 0.22.0 ../properties other-artifacts diff --git a/artifacts/upstream/pom.xml b/artifacts/upstream/pom.xml index 3bb4695e..ad7b8839 100644 --- a/artifacts/upstream/pom.xml +++ b/artifacts/upstream/pom.xml @@ -17,7 +17,7 @@ org.opendaylight.integration upstream-aggregator - 0.22.0-SNAPSHOT + 0.22.0 pom diff --git a/artifacts/upstream/properties/pom.xml b/artifacts/upstream/properties/pom.xml index d6008dd9..21aeea71 100644 --- a/artifacts/upstream/properties/pom.xml +++ b/artifacts/upstream/properties/pom.xml @@ -17,7 +17,7 @@ org.opendaylight.integration properties - 0.22.0-SNAPSHOT + 0.22.0 pom diff --git a/features/repos/index/pom.xml b/features/repos/index/pom.xml index 69ee6977..a9f7370f 100644 --- a/features/repos/index/pom.xml +++ b/features/repos/index/pom.xml @@ -17,7 +17,7 @@ org.opendaylight.integration features-index - 0.22.0-SNAPSHOT + 0.22.0 feature diff --git a/features/repos/pom.xml b/features/repos/pom.xml index 4ebd4e86..edb378f6 100644 --- a/features/repos/pom.xml +++ b/features/repos/pom.xml @@ -17,7 +17,7 @@ org.opendaylight.integration repos-aggregator - 0.22.0-SNAPSHOT + 0.22.0 pom diff --git a/features/repos/test/pom.xml b/features/repos/test/pom.xml index 5eaddbbb..f4597806 100644 --- a/features/repos/test/pom.xml +++ b/features/repos/test/pom.xml @@ -17,7 +17,7 @@ org.opendaylight.integration features-test - 0.22.0-SNAPSHOT + 0.22.0 feature diff --git a/features/singles/odl-integration-all/pom.xml b/features/singles/odl-integration-all/pom.xml index b5e518fe..e11e7014 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.22.0-SNAPSHOT + 0.22.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 311b8056..6f716c68 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.22.0-SNAPSHOT + 0.22.0 feature diff --git a/features/singles/pom.xml b/features/singles/pom.xml index 27dc004a..51e6da6c 100644 --- a/features/singles/pom.xml +++ b/features/singles/pom.xml @@ -17,7 +17,7 @@ org.opendaylight.integration singles-aggregator - 0.22.0-SNAPSHOT + 0.22.0 pom diff --git a/karaf-scripts/pom.xml b/karaf-scripts/pom.xml index 7daba984..0b74daaf 100644 --- a/karaf-scripts/pom.xml +++ b/karaf-scripts/pom.xml @@ -17,7 +17,7 @@ org.opendaylight.integration karaf-scripts - 0.22.0-SNAPSHOT + 0.22.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 5c92973c..74ff7a84 100644 --- a/karaf/pom.xml +++ b/karaf/pom.xml @@ -18,7 +18,7 @@ org.opendaylight.integration karaf - 0.22.0-SNAPSHOT + 0.22.0 pom @@ -43,7 +43,7 @@ org.opendaylight.integration all-artifacts - 0.22.0-SNAPSHOT + 0.22.0 import pom @@ -97,7 +97,7 @@ org.opendaylight.integration karaf-scripts - 0.22.0-SNAPSHOT + 0.22.0 test diff --git a/onap-karaf/pom.xml b/onap-karaf/pom.xml index b1a6223c..c479582d 100644 --- a/onap-karaf/pom.xml +++ b/onap-karaf/pom.xml @@ -10,7 +10,7 @@ org.opendaylight.integration onap-karaf - 0.22.0-SNAPSHOT + 0.22.0 pom ODL :: integration :: ${project.artifactId} 4.0.0 diff --git a/pom.xml b/pom.xml index 436b67ed..eab8d141 100644 --- a/pom.xml +++ b/pom.xml @@ -17,7 +17,7 @@ org.opendaylight.integration distribution-aggregator - 0.22.0-SNAPSHOT + 0.22.0 pom Integration/Distribution -- 2.43.0