Apache
/
archiva
mirror of https://github.com/apache/archiva.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

[MRM-1953] Upgrading and fixing jacoco configuration

This commit is contained in:
Martin Stockhammer 2017-06-13 22:48:31 +02:00
parent ebd78d8b17
commit 6ff4d94f6c
4 changed files with 19 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
archiva-modules/archiva-web/archiva-rest/archiva-rest-services/pom.xml
View File

@ -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>

13
archiva-modules/archiva-web/archiva-web-common/pom.xml
View File

@ -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>

2
archiva-modules/archiva-web/archiva-webdav/pom.xml
View File

@ -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>

11
pom.xml
View File

@ -75,7 +75,6 @@
<javax.jcr.version>2.0</javax.jcr.version>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<surefire.redirectTestOutputToFile>true</surefire.redirectTestOutputToFile>
<jacocoagent />
<lucene.version>3.6.2</lucene.version>
<jackrabbit.version>2.14.1</jackrabbit.version>
@ -106,6 +105,9 @@
<mockito.version>1.9.5</mockito.version>
<openjpa.Log>DefaultLevel=INFO,Runtime=ERROR,Tool=ERROR,SQL=ERROR,Schema=ERROR,MetaData=ERROR</openjpa.Log>
<jacocoproperty/>
<jacoco.plugin.version>0.7.9</jacoco.plugin.version>
</properties>
<dependencyManagement>
@ -1778,7 +1780,7 @@
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
<configuration>
<argLine>${jacocoagent}</argLine>
<argLine>@{jacocoproperty}</argLine>
<redirectTestOutputToFile>${surefire.redirectTestOutputToFile}</redirectTestOutputToFile>
<runOrder>alphabetical</runOrder>
<systemPropertyVariables>
@ -1876,7 +1878,7 @@
<plugin>
<groupId>org.jacoco</groupId>
<artifactId>jacoco-maven-plugin</artifactId>
<version>0.7.2.201409121644</version>
<version>${jacoco.plugin.version}</version>
<executions>
<execution>
<goals>
@ -1897,9 +1899,6 @@
</plugin>
</plugins>
</build>
<properties>
<jacocoagent>${jacocoproperty}</jacocoagent>
</properties>
</profile>
<profile>
<id>modernizer</id>