From 8aa8a6d6cd62db9ce8e9961321c0ba8eefb41f01 Mon Sep 17 00:00:00 2001 From: Anil Belur Date: Thu, 27 Aug 2026 22:23:19 +1000 Subject: [PATCH 1/3] ci: share JaCoCo execution data across subprojects Sonar reported no coverage because the reactor's subprojects each wrote their own execution data and Sonar read each subproject's report against the tests living in that same subproject alone. maven-build-action aggregates the execution data across subprojects and regenerates the reports once the whole reactor has finished; security-workflows v0.5.2 carries it and exposes jacoco_mode, which this asks for as shared. Shared is needed here rather than the default: odlparent sets the jacoco.destFile and jacoco.dataFile properties, which the action reads as the project placing its own execution data, so it leaves the layout alone and logs "The POM places the JaCoCo execution data". Coverage then stays per subproject, and yangtools measured 54.4% that way against 75.9% under the Jenkins job this lane replaced, on the same reactor and the same tests. Those are properties rather than configuration elements, so the injected -D outranks them and one file serves the whole reactor. Nothing enumerates subprojects, so adding one needs no change here. Two defects had to be fixed before shared mode paid off, both carried by v0.5.2 as maven-build-action v0.4.2. The merged file now lives under .jacoco/ rather than the reactor root's own target/, which the root's clean deletes wherever the root sorts last. And jacoco:merge reads the same jacoco.destFile property prepare-agent does, so the injected -D aimed every merge in the reactor at the shared file and a module merging late overwrote it; the aggregate is now assembled after the build instead. v0.5.2 also names the reports for Sonar rather than letting it guess at their location. Measured on yangtools: 14.6% back up to 75.5%. Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com> Change-Id: Ie56ee1f46ff2af32fd6650f40c37a9ade2a46b24 Signed-off-by: Anil Belur Signed-off-by: Robert Varga --- .github/workflows/gerrit-sonar.yaml | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/.github/workflows/gerrit-sonar.yaml b/.github/workflows/gerrit-sonar.yaml index b8fa6b8..7e14a43 100644 --- a/.github/workflows/gerrit-sonar.yaml +++ b/.github/workflows/gerrit-sonar.yaml @@ -60,7 +60,7 @@ jobs: permissions: contents: read # yamllint disable-line rule:line-length - uses: lfreleng-actions/security-workflows/.github/workflows/sonarqube-cloud.yaml@921904035e4559b4bf9069d3e821ffb4db3cfe88 # v0.5.0 + uses: lfreleng-actions/security-workflows/.github/workflows/sonarqube-cloud.yaml@ce587eb52066f14d9468d833428fa1219545fa1d # v0.5.2 with: # Gerrit dispatches carry a refspec and check out the change; # the weekly schedule leaves it empty and takes the branch. @@ -70,6 +70,10 @@ jobs: ref: ${{ inputs.GERRIT_BRANCH || 'master' }} # Sonar reads bytecode and a coverage report, so build first. build_type: "maven" + # odlparent sets the jacoco.destFile and jacoco.dataFile + # properties, which reads as the project placing its own + # execution data, and coverage then stays per subproject. + jacoco_mode: "shared" java_version: "21" mvn_version: "3.9.9" # Pinned to the version the legacy lane used; upgrading the -- 2.34.1 From c2a1de8270cc56395e959c56baed815a7893d1cb Mon Sep 17 00:00:00 2001 From: Robert Varga Date: Sat, 22 Aug 2026 09:56:12 +0200 Subject: [PATCH 2/3] Bump upstreams Adopt: - odlparent-14.3.7 - infrautils-7.1.14 - yangtools-15.1.5 - ietf-2.0.6 - mdsal-16.0.6 - controller-13.0.4 - netconf-11.0.1 Change-Id: Ia101787bcdc2f5d732bd397fcc3e3716a517894d Signed-off-by: Robert Varga --- artifacts/pom.xml | 2 +- features/daexim-features/pom.xml | 2 +- features/odl-daexim-all/pom.xml | 4 ++-- features/odl-daexim/pom.xml | 2 +- features/pom.xml | 2 +- karaf/pom.xml | 2 +- model/pom.xml | 2 +- parent/pom.xml | 6 +++--- pom.xml | 2 +- spi/pom.xml | 2 +- test-model/pom.xml | 2 +- 11 files changed, 14 insertions(+), 14 deletions(-) diff --git a/artifacts/pom.xml b/artifacts/pom.xml index 3e9e33b..52dccbc 100644 --- a/artifacts/pom.xml +++ b/artifacts/pom.xml @@ -14,7 +14,7 @@ and is available at http://www.eclipse.org/legal/epl-v10.html org.opendaylight.odlparent odlparent-lite - 14.3.1 + 14.3.7 diff --git a/features/daexim-features/pom.xml b/features/daexim-features/pom.xml index d23070f..9e62a56 100644 --- a/features/daexim-features/pom.xml +++ b/features/daexim-features/pom.xml @@ -12,7 +12,7 @@ and is available at http://www.eclipse.org/legal/epl-v10.html org.opendaylight.odlparent feature-repo-parent - 14.3.1 + 14.3.7 diff --git a/features/odl-daexim-all/pom.xml b/features/odl-daexim-all/pom.xml index 1c4b045..d5f9342 100644 --- a/features/odl-daexim-all/pom.xml +++ b/features/odl-daexim-all/pom.xml @@ -13,7 +13,7 @@ and is available at http://www.eclipse.org/legal/epl-v10.html org.opendaylight.odlparent single-feature-parent - 14.3.1 + 14.3.7 org.opendaylight.daexim @@ -34,7 +34,7 @@ and is available at http://www.eclipse.org/legal/epl-v10.html org.opendaylight.netconf netconf-artifacts pom - 11.0.0 + 11.0.1 import diff --git a/features/odl-daexim/pom.xml b/features/odl-daexim/pom.xml index 7159bed..d70fd48 100644 --- a/features/odl-daexim/pom.xml +++ b/features/odl-daexim/pom.xml @@ -13,7 +13,7 @@ and is available at http://www.eclipse.org/legal/epl-v10.html org.opendaylight.odlparent single-feature-parent - 14.3.1 + 14.3.7 org.opendaylight.daexim diff --git a/features/pom.xml b/features/pom.xml index e1184a5..dc27130 100644 --- a/features/pom.xml +++ b/features/pom.xml @@ -11,7 +11,7 @@ org.opendaylight.odlparent odlparent-lite - 14.3.1 + 14.3.7 org.opendaylight.daexim diff --git a/karaf/pom.xml b/karaf/pom.xml index 0c00252..77f9336 100644 --- a/karaf/pom.xml +++ b/karaf/pom.xml @@ -13,7 +13,7 @@ and is available at http://www.eclipse.org/legal/epl-v10.html org.opendaylight.odlparent karaf4-parent - 14.3.1 + 14.3.7 org.opendaylight.daexim diff --git a/model/pom.xml b/model/pom.xml index dbb1301..ab14024 100644 --- a/model/pom.xml +++ b/model/pom.xml @@ -12,7 +12,7 @@ and is available at http://www.eclipse.org/legal/epl-v10.html org.opendaylight.mdsal binding-parent - 16.0.3 + 16.0.6 org.opendaylight.daexim diff --git a/parent/pom.xml b/parent/pom.xml index 82ba55b..1942bf0 100644 --- a/parent/pom.xml +++ b/parent/pom.xml @@ -11,7 +11,7 @@ and is available at http://www.eclipse.org/legal/epl-v10.html org.opendaylight.mdsal bundle-parent - 16.0.3 + 16.0.6 org.opendaylight.daexim @@ -25,13 +25,13 @@ and is available at http://www.eclipse.org/legal/epl-v10.html org.opendaylight.infrautils infrautils-artifacts pom - 7.1.12 + 7.1.14 import org.opendaylight.controller controller-artifacts - 13.0.2 + 13.0.4 pom import diff --git a/pom.xml b/pom.xml index 57eeb11..b3ec44c 100644 --- a/pom.xml +++ b/pom.xml @@ -12,7 +12,7 @@ and is available at http://www.eclipse.org/legal/epl-v10.html org.opendaylight.odlparent odlparent-lite - 14.3.1 + 14.3.7 diff --git a/spi/pom.xml b/spi/pom.xml index b948aa4..ecaac38 100644 --- a/spi/pom.xml +++ b/spi/pom.xml @@ -12,7 +12,7 @@ and is available at http://www.eclipse.org/legal/epl-v10.html org.opendaylight.odlparent bundle-parent - 14.3.1 + 14.3.7 org.opendaylight.daexim diff --git a/test-model/pom.xml b/test-model/pom.xml index c4f52f2..f17658e 100644 --- a/test-model/pom.xml +++ b/test-model/pom.xml @@ -12,7 +12,7 @@ and is available at http://www.eclipse.org/legal/epl-v10.html org.opendaylight.mdsal binding-parent - 16.0.3 + 16.0.6 org.opendaylight.daexim -- 2.34.1 From daf6ab952fee1af85a7eda18df3e69012820f238 Mon Sep 17 00:00:00 2001 From: jenkins-releng Date: Thu, 10 Sep 2026 08:04:34 +0000 Subject: [PATCH 3/3] Release Validate --- akka-infoprovider-impl/pom.xml | 2 +- artifacts/pom.xml | 2 +- features/daexim-features/pom.xml | 2 +- features/odl-daexim-all/pom.xml | 2 +- features/odl-daexim/pom.xml | 2 +- features/pom.xml | 2 +- impl/pom.xml | 2 +- karaf/pom.xml | 2 +- model/pom.xml | 2 +- parent/pom.xml | 2 +- pom.xml | 2 +- spi/pom.xml | 2 +- test-model/pom.xml | 2 +- 13 files changed, 13 insertions(+), 13 deletions(-) diff --git a/akka-infoprovider-impl/pom.xml b/akka-infoprovider-impl/pom.xml index ed26192..3ede56d 100644 --- a/akka-infoprovider-impl/pom.xml +++ b/akka-infoprovider-impl/pom.xml @@ -12,7 +12,7 @@ and is available at http://www.eclipse.org/legal/epl-v10.html org.opendaylight.daexim parent - 1.20.0-SNAPSHOT + 1.20.0 ../parent daexim-akka-infoprovider-impl diff --git a/artifacts/pom.xml b/artifacts/pom.xml index 52dccbc..f2d35b1 100644 --- a/artifacts/pom.xml +++ b/artifacts/pom.xml @@ -20,7 +20,7 @@ and is available at http://www.eclipse.org/legal/epl-v10.html org.opendaylight.daexim daexim-artifacts - 1.20.0-SNAPSHOT + 1.20.0 pom diff --git a/features/daexim-features/pom.xml b/features/daexim-features/pom.xml index 9e62a56..f6efe40 100644 --- a/features/daexim-features/pom.xml +++ b/features/daexim-features/pom.xml @@ -18,7 +18,7 @@ and is available at http://www.eclipse.org/legal/epl-v10.html org.opendaylight.daexim daexim-features - 1.20.0-SNAPSHOT + 1.20.0 feature ODL :: daexim :: ${project.artifactId} diff --git a/features/odl-daexim-all/pom.xml b/features/odl-daexim-all/pom.xml index d5f9342..aa6b1c6 100644 --- a/features/odl-daexim-all/pom.xml +++ b/features/odl-daexim-all/pom.xml @@ -18,7 +18,7 @@ and is available at http://www.eclipse.org/legal/epl-v10.html org.opendaylight.daexim odl-daexim-all - 1.20.0-SNAPSHOT + 1.20.0 feature OpenDaylight :: Daexim :: All diff --git a/features/odl-daexim/pom.xml b/features/odl-daexim/pom.xml index d70fd48..8a1758e 100644 --- a/features/odl-daexim/pom.xml +++ b/features/odl-daexim/pom.xml @@ -18,7 +18,7 @@ and is available at http://www.eclipse.org/legal/epl-v10.html org.opendaylight.daexim odl-daexim - 1.20.0-SNAPSHOT + 1.20.0 feature OpenDaylight :: daexim (Karaf feature) diff --git a/features/pom.xml b/features/pom.xml index dc27130..d250dce 100644 --- a/features/pom.xml +++ b/features/pom.xml @@ -16,7 +16,7 @@ org.opendaylight.daexim features-aggregator - 1.20.0-SNAPSHOT + 1.20.0 pom diff --git a/impl/pom.xml b/impl/pom.xml index f0c6815..3e0bac1 100644 --- a/impl/pom.xml +++ b/impl/pom.xml @@ -12,7 +12,7 @@ and is available at http://www.eclipse.org/legal/epl-v10.html org.opendaylight.daexim parent - 1.20.0-SNAPSHOT + 1.20.0 ../parent daexim-impl diff --git a/karaf/pom.xml b/karaf/pom.xml index 77f9336..52694e3 100644 --- a/karaf/pom.xml +++ b/karaf/pom.xml @@ -18,7 +18,7 @@ and is available at http://www.eclipse.org/legal/epl-v10.html org.opendaylight.daexim daexim-karaf - 1.20.0-SNAPSHOT + 1.20.0 pom ${project.artifactId} diff --git a/model/pom.xml b/model/pom.xml index ab14024..08a877b 100644 --- a/model/pom.xml +++ b/model/pom.xml @@ -18,7 +18,7 @@ and is available at http://www.eclipse.org/legal/epl-v10.html org.opendaylight.daexim daexim-model bundle - 1.20.0-SNAPSHOT + 1.20.0 diff --git a/parent/pom.xml b/parent/pom.xml index 1942bf0..e77a269 100644 --- a/parent/pom.xml +++ b/parent/pom.xml @@ -16,7 +16,7 @@ and is available at http://www.eclipse.org/legal/epl-v10.html org.opendaylight.daexim parent - 1.20.0-SNAPSHOT + 1.20.0 pom diff --git a/pom.xml b/pom.xml index b3ec44c..58250c1 100644 --- a/pom.xml +++ b/pom.xml @@ -19,7 +19,7 @@ and is available at http://www.eclipse.org/legal/epl-v10.html pom org.opendaylight.daexim daexim - 1.20.0-SNAPSHOT + 1.20.0 test-model model diff --git a/spi/pom.xml b/spi/pom.xml index ecaac38..9105a68 100644 --- a/spi/pom.xml +++ b/spi/pom.xml @@ -18,5 +18,5 @@ and is available at http://www.eclipse.org/legal/epl-v10.html org.opendaylight.daexim daexim-spi bundle - 1.20.0-SNAPSHOT + 1.20.0 diff --git a/test-model/pom.xml b/test-model/pom.xml index f17658e..ecf110c 100644 --- a/test-model/pom.xml +++ b/test-model/pom.xml @@ -18,5 +18,5 @@ and is available at http://www.eclipse.org/legal/epl-v10.html org.opendaylight.daexim daexim-test-model bundle - 1.20.0-SNAPSHOT + 1.20.0 -- 2.34.1