switching to non-aggregate jacoco reporting (#2928)

Author: robertpatrick

Jenkinsfile

@@ -342,8 +342,6 @@ pipeline {
                             cat "${WORKSPACE}/.mvn/maven.config"
                         '''
                         withSonarQubeEnv('SonarCloud') {
-                            // For whatever reason, defining this property in the maven.config file is not working...
-                            //
                             sh "mvn sonar:sonar"
                         }
                     }

buildtime-reports/pom.xml

@@ -1,4 +1,4 @@
-<!-- Copyright (c) 2017, 2021, Oracle and/or its affiliates.
+<!-- Copyright (c) 2017, 2022, Oracle and/or its affiliates.
      Licensed under the Universal Permissive License v 1.0 as shown at https://oss.oracle.com/licenses/upl. -->
 <project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
          xmlns="http://maven.apache.org/POM/4.0.0"
@@ -22,6 +22,10 @@
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-checkstyle-plugin</artifactId>
             </plugin>
+            <plugin>
+                <groupId>org.jacoco</groupId>
+                <artifactId>jacoco-maven-plugin</artifactId>
+            </plugin>
         </plugins>
     </build>
 
@@ -43,9 +47,4 @@
             <scope>test</scope>
         </dependency>
     </dependencies>
-
-    <properties>
-        <sonar.coverage.jacoco.xmlReportPaths>${basedir}/../${aggregate.report.dir}</sonar.coverage.jacoco.xmlReportPaths>
-    </properties>
-
 </project>

json-schema-generator/pom.xml

@@ -1,4 +1,4 @@
-<!-- Copyright (c) 2017, 2021, Oracle and/or its affiliates.
+<!-- Copyright (c) 2017, 2022, Oracle and/or its affiliates.
      Licensed under the Universal Permissive License v 1.0 as shown at https://oss.oracle.com/licenses/upl.
 -->
 <project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
@@ -134,9 +134,4 @@
             </build>
         </profile>
     </profiles>
-
-    <properties>
-        <sonar.coverage.jacoco.xmlReportPaths>${basedir}/../${aggregate.report.dir}</sonar.coverage.jacoco.xmlReportPaths>
-    </properties>
-
 </project>

kubernetes/pom.xml

@@ -76,6 +76,10 @@
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-checkstyle-plugin</artifactId>
             </plugin>
+            <plugin>
+                <groupId>org.jacoco</groupId>
+                <artifactId>jacoco-maven-plugin</artifactId>
+            </plugin>
         </plugins>
     </build>
 </project>

operator-build-maven-plugin/pom.xml

@@ -1,4 +1,4 @@
-<!-- Copyright (c) 2017, 2021, Oracle and/or its affiliates.
+<!-- Copyright (c) 2017, 2022, Oracle and/or its affiliates.
      Licensed under the Universal Permissive License v 1.0 as shown at https://oss.oracle.com/licenses/upl. -->
 <project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://maven.apache.org/POM/4.0.0"
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
@@ -271,7 +271,10 @@
           </execution>
         </executions>
       </plugin>
-
+      <plugin>
+        <groupId>org.jacoco</groupId>
+        <artifactId>jacoco-maven-plugin</artifactId>
+      </plugin>
     </plugins>
   </build>
 
@@ -405,9 +408,4 @@
       <scope>test</scope>
     </dependency>
   </dependencies>
-
-  <properties>
-    <sonar.coverage.jacoco.xmlReportPaths>${basedir}/../${aggregate.report.dir}</sonar.coverage.jacoco.xmlReportPaths>
-  </properties>
-
 </project>

operator/pom.xml

@@ -16,7 +16,6 @@
     <module>kubernetes</module>
     <module>operator-build-maven-plugin</module>
     <module>json-schema-generator</module>
-    <module>buildtime-reports</module>
   </modules>
 
   <scm>
@@ -309,9 +308,15 @@
               <goal>prepare-agent</goal>
             </goals>
           </execution>
+          <execution>
+            <id>report</id>
+            <phase>test</phase>
+            <goals>
+              <goal>report</goal>
+            </goals>
+          </execution>
         </executions>
       </plugin>
-
     </plugins>
   </build>
 
@@ -627,9 +632,7 @@
     <jacoco.version>0.8.7</jacoco.version>
     <git-commit-id-plugin-version>4.9.10</git-commit-id-plugin-version>
     <htmlunit-version>2.59.0</htmlunit-version>
-    <aggregate.report.dir>buildtime-reports/target/site/jacoco-aggregate/jacoco.xml</aggregate.report.dir>
     <checkstyle.config.location>${root.basedir}/build-tools/checkstyle/customized_google_checks.xml</checkstyle.config.location>
     <no-reports>false</no-reports>
   </properties>
-
 </project>

pom.xml

@@ -1,4 +1,4 @@
-<!-- Copyright (c) 2017, 2021, Oracle and/or its affiliates.
+<!-- Copyright (c) 2017, 2022, Oracle and/or its affiliates.
      Licensed under the Universal Permissive License v 1.0 as shown at https://oss.oracle.com/licenses/upl. -->
 <project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://maven.apache.org/POM/4.0.0"
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
@@ -52,11 +52,14 @@
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-checkstyle-plugin</artifactId>
             </plugin>
+            <plugin>
+                <groupId>org.jacoco</groupId>
+                <artifactId>jacoco-maven-plugin</artifactId>
+            </plugin>
         </plugins>
     </build>
 
     <profiles>
-
         <profile>
             <id>default</id>
             <activation>
@@ -75,9 +78,4 @@
             <artifactId>client-java</artifactId>
        </dependency>
     </dependencies>
-
-    <properties>
-        <sonar.coverage.jacoco.xmlReportPaths>${basedir}/../${aggregate.report.dir}</sonar.coverage.jacoco.xmlReportPaths>
-    </properties>
-
 </project>