keycloak-developers

diff --git a/testsuite/integration-arquillian/pom.xml b/testsuite/integration-arquillian/pom.xml
index bcdc858..eaafb03 100644
--- a/testsuite/integration-arquillian/pom.xml
+++ b/testsuite/integration-arquillian/pom.xml
@@ -14,10 +14,6 @@
     <packaging>pom</packaging>
     <name>Keycloak Integration TestSuite with Arquillian</name>
     
-    <properties>
-        <version.rh.soo>7.0.0.DR2</version.rh.soo>
-    </properties>
-    
     <modules>
         <module>servers</module>
         <module>tests</module>

diff --git a/testsuite/integration-arquillian/servers/eap7/assembly.xml b/testsuite/integration-arquillian/servers/eap7/assembly.xml
index e6fb9a5..5fcf989 100644
--- a/testsuite/integration-arquillian/servers/eap7/assembly.xml
+++ b/testsuite/integration-arquillian/servers/eap7/assembly.xml
@@ -11,14 +11,14 @@
     <fileSets>
         <fileSet>
             <directory>${keycloak.server.home}</directory>
-            <outputDirectory>rh-sso-${version.rh.soo}</outputDirectory>
+            <outputDirectory>keycloak-${version.eap6.server.dist}</outputDirectory>
             <excludes>
                 <exclude>**/*.sh</exclude>
             </excludes>
         </fileSet>
         <fileSet>
             <directory>${keycloak.server.home}</directory>
-            <outputDirectory>rh-sso-${version.rh.soo}</outputDirectory>
+            <outputDirectory>keycloak-${version.eap6.server.dist}</outputDirectory>
             <includes>
                 <include>**/*.sh</include>
             </includes>

diff --git a/testsuite/integration-arquillian/servers/eap7/pom.xml b/testsuite/integration-arquillian/servers/eap7/pom.xml
index ba7ec2d..cc02cc2 100644
--- a/testsuite/integration-arquillian/servers/eap7/pom.xml
+++ b/testsuite/integration-arquillian/servers/eap7/pom.xml
@@ -51,8 +51,8 @@
             <dependencies>
                 <dependency>
                     <groupId>org.keycloak</groupId>
-                    <artifactId>rh-sso</artifactId>
-                    <version>${version.rh.soo}</version>
+                    <artifactId>keycloak-eap6-server-dist</artifactId>
+                    <version>${version.eap6.server.dist}</version>
                     <type>zip</type>
                 </dependency>
             </dependencies>
@@ -60,6 +60,25 @@
                 <plugins>
                     <plugin>
                         <groupId>org.apache.maven.plugins</groupId>
+                        <artifactId>maven-enforcer-plugin</artifactId>
+                        <executions>
+                            <execution>
+                                <id>enforce-properties</id>
+                                <goals>
+                                    <goal>enforce</goal>
+                                </goals>
+                                <configuration>
+                                    <rules>
+                                        <requireProperty>
+                                            <property>version.eap6.server.dist</property>
+                                        </requireProperty>
+                                    </rules>
+                                </configuration>
+                            </execution>
+                        </executions>
+                    </plugin>
+                    <plugin>
+                        <groupId>org.apache.maven.plugins</groupId>
                         <artifactId>maven-dependency-plugin</artifactId>
                         <executions>
                             <execution>
@@ -72,8 +91,8 @@
                                     <artifactItems>
                                         <artifactItem>
                                             <groupId>org.keycloak</groupId>
-                                            <artifactId>rh-sso</artifactId>
-                                            <version>${version.rh.soo}</version>
+                                            <artifactId>keycloak-eap6-server-dist</artifactId>
+                                            <version>${version.eap6.server.dist}</version>
                                             <type>zip</type>
                                             <outputDirectory>${project.build.directory}/unpacked</outputDirectory>
                                         </artifactItem>
@@ -96,7 +115,6 @@
                     <plugin>
                         <groupId>org.apache.maven.plugins</groupId>
                         <artifactId>maven-enforcer-plugin</artifactId>
-                        <version>1.4</version>
                         <executions>
                             <execution>
                                 <id>enforce-properties</id>

diff --git a/testsuite/integration-arquillian/tests/adapters/eap6/pom.xml b/testsuite/integration-arquillian/tests/adapters/eap6/pom.xml
index 44fce9a..b9075cf 100644
--- a/testsuite/integration-arquillian/tests/adapters/eap6/pom.xml
+++ b/testsuite/integration-arquillian/tests/adapters/eap6/pom.xml
@@ -14,14 +14,15 @@
     <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>
+        <version.adapter.dist>${project.version}</version.adapter.dist>
     </properties>
 
     <dependencies>
         <!-- This dependency is for starting auth server based on wildfly (eap7)-->
-        <dependency>
+<!--        <dependency>
             <groupId>org.wildfly</groupId>
             <artifactId>wildfly-arquillian-container-managed</artifactId>
-        </dependency>
+        </dependency>-->
         <!-- This is for EAP6-->
         <dependency>
             <groupId>org.jboss.as</groupId>
@@ -83,7 +84,7 @@
                                 <artifactItem>
                                     <groupId>org.keycloak</groupId>
                                     <artifactId>keycloak-eap6-adapter-dist</artifactId>
-                                    <version>${project.version}</version>
+                                    <version>${version.adapter.dist}</version>
                                     <type>zip</type>
                                     <outputDirectory>${adapter.libs.eap6}</outputDirectory>
                                 </artifactItem>
@@ -186,7 +187,6 @@
                     </plugin>
                     <plugin>
                         <artifactId>maven-resources-plugin</artifactId>
-                        <version>2.7</version>
                         <executions>
                             <execution>
                                 <id>copy-keystore</id>

diff --git a/testsuite/integration-arquillian/tests/pom.xml b/testsuite/integration-arquillian/tests/pom.xml
index 5c56d19..57d09f0 100644
--- a/testsuite/integration-arquillian/tests/pom.xml
+++ b/testsuite/integration-arquillian/tests/pom.xml
@@ -469,7 +469,7 @@
                     <version>7.2.0.Final</version>
                 </dependency>
             </dependencies>
-<!--            <dependencies>
+            <!--            <dependencies>
                 <dependency>
                     <groupId>org.wildfly</groupId>
                     <artifactId>wildfly-arquillian-container-managed</artifactId>
@@ -480,12 +480,31 @@
                     <plugins>
                         <plugin>
                             <groupId>org.apache.maven.plugins</groupId>
+                            <artifactId>maven-enforcer-plugin</artifactId>
+                            <executions>
+                                <execution>
+                                    <id>enforce-properties</id>
+                                    <goals>
+                                        <goal>enforce</goal>
+                                    </goals>
+                                    <configuration>
+                                        <rules>
+                                            <requireProperty>
+                                                <property>version.eap6.server.dist</property>
+                                            </requireProperty>
+                                        </rules>
+                                    </configuration>
+                                </execution>
+                            </executions>
+                        </plugin>
+                        <plugin>
+                            <groupId>org.apache.maven.plugins</groupId>
                             <artifactId>maven-surefire-plugin</artifactId>
                             <configuration>
                                 <systemPropertyVariables>
                                     <auth.server.eap7>true</auth.server.eap7>
                                     <auth.server.undertow>false</auth.server.undertow>
-                                    <keycloak.home>${containers.home}/rh-sso-${version.rh.soo}</keycloak.home>
+                                    <keycloak.home>${containers.home}/keycloak-${version.eap6.server.dist}</keycloak.home>
                                     <adapter.test.props>${adapter.test.props}</adapter.test.props>
                                 </systemPropertyVariables>
                             </configuration>