From b4a97f35fa19805f1607f723608a681ea0811bf9 Mon Sep 17 00:00:00 2001 From: Konrad Windszus <konrad_w@gmx.de> Date: Mon, 3 Jun 2024 21:13:38 +0200 Subject: [PATCH] Enable code coverage again for all modules Overhead should be neglectable for modules not having tests yet Rely on Sonarcloud default paths for discovering jacoco reports (works fine even for submodules) --- org.eclipse.sisu.inject/pom.xml | 11 ----------- org.eclipse.sisu.plexus/pom.xml | 13 ------------- pom.xml | 19 ++++++++++++------- 3 files changed, 12 insertions(+), 31 deletions(-) diff --git a/org.eclipse.sisu.inject/pom.xml b/org.eclipse.sisu.inject/pom.xml index 5f03a992..e6896627 100644 --- a/org.eclipse.sisu.inject/pom.xml +++ b/org.eclipse.sisu.inject/pom.xml @@ -474,16 +474,5 @@ </plugins> </build> </profile> - <profile> - <id>code-coverage</id> - <build> - <plugins> - <plugin> - <groupId>org.jacoco</groupId> - <artifactId>jacoco-maven-plugin</artifactId> - </plugin> - </plugins> - </build> - </profile> </profiles> </project> diff --git a/org.eclipse.sisu.plexus/pom.xml b/org.eclipse.sisu.plexus/pom.xml index f1d20569..a9e4ad90 100644 --- a/org.eclipse.sisu.plexus/pom.xml +++ b/org.eclipse.sisu.plexus/pom.xml @@ -441,17 +441,4 @@ </plugin> </plugins> </build> - <profiles> - <profile> - <id>code-coverage</id> - <build> - <plugins> - <plugin> - <groupId>org.jacoco</groupId> - <artifactId>jacoco-maven-plugin</artifactId> - </plugin> - </plugins> - </build> - </profile> - </profiles> </project> diff --git a/pom.xml b/pom.xml index 2cd259fd..51fd11e1 100644 --- a/pom.xml +++ b/pom.xml @@ -117,13 +117,6 @@ <sisu.licenseHeader>https://raw.githubusercontent.com/eclipse-sisu/sisu-project/main/license-header-epl2.txt</sisu.licenseHeader> <sisu.licenseYear>${project.inceptionYear}-2024</sisu.licenseYear> - <!-- Jacoco and Sonar --> - <jacoco.argLine /> - <sonar.coverage.jacoco.xmlReportPaths> - ${maven.multiModuleProjectDirectory}/org.eclipse.sisu.inject/target/site/jacoco/jacoco.xml, - ${maven.multiModuleProjectDirectory}/org.eclipse.sisu.plexus/target/site/jacoco/jacoco.xml - </sonar.coverage.jacoco.xmlReportPaths> - <!-- Versions --> <mavenRuntimeVersion>3.2.5</mavenRuntimeVersion> <mavenBuildVersion>3.6.3</mavenBuildVersion> @@ -681,5 +674,17 @@ Bundle-DocURL: http://www.eclipse.org/sisu/ </plugins> </build> </profile> + <!-- not all sub modules have tests yet, but those additional executions don't do any harm --> + <profile> + <id>code-coverage</id> + <build> + <plugins> + <plugin> + <groupId>org.jacoco</groupId> + <artifactId>jacoco-maven-plugin</artifactId> + </plugin> + </plugins> + </build> + </profile> </profiles> </project>