aboutsummaryrefslogtreecommitdiffstats
path: root/archiva-modules/archiva-web
diff options
context:
space:
mode:
authorMartin Stockhammer <martin_s@apache.org>2017-06-13 22:48:31 +0200
committerMartin Stockhammer <martin_s@apache.org>2017-06-13 22:48:31 +0200
commit6ff4d94f6c462d7ebf84b49f6ebb3a7d931285c9 (patch)
treef29b7316d919db92ce4d7cc7bf62c75435a90c26 /archiva-modules/archiva-web
parentebd78d8b173569eecb4f995ce954fed36c233a8a (diff)
downloadarchiva-6ff4d94f6c462d7ebf84b49f6ebb3a7d931285c9.tar.gz
archiva-6ff4d94f6c462d7ebf84b49f6ebb3a7d931285c9.zip
[MRM-1953] Upgrading and fixing jacoco configuration
Diffstat (limited to 'archiva-modules/archiva-web')
-rw-r--r--archiva-modules/archiva-web/archiva-rest/archiva-rest-services/pom.xml2
-rw-r--r--archiva-modules/archiva-web/archiva-web-common/pom.xml13
-rw-r--r--archiva-modules/archiva-web/archiva-webdav/pom.xml2
3 files changed, 14 insertions, 3 deletions
diff --git a/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/pom.xml b/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/pom.xml
index d6b1c98c1..2c471a551 100644
--- a/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/pom.xml
+++ b/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/pom.xml
@@ -455,7 +455,7 @@
<include>**/*Tests.java</include>
<include>**/*Test.java</include>
</includes>
- <argLine>-Xmx512m -Xms512m -server -XX:MaxPermSize=256m ${jacocoagent}</argLine>
+ <argLine>-Xmx512m -Xms512m -server -XX:MaxPermSize=256m @{jacocoproperty}</argLine>
<systemPropertyVariables>
<appserver.base>${project.build.directory}/appserver-base</appserver.base>
<plexus.home>${project.build.directory}/appserver-base</plexus.home>
diff --git a/archiva-modules/archiva-web/archiva-web-common/pom.xml b/archiva-modules/archiva-web/archiva-web-common/pom.xml
index c14197124..90d245e5a 100644
--- a/archiva-modules/archiva-web/archiva-web-common/pom.xml
+++ b/archiva-modules/archiva-web/archiva-web-common/pom.xml
@@ -509,7 +509,7 @@
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
<configuration>
- <argLine>-Xmx1024m -Xms512m -XX:MaxPermSize=256m ${jacocoagent}</argLine>
+ <argLine>-Xmx1024m -Xms512m -XX:MaxPermSize=256m @{jacocoproperty}</argLine>
<systemPropertyVariables>
<appserver.base>${project.build.directory}/appserver-base</appserver.base>
<plexus.home>${project.build.directory}/appserver-base</plexus.home>
@@ -527,6 +527,17 @@
</systemPropertyVariables>
</configuration>
</plugin>
+ <!-- Conflicts with the client libraries. Found no other exclude entry that worked -->
+ <plugin>
+ <groupId>org.jacoco</groupId>
+ <artifactId>jacoco-maven-plugin</artifactId>
+ <configuration>
+ <excludes>
+ <exclude>**/*org/apache/archiva/web/model/*</exclude>
+ <exclude>**/archiva-web-common-json-client.jar*</exclude>
+ </excludes>
+ </configuration>
+ </plugin>
</plugins>
</build>
diff --git a/archiva-modules/archiva-web/archiva-webdav/pom.xml b/archiva-modules/archiva-web/archiva-webdav/pom.xml
index a277f1163..5d5966448 100644
--- a/archiva-modules/archiva-web/archiva-webdav/pom.xml
+++ b/archiva-modules/archiva-web/archiva-webdav/pom.xml
@@ -320,7 +320,7 @@
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
<configuration>
- <argLine>${webdav.argLine} ${jacocoagent}</argLine>
+ <argLine>${webdav.argLine} @{jacocoproperty}</argLine>
<systemPropertyVariables>
<appserver.base>${project.build.directory}/appserver-base</appserver.base>
<plexus.home>${project.build.directory}/appserver-base</plexus.home>