Merge remote-tracking branch 'origin/2.4.0' into 2.4.0

Dancovich
2 parents 5dbfb6de 181e85cd
Showing 1 changed file with 2 additions and 0 deletions Show diff stats
impl/extension/jpa/src/test/resources/arquillian.xml
@@ -43,11 +43,13 @@
 		<property name="deploymentExportPath">target/deployments</property>
 	</engine>
  
+	<!--
 	<container qualifier="glassfish-embedded" default="true">
 		<configuration>
 			<property name="resourcesXml">src/test/resources/glassfish-resources.xml</property>
 		</configuration>
 	</container>
+	-->
  
 	<!--
 	<container qualifier="jbossas-managed" default="true">
...	...	@@ -43,11 +43,13 @@
43	43	<property name="deploymentExportPath">target/deployments</property>
44	44	</engine>
45	45
	46	+ <!--
46	47	<container qualifier="glassfish-embedded" default="true">
47	48	<configuration>
48	49	<property name="resourcesXml">src/test/resources/glassfish-resources.xml</property>
49	50	</configuration>
50	51	</container>
	52	+ -->
51	53
52	54	<!--
53	55	<container qualifier="jbossas-managed" default="true">
...	...