You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@uima.apache.org by re...@apache.org on 2016/07/17 18:52:27 UTC
svn commit: r1753101 - in /uima/uimaj/trunk: uimaj-core/pom.xml
uimaj-parent/pom.xml
Author: rec
Date: Sun Jul 17 18:52:27 2016
New Revision: 1753101
URL: http://svn.apache.org/viewvc?rev=1753101&view=rev
Log:
[UIMA-4580] Findbugs (and others) fail on Java 8 CI build
- Needed to update surefire to support @-properties
Modified:
uima/uimaj/trunk/uimaj-core/pom.xml
uima/uimaj/trunk/uimaj-parent/pom.xml
Modified: uima/uimaj/trunk/uimaj-core/pom.xml
URL: http://svn.apache.org/viewvc/uima/uimaj/trunk/uimaj-core/pom.xml?rev=1753101&r1=1753100&r2=1753101&view=diff
==============================================================================
--- uima/uimaj/trunk/uimaj-core/pom.xml (original)
+++ uima/uimaj/trunk/uimaj-core/pom.xml Sun Jul 17 18:52:27 2016
@@ -56,6 +56,7 @@
<properties>
<uimaScmProject>${project.artifactId}</uimaScmProject>
<postNoticeText>${ibmNoticeText}</postNoticeText>
+ <maven.surefire.heap>650M</maven.surefire.heap>
</properties>
<dependencies>
@@ -191,16 +192,6 @@
</execution>
</executions>
</plugin>
-
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-surefire-plugin</artifactId>
- <configuration>
- <!-- testing on 64 bit Linux requires larger heap -->
- <argLine>-Xmx650M</argLine>
- </configuration>
- </plugin>
- </plugins>
- </build>
-
+ </plugins>
+ </build>
</project>
\ No newline at end of file
Modified: uima/uimaj/trunk/uimaj-parent/pom.xml
URL: http://svn.apache.org/viewvc/uima/uimaj/trunk/uimaj-parent/pom.xml?rev=1753101&r1=1753100&r2=1753101&view=diff
==============================================================================
--- uima/uimaj/trunk/uimaj-parent/pom.xml (original)
+++ uima/uimaj/trunk/uimaj-parent/pom.xml Sun Jul 17 18:52:27 2016
@@ -149,12 +149,15 @@
<!--
Configuring settings is best done through default properties that multiple plugins.
- Local configuratins within plugins should be avoided. Where plugins do not pick up default
+ Local configurations within plugins should be avoided. Where plugins do not pick up default
properties already, they should be injected manually into the plugins.
-->
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<maven.compiler.target>1.7</maven.compiler.target>
<maven.compiler.source>1.7</maven.compiler.source>
+ <maven.surefire.heap>512m</maven.surefire.heap>
+ <maven.surefire.argLine />
+ <jacoco.argLine />
</properties>
<build>
@@ -187,6 +190,15 @@
</execution>
</executions>
</plugin>
+
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-surefire-plugin</artifactId>
+ <version>2.19.1</version>
+ <configuration>
+ <argLine>@{jacoco.argLine} -Xmx${maven.surefire.heap} -Xms${maven.surefire.heap} ${maven.surefire.argLine}</argLine>
+ </configuration>
+ </plugin>
<!-- Code quality checking plugins mostly used for CI builds -->
<plugin>
@@ -307,10 +319,6 @@
</profile>
<profile>
<id>jacoco</id>
- <properties>
- <maven.surefire.argLine />
- <jacoco.argLine />
- </properties>
<build>
<plugins>
<plugin>
@@ -344,13 +352,6 @@
</execution>
</executions>
</plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-surefire-plugin</artifactId>
- <configuration>
- <argLine>@{jacoco.argLine} ${maven.surefire.argLine}</argLine>
- </configuration>
- </plugin>
</plugins>
</build>
</profile>