KEYCLOAK-8139 Added wildfly-deprecated module for adapters testing. Remove wildfly9 and wildfly10

testsuite/integration-arquillian/HOW-TO-RUN.md

@@ -86,7 +86,29 @@ TODO: Add info about Wildfly logging
     # Run tests
     mvn -f testsuite/integration-arquillian/pom.xml \
        clean install \
-       -Papp-server-wildfly
+       -Papp-server-wildfly \
+       -Dtest=org.keycloak.testsuite.adapter.**
+       
+### Wildfly with legacy non-elytron adapter
+    
+    mvn -f testsuite/integration-arquillian/pom.xml \
+       clean install \
+       -Dskip.elytron.adapter.installation=true \
+       -Dskip.adapter.offline.installation=false \
+       -Papp-server-wildfly \
+       -Dtest=org.keycloak.testsuite.adapter.**
+       
+       
+### Wildfly deprecated
+
+This is usually previous version of WildFly application server right before current version.
+See the property `wildfly.deprecated.version` in the file [pom.xml](pom.xml) ) .
+
+    mvn -f testsuite/integration-arquillian/pom.xml \
+       clean install \
+       -Pauth-server-wildfly \
+       -Papp-server-wildfly-deprecated \
+       -Dtest=org.keycloak.testsuite.adapter.**
     
 
 ### JBoss Fuse 6.3

testsuite/integration-arquillian/pom.xml

@@ -41,6 +41,12 @@
         <app.server.java.home>${java.home}</app.server.java.home>
         <app.server>undertow</app.server>
 
+        <!-- Wildfly deprecated versions -->
+        <wildfly.deprecated.version>11.0.0.Final</wildfly.deprecated.version>
+        <wildfly.deprecated.wildfly.core.version>3.0.8.Final</wildfly.deprecated.wildfly.core.version>
+        <wildfly.deprecated.infinispan.version>8.2.8.Final</wildfly.deprecated.infinispan.version>
+        <wildfly.deprecated.arquillian.wildfly.container>2.1.0.Final</wildfly.deprecated.arquillian.wildfly.container>
+
         <!--component versions-->
         <!--
             to update arquillian-core to 1.3.0.Final or higher

testsuite/integration-arquillian/servers/app-server/jboss/pom.xml

@@ -626,27 +626,15 @@
             </modules>
         </profile>
         <profile>
-            <id>app-server-wildfly9</id>
+            <id>app-server-wildfly-deprecated</id>
             <activation>
                 <property>
                     <name>app.server</name>
-                    <value>wildfly9</value>
+                    <value>wildfly-deprecated</value>
                 </property>
             </activation>
             <modules>
-                <module>wildfly9</module>
+                <module>wildfly-deprecated</module>
-            </modules>
-        </profile>
-        <profile>
-            <id>app-server-wildfly10</id>
-            <activation>
-                <property>
-                    <name>app.server</name>
-                    <value>wildfly10</value>
-                </property>
-            </activation>
-            <modules>
-                <module>wildfly10</module>
             </modules>
         </profile>
         <profile>

testsuite/integration-arquillian/servers/app-server/jboss/wildfly-deprecated/pom.xml

@@ -25,22 +25,22 @@
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
-    <artifactId>integration-arquillian-servers-app-server-wildfly10</artifactId>
+    <artifactId>integration-arquillian-servers-app-server-wildfly-deprecated</artifactId>
     <packaging>jar</packaging>
-    <name>App Server - Wildfly 10</name>
+    <name>App Server - Wildfly Deprecated</name>
     
     <properties>
-        <app.server.jboss>wildfly10</app.server.jboss>
+        <app.server.jboss>wildfly-deprecated</app.server.jboss>
         
         <app.server.jboss.groupId>org.wildfly</app.server.jboss.groupId>
         <app.server.jboss.artifactId>wildfly-dist</app.server.jboss.artifactId>
-        <app.server.jboss.version>${wildfly10.version}</app.server.jboss.version>
+        <app.server.jboss.version>${wildfly.deprecated.version}</app.server.jboss.version>
-        <app.server.jboss.unpacked.folder.name>wildfly-${wildfly10.version}</app.server.jboss.unpacked.folder.name>
+        <app.server.jboss.unpacked.folder.name>wildfly-${wildfly.deprecated.version}</app.server.jboss.unpacked.folder.name>
         
         <app.server.oidc.adapter.artifactId>keycloak-wildfly-adapter-dist</app.server.oidc.adapter.artifactId>
         <app.server.saml.adapter.artifactId>keycloak-saml-wildfly-adapter-dist</app.server.saml.adapter.artifactId>
 
-        <skip.adapter.offline.installation>false</skip.adapter.offline.installation>
+        <skip.elytron.adapter.installation>false</skip.elytron.adapter.installation>
     </properties>
 
     <dependencies>

testsuite/integration-arquillian/servers/app-server/jboss/wildfly-deprecated/src/main/java/org/keycloak/testsuite/arquillian/wildfly/WildflyDeprecatedAppServerArquillianExtension.java

@@ -18,17 +18,17 @@ package org.keycloak.testsuite.arquillian.wildfly;
 
 import org.jboss.arquillian.container.test.spi.client.deployment.ApplicationArchiveProcessor;
 import org.jboss.arquillian.core.spi.LoadableExtension;
-import org.keycloak.testsuite.arquillian.wildfly.container.Wildfly9DeploymentArchiveProcessor;
+import org.keycloak.testsuite.arquillian.wildfly.container.WildflyDeprecatedDeploymentArchiveProcessor;
 
 /**
  *
  * @author <a href="mailto:vramik@redhat.com">Vlasta Ramik</a>
  */
-public class Wildfly9AppServerArquillianExtension implements LoadableExtension {
+public class WildflyDeprecatedAppServerArquillianExtension implements LoadableExtension {
 
     @Override
     public void register(ExtensionBuilder builder) {
-        builder.service(ApplicationArchiveProcessor.class, Wildfly9DeploymentArchiveProcessor.class);
+        builder.service(ApplicationArchiveProcessor.class, WildflyDeprecatedDeploymentArchiveProcessor.class);
     }
 
 }

testsuite/integration-arquillian/servers/app-server/jboss/wildfly-deprecated/src/main/java/org/keycloak/testsuite/arquillian/wildfly/container/WildflyDeprecatedAppServerProvider.java

@@ -27,10 +27,10 @@ import org.keycloak.testsuite.arquillian.container.AppServerContainerProvider;
 /**
  * @author <a href="mailto:vramik@redhat.com">Vlasta Ramik</a>
  */
-public class Wildfly10AppServerProvider implements AppServerContainerProvider {
+public class WildflyDeprecatedAppServerProvider implements AppServerContainerProvider {
 
     private Node configuration;
-    private static final String containerName = "wildfly10";
+    private static final String containerName = "wildfly-deprecated";
 
     private final String appServerHome;
     private final String appServerJavaHome;
@@ -39,7 +39,7 @@ public class Wildfly10AppServerProvider implements AppServerContainerProvider {
     private final String managementPort;
     private final String startupTimeoutInSeconds;
 
-    public Wildfly10AppServerProvider() {
+    public WildflyDeprecatedAppServerProvider() {
         appServerHome = System.getProperty("app.server.home");
         appServerJavaHome = System.getProperty("app.server.java.home");
         appServerPortOffset = System.getProperty("app.server.port.offset");
@@ -106,7 +106,7 @@ public class Wildfly10AppServerProvider implements AppServerContainerProvider {
 
     private Node clusterGroup() {
         Node group = new Node("group");
-        group.attribute("qualifier", "app-server-wildfly10-clustered");
+        group.attribute("qualifier", "app-server-wildfly-deprecated-clustered");
         addHaNodeContainer(group, 1);
         addHaNodeContainer(group, 2);
         return group;

testsuite/integration-arquillian/servers/app-server/jboss/wildfly-deprecated/src/main/java/org/keycloak/testsuite/arquillian/wildfly/container/WildflyDeprecatedDeploymentArchiveProcessor.java

@@ -27,9 +27,9 @@ import org.keycloak.testsuite.utils.arquillian.DeploymentArchiveProcessorUtils;
  *
  * @author <a href="mailto:vramik@redhat.com">Vlasta Ramik</a>
  */
-public class Wildfly9DeploymentArchiveProcessor implements ApplicationArchiveProcessor {
+public class WildflyDeprecatedDeploymentArchiveProcessor implements ApplicationArchiveProcessor {
 
-    private final Logger log = Logger.getLogger(Wildfly9DeploymentArchiveProcessor.class);
+    private final Logger log = Logger.getLogger(WildflyDeprecatedDeploymentArchiveProcessor.class);
     
     @Override
     public void process(Archive<?> archive, TestClass testClass) {

testsuite/integration-arquillian/servers/app-server/jboss/wildfly-deprecated/src/main/resources/META-INF/services/org.jboss.arquillian.core.spi.LoadableExtension

@@ -0,0 +1 @@
+org.keycloak.testsuite.arquillian.wildfly.WildflyDeprecatedAppServerArquillianExtension

testsuite/integration-arquillian/servers/app-server/jboss/wildfly-deprecated/src/main/resources/META-INF/services/org.keycloak.testsuite.arquillian.container.AppServerContainerProvider

@@ -0,0 +1 @@
+org.keycloak.testsuite.arquillian.wildfly.container.WildflyDeprecatedAppServerProvider

testsuite/integration-arquillian/servers/app-server/jboss/wildfly10/src/main/java/org/keycloak/testsuite/arquillian/wildfly/Wildfly10AppServerArquillianExtension.java

@@ -1,34 +0,0 @@
-/*
- * Copyright 2018 Red Hat, Inc. and/or its affiliates
- * and other contributors as indicated by the @author tags.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.keycloak.testsuite.arquillian.wildfly;
-
-import org.jboss.arquillian.container.test.spi.client.deployment.ApplicationArchiveProcessor;
-import org.jboss.arquillian.core.spi.LoadableExtension;
-import org.keycloak.testsuite.arquillian.wildfly.container.Wildfly10DeploymentArchiveProcessor;
-
-/**
- *
- * @author <a href="mailto:vramik@redhat.com">Vlasta Ramik</a>
- */
-public class Wildfly10AppServerArquillianExtension implements LoadableExtension {
-
-    @Override
-    public void register(ExtensionBuilder builder) {
-        builder.service(ApplicationArchiveProcessor.class, Wildfly10DeploymentArchiveProcessor.class);
-    }
-
-}

testsuite/integration-arquillian/servers/app-server/jboss/wildfly10/src/main/java/org/keycloak/testsuite/arquillian/wildfly/container/Wildfly10DeploymentArchiveProcessor.java

@@ -1,73 +0,0 @@
-/*
- * Copyright 2018 Red Hat, Inc. and/or its affiliates
- * and other contributors as indicated by the @author tags.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.keycloak.testsuite.arquillian.wildfly.container;
-
-import org.jboss.arquillian.container.test.spi.client.deployment.ApplicationArchiveProcessor;
-import org.jboss.arquillian.test.spi.TestClass;
-import org.jboss.logging.Logger;
-import org.jboss.shrinkwrap.api.Archive;
-import org.keycloak.testsuite.utils.annotation.UseServletFilter;
-import org.keycloak.testsuite.utils.arquillian.DeploymentArchiveProcessorUtils;
-
-/**
- *
- * @author <a href="mailto:vramik@redhat.com">Vlasta Ramik</a>
- */
-public class Wildfly10DeploymentArchiveProcessor implements ApplicationArchiveProcessor {
-
-    private final Logger log = Logger.getLogger(Wildfly10DeploymentArchiveProcessor.class);
-    
-    @Override
-    public void process(Archive<?> archive, TestClass testClass) {
-        if (DeploymentArchiveProcessorUtils.checkRunOnServerDeployment(archive)) {
-            return;
-        }
-        modifyWebXML(archive, testClass);
-        
-        modifyOIDCAdapterConfig(archive, DeploymentArchiveProcessorUtils.ADAPTER_CONFIG_PATH);
-        modifyOIDCAdapterConfig(archive, DeploymentArchiveProcessorUtils.ADAPTER_CONFIG_PATH_JS);
-        
-        modifySAMLAdapterConfig(archive, DeploymentArchiveProcessorUtils.SAML_ADAPTER_CONFIG_PATH);
-        modifySAMLAdapterConfig(archive, DeploymentArchiveProcessorUtils.SAML_ADAPTER_CONFIG_PATH_TENANT1);
-        modifySAMLAdapterConfig(archive, DeploymentArchiveProcessorUtils.SAML_ADAPTER_CONFIG_PATH_TENANT2);
-    }
-    
-    private void modifyWebXML(Archive<?> archive, TestClass testClass) {
-        if (!archive.contains(DeploymentArchiveProcessorUtils.WEBXML_PATH)) return;
-        if (!testClass.getJavaClass().isAnnotationPresent(UseServletFilter.class)) return;
-        if (!archive.contains(DeploymentArchiveProcessorUtils.JBOSS_DEPLOYMENT_XML_PATH)) return;
-        
-        log.debug("Modifying WEB.XML in " + archive.getName() + " for Servlet Filter.");
-        DeploymentArchiveProcessorUtils.modifyWebXMLForServletFilter(archive, testClass);
-        DeploymentArchiveProcessorUtils.addFilterDependencies(archive, testClass);
-    }
-
-    private void modifyOIDCAdapterConfig(Archive<?> archive, String adapterConfigPath) {
-        if (!archive.contains(adapterConfigPath)) return;
-        
-        log.debug("Modifying adapter config " + adapterConfigPath + " in " + archive.getName());
-        
-        DeploymentArchiveProcessorUtils.modifyOIDCAdapterConfig(archive, adapterConfigPath);
-    }
-
-    private void modifySAMLAdapterConfig(Archive<?> archive, String adapterConfigPath) {
-        if (!archive.contains(adapterConfigPath)) return;
-        
-        log.debug("Modifying adapter config " + adapterConfigPath + " in " + archive.getName());
-        DeploymentArchiveProcessorUtils.modifySAMLAdapterConfig(archive, adapterConfigPath);
-    }
-}

testsuite/integration-arquillian/servers/app-server/jboss/wildfly10/src/main/resources/META-INF/services/org.jboss.arquillian.core.spi.LoadableExtension

@@ -1 +0,0 @@
-org.keycloak.testsuite.arquillian.wildfly.Wildfly10AppServerArquillianExtension

testsuite/integration-arquillian/servers/app-server/jboss/wildfly10/src/main/resources/META-INF/services/org.keycloak.testsuite.arquillian.container.AppServerContainerProvider

@@ -1 +0,0 @@
-org.keycloak.testsuite.arquillian.wildfly.container.Wildfly10AppServerProvider

testsuite/integration-arquillian/servers/app-server/jboss/wildfly9/pom.xml

@@ -1,63 +0,0 @@
-<?xml version="1.0"?>
-<!--
-~ Copyright 2016 Red Hat, Inc. and/or its affiliates
-~ and other contributors as indicated by the @author tags.
-~
-~ Licensed under the Apache License, Version 2.0 (the "License");
-~ you may not use this file except in compliance with the License.
-~ You may obtain a copy of the License at
-~
-~ http://www.apache.org/licenses/LICENSE-2.0
-~
-~ Unless required by applicable law or agreed to in writing, software
-~ distributed under the License is distributed on an "AS IS" BASIS,
-~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-~ See the License for the specific language governing permissions and
-~ limitations under the License.
--->
-
-<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
-         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-    <parent>
-        <groupId>org.keycloak.testsuite</groupId>
-        <artifactId>integration-arquillian-servers-app-server-jboss</artifactId>
-        <version>4.3.0.Final-SNAPSHOT</version>
-    </parent>
-    <modelVersion>4.0.0</modelVersion>
-
-    <artifactId>integration-arquillian-servers-app-server-wildfly9</artifactId>
-    <packaging>jar</packaging>
-    <name>App Server - Wildfly 9</name>
-    
-    <properties>
-        <app.server.jboss>wildfly9</app.server.jboss>
-        
-        <app.server.jboss.groupId>org.wildfly</app.server.jboss.groupId>
-        <app.server.jboss.artifactId>wildfly-dist</app.server.jboss.artifactId>
-        <app.server.jboss.version>${wildfly9.version}</app.server.jboss.version>
-        <app.server.jboss.unpacked.folder.name>wildfly-${wildfly9.version}</app.server.jboss.unpacked.folder.name>
-        
-        <app.server.oidc.adapter.artifactId>keycloak-wildfly-adapter-dist</app.server.oidc.adapter.artifactId>
-        <app.server.saml.adapter.artifactId>keycloak-saml-wildfly-adapter-dist</app.server.saml.adapter.artifactId>
-
-        <skip.adapter.offline.installation>false</skip.adapter.offline.installation>
-        <skip.configure.clustered.scenario>true</skip.configure.clustered.scenario>
-    </properties>
-
-    <dependencies>
-        <dependency>
-            <groupId>org.keycloak.testsuite</groupId>
-            <artifactId>integration-arquillian-servers-app-server-spi</artifactId>
-            <version>${project.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>org.wildfly.arquillian</groupId>
-            <artifactId>wildfly-arquillian-container-managed</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.keycloak.testsuite</groupId>
-            <artifactId>integration-arquillian-util</artifactId>
-            <version>${project.version}</version>
-        </dependency>
-    </dependencies>
-</project>

testsuite/integration-arquillian/servers/app-server/jboss/wildfly9/src/main/java/org/keycloak/testsuite/arquillian/wildfly/container/Wildfly9AppServerProvider.java

@@ -1,165 +0,0 @@
-/*
- * Copyright 2018 Red Hat, Inc. and/or its affiliates
- * and other contributors as indicated by the @author tags.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.keycloak.testsuite.arquillian.wildfly.container;
-
-import java.util.ArrayList;
-import java.util.List;
-import org.jboss.arquillian.core.spi.Validate;
-import org.jboss.as.arquillian.container.managed.ManagedDeployableContainer;
-import org.jboss.shrinkwrap.descriptor.spi.node.Node;
-import org.keycloak.testsuite.arquillian.container.AppServerContainerProvider;
-
-/**
- * @author <a href="mailto:vramik@redhat.com">Vlasta Ramik</a>
- */
-public class Wildfly9AppServerProvider implements AppServerContainerProvider {
-
-    private Node configuration;
-    private static final String containerName = "wildfly9";
-
-    private final String appServerHome;
-    private final String appServerJavaHome;
-    private final String appServerPortOffset;
-    private final String managementProtocol;
-    private final String managementPort;
-    private final String startupTimeoutInSeconds;
-
-    public Wildfly9AppServerProvider() {
-        appServerHome = System.getProperty("app.server.home");
-        appServerJavaHome = System.getProperty("app.server.java.home");
-        appServerPortOffset = System.getProperty("app.server.port.offset");
-        managementProtocol = System.getProperty("app.server.management.protocol");
-        managementPort = System.getProperty("app.server.management.port");
-        startupTimeoutInSeconds = System.getProperty("app.server.startup.timeout");
-
-        Validate.notNullOrEmpty(appServerHome, "app.server.home is not set.");
-        Validate.notNullOrEmpty(appServerJavaHome, "app.server.java.home is not set.");
-        Validate.notNullOrEmpty(appServerPortOffset, "app.server.port.offset is not set.");
-        Validate.notNullOrEmpty(managementProtocol, "app.server.management.protocol is not set.");
-        Validate.notNullOrEmpty(managementPort, "app.server.management.port is not set.");
-        Validate.notNullOrEmpty(startupTimeoutInSeconds, "app.server.startup.timeout is not set.");
-    }
-
-    @Override
-    public String getName() {
-        return containerName;
-    }
-
-    @Override
-    public List<Node> getContainers() {
-        List<Node> containers = new ArrayList<>();
-
-        containers.add(standaloneContainer());
-//        containers.add(clusterGroup());
-
-        return containers;
-    }
-
-    private void createChild(String name, String text) {
-        configuration.createChild("property").attribute("name", name).text(text);
-    }
-
-    private Node standaloneContainer() {
-        Node container = new Node("container");
-        container.attribute("mode", "manual");
-        container.attribute("qualifier", AppServerContainerProvider.APP_SERVER + "-" + containerName);
-
-        configuration = container.createChild("configuration");
-        createChild("enabled", "true");
-        createChild("adapterImplClass", ManagedDeployableContainer.class.getName());
-        createChild("jbossHome", appServerHome);
-        createChild("javaHome", appServerJavaHome);
-        createChild("jbossArguments", 
-                "-Djboss.server.base.dir=" + appServerHome + "/standalone-test " +
-                "-Djboss.server.config.dir=" + appServerHome + "/standalone-test/configuration " +
-                "-Djboss.server.log.dir=" + appServerHome + "/standalone-test/log " +
-                "-Djboss.socket.binding.port-offset=" + appServerPortOffset + " " +
-                System.getProperty("adapter.test.props", " ") +
-                System.getProperty("kie.maven.settings", " ")
-        );
-        createChild("javaVmArguments", 
-                System.getProperty("app.server.jboss.jvm.debug.args", "") + " " +
-                System.getProperty("app.server.memory.settings", "") + " " +
-                "-Djava.net.preferIPv4Stack=true"
-        );
-        createChild("managementProtocol", managementProtocol);
-        createChild("managementPort", managementPort);
-        createChild("startupTimeoutInSeconds", startupTimeoutInSeconds);
-
-        return container;
-    }
-
-    private Node clusterGroup() {
-        Node group = new Node("group");
-        group.attribute("qualifier", "app-server-wildfly9-clustered");
-        addHaNodeContainer(group, 1);
-        addHaNodeContainer(group, 2);
-        return group;
-    }
-
-    private void addHaNodeContainer(Node group, int number) {
-        String portOffset = System.getProperty("app.server." + number + ".port.offset");
-        String managementPort = System.getProperty("app.server." + number + ".management.port");
-
-        Validate.notNullOrEmpty(portOffset, "app.server." + number + ".port.offset is not set.");
-        Validate.notNullOrEmpty(managementPort, "app.server." + number + ".management.port is not set.");
-
-        Node container = group.createChild("container");
-        container.attribute("mode", "manual");
-        container.attribute("qualifier", AppServerContainerProvider.APP_SERVER + "-" + containerName + "-ha-node-" + number);
-
-        configuration = container.createChild("configuration");
-        createChild("enabled", "true");
-        createChild("adapterImplClass", ManagedDeployableContainer.class.getName());
-        createChild("jbossHome", appServerHome);
-        createChild("javaHome", appServerJavaHome);
-        //cleanServerBaseDir cannot be used until WFARQ-44 is fixed
-//        createChild("cleanServerBaseDir", appServerHome + "/standalone-ha-node-" + number);
-        createChild("serverConfig", "standalone-ha.xml");
-        createChild("jbossArguments", 
-                "-Djboss.server.base.dir=" + appServerHome + "/standalone-ha-node-" + number + " " +
-                "-Djboss.socket.binding.port-offset=" + portOffset + " " +
-                "-Djboss.node.name=ha-node-" + number + " " +
-                getCrossDCProperties(number, portOffset) +
-                System.getProperty("adapter.test.props", " ") +
-                System.getProperty("kie.maven.settings", " ")
-        );
-        createChild("javaVmArguments", 
-                "-agentlib:jdwp=transport=dt_socket,server=y,suspend=n,address=790" + number + " " +
-                System.getProperty("app.server.memory.settings", "") + " " +
-                "-Djava.net.preferIPv4Stack=true"
-        );
-        createChild("managementProtocol", managementProtocol);
-        createChild("managementPort", managementPort);
-        createChild("startupTimeoutInSeconds", startupTimeoutInSeconds);
-    }
-    
-    private String getCrossDCProperties(int number, String portOffset) {
-        if (System.getProperty("cache.server") == null || System.getProperty("cache.server").equals("undefined")) {
-            return "";
-        }
-        String cacheHotrodPortString = System.getProperty("cache.server." + number + ".port.offset");
-        Validate.notNullOrEmpty(cacheHotrodPortString, "cache.server." + number + ".port.offset is not set.");
-
-        int tcppingPort = 7600 + Integer.parseInt(portOffset);
-        int cacheHotrodPort = 11222 + Integer.parseInt(cacheHotrodPortString);
-        
-        //properties used in servers/app-server/jboss/common/cli/configure-crossdc-config.cli
-        return "-Dtcpping.port=" + tcppingPort + " -Dcache.hotrod.port=" + cacheHotrodPort + " ";
-    }
-}

testsuite/integration-arquillian/servers/app-server/jboss/wildfly9/src/main/resources/META-INF/services/org.jboss.arquillian.core.spi.LoadableExtension

@@ -1 +0,0 @@
-org.keycloak.testsuite.arquillian.wildfly.Wildfly9AppServerArquillianExtension

testsuite/integration-arquillian/servers/app-server/jboss/wildfly9/src/main/resources/META-INF/services/org.keycloak.testsuite.arquillian.container.AppServerContainerProvider

@@ -1 +0,0 @@
-org.keycloak.testsuite.arquillian.wildfly.container.Wildfly9AppServerProvider

testsuite/integration-arquillian/servers/app-server/jboss/wildfly9/src/saml-adapter-supported

@@ -1 +0,0 @@
-

testsuite/integration-arquillian/servers/pom.xml

@@ -32,10 +32,7 @@
     <properties>
         <script.suffix>sh</script.suffix>
         
-        <!--app container versions-->        
+        <!--app container versions-->
-        <wildfly10.version>10.1.0.Final</wildfly10.version>
-        <wildfly9.version>9.0.2.Final</wildfly9.version>
-        <wildfly8.version>8.2.1.Final</wildfly8.version>
         <eap6.version>7.5.20.Final-redhat-1</eap6.version>
         <eap71.version>7.1.4.GA-redhat-1</eap71.version>
         <jboss.as.version>7.1.1.Final</jboss.as.version>

testsuite/integration-arquillian/tests/base/pom.xml

@@ -357,24 +357,24 @@
             </build>
         </profile>
         <profile>
-            <id>app-server-wildfly10</id>
+            <id>app-server-wildfly-deprecated</id>
             <activation>
                 <property>
                     <name>app.server</name>
-                    <value>wildfly10</value>
+                    <value>wildfly-deprecated</value>
                 </property>
             </activation>
             <properties>
-                <app.server>wildfly10</app.server> <!--in case the profile is called directly-->
+                <app.server>wildfly-deprecated</app.server> <!--in case the profile is called directly-->
                 <app.server.skip.unpack>false</app.server.skip.unpack>
 
-                <arquillian-wildfly-container.version>2.0.0.Final</arquillian-wildfly-container.version>
+                <arquillian-wildfly-container.version>${wildfly.deprecated.arquillian.wildfly.container}</arquillian-wildfly-container.version>
-                <infinispan.version>8.2.5.Final</infinispan.version>    <!-- KEYCLOAK-5302 -->
+                <infinispan.version>${wildfly.deprecated.infinispan.version}</infinispan.version>    <!-- KEYCLOAK-5302 -->
             </properties>
             <dependencies>
                 <dependency>
                     <groupId>org.keycloak.testsuite</groupId>
-                    <artifactId>integration-arquillian-servers-app-server-wildfly10</artifactId>
+                    <artifactId>integration-arquillian-servers-app-server-wildfly-deprecated</artifactId>
                     <version>${project.version}</version>
                     <scope>runtime</scope>
                 </dependency>
@@ -383,43 +383,7 @@
                     <groupId>org.wildfly.core</groupId>
                     <artifactId>wildfly-cli</artifactId>
                     <scope>test</scope>
-                    <version>${wildfly10.core.version}</version>
+                    <version>${wildfly.deprecated.wildfly.core.version}</version>
-                </dependency>
-            </dependencies>
-            <build>
-                <plugins>
-                    <plugin>
-                        <groupId>org.commonjava.maven.plugins</groupId>
-                        <artifactId>directory-maven-plugin</artifactId>
-                    </plugin>
-                </plugins>
-            </build>
-        </profile>
-        <profile>
-            <id>app-server-wildfly9</id>
-            <activation>
-                <property>
-                    <name>app.server</name>
-                    <value>wildfly9</value>
-                </property>
-            </activation>
-            <properties>
-                <app.server>wildfly9</app.server> <!--in case the profile is called directly-->
-                <app.server.skip.unpack>false</app.server.skip.unpack>
-            </properties>
-            <dependencies>
-                <dependency>
-                    <groupId>org.keycloak.testsuite</groupId>
-                    <artifactId>integration-arquillian-servers-app-server-wildfly9</artifactId>
-                    <version>${project.version}</version>
-                    <scope>runtime</scope>
-                </dependency>
-                <!--required by creaper-core-->
-                <dependency>
-                    <groupId>org.wildfly.core</groupId>
-                    <artifactId>wildfly-cli</artifactId>
-                    <scope>test</scope>
-                    <version>${wildfly.core.version}</version>
                 </dependency>
             </dependencies>
             <build>

testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/arquillian/containers/ContainerConstants.java

@@ -24,10 +24,8 @@ public interface ContainerConstants {
     public static final String APP_SERVER_WILDFLY = APP_SERVER_PREFIX + "wildfly";
     public static final String APP_SERVER_WILDFLY_CLUSTER = APP_SERVER_WILDFLY + "-ha-node-1;" + APP_SERVER_WILDFLY + "-ha-node-2";
 
-    public static final String APP_SERVER_WILDFLY10 = APP_SERVER_PREFIX + "wildfly10";
+    public static final String APP_SERVER_WILDFLY_DEPRECATED = APP_SERVER_PREFIX + "wildfly-deprecated";
-    public static final String APP_SERVER_WILDFLY10_CLUSTER = APP_SERVER_WILDFLY10 + "-ha-node-1;" + APP_SERVER_WILDFLY10 + "-ha-node-2";
+    public static final String APP_SERVER_WILDFLY_DEPRECATED_CLUSTER = APP_SERVER_WILDFLY_DEPRECATED + "-ha-node-1;" + APP_SERVER_WILDFLY_DEPRECATED + "-ha-node-2";
-
-    public static final String APP_SERVER_WILDFLY9 = APP_SERVER_PREFIX + "wildfly9";
 
     public static final String APP_SERVER_EAP = APP_SERVER_PREFIX + "eap";
     public static final String APP_SERVER_EAP_CLUSTER = APP_SERVER_EAP + "-ha-node-1;" + APP_SERVER_EAP + "-ha-node-2";

testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/adapter/example/authorization/DefaultAuthzConfigAdapterTest.java

@@ -47,7 +47,7 @@ import static org.keycloak.testsuite.utils.io.IOUtil.loadRealm;
  * @author <a href="mailto:psilva@redhat.com">Pedro Igor</a>
  */
 @AppServerContainer(ContainerConstants.APP_SERVER_WILDFLY)
-@AppServerContainer(ContainerConstants.APP_SERVER_WILDFLY10)
+@AppServerContainer(ContainerConstants.APP_SERVER_WILDFLY_DEPRECATED)
 @AppServerContainer(ContainerConstants.APP_SERVER_EAP)
 @AppServerContainer(ContainerConstants.APP_SERVER_EAP6)
 @AppServerContainer(ContainerConstants.APP_SERVER_UNDERTOW)

testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/adapter/example/authorization/PermissiveModeAdapterTest.java

@@ -31,7 +31,7 @@ import org.keycloak.testsuite.arquillian.containers.ContainerConstants;
  * @author <a href="mailto:psilva@redhat.com">Pedro Igor</a>
  */
 @AppServerContainer(ContainerConstants.APP_SERVER_WILDFLY)
-@AppServerContainer(ContainerConstants.APP_SERVER_WILDFLY10)
+@AppServerContainer(ContainerConstants.APP_SERVER_WILDFLY_DEPRECATED)
 @AppServerContainer(ContainerConstants.APP_SERVER_EAP)
 @AppServerContainer(ContainerConstants.APP_SERVER_EAP6)
 @AppServerContainer(ContainerConstants.APP_SERVER_UNDERTOW)

testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/adapter/example/authorization/PhotozExampleLazyLoadPathsAdapterTest.java

@@ -29,7 +29,7 @@ import org.keycloak.testsuite.arquillian.containers.ContainerConstants;
  * @author <a href="mailto:psilva@redhat.com">Pedro Igor</a>
  */
 @AppServerContainer(ContainerConstants.APP_SERVER_WILDFLY)
-@AppServerContainer(ContainerConstants.APP_SERVER_WILDFLY10)
+@AppServerContainer(ContainerConstants.APP_SERVER_WILDFLY_DEPRECATED)
 @AppServerContainer(ContainerConstants.APP_SERVER_EAP)
 @AppServerContainer(ContainerConstants.APP_SERVER_EAP6)
 @AppServerContainer(ContainerConstants.APP_SERVER_EAP71)

testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/adapter/example/authorization/PhotozExampleNoLazyLoadPathsAdapterTest.java

@@ -28,7 +28,7 @@ import org.keycloak.testsuite.arquillian.containers.ContainerConstants;
  * @author <a href="mailto:psilva@redhat.com">Pedro Igor</a>
  */
 @AppServerContainer(ContainerConstants.APP_SERVER_WILDFLY)
-@AppServerContainer(ContainerConstants.APP_SERVER_WILDFLY10)
+@AppServerContainer(ContainerConstants.APP_SERVER_WILDFLY_DEPRECATED)
 @AppServerContainer(ContainerConstants.APP_SERVER_EAP)
 @AppServerContainer(ContainerConstants.APP_SERVER_EAP6)
 @AppServerContainer(ContainerConstants.APP_SERVER_EAP71)

testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/adapter/example/authorization/ServletAuthzCIPAdapterTest.java

@@ -29,7 +29,7 @@ import org.keycloak.testsuite.arquillian.containers.ContainerConstants;
  * @author <a href="mailto:psilva@redhat.com">Pedro Igor</a>
  */
 @AppServerContainer(ContainerConstants.APP_SERVER_WILDFLY)
-@AppServerContainer(ContainerConstants.APP_SERVER_WILDFLY10)
+@AppServerContainer(ContainerConstants.APP_SERVER_WILDFLY_DEPRECATED)
 @AppServerContainer(ContainerConstants.APP_SERVER_EAP)
 @AppServerContainer(ContainerConstants.APP_SERVER_EAP6)
 @AppServerContainer(ContainerConstants.APP_SERVER_UNDERTOW)

testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/adapter/example/authorization/ServletAuthzCacheDisabledAdapterTest.java

@@ -31,7 +31,7 @@ import org.keycloak.testsuite.arquillian.containers.ContainerConstants;
  * @author <a href="mailto:psilva@redhat.com">Pedro Igor</a>
  */
 @AppServerContainer(ContainerConstants.APP_SERVER_WILDFLY)
-@AppServerContainer(ContainerConstants.APP_SERVER_WILDFLY10)
+@AppServerContainer(ContainerConstants.APP_SERVER_WILDFLY_DEPRECATED)
 @AppServerContainer(ContainerConstants.APP_SERVER_EAP)
 @AppServerContainer(ContainerConstants.APP_SERVER_EAP6)
 @AppServerContainer(ContainerConstants.APP_SERVER_UNDERTOW)

testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/adapter/example/authorization/ServletAuthzCacheLifespanAdapterTest.java

@@ -30,7 +30,7 @@ import org.keycloak.testsuite.arquillian.containers.ContainerConstants;
  * @author <a href="mailto:psilva@redhat.com">Pedro Igor</a>
  */
 @AppServerContainer(ContainerConstants.APP_SERVER_WILDFLY)
-@AppServerContainer(ContainerConstants.APP_SERVER_WILDFLY10)
+@AppServerContainer(ContainerConstants.APP_SERVER_WILDFLY_DEPRECATED)
 @AppServerContainer(ContainerConstants.APP_SERVER_EAP)
 @AppServerContainer(ContainerConstants.APP_SERVER_EAP6)
 @AppServerContainer(ContainerConstants.APP_SERVER_UNDERTOW)

testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/adapter/example/authorization/ServletAuthzLazyLoadPathsAdapterTest.java

@@ -29,7 +29,7 @@ import org.keycloak.testsuite.arquillian.containers.ContainerConstants;
  * @author <a href="mailto:psilva@redhat.com">Pedro Igor</a>
  */
 @AppServerContainer(ContainerConstants.APP_SERVER_WILDFLY)
-@AppServerContainer(ContainerConstants.APP_SERVER_WILDFLY10)
+@AppServerContainer(ContainerConstants.APP_SERVER_WILDFLY_DEPRECATED)
 @AppServerContainer(ContainerConstants.APP_SERVER_EAP)
 @AppServerContainer(ContainerConstants.APP_SERVER_EAP6)
 @AppServerContainer(ContainerConstants.APP_SERVER_UNDERTOW)

testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/adapter/example/authorization/ServletAuthzNoLazyLoadPathsAdapterTest.java

@@ -27,7 +27,7 @@ import org.keycloak.testsuite.arquillian.containers.ContainerConstants;
  * @author <a href="mailto:psilva@redhat.com">Pedro Igor</a>
  */
 @AppServerContainer(ContainerConstants.APP_SERVER_WILDFLY)
-@AppServerContainer(ContainerConstants.APP_SERVER_WILDFLY10)
+@AppServerContainer(ContainerConstants.APP_SERVER_WILDFLY_DEPRECATED)
 @AppServerContainer(ContainerConstants.APP_SERVER_EAP)
 @AppServerContainer(ContainerConstants.APP_SERVER_EAP6)
 @AppServerContainer(ContainerConstants.APP_SERVER_UNDERTOW)

testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/adapter/example/authorization/ServletPolicyEnforcerTest.java

@@ -53,7 +53,7 @@ import org.openqa.selenium.By;
  * @author <a href="mailto:psilva@redhat.com">Pedro Igor</a>
  */
 @AppServerContainer(ContainerConstants.APP_SERVER_WILDFLY)
-@AppServerContainer(ContainerConstants.APP_SERVER_WILDFLY10)
+@AppServerContainer(ContainerConstants.APP_SERVER_WILDFLY_DEPRECATED)
 @AppServerContainer(ContainerConstants.APP_SERVER_EAP)
 @AppServerContainer(ContainerConstants.APP_SERVER_EAP6)
 @AppServerContainer(ContainerConstants.APP_SERVER_UNDERTOW)

testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/adapter/example/cors/CorsExampleAdapterTest.java

@@ -57,7 +57,7 @@ import static org.keycloak.testsuite.util.WaitUtils.waitUntilElement;
  * Created by fkiss.
  */
 @AppServerContainer(ContainerConstants.APP_SERVER_WILDFLY)
-@AppServerContainer(ContainerConstants.APP_SERVER_WILDFLY10)
+@AppServerContainer(ContainerConstants.APP_SERVER_WILDFLY_DEPRECATED)
 @AppServerContainer(ContainerConstants.APP_SERVER_EAP)
 @AppServerContainer(ContainerConstants.APP_SERVER_EAP6)
 @AppServerContainer(ContainerConstants.APP_SERVER_EAP71)

testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/adapter/servlet/BrokerLinkAndTokenExchangeTest.java

@@ -93,7 +93,7 @@ import static org.keycloak.testsuite.arquillian.DeploymentTargetModifier.AUTH_SE
  */
 @AppServerContainer(ContainerConstants.APP_SERVER_UNDERTOW)
 @AppServerContainer(ContainerConstants.APP_SERVER_WILDFLY)
-@AppServerContainer(ContainerConstants.APP_SERVER_WILDFLY10)
+@AppServerContainer(ContainerConstants.APP_SERVER_WILDFLY_DEPRECATED)
 @AppServerContainer(ContainerConstants.APP_SERVER_EAP)
 @AppServerContainer(ContainerConstants.APP_SERVER_EAP6)
 @AppServerContainer(ContainerConstants.APP_SERVER_EAP71)

testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/adapter/servlet/ClientInitiatedAccountLinkTest.java

@@ -23,7 +23,6 @@ import org.jboss.arquillian.test.api.ArquillianResource;
 import org.jboss.shrinkwrap.api.spec.WebArchive;
 import org.junit.Assert;
 import org.junit.Before;
-import org.junit.Ignore;
 import org.junit.Test;
 import org.keycloak.admin.client.resource.ClientResource;
 import org.keycloak.admin.client.resource.RealmResource;
@@ -75,7 +74,7 @@ import static org.keycloak.testsuite.admin.ApiUtil.createUserAndResetPasswordWit
  */
 @AppServerContainer(ContainerConstants.APP_SERVER_UNDERTOW)
 @AppServerContainer(ContainerConstants.APP_SERVER_WILDFLY)
-@AppServerContainer(ContainerConstants.APP_SERVER_WILDFLY10)
+@AppServerContainer(ContainerConstants.APP_SERVER_WILDFLY_DEPRECATED)
 @AppServerContainer(ContainerConstants.APP_SERVER_EAP)
 @AppServerContainer(ContainerConstants.APP_SERVER_EAP6)
 @AppServerContainer(ContainerConstants.APP_SERVER_EAP71)

testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/adapter/servlet/DemoFilterServletAdapterTest.java

@@ -24,7 +24,7 @@ import org.keycloak.testsuite.arquillian.containers.ContainerConstants;
 
 @AppServerContainer(ContainerConstants.APP_SERVER_UNDERTOW)
 @AppServerContainer(ContainerConstants.APP_SERVER_WILDFLY)
-@AppServerContainer(ContainerConstants.APP_SERVER_WILDFLY10)
+@AppServerContainer(ContainerConstants.APP_SERVER_WILDFLY_DEPRECATED)
 @AppServerContainer(ContainerConstants.APP_SERVER_EAP)
 @AppServerContainer(ContainerConstants.APP_SERVER_EAP6)
 @AppServerContainer(ContainerConstants.APP_SERVER_EAP71)

testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/adapter/servlet/DemoServletsAdapterTest.java

@@ -128,8 +128,7 @@ import static org.keycloak.testsuite.util.WaitUtils.waitForPageToLoad;
  */
 @AppServerContainer(ContainerConstants.APP_SERVER_UNDERTOW)
 @AppServerContainer(ContainerConstants.APP_SERVER_WILDFLY)
-@AppServerContainer(ContainerConstants.APP_SERVER_WILDFLY10)
+@AppServerContainer(ContainerConstants.APP_SERVER_WILDFLY_DEPRECATED)
-@AppServerContainer(ContainerConstants.APP_SERVER_WILDFLY9)
 @AppServerContainer(ContainerConstants.APP_SERVER_EAP)
 @AppServerContainer(ContainerConstants.APP_SERVER_EAP6)
 @AppServerContainer(ContainerConstants.APP_SERVER_EAP71)

testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/adapter/servlet/OIDCPublicKeyRotationAdapterTest.java

@@ -80,8 +80,7 @@ import static org.keycloak.testsuite.util.WaitUtils.waitUntilElement;
  */
 @AppServerContainer(ContainerConstants.APP_SERVER_UNDERTOW)
 @AppServerContainer(ContainerConstants.APP_SERVER_WILDFLY)
-@AppServerContainer(ContainerConstants.APP_SERVER_WILDFLY10)
+@AppServerContainer(ContainerConstants.APP_SERVER_WILDFLY_DEPRECATED)
-@AppServerContainer(ContainerConstants.APP_SERVER_WILDFLY9)
 @AppServerContainer(ContainerConstants.APP_SERVER_EAP)
 @AppServerContainer(ContainerConstants.APP_SERVER_EAP6)
 @AppServerContainer(ContainerConstants.APP_SERVER_EAP71)

testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/adapter/servlet/OfflineServletsAdapterTest.java

@@ -37,8 +37,7 @@ import static org.keycloak.testsuite.util.WaitUtils.waitUntilElement;
  */
 @AppServerContainer(ContainerConstants.APP_SERVER_UNDERTOW)
 @AppServerContainer(ContainerConstants.APP_SERVER_WILDFLY)
-@AppServerContainer(ContainerConstants.APP_SERVER_WILDFLY10)
+@AppServerContainer(ContainerConstants.APP_SERVER_WILDFLY_DEPRECATED)
-@AppServerContainer(ContainerConstants.APP_SERVER_WILDFLY9)
 @AppServerContainer(ContainerConstants.APP_SERVER_EAP)
 @AppServerContainer(ContainerConstants.APP_SERVER_EAP6)
 @AppServerContainer(ContainerConstants.APP_SERVER_EAP71)

testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/adapter/servlet/SAMLFilterServletAdapterTest.java

@@ -12,8 +12,7 @@ import org.keycloak.testsuite.arquillian.containers.ContainerConstants;
  * @author mhajas
  */
 @AppServerContainer(ContainerConstants.APP_SERVER_WILDFLY)
-@AppServerContainer(ContainerConstants.APP_SERVER_WILDFLY10)
+@AppServerContainer(ContainerConstants.APP_SERVER_WILDFLY_DEPRECATED)
-@AppServerContainer(ContainerConstants.APP_SERVER_WILDFLY9)
 @AppServerContainer(ContainerConstants.APP_SERVER_EAP)
 @AppServerContainer(ContainerConstants.APP_SERVER_EAP6)
 @AppServerContainer(ContainerConstants.APP_SERVER_EAP71)

testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/adapter/servlet/SAMLServletAdapterTest.java

@@ -160,8 +160,7 @@ import org.xml.sax.SAXException;
  * @author mhajas
  */
 @AppServerContainer(ContainerConstants.APP_SERVER_WILDFLY)
-@AppServerContainer(ContainerConstants.APP_SERVER_WILDFLY10)
+@AppServerContainer(ContainerConstants.APP_SERVER_WILDFLY_DEPRECATED)
-@AppServerContainer(ContainerConstants.APP_SERVER_WILDFLY9)
 @AppServerContainer(ContainerConstants.APP_SERVER_EAP)
 @AppServerContainer(ContainerConstants.APP_SERVER_EAP6)
 @AppServerContainer(ContainerConstants.APP_SERVER_EAP71)

testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/adapter/servlet/SecuredDeploymentsAdapterTest.java

@@ -44,8 +44,7 @@ import org.keycloak.testsuite.arquillian.containers.ContainerConstants;
 import org.keycloak.testsuite.arquillian.containers.SelfManagedAppContainerLifecycle;
 
 @AppServerContainer(ContainerConstants.APP_SERVER_WILDFLY)
-@AppServerContainer(ContainerConstants.APP_SERVER_WILDFLY10)
+@AppServerContainer(ContainerConstants.APP_SERVER_WILDFLY_DEPRECATED)
-@AppServerContainer(ContainerConstants.APP_SERVER_WILDFLY9)
 @AppServerContainer(ContainerConstants.APP_SERVER_EAP)
 @AppServerContainer(ContainerConstants.APP_SERVER_EAP6)
 @AppServerContainer(ContainerConstants.APP_SERVER_EAP71)

testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/adapter/servlet/SessionServletAdapterTest.java

@@ -52,8 +52,7 @@ import static org.keycloak.testsuite.util.URLAssert.assertCurrentUrlStartsWithLo
  */
 @AppServerContainer(ContainerConstants.APP_SERVER_UNDERTOW)
 @AppServerContainer(ContainerConstants.APP_SERVER_WILDFLY)
-@AppServerContainer(ContainerConstants.APP_SERVER_WILDFLY10)
+@AppServerContainer(ContainerConstants.APP_SERVER_WILDFLY_DEPRECATED)
-@AppServerContainer(ContainerConstants.APP_SERVER_WILDFLY9)
 @AppServerContainer(ContainerConstants.APP_SERVER_EAP)
 @AppServerContainer(ContainerConstants.APP_SERVER_EAP6)
 @AppServerContainer(ContainerConstants.APP_SERVER_EAP71)

testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/adapter/servlet/UserStorageConsentTest.java

@@ -67,7 +67,7 @@ import static org.keycloak.testsuite.util.URLAssert.assertCurrentUrlStartsWithLo
  */
 @AppServerContainer(ContainerConstants.APP_SERVER_UNDERTOW)
 @AppServerContainer(ContainerConstants.APP_SERVER_WILDFLY)
-@AppServerContainer(ContainerConstants.APP_SERVER_WILDFLY10)
+@AppServerContainer(ContainerConstants.APP_SERVER_WILDFLY_DEPRECATED)
 @AppServerContainer(ContainerConstants.APP_SERVER_EAP)
 @AppServerContainer(ContainerConstants.APP_SERVER_EAP6)
 @AppServerContainer(ContainerConstants.APP_SERVER_EAP71)

testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/adapter/servlet/cluster/SAMLAdapterClusterTest.java

@@ -33,7 +33,7 @@ import static org.keycloak.testsuite.adapter.AbstractServletsAdapterTest.samlSer
  * @author hmlnarik
  */
 @AppServerContainer(ContainerConstants.APP_SERVER_WILDFLY_CLUSTER)
-@AppServerContainer(ContainerConstants.APP_SERVER_WILDFLY10_CLUSTER)
+@AppServerContainer(ContainerConstants.APP_SERVER_WILDFLY_DEPRECATED_CLUSTER)
 @AppServerContainer(ContainerConstants.APP_SERVER_EAP_CLUSTER)
 @AppServerContainer(ContainerConstants.APP_SERVER_EAP6_CLUSTER)
 public class SAMLAdapterClusterTest extends AbstractSAMLAdapterClusteredTest {

testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/adapter/servlet/crossdc/SAMLAdapterCrossDCTest.java

@@ -37,7 +37,7 @@ import static org.keycloak.testsuite.adapter.AbstractServletsAdapterTest.samlSer
  * @author hmlnarik
  */
 @AppServerContainer(ContainerConstants.APP_SERVER_WILDFLY_CLUSTER)
-@AppServerContainer(ContainerConstants.APP_SERVER_WILDFLY10_CLUSTER)
+@AppServerContainer(ContainerConstants.APP_SERVER_WILDFLY_DEPRECATED_CLUSTER)
 @AppServerContainer(ContainerConstants.APP_SERVER_EAP_CLUSTER)
 public class SAMLAdapterCrossDCTest extends AbstractSAMLAdapterClusteredTest {