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 2020/03/06 10:55:10 UTC
svn commit: r1874887 - in /jackrabbit/branches/2.16: ./
jackrabbit-parent/pom.xml
Author: reschke
Date: Fri Mar 6 10:55:10 2020
New Revision: 1874887
URL: http://svn.apache.org/viewvc?rev=1874887&view=rev
Log:
JCR-4499: Update jacoco dependency to 0.8.5 and align config with Oak (merged r1869790 and r1870830 into 2.16)
Modified:
jackrabbit/branches/2.16/ (props changed)
jackrabbit/branches/2.16/jackrabbit-parent/pom.xml
Propchange: jackrabbit/branches/2.16/
------------------------------------------------------------------------------
Merged /jackrabbit/trunk:r1869790,1870830
Modified: jackrabbit/branches/2.16/jackrabbit-parent/pom.xml
URL: http://svn.apache.org/viewvc/jackrabbit/branches/2.16/jackrabbit-parent/pom.xml?rev=1874887&r1=1874886&r2=1874887&view=diff
==============================================================================
--- jackrabbit/branches/2.16/jackrabbit-parent/pom.xml (original)
+++ jackrabbit/branches/2.16/jackrabbit-parent/pom.xml Fri Mar 6 10:55:10 2020
@@ -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>