You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@archiva.apache.org by ma...@apache.org on 2017/06/13 20:49:28 UTC
archiva git commit: [MRM-1953] Upgrading and fixing jacoco
configuration
Repository: archiva
Updated Branches:
refs/heads/master ebd78d8b1 -> 6ff4d94f6
[MRM-1953] Upgrading and fixing jacoco configuration
Project: http://git-wip-us.apache.org/repos/asf/archiva/repo
Commit: http://git-wip-us.apache.org/repos/asf/archiva/commit/6ff4d94f
Tree: http://git-wip-us.apache.org/repos/asf/archiva/tree/6ff4d94f
Diff: http://git-wip-us.apache.org/repos/asf/archiva/diff/6ff4d94f
Branch: refs/heads/master
Commit: 6ff4d94f6c462d7ebf84b49f6ebb3a7d931285c9
Parents: ebd78d8
Author: Martin Stockhammer <ma...@apache.org>
Authored: Tue Jun 13 22:48:31 2017 +0200
Committer: Martin Stockhammer <ma...@apache.org>
Committed: Tue Jun 13 22:48:31 2017 +0200
----------------------------------------------------------------------
.../archiva-rest/archiva-rest-services/pom.xml | 2 +-
archiva-modules/archiva-web/archiva-web-common/pom.xml | 13 ++++++++++++-
archiva-modules/archiva-web/archiva-webdav/pom.xml | 2 +-
pom.xml | 11 +++++------
4 files changed, 19 insertions(+), 9 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/archiva/blob/6ff4d94f/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/pom.xml
----------------------------------------------------------------------
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 d6b1c98..2c471a5 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>
http://git-wip-us.apache.org/repos/asf/archiva/blob/6ff4d94f/archiva-modules/archiva-web/archiva-web-common/pom.xml
----------------------------------------------------------------------
diff --git a/archiva-modules/archiva-web/archiva-web-common/pom.xml b/archiva-modules/archiva-web/archiva-web-common/pom.xml
index c141971..90d245e 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>
http://git-wip-us.apache.org/repos/asf/archiva/blob/6ff4d94f/archiva-modules/archiva-web/archiva-webdav/pom.xml
----------------------------------------------------------------------
diff --git a/archiva-modules/archiva-web/archiva-webdav/pom.xml b/archiva-modules/archiva-web/archiva-webdav/pom.xml
index a277f11..5d59664 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>
http://git-wip-us.apache.org/repos/asf/archiva/blob/6ff4d94f/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 408846e..4e61888 100644
--- a/pom.xml
+++ b/pom.xml
@@ -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>