Author: jukka
Date: Tue Mar 25 03:27:22 2014
New Revision: 1581208
URL: http://svn.apache.org/r1581208
Log:
OAK-1594: Build fails on Java 8
Exclude the -XX:MaxPermSize setting on Java 8 to avoid the warning
Modified:
jackrabbit/oak/trunk/oak-parent/pom.xml
Modified: jackrabbit/oak/trunk/oak-parent/pom.xml
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-parent/pom.xml?rev=1581208&r1=1581207&r2=1581208&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-parent/pom.xml (original)
+++ jackrabbit/oak/trunk/oak-parent/pom.xml Tue Mar 25 03:27:22 2014
@@ -34,7 +34,8 @@
<packaging>pom</packaging>
<properties>
- <test.opts>-Xmx512m -XX:MaxPermSize=64m -XX:+HeapDumpOnOutOfMemoryError
-Dupdate.limit=100 -Djava.awt.headless=true</test.opts>
+ <test.opts.memory>-Xmx512m -XX:MaxPermSize=64m</test.opts.memory>
+ <test.opts>${test.opts.memory} -XX:+HeapDumpOnOutOfMemoryError
-Dupdate.limit=100 -Djava.awt.headless=true</test.opts>
<skip.deployment>false</skip.deployment>
<known.issues />
<project.reporting.outputEncoding>
@@ -452,5 +453,14 @@
</dependency>
</dependencies>
</profile>
+ <profile>
+ <id>java8</id>
+ <activation>
+ <jdk>[1.8,)</jdk>
+ </activation>
+ <properties>
+ <test.opts.memory>-Xmx512m</test.opts.memory>
+ </properties>
+ </profile>
</profiles>
</project>
