Repository: cxf
Updated Branches:
refs/heads/2.7.x-fixes 8e1ef5227 -> 09815dc32
Increase permgen to get tests to run on Java6 on Mac
Conflicts:
systests/jaxrs/pom.xml
Project: http://git-wip-us.apache.org/repos/asf/cxf/repo
Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/7d9f038f
Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/7d9f038f
Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/7d9f038f
Branch: refs/heads/2.7.x-fixes
Commit: 7d9f038f5ac5dca27eaa8c0e2249fd4fcb46d579
Parents: 8e1ef52
Author: Daniel Kulp <[email protected]>
Authored: Tue Mar 4 11:55:46 2014 -0500
Committer: Daniel Kulp <[email protected]>
Committed: Fri Mar 7 16:45:02 2014 -0500
----------------------------------------------------------------------
systests/jaxrs/pom.xml | 6 +++++-
1 file changed, 5 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cxf/blob/7d9f038f/systests/jaxrs/pom.xml
----------------------------------------------------------------------
diff --git a/systests/jaxrs/pom.xml b/systests/jaxrs/pom.xml
index c39ab1e..33aea6b 100644
--- a/systests/jaxrs/pom.xml
+++ b/systests/jaxrs/pom.xml
@@ -31,7 +31,11 @@
<description>Apache CXF JAX-RS System Tests</description>
<version>2.7.11-SNAPSHOT</version>
<url>http://cxf.apache.org</url>
-
+
+ <properties>
+
<cxf.surefire.fork.vmargs>-XX:MaxPermSize=192m</cxf.surefire.fork.vmargs>
+
<cxf.server.launcher.vmargs>-XX:MaxPermSize=192m</cxf.server.launcher.vmargs>
+ </properties>
<dependencies>
<dependency>
<groupId>xalan</groupId>
