diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index a24c4396..629050b4 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -30,7 +30,7 @@ jobs: run: | if [ "${{ matrix.isMainBuildEnv }}" = "true" ]; then echo "SONAR_TOKEN=${{ secrets.SONAR_TOKEN }}" >> $GITHUB_ENV - echo "MVN_ADDITIONAL_OPTS=org.sonarsource.scanner.maven:sonar-maven-plugin:4.0.0.4121:sonar -Dsonar.host.url=https://sonarcloud.io -Dsonar.projectKey=${{ vars.SONAR_PROJECT_KEY }} -Dsonar.organization=${{ vars.SONAR_ORGANIZATION }}" >> $GITHUB_ENV + echo "MVN_ADDITIONAL_OPTS=org.sonarsource.scanner.maven:sonar-maven-plugin:4.0.0.4121:sonar -Dsonar.host.url=https://sonarcloud.io -Dsonar.projectKey=${{ vars.SONAR_PROJECT_KEY }} -Dsonar.organization=${{ vars.SONAR_ORGANIZATION }} -Pcode-coverage" >> $GITHUB_ENV echo "GIT_FETCH_DEPTH=0" >> $GITHUB_ENV # Shallow clones should be disabled for a better relevancy of analysis else echo "MVN_ADDITIONAL_OPTS=" >> $GITHUB_ENV diff --git a/org.eclipse.sisu.inject/pom.xml b/org.eclipse.sisu.inject/pom.xml index 95f74855..5f03a992 100644 --- a/org.eclipse.sisu.inject/pom.xml +++ b/org.eclipse.sisu.inject/pom.xml @@ -423,10 +423,6 @@ - - org.jacoco - jacoco-maven-plugin - @@ -478,5 +474,16 @@ + + code-coverage + + + + org.jacoco + jacoco-maven-plugin + + + + diff --git a/org.eclipse.sisu.plexus/pom.xml b/org.eclipse.sisu.plexus/pom.xml index 8ac97e91..f1d20569 100644 --- a/org.eclipse.sisu.plexus/pom.xml +++ b/org.eclipse.sisu.plexus/pom.xml @@ -439,11 +439,19 @@ - - org.jacoco - jacoco-maven-plugin - - + + + code-coverage + + + + org.jacoco + jacoco-maven-plugin + + + + + diff --git a/pom.xml b/pom.xml index e02548c9..2cd259fd 100644 --- a/pom.xml +++ b/pom.xml @@ -117,6 +117,13 @@ https://raw.githubusercontent.com/eclipse-sisu/sisu-project/main/license-header-epl2.txt ${project.inceptionYear}-2024 + + + + ${maven.multiModuleProjectDirectory}/org.eclipse.sisu.inject/target/site/jacoco/jacoco.xml, + ${maven.multiModuleProjectDirectory}/org.eclipse.sisu.plexus/target/site/jacoco/jacoco.xml + + 3.2.5 3.6.3 @@ -674,16 +681,5 @@ Bundle-DocURL: http://www.eclipse.org/sisu/ - - code-coverage - - - - org.jacoco - jacoco-maven-plugin - - - -