jackrabbit-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From resc...@apache.org
Subject svn commit: r1871132 - in /jackrabbit/branches/2.18: ./ jackrabbit-parent/pom.xml
Date Tue, 10 Dec 2019 12:17:02 GMT
Author: reschke
Date: Tue Dec 10 12:17:01 2019
New Revision: 1871132

URL: http://svn.apache.org/viewvc?rev=1871132&view=rev
Log:
-4499: Update jacoco dependency to 0.8.5 and align config with Oak (merged r1869790 and 1870830
into 2.18)

Modified:
    jackrabbit/branches/2.18/   (props changed)
    jackrabbit/branches/2.18/jackrabbit-parent/pom.xml

Propchange: jackrabbit/branches/2.18/
------------------------------------------------------------------------------
  Merged /jackrabbit/trunk:r1869790,1870830

Modified: jackrabbit/branches/2.18/jackrabbit-parent/pom.xml
URL: http://svn.apache.org/viewvc/jackrabbit/branches/2.18/jackrabbit-parent/pom.xml?rev=1871132&r1=1871131&r2=1871132&view=diff
==============================================================================
--- jackrabbit/branches/2.18/jackrabbit-parent/pom.xml (original)
+++ jackrabbit/branches/2.18/jackrabbit-parent/pom.xml Tue Dec 10 12:17:01 2019
@@ -55,7 +55,8 @@
     <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>
   </properties>
 
   <url>http://jackrabbit.apache.org/</url>
@@ -221,54 +222,58 @@
       <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>
+        <version>0.8.5</version>
+        <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>



Mime
View raw message