Fixed Sonar Coverage.

smallrye · Dec 15, 2020 · 52a0c42 · 52a0c42
1 parent e575006
commit 52a0c42
Show file tree

Hide file tree

Showing 13 changed files with 36 additions and 56 deletions.
diff --git a/cdi/pom.xml b/cdi/pom.xml
@@ -95,13 +95,6 @@
             <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>

diff --git a/converters/json/pom.xml b/converters/json/pom.xml
@@ -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>

diff --git a/coverage/pom.xml b/coverage/pom.xml
@@ -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>
@@ -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>
@@ -71,29 +87,6 @@
         <groupId>org.jacoco</groupId>
         <artifactId>jacoco-maven-plugin</artifactId>
         <executions>
-          <execution>
-            <id>merge</id>
-            <goals>
-              <goal>merge</goal>
-            </goals>
-            <configuration>
-              <fileSets>
-                <fileSet implementation="org.apache.maven.shared.model.fileset.FileSet">
-                  <directory>.</directory>
-                  <includes>
-                    <include>**/*.exec</include>
-                  </includes>
-                </fileSet>
-              </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>

diff --git a/implementation/pom.xml b/implementation/pom.xml
@@ -139,13 +139,6 @@
             <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>

diff --git a/pom.xml b/pom.xml
@@ -156,6 +156,10 @@
       <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>
       <modules>
         <module>coverage</module>

diff --git a/sources/file-system/pom.xml b/sources/file-system/pom.xml
@@ -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>

diff --git a/sources/hocon/pom.xml b/sources/hocon/pom.xml
@@ -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>
 

diff --git a/sources/yaml/pom.xml b/sources/yaml/pom.xml
@@ -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>
 

diff --git a/sources/zookeeper/pom.xml b/sources/zookeeper/pom.xml
@@ -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>
 

diff --git a/testsuite/extra/pom.xml b/testsuite/extra/pom.xml
@@ -79,6 +79,14 @@
       </properties>
       <build>
         <plugins>
+          <plugin>
+            <groupId>org.apache.maven.plugins</groupId>
+            <artifactId>maven-surefire-plugin</artifactId>
+            <configuration>
+              <!--suppress UnresolvedMavenProperty -->
+              <argLine>${jacocoArgLine}</argLine>
+            </configuration>
+          </plugin>
           <plugin>
             <groupId>org.jacoco</groupId>
             <artifactId>jacoco-maven-plugin</artifactId>

diff --git a/testsuite/tck/pom.xml b/testsuite/tck/pom.xml
@@ -97,6 +97,14 @@
       </properties>
       <build>
         <plugins>
+          <plugin>
+            <groupId>org.apache.maven.plugins</groupId>
+            <artifactId>maven-surefire-plugin</artifactId>
+            <configuration>
+              <!--suppress UnresolvedMavenProperty -->
+              <argLine>${jacocoArgLine}</argLine>
+            </configuration>
+          </plugin>
           <plugin>
             <groupId>org.jacoco</groupId>
             <artifactId>jacoco-maven-plugin</artifactId>

diff --git a/utils/cdi-provider/pom.xml b/utils/cdi-provider/pom.xml
@@ -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>

diff --git a/utils/events/pom.xml b/utils/events/pom.xml
@@ -13,10 +13,6 @@
 
     <name>SmallRye: MicroProfile Config Events</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>