diff --git a/testsuite/integration-arquillian/tests/adapters/eap6/pom.xml b/testsuite/integration-arquillian/tests/adapters/eap6/pom.xml
index 0026220..d5549fa 100644
--- a/testsuite/integration-arquillian/tests/adapters/eap6/pom.xml
+++ b/testsuite/integration-arquillian/tests/adapters/eap6/pom.xml
@@ -12,25 +12,19 @@
<name>Adapter Tests on EAP 6</name>
<properties>
- <app.server.eap6.home>${containers.home}/jboss-eap-6.4</app.server.eap6.home>
- <adapter.libs.eap6>${containers.home}/keycloak-eap6-adapter-dist</adapter.libs.eap6>
+ <app.server.eap6.home>${containers.home}</app.server.eap6.home>
</properties>
<dependencies>
- <dependency>
- <groupId>org.jboss.as</groupId>
- <artifactId>jboss-as-dist</artifactId>
- <version>${jboss.version}</version>
- <type>zip</type>
- </dependency>
- <dependency>
+<!-- <dependency>
<groupId>org.wildfly</groupId>
<artifactId>wildfly-arquillian-container-managed</artifactId>
- </dependency>
+ </dependency>-->
+ <!--TODO: this is for EAP6-->
<dependency>
- <groupId>org.keycloak</groupId>
- <artifactId>keycloak-eap6-adapter-dist</artifactId>
- <type>zip</type>
+ <groupId>org.jboss.as</groupId>
+ <artifactId>jboss-as-arquillian-container-managed</artifactId>
+ <version>7.2.0.Final</version>
</dependency>
</dependencies>
@@ -45,44 +39,12 @@
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-dependency-plugin</artifactId>
- <executions>
- <execution>
- <id>unpack-as7-and-adapter</id>
- <phase>generate-resources</phase>
- <goals>
- <goal>unpack</goal>
- </goals>
- <configuration>
- <artifactItems>
- <artifactItem>
- <groupId>org.jboss.as</groupId>
- <artifactId>jboss-as-dist</artifactId>
- <version>${jboss.version}</version>
- <type>zip</type>
- <outputDirectory>${containers.home}</outputDirectory>
- </artifactItem>
- <artifactItem>
- <groupId>org.keycloak</groupId>
- <artifactId>keycloak-eap6-adapter-dist</artifactId>
- <version>${project.version}</version>
- <type>zip</type>
- <outputDirectory>${adapter.libs.eap6}</outputDirectory>
- </artifactItem>
- </artifactItems>
- </configuration>
- </execution>
- </executions>
- </plugin>
-
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
<version>2.18.1</version>
<configuration>
<systemPropertyVariables>
<app.server.eap6>true</app.server.eap6>
- <app.server.eap6.home>${app.server.eap6.home}</app.server.eap6.home>
+ <app.server.eap6.home>${app.server.eap6.home}/jboss-eap-6.4</app.server.eap6.home>
<adapter.libs.eap6>${adapter.libs.eap6}</adapter.libs.eap6>
</systemPropertyVariables>
</configuration>
@@ -92,6 +54,91 @@
<profiles>
<profile>
+ <id>prod</id>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-dependency-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>unpack-eap6-with-adapter</id>
+ <phase>generate-resources</phase>
+ <goals>
+ <goal>unpack</goal>
+ </goals>
+ <configuration>
+ <artifactItems>
+ <artifactItem>
+ <groupId>org.keycloak</groupId>
+ <artifactId>rh-sso-eap6-adapter</artifactId>
+ <version>${version.rh.soo}</version>
+ <type>zip</type>
+ <outputDirectory>${app.server.eap6.home}</outputDirectory>
+ </artifactItem>
+ </artifactItems>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
+ </profile>
+ <profile>
+ <id>community</id>
+ <properties>
+ <adapter.libs.eap6>${containers.home}/keycloak-eap6-adapter-dist</adapter.libs.eap6>
+ </properties>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-dependency-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>unpack-as7-and-adapter</id>
+ <phase>generate-resources</phase>
+ <goals>
+ <goal>unpack</goal>
+ </goals>
+ <configuration>
+ <artifactItems>
+ <artifactItem>
+ <groupId>org.jboss.as</groupId>
+ <artifactId>jboss-as-dist</artifactId>
+ <version>${jboss.version}</version>
+ <type>zip</type>
+ <outputDirectory>${containers.home}</outputDirectory>
+ </artifactItem>
+ <artifactItem>
+ <groupId>org.keycloak</groupId>
+ <artifactId>keycloak-eap6-adapter-dist</artifactId>
+ <version>${project.version}</version>
+ <type>zip</type>
+ <outputDirectory>${adapter.libs.eap6}</outputDirectory>
+ </artifactItem>
+ </artifactItems>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
+ <dependencies>
+ <dependency>
+ <groupId>org.jboss.as</groupId>
+ <artifactId>jboss-as-dist</artifactId>
+ <version>${jboss.version}</version>
+ <type>zip</type>
+ </dependency>
+ <dependency>
+ <groupId>org.keycloak</groupId>
+ <artifactId>keycloak-eap6-adapter-dist</artifactId>
+ <type>zip</type>
+ </dependency>
+ </dependencies>
+ </profile>
+ <profile>
<id>adapter-libs-provided</id>
<activation>
<property>
@@ -176,20 +223,20 @@
<goal>copy-resources</goal>
</goals>
<configuration>
- <outputDirectory>${app.server.eap6.home}/standalone/configuration</outputDirectory>
- <resources>
- <resource>
- <directory>src/main/keystore</directory>
- <includes>
- <include>adapter.jks</include>
- <include>keycloak.truststore</include>
- </includes>
- </resource>
- </resources>
- <nonFilteredFileExtensions>
+ <outputDirectory>${app.server.eap6.home}/standalone/configuration</outputDirectory>
+ <resources>
+ <resource>
+ <directory>src/main/keystore</directory>
+ <includes>
+ <include>adapter.jks</include>
+ <include>keycloak.truststore</include>
+ </includes>
+ </resource>
+ </resources>
+ <nonFilteredFileExtensions>
<nonFilteredFileExtension>jks</nonFilteredFileExtension>
<nonFilteredFileExtension>truststore</nonFilteredFileExtension>
- </nonFilteredFileExtensions>
+ </nonFilteredFileExtensions>
</configuration>
</execution>
</executions>
diff --git a/testsuite/integration-arquillian/tests/adapters/pom.xml b/testsuite/integration-arquillian/tests/adapters/pom.xml
index 865f8fc..55498bd 100644
--- a/testsuite/integration-arquillian/tests/adapters/pom.xml
+++ b/testsuite/integration-arquillian/tests/adapters/pom.xml
@@ -343,6 +343,12 @@
</modules>
</profile>
<profile>
+ <id>app-server-eap6</id>
+ <modules>
+ <module>eap6</module>
+ </modules>
+ </profile>
+ <profile>
<id>app-server-wildfly</id>
<modules>
<module>wildfly</module>
