Merge pull request #132 from groovy/java-11

Switch from Cobertura to Jacoco
groovy · May 5, 2019 · db438cf · db438cf
2 parents a8571ab + b43922c
commit db438cf
Show file tree

Hide file tree

Showing 2 changed files with 30 additions and 19 deletions.
diff --git a/pom.xml b/pom.xml
@@ -11,7 +11,7 @@
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
     <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
     <mavenVersion>3.0.1</mavenVersion>
-    <coberturaPluginVersion>2.7</coberturaPluginVersion>
+    <jacocoPluginVersion>0.8.3</jacocoPluginVersion>
     <javadocPluginVersion>3.1.0</javadocPluginVersion>
     <!-- these are properties so integration tests can use them -->
     <javaVersion>1.6</javaVersion>
@@ -377,20 +377,16 @@
         <version>${surefirePluginVersion}</version>
       </plugin>
       <plugin>
-        <groupId>org.codehaus.mojo</groupId>
-        <artifactId>cobertura-maven-plugin</artifactId>
-        <version>${coberturaPluginVersion}</version>
-        <configuration>
-          <check />
-          <instrumentation>
-            <excludes>
-              <!-- excluded because is a generated class -->
-              <exclude>org/codehaus/gmavenplus/mojo/HelpMojo.class</exclude>
-              <!-- excluded because is copied from and maintained in JDK -->
-              <exclude>org/codehaus/gmavenplus/util/JDK5Utils.class</exclude>
-            </excludes>
-          </instrumentation>
-        </configuration>
+        <groupId>org.jacoco</groupId>
+        <artifactId>jacoco-maven-plugin</artifactId>
+        <version>${jacocoPluginVersion}</version>
+        <executions>
+          <execution>
+            <goals>
+              <goal>prepare-agent</goal>
+            </goals>
+          </execution>
+        </executions>
       </plugin>
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
@@ -429,6 +425,7 @@
         <artifactId>maven-javadoc-plugin</artifactId>
         <version>${javadocPluginVersion}</version>
         <configuration>
+          <source>6</source>
           <failOnError>false</failOnError>
         </configuration>
         <executions>
@@ -504,6 +501,7 @@
         <artifactId>maven-javadoc-plugin</artifactId>
         <version>${javadocPluginVersion}</version>
         <configuration>
+          <source>6</source>
           <failOnError>false</failOnError>
         </configuration>
       </plugin>
@@ -518,9 +516,22 @@
         <version>${surefirePluginVersion}</version>
       </plugin>
       <plugin>
-        <groupId>org.codehaus.mojo</groupId>
-        <artifactId>cobertura-maven-plugin</artifactId>
-        <version>${coberturaPluginVersion}</version>
+        <groupId>org.jacoco</groupId>
+        <artifactId>jacoco-maven-plugin</artifactId>
+        <version>${jacocoPluginVersion}</version>
+        <configuration>
+          <excludes>
+            <!-- excluded because is a generated class -->
+            <exclude>org/codehaus/gmavenplus/mojo/HelpMojo.class</exclude>
+          </excludes>
+        </configuration>
+        <reportSets>
+          <reportSet>
+            <reports>
+              <report>report</report>
+            </reports>
+          </reportSet>
+        </reportSets>
       </plugin>
       <plugin>
         <groupId>org.codehaus.mojo</groupId>

diff --git a/src/site/site.xml b/src/site/site.xml
@@ -14,7 +14,7 @@
   <skin>
     <groupId>org.apache.maven.skins</groupId>
     <artifactId>maven-fluido-skin</artifactId>
-    <version>1.6</version>
+    <version>1.7</version>
   </skin>
 
   <custom>