keycloak-memoizeit

diff --git a/testsuite/integration-arquillian/servers/eap7/assembly.xml b/testsuite/integration-arquillian/servers/eap7/assembly.xml
index 5fcf989..98df2c8 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>keycloak-${version.eap6.server.dist}</outputDirectory>
+            <outputDirectory>keycloak-${version.server.dist}</outputDirectory>
             <excludes>
                 <exclude>**/*.sh</exclude>
             </excludes>
         </fileSet>
         <fileSet>
             <directory>${keycloak.server.home}</directory>
-            <outputDirectory>keycloak-${version.eap6.server.dist}</outputDirectory>
+            <outputDirectory>keycloak-${version.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 b4fdeb1..67110ef 100644
--- a/testsuite/integration-arquillian/servers/eap7/pom.xml
+++ b/testsuite/integration-arquillian/servers/eap7/pom.xml
@@ -52,7 +52,7 @@
                 <dependency>
                     <groupId>org.keycloak</groupId>
                     <artifactId>keycloak-eap6-server-dist</artifactId>
-                    <version>${version.eap6.server.dist}</version>
+                    <version>${version.server.dist}</version>
                     <type>zip</type>
                 </dependency>
             </dependencies>
@@ -70,7 +70,7 @@
                                 <configuration>
                                     <rules>
                                         <requireProperty>
-                                            <property>version.eap6.server.dist</property>
+                                            <property>version.server.dist</property>
                                         </requireProperty>
                                     </rules>
                                 </configuration>
@@ -92,7 +92,7 @@
                                         <artifactItem>
                                             <groupId>org.keycloak</groupId>
                                             <artifactId>keycloak-eap6-server-dist</artifactId>
-                                            <version>${version.eap6.server.dist}</version>
+                                            <version>${version.server.dist}</version>
                                             <type>zip</type>
                                             <outputDirectory>${project.build.directory}/unpacked</outputDirectory>
                                         </artifactItem>

diff --git a/testsuite/integration-arquillian/servers/pom.xml b/testsuite/integration-arquillian/servers/pom.xml
index 5da7a38..c91ada5 100644
--- a/testsuite/integration-arquillian/servers/pom.xml
+++ b/testsuite/integration-arquillian/servers/pom.xml
@@ -24,13 +24,6 @@
             </modules>
         </profile>
         <profile>
-            <id>auth-server-eap6</id>
-            <modules>
-                <!--doesn't work yet, WIP-->
-                <module>eap6</module>
-            </modules>
-        </profile>
-        <profile>
             <id>auth-server-eap7</id>
             <modules>
                 <module>eap7</module>

diff --git a/testsuite/integration-arquillian/tests/base/src/test/resources/arquillian.xml b/testsuite/integration-arquillian/tests/base/src/test/resources/arquillian.xml
index 60b3ceb..afc3334 100644
--- a/testsuite/integration-arquillian/tests/base/src/test/resources/arquillian.xml
+++ b/testsuite/integration-arquillian/tests/base/src/test/resources/arquillian.xml
@@ -123,26 +123,13 @@
         </configuration>
     </container>
     
-    <container qualifier="auth-server-eap6" mode="suite" >
-        <configuration>
-            <property name="enabled">${auth.server.eap6}</property>
-            <property name="adapterImplClass">org.jboss.as.arquillian.container.managed.ManagedDeployableContainer</property>
-            <property name="jbossHome">${keycloak.home}</property>
-            <property name="javaVmArguments">-Djboss.socket.binding.port-offset=${auth.server.port.offset} -Xms64m -Xmx512m -XX:MaxPermSize=256m ${adapter.test.props}</property>
-            <property name="managementAddress">localhost</property>
-            <property name="managementPort">${auth.server.management.port.jmx}</property>
-            <property name="startupTimeoutInSeconds">${startup.timeout.sec}</property>
-        </configuration>
-    </container>
-    
     <container qualifier="auth-server-eap7" mode="suite" >
         <configuration>
             <property name="enabled">${auth.server.eap7}</property>
             <property name="adapterImplClass">org.jboss.as.arquillian.container.managed.ManagedDeployableContainer</property>
             <property name="jbossHome">${keycloak.home}</property>
             <property name="javaVmArguments">-Djboss.socket.binding.port-offset=${auth.server.port.offset} -Xms64m -Xmx512m -XX:MaxPermSize=256m ${adapter.test.props}</property>
-            <property name="managementAddress">localhost</property>
-            <property name="managementPort">${auth.server.management.port.jmx}</property>
+            <property name="managementPort">${auth.server.management.port}</property>
             <property name="startupTimeoutInSeconds">${startup.timeout.sec}</property>
         </configuration>
     </container>

diff --git a/testsuite/integration-arquillian/tests/pom.xml b/testsuite/integration-arquillian/tests/pom.xml
index 03aa8ec..f8c817e 100644
--- a/testsuite/integration-arquillian/tests/pom.xml
+++ b/testsuite/integration-arquillian/tests/pom.xml
@@ -472,42 +472,6 @@
         </profile>
         
         <profile>
-            <id>auth-server-eap6</id>
-            <properties>
-                <skip.unpack.server>false</skip.unpack.server>
-                <server.artifactId>integration-arquillian-server-eap6</server.artifactId>
-                <auth.server.container>auth-server-eap6</auth.server.container>
-                <startup.timeout.sec>300</startup.timeout.sec>
-                <adapter.test.props/>
-            </properties>
-            <dependencies>
-                <dependency>
-                    <groupId>org.jboss.as</groupId>
-                    <artifactId>jboss-as-arquillian-container-managed</artifactId>
-                    <version>7.2.0.Final</version>
-                </dependency>
-            </dependencies>
-            <build>
-                <pluginManagement>
-                    <plugins>
-                        <plugin>
-                            <groupId>org.apache.maven.plugins</groupId>
-                            <artifactId>maven-surefire-plugin</artifactId>
-                            <configuration>
-                                <systemPropertyVariables>
-                                    <auth.server.eap6>true</auth.server.eap6>
-                                    <auth.server.undertow>false</auth.server.undertow>
-                                    <keycloak.home>${containers.home}/keycloak-${project.version}</keycloak.home>
-                                    <adapter.test.props>${adapter.test.props}</adapter.test.props>
-                                </systemPropertyVariables>
-                            </configuration>
-                        </plugin>
-                    </plugins>
-                </pluginManagement>
-            </build>
-        </profile>
-        
-        <profile>
             <id>auth-server-eap7</id>
             <properties>
                 <skip.unpack.server>false</skip.unpack.server>
@@ -515,22 +479,15 @@
                 <auth.server.container>auth-server-eap7</auth.server.container>
                 <startup.timeout.sec>300</startup.timeout.sec>
                 <adapter.test.props/>
-                <keycloak.home>${containers.home}/keycloak-${version.eap6.server.dist}</keycloak.home>
+                <keycloak.home>${containers.home}/keycloak-${version.server.dist}</keycloak.home>
                 <jboss.server.config.dir>${keycloak.home}/standalone/configuration</jboss.server.config.dir>
             </properties>
             <dependencies>
                 <dependency>
-                    <groupId>org.jboss.as</groupId>
-                    <artifactId>jboss-as-arquillian-container-managed</artifactId>
-                    <version>7.2.0.Final</version>
-                </dependency>
-            </dependencies>
-            <!--            <dependencies>
-                <dependency>
                     <groupId>org.wildfly</groupId>
                     <artifactId>wildfly-arquillian-container-managed</artifactId>
                 </dependency>
-            </dependencies>-->
+            </dependencies>
             <build>
                 <pluginManagement>
                     <plugins>
@@ -546,7 +503,7 @@
                                     <configuration>
                                         <rules>
                                             <requireProperty>
-                                                <property>version.eap6.server.dist</property>
+                                                <property>version.server.dist</property>
                                             </requireProperty>
                                         </rules>
                                     </configuration>