Repository: maven-surefire Updated Branches: refs/heads/master a673df54a -> c43ff3e73
[SUREFIRE] Update to JaCoCo latest version 0.7.5 Project: http://git-wip-us.apache.org/repos/asf/maven-surefire/repo Commit: http://git-wip-us.apache.org/repos/asf/maven-surefire/commit/c43ff3e7 Tree: http://git-wip-us.apache.org/repos/asf/maven-surefire/tree/c43ff3e7 Diff: http://git-wip-us.apache.org/repos/asf/maven-surefire/diff/c43ff3e7 Branch: refs/heads/master Commit: c43ff3e7348250a7ce186238b09f1b060ced50b3 Parents: a673df5 Author: Tibor17 <tibo...@lycos.com> Authored: Fri Jan 15 04:19:57 2016 +0100 Committer: Tibor17 <tibo...@lycos.com> Committed: Fri Jan 15 04:19:57 2016 +0100 ---------------------------------------------------------------------- pom.xml | 33 +++++++++++++++++++++++++--- surefire-integration-tests/pom.xml | 38 ++++++++++++++++++++++++++++----- 2 files changed, 63 insertions(+), 8 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/c43ff3e7/pom.xml ---------------------------------------------------------------------- diff --git a/pom.xml b/pom.xml index 9aef666..0d6fda1 100644 --- a/pom.xml +++ b/pom.xml @@ -295,7 +295,7 @@ <configuration> <!-- NOTE: Be sure to isolate the Surefire version under test from the version running the tests! --> <useSystemClassLoader>false</useSystemClassLoader> - <argLine>${surefireArgLine}</argLine> + <argLine>${jacoco.agent}</argLine> </configuration> </plugin> <plugin> @@ -319,9 +319,14 @@ <plugin> <groupId>org.jacoco</groupId> <artifactId>jacoco-maven-plugin</artifactId> - <version>0.7.4.201502262128</version> + <version>0.7.5.201505241946</version> <configuration> - <propertyName>surefireArgLine</propertyName> + <includes> + <include>**/failsafe/*</include> + <include>**/failsafe/**/*</include> + <include>**/surefire/*</include> + <include>**/surefire/**/*</include> + </includes> </configuration> </plugin> </plugins> @@ -516,5 +521,27 @@ </plugins> </build> </profile> + <profile> + <id>jenkins</id> + <build> + <plugins> + <plugin> + <groupId>org.jacoco</groupId> + <artifactId>jacoco-maven-plugin</artifactId> + <executions> + <execution> + <id>jacoco-agent</id> + <goals> + <goal>prepare-agent</goal> + </goals> + <configuration> + <propertyName>jacoco.agent</propertyName> + </configuration> + </execution> + </executions> + </plugin> + </plugins> + </build> + </profile> </profiles> </project> http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/c43ff3e7/surefire-integration-tests/pom.xml ---------------------------------------------------------------------- diff --git a/surefire-integration-tests/pom.xml b/surefire-integration-tests/pom.xml index 64bf878..61e7434 100644 --- a/surefire-integration-tests/pom.xml +++ b/surefire-integration-tests/pom.xml @@ -94,7 +94,7 @@ <threadCount>1</threadCount> <perCoreThreadCount>false</perCoreThreadCount> <forkMode>never</forkMode> - <argLine>-Xmx512m -XX:MaxPermSize=356m</argLine> + <argLine>${argLine}</argLine> <includes> <include>org/apache/**/*IT*.java</include> </includes> @@ -184,13 +184,12 @@ <configuration> <parallel>classes</parallel> <threadCount>${surefire.threadcount}</threadCount> - <argLine>-Xmx2512m -XX:MaxPermSize=256m</argLine> + <argLine>${argLine} -Xmx512m -XX:MaxPermSize=356m</argLine> </configuration> </plugin> </plugins> </build> </profile> - <profile> <id>embedded</id> <activation> @@ -203,7 +202,6 @@ <verifier.forkMode>auto</verifier.forkMode> </properties> </profile> - <profile> <id>maven-2.2.1</id> <properties> @@ -248,6 +246,36 @@ </plugins> </build> </profile> - + <profile> + <id>jenkins</id> + <build> + <plugins> + <plugin> + <groupId>org.jacoco</groupId> + <artifactId>jacoco-maven-plugin</artifactId> + <executions> + <execution> + <id>jacoco-agent</id> + <goals> + <goal>prepare-agent</goal> + </goals> + <configuration> + <skip>true</skip> + </configuration> + </execution> + <execution> + <id>jacoco-agent-it</id> + <goals> + <goal>prepare-agent-integration</goal> + </goals> + <configuration> + <propertyName>argLine</propertyName> + </configuration> + </execution> + </executions> + </plugin> + </plugins> + </build> + </profile> </profiles> </project>
