Skip to content

Commit

Permalink
Fixed Sonar Coverage.
Browse files Browse the repository at this point in the history
  • Loading branch information
@radcortez
radcortez committed Dec 15, 2020
1 parent e575006 commit bb1ec2e
Show file tree
Hide file tree
Showing 14 changed files with 28 additions and 241 deletions.
24 changes: 0 additions & 24 deletions cdi/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -83,28 +83,4 @@
</dependency>
</dependencies>

<profiles>
<profile>
<id>coverage</id>
<properties>
<argLine>@{jacocoArgLine}</argLine>
</properties>
<build>
<plugins>
<plugin>
<groupId>org.jacoco</groupId>
<artifactId>jacoco-maven-plugin</artifactId>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
<configuration>
<argLine>@{jacocoArgLine} -Xmx512m</argLine>
</configuration>
</plugin>
</plugins>
</build>
</profile>
</profiles>

</project>
17 changes: 0 additions & 17 deletions common/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -33,21 +33,4 @@
</dependency>
</dependencies>

<profiles>
<profile>
<id>coverage</id>
<properties>
<argLine>@{jacocoArgLine}</argLine>
</properties>
<build>
<plugins>
<plugin>
<groupId>org.jacoco</groupId>
<artifactId>jacoco-maven-plugin</artifactId>
</plugin>
</plugins>
</build>
</profile>
</profiles>

</project>
20 changes: 0 additions & 20 deletions converters/json/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,10 +13,6 @@

<name>SmallRye: MicroProfile Config Converter - Json</name>

<properties>
<sonar.coverage.jacoco.xmlReportPaths>${project.basedir}/../../coverage/target/site/jacoco-aggregate/jacoco.xml</sonar.coverage.jacoco.xmlReportPaths>
</properties>

<dependencies>
<dependency>
<groupId>org.eclipse.microprofile.config</groupId>
Expand Down Expand Up @@ -50,20 +46,4 @@
</dependency>
</dependencies>

<profiles>
<profile>
<id>coverage</id>
<properties>
<argLine>@{jacocoArgLine}</argLine>
</properties>
<build>
<plugins>
<plugin>
<groupId>org.jacoco</groupId>
<artifactId>jacoco-maven-plugin</artifactId>
</plugin>
</plugins>
</build>
</profile>
</profiles>
</project>
23 changes: 16 additions & 7 deletions coverage/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,10 @@
<groupId>io.smallrye.config</groupId>
<artifactId>smallrye-config-common</artifactId>
</dependency>
<dependency>
<groupId>io.smallrye.config</groupId>
<artifactId>smallrye-config-core</artifactId>
</dependency>
<dependency>
<groupId>io.smallrye.config</groupId>
<artifactId>smallrye-config</artifactId>
Expand Down Expand Up @@ -63,6 +67,18 @@
<artifactId>smallrye-config-source-injection</artifactId>
<version>${project.version}</version>
</dependency>

<!-- TCKs -->
<dependency>
<groupId>io.smallrye.config</groupId>
<artifactId>smallrye-config-test-extra</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>io.smallrye.config</groupId>
<artifactId>smallrye-config-tck</artifactId>
<version>${project.version}</version>
</dependency>
</dependencies>

<build>
Expand All @@ -87,13 +103,6 @@
</fileSets>
</configuration>
</execution>
<execution>
<id>prepare-agent</id>
<phase>none</phase>
<goals>
<goal>prepare-agent</goal>
</goals>
</execution>
<execution>
<id>aggregate-report</id>
<phase>verify</phase>
Expand Down
26 changes: 0 additions & 26 deletions implementation/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -105,8 +105,6 @@
</environmentVariables>
<redirectTestOutputToFile>true</redirectTestOutputToFile>
<enableAssertions>true</enableAssertions>
<argLine>-Xmx512m</argLine>
<forkMode>once</forkMode>
<trimStackTrace>false</trimStackTrace>
</configuration>
</plugin>
Expand All @@ -127,28 +125,4 @@
</plugins>
</build>

<profiles>
<profile>
<id>coverage</id>
<properties>
<argLine>@{jacocoArgLine}</argLine>
</properties>
<build>
<plugins>
<plugin>
<groupId>org.jacoco</groupId>
<artifactId>jacoco-maven-plugin</artifactId>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
<configuration>
<argLine>@{jacocoArgLine} -Xmx512m</argLine>
</configuration>
</plugin>
</plugins>
</build>
</profile>
</profiles>

</project>
13 changes: 12 additions & 1 deletion pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,6 @@

<!-- Sonar settings -->
<sonar.projectName>SmallRye Config</sonar.projectName>
<sonar.coverage.jacoco.xmlReportPaths>${project.basedir}/../coverage/target/site/jacoco-aggregate/jacoco.xml</sonar.coverage.jacoco.xmlReportPaths>
</properties>

<licenses>
Expand Down Expand Up @@ -156,7 +155,19 @@
<id>coverage</id>
<properties>
<argLine>@{jacocoArgLine}</argLine>
<!--suppress UnresolvedMavenProperty -->
<sonar.coverage.jacoco.xmlReportPaths>
${maven.multiModuleProjectDirectory}/coverage/target/site/jacoco-aggregate/jacoco.xml
</sonar.coverage.jacoco.xmlReportPaths>
</properties>
<build>
<plugins>
<plugin>
<groupId>org.jacoco</groupId>
<artifactId>jacoco-maven-plugin</artifactId>
</plugin>
</plugins>
</build>
<modules>
<module>coverage</module>
</modules>
Expand Down
20 changes: 0 additions & 20 deletions sources/file-system/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,10 +11,6 @@
<artifactId>smallrye-config-source-file-system</artifactId>
<name>SmallRye: FileSystem ConfigSource</name>

<properties>
<sonar.coverage.jacoco.xmlReportPaths>${project.basedir}/../../coverage/target/site/jacoco-aggregate/jacoco.xml</sonar.coverage.jacoco.xmlReportPaths>
</properties>

<dependencies>
<dependency>
<groupId>io.smallrye.config</groupId>
Expand All @@ -35,20 +31,4 @@
</dependency>
</dependencies>

<profiles>
<profile>
<id>coverage</id>
<properties>
<argLine>@{jacocoArgLine}</argLine>
</properties>
<build>
<plugins>
<plugin>
<groupId>org.jacoco</groupId>
<artifactId>jacoco-maven-plugin</artifactId>
</plugin>
</plugins>
</build>
</profile>
</profiles>
</project>
17 changes: 0 additions & 17 deletions sources/hocon/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,6 @@
<name>SmallRye: HOCON ConfigSource</name>

<properties>
<sonar.coverage.jacoco.xmlReportPaths>${project.basedir}/../../coverage/target/site/jacoco-aggregate/jacoco.xml</sonar.coverage.jacoco.xmlReportPaths>
<lightbend-config.version>1.4.1</lightbend-config.version>
</properties>

Expand All @@ -33,20 +32,4 @@
</dependency>
</dependencies>

<profiles>
<profile>
<id>coverage</id>
<properties>
<argLine>@{jacocoArgLine}</argLine>
</properties>
<build>
<plugins>
<plugin>
<groupId>org.jacoco</groupId>
<artifactId>jacoco-maven-plugin</artifactId>
</plugin>
</plugins>
</build>
</profile>
</profiles>
</project>
17 changes: 0 additions & 17 deletions sources/yaml/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,6 @@
<name>SmallRye: MicroProfile Config Source - Yaml</name>

<properties>
<sonar.coverage.jacoco.xmlReportPaths>${project.basedir}/../../coverage/target/site/jacoco-aggregate/jacoco.xml</sonar.coverage.jacoco.xmlReportPaths>
<snakeyaml.version>1.27</snakeyaml.version>
</properties>

Expand Down Expand Up @@ -53,20 +52,4 @@
</dependency>
</dependencies>

<profiles>
<profile>
<id>coverage</id>
<properties>
<argLine>@{jacocoArgLine}</argLine>
</properties>
<build>
<plugins>
<plugin>
<groupId>org.jacoco</groupId>
<artifactId>jacoco-maven-plugin</artifactId>
</plugin>
</plugins>
</build>
</profile>
</profiles>
</project>
18 changes: 0 additions & 18 deletions sources/zookeeper/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,6 @@
<name>SmallRye: ZooKeeper ConfigSource</name>

<properties>
<sonar.coverage.jacoco.xmlReportPaths>${project.basedir}/../../coverage/target/site/jacoco-aggregate/jacoco.xml</sonar.coverage.jacoco.xmlReportPaths>
<version.curator>5.1.0</version.curator>
</properties>

Expand Down Expand Up @@ -85,21 +84,4 @@
</dependency>
</dependencies>

<profiles>
<profile>
<id>coverage</id>
<properties>
<argLine>@{jacocoArgLine}</argLine>
</properties>
<build>
<plugins>
<plugin>
<groupId>org.jacoco</groupId>
<artifactId>jacoco-maven-plugin</artifactId>
</plugin>
</plugins>
</build>
</profile>
</profiles>

</project>
17 changes: 0 additions & 17 deletions testsuite/extra/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -71,21 +71,4 @@
</dependency>
</dependencies>

<profiles>
<profile>
<id>coverage</id>
<properties>
<argLine>@{jacocoArgLine}</argLine>
</properties>
<build>
<plugins>
<plugin>
<groupId>org.jacoco</groupId>
<artifactId>jacoco-maven-plugin</artifactId>
</plugin>
</plugins>
</build>
</profile>
</profiles>

</project>
16 changes: 0 additions & 16 deletions testsuite/tck/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -89,20 +89,4 @@
</dependency>
</dependencies>

<profiles>
<profile>
<id>coverage</id>
<properties>
<argLine>@{jacocoArgLine}</argLine>
</properties>
<build>
<plugins>
<plugin>
<groupId>org.jacoco</groupId>
<artifactId>jacoco-maven-plugin</artifactId>
</plugin>
</plugins>
</build>
</profile>
</profiles>
</project>
20 changes: 0 additions & 20 deletions utils/cdi-provider/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,10 +13,6 @@

<name>SmallRye: MicroProfile Config Source Injection</name>

<properties>
<sonar.coverage.jacoco.xmlReportPaths>${project.basedir}/../../coverage/target/site/jacoco-aggregate/jacoco.xml</sonar.coverage.jacoco.xmlReportPaths>
</properties>

<dependencies>
<dependency>
<groupId>jakarta.enterprise</groupId>
Expand Down Expand Up @@ -48,20 +44,4 @@
</dependency>
</dependencies>

<profiles>
<profile>
<id>coverage</id>
<properties>
<argLine>@{jacocoArgLine}</argLine>
</properties>
<build>
<plugins>
<plugin>
<groupId>org.jacoco</groupId>
<artifactId>jacoco-maven-plugin</artifactId>
</plugin>
</plugins>
</build>
</profile>
</profiles>
</project>
Loading

0 comments on commit bb1ec2e

Please sign in to comment.