From ca056d5840ef5e88d77c25b88f81472376b60212 Mon Sep 17 00:00:00 2001
From: Robert Godfrey <rgodfrey@apache.org>
Date: Wed, 20 Aug 2014 12:49:33 +0000
Subject: QPID-5996 : Applying patch from Robbie Gemmell

git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1619093 13f79535-47bb-0310-9956-ffa450edef68
---
 qpid/java/pom.xml                      | 5 +++--
 qpid/java/qpid-systests-parent/pom.xml | 2 --
 2 files changed, 3 insertions(+), 4 deletions(-)

(limited to 'qpid/java')

diff --git a/qpid/java/pom.xml b/qpid/java/pom.xml
index d535b4c60a..d2d132294d 100644
--- a/qpid/java/pom.xml
+++ b/qpid/java/pom.xml
@@ -49,12 +49,14 @@
     <!-- enforcer plugin config properties -->
     <supported-test-profiles-regex>(java-mms.0-9|java-mms.0-9-1|java-mms.0-10|java-bdb.0-9|java-bdb.0-9-1|java-bdb.0-10|java-dby.0-9|java-dby.0-9-1|java-dby.0-10|java-dby-mem.0-9|java-dby-mem.0-9-1|java-dby-mem.0-10|cpp|java-json.0-9-1|java-json.0-10)</supported-test-profiles-regex>
 
+    <!-- surefire forked jvm arguments -->
+    <argLine>-Xmx512m</argLine>
+
     <!-- test profile properties and defaults-->
     <qpid.home>${basedir}</qpid.home> <!-- override for broker tests -->
     <qpid.home.qbtc.output>${qpid.home}${file.separator}target${file.separator}qbtc-output</qpid.home.qbtc.output> <!-- override for broker tests -->
     <qpid.work>${project.build.directory}${file.separator}QPID_WORK</qpid.work>
 
-    <argLine />
     <profile>java-mms.0-10</profile>
     <profile.broker.language>java</profile.broker.language>
     <profile.broker.type>internal</profile.broker.type>
@@ -203,7 +205,6 @@
           <includes>
             <include>**/*Test.java</include>
           </includes>
-          <argLine>${argLine} -Xmx512m</argLine>
           <systemPropertyVariables>
             <!-- Defaults -->
             <QPID_HOME>${qpid.home}</QPID_HOME>
diff --git a/qpid/java/qpid-systests-parent/pom.xml b/qpid/java/qpid-systests-parent/pom.xml
index 9062f975f9..88c0c45354 100644
--- a/qpid/java/qpid-systests-parent/pom.xml
+++ b/qpid/java/qpid-systests-parent/pom.xml
@@ -39,8 +39,6 @@
     <test.working.directory>${basedir}/..</test.working.directory>
     <test.resource.directory>${basedir}/..</test.resource.directory>
     <test.systest.resource.directory>${basedir}</test.systest.resource.directory>
-    <!-- Jacoco skip workaround -->
-    <argLine />
   </properties>
 
   <dependencies>
-- 
cgit v1.2.1