From efa112f82042e4bb8a6a743c4859109e7ca95e3c Mon Sep 17 00:00:00 2001
From: vramik <vramik@localhost.localdomain>
Date: Mon, 4 Jan 2016 16:46:47 +0100
Subject: [PATCH] updated version of xml plugin, fix adapter-libs-provided
 profile in eap6 adapter

---
 testsuite/integration-arquillian/pom.xml      |  2 +-
 .../tests/adapters/eap6/pom.xml               | 20 ++++++++++++-------
 .../tests/adapters/pom.xml                    |  1 -
 3 files changed, 14 insertions(+), 9 deletions(-)

diff --git a/testsuite/integration-arquillian/pom.xml b/testsuite/integration-arquillian/pom.xml
index e15c473d80..bcdc85803c 100644
--- a/testsuite/integration-arquillian/pom.xml
+++ b/testsuite/integration-arquillian/pom.xml
@@ -34,7 +34,7 @@
                 <plugin>
                     <groupId>org.codehaus.mojo</groupId>
                     <artifactId>xml-maven-plugin</artifactId>
-                    <version>1.0</version>
+                    <version>1.0.1</version>
                 </plugin>
                 <plugin>
                     <groupId>org.apache.maven.plugins</groupId>
diff --git a/testsuite/integration-arquillian/tests/adapters/eap6/pom.xml b/testsuite/integration-arquillian/tests/adapters/eap6/pom.xml
index 7289cc6bb1..11abbf17ff 100644
--- a/testsuite/integration-arquillian/tests/adapters/eap6/pom.xml
+++ b/testsuite/integration-arquillian/tests/adapters/eap6/pom.xml
@@ -14,6 +14,7 @@
     <properties>
         <app.server.eap6.home>${containers.home}</app.server.eap6.home>
         <adapter.libs.eap6>${containers.home}/keycloak-eap6-adapter-dist</adapter.libs.eap6>
+        <skip.configure.adapter.subsystem>false</skip.configure.adapter.subsystem>
     </properties>
 
     <dependencies>
@@ -98,6 +99,15 @@
     <profiles>
         <profile>
             <id>prod</id>
+            <activation>
+                <property>
+                    <name>prod</name>
+                    <value>true</value>
+                </property>
+            </activation>
+            <properties>
+                <skip.configure.adapter.subsystem>true</skip.configure.adapter.subsystem>
+            </properties>
             <build>
                 <plugins>
                     <plugin>
@@ -172,16 +182,11 @@
         </profile>
         <profile>
             <id>adapter-libs-provided</id>
-<!--            this profile has to be activated directly, the profile cannot be activated 
-            for prod tests, but we also need to activate adapter-libs-provided from 
-            integration-arquillian-tests-adapters, once new release of xml-maven-plugin
-            will be available we can resolve this by skipping this particular tranformation
-            for prod build-->
-<!--            <activation>    
+            <activation>    
                 <property>
                     <name>!adapter.libs.bundled</name>
                 </property>
-            </activation>-->
+            </activation>
             <properties>
                 <adapter.libs.eap6>${app.server.eap6.home}</adapter.libs.eap6>
             </properties>
@@ -198,6 +203,7 @@
                                     <goal>transform</goal>
                                 </goals>
                                 <configuration>
+                                    <skip>${skip.configure.adapter.subsystem}</skip>
                                     <transformationSets>
                                         <transformationSet>
                                             <dir>${app.server.eap6.home}/standalone/configuration</dir>
diff --git a/testsuite/integration-arquillian/tests/adapters/pom.xml b/testsuite/integration-arquillian/tests/adapters/pom.xml
index 55498bde5b..5474ad9263 100644
--- a/testsuite/integration-arquillian/tests/adapters/pom.xml
+++ b/testsuite/integration-arquillian/tests/adapters/pom.xml
@@ -55,7 +55,6 @@
                 <plugin>
                     <groupId>org.codehaus.mojo</groupId>
                     <artifactId>xml-maven-plugin</artifactId>
-                    <version>1.0</version>
                     <executions>
                         <execution>
                             <id>add-app-server-to-arquillian-xml</id>