Mercurial > hg > release > thermostat-0.5
changeset 598:34c478d54c36
Fix build.
The jacoco maven plug-in uses argLine as the default property to use and it was
overwritten by the maven surefire plugin's argLine config. This patch adds
config for jacoco so that it uses coverageAgent as the property name over
argLine which should fix the build.
Reviewed-by: neugens
Review-thread: http://icedtea.classpath.org/pipermail/thermostat/2012-September/003118.html
author | Severin Gehwolf <sgehwolf@redhat.com> |
---|---|
date | Mon, 10 Sep 2012 19:15:38 +0200 |
parents | c096b240356c |
children | 7cdd2c84ef35 |
files | pom.xml |
diffstat | 1 files changed, 16 insertions(+), 2 deletions(-) [+] |
line wrap: on
line diff
--- a/pom.xml Mon Sep 10 15:33:09 2012 +0200 +++ b/pom.xml Mon Sep 10 19:15:38 2012 +0200 @@ -137,7 +137,7 @@ <artifactId>maven-surefire-plugin</artifactId> <version>2.12</version> <configuration> - <argLine>-XX:-UseSplitVerifier -XX:MaxPermSize=300m</argLine> + <argLine>-XX:-UseSplitVerifier -XX:MaxPermSize=300m ${coverageAgent}</argLine> <systemPropertyVariables> <java.awt.headless>false</java.awt.headless> <awt.toolkit>net.java.openjdk.cacio.ctc.CTCToolkit</awt.toolkit> @@ -156,7 +156,7 @@ <plugin> <groupId>org.jacoco</groupId> <artifactId>jacoco-maven-plugin</artifactId> - <version>0.5.6.201201232323</version> + <version>0.5.10.201208310627</version> </plugin> <plugin> <groupId>org.apache.felix</groupId> @@ -167,6 +167,20 @@ </pluginManagement> <plugins> <plugin> + <groupId>org.jacoco</groupId> + <artifactId>jacoco-maven-plugin</artifactId> + <executions> + <execution> + <goals> + <goal>prepare-agent</goal> + </goals> + <configuration> + <propertyName>coverageAgent</propertyName> + </configuration> + </execution> + </executions> + </plugin> + <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-assembly-plugin</artifactId> <version>2.3</version>