You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@jackrabbit.apache.org by re...@apache.org on 2019/11/14 10:45:59 UTC

svn commit: r1869790 - /jackrabbit/trunk/jackrabbit-parent/pom.xml

Author: reschke
Date: Thu Nov 14 10:45:58 2019
New Revision: 1869790

URL: http://svn.apache.org/viewvc?rev=1869790&view=rev
Log:
JCR-4499: Update jacoco dependency to 0.8.5 and align config with Oak

Modified:
    jackrabbit/trunk/jackrabbit-parent/pom.xml

Modified: jackrabbit/trunk/jackrabbit-parent/pom.xml
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-parent/pom.xml?rev=1869790&r1=1869789&r2=1869790&view=diff
==============================================================================
--- jackrabbit/trunk/jackrabbit-parent/pom.xml (original)
+++ jackrabbit/trunk/jackrabbit-parent/pom.xml Thu Nov 14 10:45:58 2019
@@ -56,7 +56,9 @@
     <java.version>1.8</java.version>
     <java.version.signature>java18</java.version.signature>
     <skip.coverage>true</skip.coverage>
-    <jacoco.version>0.8.4</jacoco.version>
+    <minimum.line.coverage>0.0</minimum.line.coverage>
+    <minimum.branch.coverage>0.0</minimum.branch.coverage>
+    <jacoco.version>0.8.5</jacoco.version>
   </properties>
 
   <url>http://jackrabbit.apache.org/</url>
@@ -223,54 +225,57 @@
       <plugin>
         <groupId>org.jacoco</groupId>
         <artifactId>jacoco-maven-plugin</artifactId>
-        <version>${jacoco.version}</version>
-          <executions>
-            <execution>
-              <id>default-prepare-agent</id>
-              <goals>
-                <goal>prepare-agent</goal>
-              </goals>
-              <configuration>
-                <skip>${skip.coverage}</skip>
-                <propertyName>test.opts.coverage</propertyName>
-              </configuration>
-            </execution>
-            <execution>
-              <id>default-prepare-agent-integration</id>
-              <goals>
-                <goal>prepare-agent-integration</goal>
-              </goals>
-              <configuration>
-                <skip>${skip.coverage}</skip>
-                <propertyName>test.opts.coverage</propertyName>
-              </configuration>
-            </execution>
-            <execution>
-              <id>default-report</id>
-              <goals>
-                <goal>report</goal>
-              </goals>
-              <configuration>
-                <skip>${skip.coverage}</skip>
-              </configuration>
-            </execution>
-            <execution>
-              <id>default-report-integration</id>
-              <goals>
-                <goal>report-integration</goal>
-              </goals>
-            </execution>
-            <execution>
-              <id>default-check</id>
-              <goals>
-                <goal>check</goal>
-              </goals>
-              <configuration>
-                <rules>
-                </rules>
-              </configuration>
-           </execution>
-         </executions>
+        <executions>
+          <execution>
+            <id>pre-unit-test</id>
+            <goals>
+              <goal>prepare-agent</goal>
+            </goals>
+            <configuration>
+              <skip>${skip.coverage}</skip>
+              <destFile>${project.build.directory}/coverage-reports/jacoco-ut.exec</destFile>
+              <propertyName>test.opts.coverage</propertyName>
+            </configuration>
+          </execution>
+          <execution>
+            <id>post-unit-test</id>
+            <phase>test</phase>
+            <goals>
+              <goal>report</goal>
+            </goals>
+            <configuration>
+              <skip>${skip.coverage}</skip>
+              <dataFile>${project.build.directory}/coverage-reports/jacoco-ut.exec</dataFile>
+              <outputDirectory>${project.reporting.outputDirectory}/jacoco-ut</outputDirectory>
+            </configuration>
+          </execution>
+          <execution>
+            <id>default-check</id>
+            <goals>
+              <goal>check</goal>
+            </goals>
+            <configuration>
+              <dataFile>${project.build.directory}/coverage-reports/jacoco-ut.exec</dataFile>
+              <rules>
+                <rule>
+                  <element>BUNDLE</element>
+                  <limits>
+                    <limit>
+                      <counter>LINE</counter>
+                      <value>COVEREDRATIO</value>
+                      <minimum>${minimum.line.coverage}</minimum>
+                    </limit>
+                    <limit>
+                      <counter>BRANCH</counter>
+                      <value>COVEREDRATIO</value>
+                      <minimum>${minimum.branch.coverage}</minimum>
+                    </limit>
+                  </limits>
+                </rule>
+              </rules>
+            </configuration>
+          </execution>
+        </executions>
       </plugin>
     </plugins>
     <pluginManagement>