Commit bb5a2f52e1d2f7af03e9dd59c80d32d3b9657428

Authored by Dancovich
2 parents 5dbfb6de 181e85cd
Exists in master

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

impl/extension/jpa/src/test/resources/arquillian.xml
@@ -43,11 +43,13 @@ @@ -43,11 +43,13 @@
43 <property name="deploymentExportPath">target/deployments</property> 43 <property name="deploymentExportPath">target/deployments</property>
44 </engine> 44 </engine>
45 45
  46 + <!--
46 <container qualifier="glassfish-embedded" default="true"> 47 <container qualifier="glassfish-embedded" default="true">
47 <configuration> 48 <configuration>
48 <property name="resourcesXml">src/test/resources/glassfish-resources.xml</property> 49 <property name="resourcesXml">src/test/resources/glassfish-resources.xml</property>
49 </configuration> 50 </configuration>
50 </container> 51 </container>
  52 + -->
51 53
52 <!-- 54 <!--
53 <container qualifier="jbossas-managed" default="true"> 55 <container qualifier="jbossas-managed" default="true">