From 2da7df1c1c6dd734e93c4e486dda5b929c94ce02 Mon Sep 17 00:00:00 2001 From: Karol Lassak Date: Sat, 18 Mar 2017 21:50:18 +0100 Subject: [PATCH] Fix for building on eap --- .../tools/arquillian/extension/suite/Deployments.java | 2 -- src/test/resources/arquillian.xml | 7 ++++--- src/test/resources/jboss-all.xml | 3 --- 3 files changed, 4 insertions(+), 8 deletions(-) delete mode 100644 src/test/resources/jboss-all.xml diff --git a/src/test/java/org/eu/ingwar/tools/arquillian/extension/suite/Deployments.java b/src/test/java/org/eu/ingwar/tools/arquillian/extension/suite/Deployments.java index ea7e1e2..65d41f0 100644 --- a/src/test/java/org/eu/ingwar/tools/arquillian/extension/suite/Deployments.java +++ b/src/test/java/org/eu/ingwar/tools/arquillian/extension/suite/Deployments.java @@ -66,7 +66,6 @@ public static Archive generateExtraDeployment() { public static Archive generateAutogeneratedDeployment() { EnterpriseArchive ear = EarGenericBuilder.getModuleDeployment(ModuleType.EJB); ear.delete("lib/glassfish-embedded-all-3.1.2.2.jar"); - ear.addAsManifestResource("jboss-all.xml"); return ear; } @@ -74,7 +73,6 @@ public static Archive generateAutogeneratedDeployment() { @TargetsContainer("app") public static Archive generateAutogeneratedWebDeployment() { EnterpriseArchive ear = EarGenericBuilder.getModuleDeployment(ModuleType.WAR, "test-war-module"); - ear.addAsManifestResource("jboss-all.xml"); ear.delete("lib/glassfish-embedded-all-3.1.2.2.jar"); return ear; } diff --git a/src/test/resources/arquillian.xml b/src/test/resources/arquillian.xml index 888036b..cae921f 100644 --- a/src/test/resources/arquillian.xml +++ b/src/test/resources/arquillian.xml @@ -31,6 +31,9 @@ limitations under the License. + + -Xmx1G + @@ -38,9 +41,7 @@ limitations under the License. - - main-server-group=app, - + main-server-group=app, diff --git a/src/test/resources/jboss-all.xml b/src/test/resources/jboss-all.xml deleted file mode 100644 index 56afd17..0000000 --- a/src/test/resources/jboss-all.xml +++ /dev/null @@ -1,3 +0,0 @@ - - - \ No newline at end of file