From a691f31d1fe0086e9521116c93f651b4e6735084 Mon Sep 17 00:00:00 2001 From: Anil Belur Date: Thu, 12 Mar 2026 17:45:23 +1000 Subject: [PATCH 1/2] ci: apply pre-commit formatting fixes Apply formatting fixes identified by pre-commit hooks: - trailing-whitespace: fix docs and xml files - end-of-file-fixer: fix missing newlines Change-Id: I58b008e1c4b473adf19bd5fd25ce583541d92c85 Signed-off-by: Anil Belur Signed-off-by: Anil Belur Signed-off-by: Robert Varga --- docs/platform-versions.rst | 2 -- karaf-scripts/src/main/assembly/etc/org.ops4j.pax.url.mvn.cfg | 2 +- onap-karaf/pom.xml | 1 - 3 files changed, 1 insertion(+), 4 deletions(-) diff --git a/docs/platform-versions.rst b/docs/platform-versions.rst index 7fca08c8..7056cd70 100644 --- a/docs/platform-versions.rst +++ b/docs/platform-versions.rst @@ -47,5 +47,3 @@ Platform versions ${project}-artifacts are maven `bill of materials `__ (a.k.a. bom or BOM), whose use is strongly recommended to avoid versions mismatch across multiple dependencies in poms. - - diff --git a/karaf-scripts/src/main/assembly/etc/org.ops4j.pax.url.mvn.cfg b/karaf-scripts/src/main/assembly/etc/org.ops4j.pax.url.mvn.cfg index cdd58378..be7fa3eb 100644 --- a/karaf-scripts/src/main/assembly/etc/org.ops4j.pax.url.mvn.cfg +++ b/karaf-scripts/src/main/assembly/etc/org.ops4j.pax.url.mvn.cfg @@ -93,4 +93,4 @@ org.ops4j.pax.url.mvn.defaultRepositories=\ # org.ops4j.pax.url.mvn.repositories= -### ^^^ No remote repositories. This is the only ODL change compared to Karaf defaults. \ No newline at end of file +### ^^^ No remote repositories. This is the only ODL change compared to Karaf defaults. diff --git a/onap-karaf/pom.xml b/onap-karaf/pom.xml index bdb87f07..533202da 100644 --- a/onap-karaf/pom.xml +++ b/onap-karaf/pom.xml @@ -172,4 +172,3 @@ - -- 2.34.1 From ec0f18991f52b5b02c47cf754e5ffd7ea24605a4 Mon Sep 17 00:00:00 2001 From: jenkins-releng Date: Thu, 19 Mar 2026 07:52:04 +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 4abfacce..ef1261bf 100644 --- a/artifacts/all/pom.xml +++ b/artifacts/all/pom.xml @@ -17,7 +17,7 @@ org.opendaylight.integration all-artifacts - 0.24.0-SNAPSHOT + 0.24.0 pom diff --git a/artifacts/distribution/pom.xml b/artifacts/distribution/pom.xml index d059c325..f7a9b4b3 100644 --- a/artifacts/distribution/pom.xml +++ b/artifacts/distribution/pom.xml @@ -17,7 +17,7 @@ org.opendaylight.integration distribution-artifacts - 0.24.0-SNAPSHOT + 0.24.0 pom diff --git a/artifacts/pom.xml b/artifacts/pom.xml index 41ee9da3..1fdf3ae8 100644 --- a/artifacts/pom.xml +++ b/artifacts/pom.xml @@ -17,7 +17,7 @@ org.opendaylight.integration artifacts-aggregator - 0.24.0-SNAPSHOT + 0.24.0 pom diff --git a/artifacts/upstream/all/pom.xml b/artifacts/upstream/all/pom.xml index 2311dc6e..0ab72017 100644 --- a/artifacts/upstream/all/pom.xml +++ b/artifacts/upstream/all/pom.xml @@ -17,7 +17,7 @@ org.opendaylight.integration upstream-all-artifacts - 0.24.0-SNAPSHOT + 0.24.0 pom diff --git a/artifacts/upstream/artifacts/pom.xml b/artifacts/upstream/artifacts/pom.xml index 55a5a4e5..3154677a 100644 --- a/artifacts/upstream/artifacts/pom.xml +++ b/artifacts/upstream/artifacts/pom.xml @@ -12,7 +12,7 @@ org.opendaylight.integration properties - 0.24.0-SNAPSHOT + 0.24.0 ../properties artifact-artifacts diff --git a/artifacts/upstream/other/pom.xml b/artifacts/upstream/other/pom.xml index af29b0d8..eb22eb60 100644 --- a/artifacts/upstream/other/pom.xml +++ b/artifacts/upstream/other/pom.xml @@ -14,7 +14,7 @@ org.opendaylight.integration properties - 0.24.0-SNAPSHOT + 0.24.0 ../properties other-artifacts diff --git a/artifacts/upstream/pom.xml b/artifacts/upstream/pom.xml index 9052792e..5a89a255 100644 --- a/artifacts/upstream/pom.xml +++ b/artifacts/upstream/pom.xml @@ -17,7 +17,7 @@ org.opendaylight.integration upstream-aggregator - 0.24.0-SNAPSHOT + 0.24.0 pom diff --git a/artifacts/upstream/properties/pom.xml b/artifacts/upstream/properties/pom.xml index 1d07f990..e079361c 100644 --- a/artifacts/upstream/properties/pom.xml +++ b/artifacts/upstream/properties/pom.xml @@ -17,7 +17,7 @@ org.opendaylight.integration properties - 0.24.0-SNAPSHOT + 0.24.0 pom diff --git a/features/repos/index/pom.xml b/features/repos/index/pom.xml index cc15bab8..4fcae45a 100644 --- a/features/repos/index/pom.xml +++ b/features/repos/index/pom.xml @@ -17,7 +17,7 @@ org.opendaylight.integration features-index - 0.24.0-SNAPSHOT + 0.24.0 feature diff --git a/features/repos/pom.xml b/features/repos/pom.xml index c152c086..6da3e384 100644 --- a/features/repos/pom.xml +++ b/features/repos/pom.xml @@ -17,7 +17,7 @@ org.opendaylight.integration repos-aggregator - 0.24.0-SNAPSHOT + 0.24.0 pom diff --git a/features/repos/test/pom.xml b/features/repos/test/pom.xml index bda4b5d9..f159eeac 100644 --- a/features/repos/test/pom.xml +++ b/features/repos/test/pom.xml @@ -17,7 +17,7 @@ org.opendaylight.integration features-test - 0.24.0-SNAPSHOT + 0.24.0 feature diff --git a/features/singles/odl-integration-all/pom.xml b/features/singles/odl-integration-all/pom.xml index 6ba7ff44..d68eddc2 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.24.0-SNAPSHOT + 0.24.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 25e88784..0d6a920b 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.24.0-SNAPSHOT + 0.24.0 feature diff --git a/features/singles/pom.xml b/features/singles/pom.xml index 5bc5d311..0948337d 100644 --- a/features/singles/pom.xml +++ b/features/singles/pom.xml @@ -17,7 +17,7 @@ org.opendaylight.integration singles-aggregator - 0.24.0-SNAPSHOT + 0.24.0 pom diff --git a/karaf-scripts/pom.xml b/karaf-scripts/pom.xml index 8cfbcae3..b32ca3cd 100644 --- a/karaf-scripts/pom.xml +++ b/karaf-scripts/pom.xml @@ -17,7 +17,7 @@ org.opendaylight.integration karaf-scripts - 0.24.0-SNAPSHOT + 0.24.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 81996000..83437c41 100644 --- a/karaf/pom.xml +++ b/karaf/pom.xml @@ -18,7 +18,7 @@ org.opendaylight.integration karaf - 0.24.0-SNAPSHOT + 0.24.0 pom @@ -43,7 +43,7 @@ org.opendaylight.integration all-artifacts - 0.24.0-SNAPSHOT + 0.24.0 import pom @@ -97,7 +97,7 @@ org.opendaylight.integration karaf-scripts - 0.24.0-SNAPSHOT + 0.24.0 test diff --git a/onap-karaf/pom.xml b/onap-karaf/pom.xml index 533202da..ea1bc1bc 100644 --- a/onap-karaf/pom.xml +++ b/onap-karaf/pom.xml @@ -10,7 +10,7 @@ org.opendaylight.integration onap-karaf - 0.24.0-SNAPSHOT + 0.24.0 pom ODL :: integration :: ${project.artifactId} 4.0.0 diff --git a/pom.xml b/pom.xml index 8184e072..09044711 100644 --- a/pom.xml +++ b/pom.xml @@ -17,7 +17,7 @@ org.opendaylight.integration distribution-aggregator - 0.24.0-SNAPSHOT + 0.24.0 pom Integration/Distribution -- 2.34.1