This is an automated email from the ASF dual-hosted git repository.
pcongiusti pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/camel.git
The following commit(s) were added to refs/heads/main by this push:
new f7b913f720d3 fix(ci): include the proper coverage variable required by
Sonarqube
f7b913f720d3 is described below
commit f7b913f720d370a2bc41ff8f932e1c29653b623c
Author: Pasquale Congiusti <[email protected]>
AuthorDate: Wed Feb 4 12:12:19 2026 +0100
fix(ci): include the proper coverage variable required by Sonarqube
Ref CAMEL-22913
---
Jenkinsfile | 2 +-
bom/camel-bom/pom.xml | 5 +++++
coverage/pom.xml | 18 ++++++++++++------
parent/pom.xml | 12 +++++-------
pom.xml | 9 +++++++--
5 files changed, 30 insertions(+), 16 deletions(-)
diff --git a/Jenkinsfile b/Jenkinsfile
index d261db586720..1f735db94b1f 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -171,7 +171,7 @@ pipeline {
if ("${PLATFORM}" == "ubuntu-avx" &&
"${JDK_NAME}" == "jdk_17_latest") {
withCredentials([string(credentialsId:
'apache-camel-core', variable: 'SONAR_TOKEN')]) {
echo "Code quality review ENABLED for
${PLATFORM} with ${JDK_NAME}"
- sh "./mvnw $MAVEN_PARAMS
-Dsonar.host.url=https://sonarcloud.io
-Dsonar.java.experimental.batchModeSizeInKB=2048 -Dsonar.organization=apache
-Dsonar.projectKey=apache_camel -Dsonar.branch.name=$BRANCH_NAME
org.sonarsource.scanner.maven:sonar-maven-plugin:sonar
-Dsonar.coverage.jacoco.xmlReportPaths=coverage/target/site/jacoco-aggregate/jacoco.xml"
+ sh "./mvnw $MAVEN_PARAMS
-Dsonar.host.url=https://sonarcloud.io
-Dsonar.java.experimental.batchModeSizeInKB=2048 -Dsonar.organization=apache
-Dsonar.projectKey=apache_camel -Dsonar.branch.name=$BRANCH_NAME
org.sonarsource.scanner.maven:sonar-maven-plugin:sonar"
}
} else {
echo "Code quality review DISABLED for
${PLATFORM} with ${JDK_NAME}"
diff --git a/bom/camel-bom/pom.xml b/bom/camel-bom/pom.xml
index 5563999d2f9f..8f22a0a28b31 100644
--- a/bom/camel-bom/pom.xml
+++ b/bom/camel-bom/pom.xml
@@ -2277,6 +2277,11 @@
<artifactId>camel-tensorflow-serving</artifactId>
<version>4.18.0-SNAPSHOT</version>
</dependency>
+ <dependency>
+ <groupId>org.apache.camel</groupId>
+ <artifactId>camel-test</artifactId>
+ <version>4.18.0-SNAPSHOT</version>
+ </dependency>
<dependency>
<groupId>org.apache.camel</groupId>
<artifactId>camel-test-junit5</artifactId>
diff --git a/coverage/pom.xml b/coverage/pom.xml
index e20787e3a377..2d1061567cd9 100644
--- a/coverage/pom.xml
+++ b/coverage/pom.xml
@@ -23,8 +23,9 @@
<parent>
<groupId>org.apache.camel</groupId>
- <artifactId>camel</artifactId>
+ <artifactId>camel-parent</artifactId>
<version>4.18.0-SNAPSHOT</version>
+ <relativePath>../parent/pom.xml</relativePath>
</parent>
<groupId>org.apache.camel</groupId>
@@ -2224,6 +2225,11 @@
<artifactId>camel-tensorflow-serving</artifactId>
<version>${project.version}</version>
</dependency>
+ <dependency>
+ <groupId>org.apache.camel</groupId>
+ <artifactId>camel-test</artifactId>
+ <version>4.18.0-SNAPSHOT</version>
+ </dependency>
<dependency>
<groupId>org.apache.camel</groupId>
<artifactId>camel-test-junit5</artifactId>
@@ -2657,11 +2663,11 @@
<version>${jacoco-version}</version>
<executions>
<execution>
- <id>report-aggregate</id>
- <phase>verify</phase>
- <goals>
- <goal>report-aggregate</goal>
- </goals>
+ <id>report-aggregate</id>
+ <phase>verify</phase>
+ <goals>
+ <goal>report-aggregate</goal>
+ </goals>
</execution>
</executions>
</plugin>
diff --git a/parent/pom.xml b/parent/pom.xml
index 916c282e7c35..b558f8e41f8b 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -2734,6 +2734,11 @@
<artifactId>camel-tensorflow-serving</artifactId>
<version>${project.version}</version>
</dependency>
+ <dependency>
+ <groupId>org.apache.camel</groupId>
+ <artifactId>camel-test</artifactId>
+ <version>4.18.0-SNAPSHOT</version>
+ </dependency>
<dependency>
<groupId>org.apache.camel</groupId>
<artifactId>camel-test-junit5</artifactId>
@@ -4382,13 +4387,6 @@
<propertyName>jacocoAgent</propertyName>
</configuration>
</execution>
- <execution>
- <id>report</id>
- <phase>verify</phase>
- <goals>
- <goal>report</goal>
- </goals>
- </execution>
</executions>
</plugin>
<plugin>
diff --git a/pom.xml b/pom.xml
index 2c3736ca333c..82ebe94a0087 100644
--- a/pom.xml
+++ b/pom.xml
@@ -105,7 +105,6 @@
</distributionManagement>
<properties>
-
<!-- unify the encoding for all the modules -->
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
@@ -118,9 +117,15 @@
<maven.compiler.release>${jdk.version}</maven.compiler.release>
<minimalJavaBuildVersion>${jdk.version}</minimalJavaBuildVersion>
- <!-- reproduceable builds:
https://maven.apache.org/guides/mini/guide-reproducible-builds.html -->
+ <!-- reproducible builds:
https://maven.apache.org/guides/mini/guide-reproducible-builds.html -->
<project.build.outputTimestamp>2026-01-12T11:12:19Z</project.build.outputTimestamp>
+ <!-- NOTE: this is required to correctly map each module coverage in
Sonarqube. The ${maven.multiModuleProjectDirectory} may require some change
+ when upgrading to Maven 4.x, according to any of the new variables
that will replace this one. -->
+ <sonar.coverage.jacoco.xmlReportPaths>
+
${maven.multiModuleProjectDirectory}/coverage/target/site/jacoco-aggregate/jacoco.xml
+ </sonar.coverage.jacoco.xmlReportPaths>
+
<cyclonedx-maven-plugin-version>2.9.1</cyclonedx-maven-plugin-version>
<flatten-maven-plugin-version>1.7.3</flatten-maven-plugin-version>
<jacoco-version>0.8.14</jacoco-version>
