From f0ba8f6591d7aa1bff0cc2aa56d80e5d64964995 Mon Sep 17 00:00:00 2001 From: mposolda Date: Fri, 31 Aug 2018 14:21:03 +0200 Subject: [PATCH] KEYCLOAK-8139 Added wildfly-deprecated module for adapters testing. Remove wildfly9 and wildfly10 --- .../integration-arquillian/HOW-TO-RUN.md | 24 ++- testsuite/integration-arquillian/pom.xml | 6 + .../servers/app-server/jboss/pom.xml | 18 +- .../{wildfly10 => wildfly-deprecated}/pom.xml | 12 +- ...precatedAppServerArquillianExtension.java} | 6 +- .../WildflyDeprecatedAppServerProvider.java} | 8 +- ...DeprecatedDeploymentArchiveProcessor.java} | 4 +- ...boss.arquillian.core.spi.LoadableExtension | 1 + ...llian.container.AppServerContainerProvider | 1 + .../src/saml-adapter-supported | 0 ...Wildfly10AppServerArquillianExtension.java | 34 ---- .../Wildfly10DeploymentArchiveProcessor.java | 73 -------- ...boss.arquillian.core.spi.LoadableExtension | 1 - ...llian.container.AppServerContainerProvider | 1 - .../servers/app-server/jboss/wildfly9/pom.xml | 63 ------- .../container/Wildfly9AppServerProvider.java | 165 ------------------ ...boss.arquillian.core.spi.LoadableExtension | 1 - ...llian.container.AppServerContainerProvider | 1 - .../jboss/wildfly9/src/saml-adapter-supported | 1 - .../integration-arquillian/servers/pom.xml | 5 +- .../integration-arquillian/tests/base/pom.xml | 50 +----- .../containers/ContainerConstants.java | 6 +- .../DefaultAuthzConfigAdapterTest.java | 2 +- .../PermissiveModeAdapterTest.java | 2 +- ...PhotozExampleLazyLoadPathsAdapterTest.java | 2 +- ...otozExampleNoLazyLoadPathsAdapterTest.java | 2 +- .../ServletAuthzCIPAdapterTest.java | 2 +- .../ServletAuthzCacheDisabledAdapterTest.java | 2 +- .../ServletAuthzCacheLifespanAdapterTest.java | 2 +- .../ServletAuthzLazyLoadPathsAdapterTest.java | 2 +- ...ervletAuthzNoLazyLoadPathsAdapterTest.java | 2 +- .../ServletPolicyEnforcerTest.java | 2 +- .../example/cors/CorsExampleAdapterTest.java | 2 +- .../BrokerLinkAndTokenExchangeTest.java | 2 +- .../ClientInitiatedAccountLinkTest.java | 3 +- .../servlet/DemoFilterServletAdapterTest.java | 2 +- .../servlet/DemoServletsAdapterTest.java | 3 +- .../OIDCPublicKeyRotationAdapterTest.java | 3 +- .../servlet/OfflineServletsAdapterTest.java | 3 +- .../servlet/SAMLFilterServletAdapterTest.java | 3 +- .../servlet/SAMLServletAdapterTest.java | 3 +- .../SecuredDeploymentsAdapterTest.java | 3 +- .../servlet/SessionServletAdapterTest.java | 3 +- .../servlet/UserStorageConsentTest.java | 2 +- .../cluster/SAMLAdapterClusterTest.java | 2 +- .../crossdc/SAMLAdapterCrossDCTest.java | 2 +- 46 files changed, 83 insertions(+), 454 deletions(-) rename testsuite/integration-arquillian/servers/app-server/jboss/{wildfly10 => wildfly-deprecated}/pom.xml (86%) rename testsuite/integration-arquillian/servers/app-server/jboss/{wildfly9/src/main/java/org/keycloak/testsuite/arquillian/wildfly/Wildfly9AppServerArquillianExtension.java => wildfly-deprecated/src/main/java/org/keycloak/testsuite/arquillian/wildfly/WildflyDeprecatedAppServerArquillianExtension.java} (86%) rename testsuite/integration-arquillian/servers/app-server/jboss/{wildfly10/src/main/java/org/keycloak/testsuite/arquillian/wildfly/container/Wildfly10AppServerProvider.java => wildfly-deprecated/src/main/java/org/keycloak/testsuite/arquillian/wildfly/container/WildflyDeprecatedAppServerProvider.java} (96%) rename testsuite/integration-arquillian/servers/app-server/jboss/{wildfly9/src/main/java/org/keycloak/testsuite/arquillian/wildfly/container/Wildfly9DeploymentArchiveProcessor.java => wildfly-deprecated/src/main/java/org/keycloak/testsuite/arquillian/wildfly/container/WildflyDeprecatedDeploymentArchiveProcessor.java} (94%) create mode 100644 testsuite/integration-arquillian/servers/app-server/jboss/wildfly-deprecated/src/main/resources/META-INF/services/org.jboss.arquillian.core.spi.LoadableExtension create mode 100644 testsuite/integration-arquillian/servers/app-server/jboss/wildfly-deprecated/src/main/resources/META-INF/services/org.keycloak.testsuite.arquillian.container.AppServerContainerProvider rename testsuite/integration-arquillian/servers/app-server/jboss/{wildfly10 => wildfly-deprecated}/src/saml-adapter-supported (100%) delete mode 100644 testsuite/integration-arquillian/servers/app-server/jboss/wildfly10/src/main/java/org/keycloak/testsuite/arquillian/wildfly/Wildfly10AppServerArquillianExtension.java delete mode 100644 testsuite/integration-arquillian/servers/app-server/jboss/wildfly10/src/main/java/org/keycloak/testsuite/arquillian/wildfly/container/Wildfly10DeploymentArchiveProcessor.java delete mode 100644 testsuite/integration-arquillian/servers/app-server/jboss/wildfly10/src/main/resources/META-INF/services/org.jboss.arquillian.core.spi.LoadableExtension delete mode 100644 testsuite/integration-arquillian/servers/app-server/jboss/wildfly10/src/main/resources/META-INF/services/org.keycloak.testsuite.arquillian.container.AppServerContainerProvider delete mode 100644 testsuite/integration-arquillian/servers/app-server/jboss/wildfly9/pom.xml delete mode 100644 testsuite/integration-arquillian/servers/app-server/jboss/wildfly9/src/main/java/org/keycloak/testsuite/arquillian/wildfly/container/Wildfly9AppServerProvider.java delete mode 100644 testsuite/integration-arquillian/servers/app-server/jboss/wildfly9/src/main/resources/META-INF/services/org.jboss.arquillian.core.spi.LoadableExtension delete mode 100644 testsuite/integration-arquillian/servers/app-server/jboss/wildfly9/src/main/resources/META-INF/services/org.keycloak.testsuite.arquillian.container.AppServerContainerProvider delete mode 100644 testsuite/integration-arquillian/servers/app-server/jboss/wildfly9/src/saml-adapter-supported diff --git a/testsuite/integration-arquillian/HOW-TO-RUN.md b/testsuite/integration-arquillian/HOW-TO-RUN.md index 81eb5cb838..a825623806 100644 --- a/testsuite/integration-arquillian/HOW-TO-RUN.md +++ b/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 diff --git a/testsuite/integration-arquillian/pom.xml b/testsuite/integration-arquillian/pom.xml index 385eb6eacb..4ecec25849 100644 --- a/testsuite/integration-arquillian/pom.xml +++ b/testsuite/integration-arquillian/pom.xml @@ -41,6 +41,12 @@ ${java.home} undertow + + 11.0.0.Final + 3.0.8.Final + 8.2.8.Final + 2.1.0.Final + - - - - org.keycloak.testsuite - integration-arquillian-servers-app-server-jboss - 4.3.0.Final-SNAPSHOT - - 4.0.0 - - integration-arquillian-servers-app-server-wildfly9 - jar - App Server - Wildfly 9 - - - wildfly9 - - org.wildfly - wildfly-dist - ${wildfly9.version} - wildfly-${wildfly9.version} - - keycloak-wildfly-adapter-dist - keycloak-saml-wildfly-adapter-dist - - false - true - - - - - org.keycloak.testsuite - integration-arquillian-servers-app-server-spi - ${project.version} - - - org.wildfly.arquillian - wildfly-arquillian-container-managed - - - org.keycloak.testsuite - integration-arquillian-util - ${project.version} - - - diff --git a/testsuite/integration-arquillian/servers/app-server/jboss/wildfly9/src/main/java/org/keycloak/testsuite/arquillian/wildfly/container/Wildfly9AppServerProvider.java b/testsuite/integration-arquillian/servers/app-server/jboss/wildfly9/src/main/java/org/keycloak/testsuite/arquillian/wildfly/container/Wildfly9AppServerProvider.java deleted file mode 100644 index a386d73a0e..0000000000 --- a/testsuite/integration-arquillian/servers/app-server/jboss/wildfly9/src/main/java/org/keycloak/testsuite/arquillian/wildfly/container/Wildfly9AppServerProvider.java +++ /dev/null @@ -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 Vlasta Ramik - */ -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 getContainers() { - List 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 + " "; - } -} diff --git a/testsuite/integration-arquillian/servers/app-server/jboss/wildfly9/src/main/resources/META-INF/services/org.jboss.arquillian.core.spi.LoadableExtension b/testsuite/integration-arquillian/servers/app-server/jboss/wildfly9/src/main/resources/META-INF/services/org.jboss.arquillian.core.spi.LoadableExtension deleted file mode 100644 index e27917baac..0000000000 --- a/testsuite/integration-arquillian/servers/app-server/jboss/wildfly9/src/main/resources/META-INF/services/org.jboss.arquillian.core.spi.LoadableExtension +++ /dev/null @@ -1 +0,0 @@ -org.keycloak.testsuite.arquillian.wildfly.Wildfly9AppServerArquillianExtension diff --git a/testsuite/integration-arquillian/servers/app-server/jboss/wildfly9/src/main/resources/META-INF/services/org.keycloak.testsuite.arquillian.container.AppServerContainerProvider b/testsuite/integration-arquillian/servers/app-server/jboss/wildfly9/src/main/resources/META-INF/services/org.keycloak.testsuite.arquillian.container.AppServerContainerProvider deleted file mode 100644 index 134e751573..0000000000 --- a/testsuite/integration-arquillian/servers/app-server/jboss/wildfly9/src/main/resources/META-INF/services/org.keycloak.testsuite.arquillian.container.AppServerContainerProvider +++ /dev/null @@ -1 +0,0 @@ -org.keycloak.testsuite.arquillian.wildfly.container.Wildfly9AppServerProvider diff --git a/testsuite/integration-arquillian/servers/app-server/jboss/wildfly9/src/saml-adapter-supported b/testsuite/integration-arquillian/servers/app-server/jboss/wildfly9/src/saml-adapter-supported deleted file mode 100644 index 8b13789179..0000000000 --- a/testsuite/integration-arquillian/servers/app-server/jboss/wildfly9/src/saml-adapter-supported +++ /dev/null @@ -1 +0,0 @@ - diff --git a/testsuite/integration-arquillian/servers/pom.xml b/testsuite/integration-arquillian/servers/pom.xml index 0df8402f6a..9f50f63ba9 100644 --- a/testsuite/integration-arquillian/servers/pom.xml +++ b/testsuite/integration-arquillian/servers/pom.xml @@ -32,10 +32,7 @@ sh - - 10.1.0.Final - 9.0.2.Final - 8.2.1.Final + 7.5.20.Final-redhat-1 7.1.4.GA-redhat-1 7.1.1.Final diff --git a/testsuite/integration-arquillian/tests/base/pom.xml b/testsuite/integration-arquillian/tests/base/pom.xml index 5abb910f6a..6ca1f14eb2 100644 --- a/testsuite/integration-arquillian/tests/base/pom.xml +++ b/testsuite/integration-arquillian/tests/base/pom.xml @@ -357,24 +357,24 @@ - app-server-wildfly10 + app-server-wildfly-deprecated app.server - wildfly10 + wildfly-deprecated - wildfly10 + wildfly-deprecated false - 2.0.0.Final - 8.2.5.Final + ${wildfly.deprecated.arquillian.wildfly.container} + ${wildfly.deprecated.infinispan.version} org.keycloak.testsuite - integration-arquillian-servers-app-server-wildfly10 + integration-arquillian-servers-app-server-wildfly-deprecated ${project.version} runtime @@ -383,43 +383,7 @@ org.wildfly.core wildfly-cli test - ${wildfly10.core.version} - - - - - - org.commonjava.maven.plugins - directory-maven-plugin - - - - - - app-server-wildfly9 - - - app.server - wildfly9 - - - - wildfly9 - false - - - - org.keycloak.testsuite - integration-arquillian-servers-app-server-wildfly9 - ${project.version} - runtime - - - - org.wildfly.core - wildfly-cli - test - ${wildfly.core.version} + ${wildfly.deprecated.wildfly.core.version} diff --git a/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/arquillian/containers/ContainerConstants.java b/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/arquillian/containers/ContainerConstants.java index 2d2ac1dee5..6f5279e3b8 100644 --- a/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/arquillian/containers/ContainerConstants.java +++ b/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_WILDFLY10_CLUSTER = APP_SERVER_WILDFLY10 + "-ha-node-1;" + APP_SERVER_WILDFLY10 + "-ha-node-2"; - - public static final String APP_SERVER_WILDFLY9 = APP_SERVER_PREFIX + "wildfly9"; + public static final String APP_SERVER_WILDFLY_DEPRECATED = APP_SERVER_PREFIX + "wildfly-deprecated"; + 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_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"; diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/adapter/example/authorization/DefaultAuthzConfigAdapterTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/adapter/example/authorization/DefaultAuthzConfigAdapterTest.java index dcc0e694cd..df1738e483 100644 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/adapter/example/authorization/DefaultAuthzConfigAdapterTest.java +++ b/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 Pedro Igor */ @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) diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/adapter/example/authorization/PermissiveModeAdapterTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/adapter/example/authorization/PermissiveModeAdapterTest.java index e154a8b7a1..66cbc7368f 100644 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/adapter/example/authorization/PermissiveModeAdapterTest.java +++ b/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 Pedro Igor */ @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) diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/adapter/example/authorization/PhotozExampleLazyLoadPathsAdapterTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/adapter/example/authorization/PhotozExampleLazyLoadPathsAdapterTest.java index b729941d25..a4eef0ea92 100644 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/adapter/example/authorization/PhotozExampleLazyLoadPathsAdapterTest.java +++ b/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 Pedro Igor */ @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) diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/adapter/example/authorization/PhotozExampleNoLazyLoadPathsAdapterTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/adapter/example/authorization/PhotozExampleNoLazyLoadPathsAdapterTest.java index c8b605f77e..68aad30e02 100644 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/adapter/example/authorization/PhotozExampleNoLazyLoadPathsAdapterTest.java +++ b/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 Pedro Igor */ @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) diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/adapter/example/authorization/ServletAuthzCIPAdapterTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/adapter/example/authorization/ServletAuthzCIPAdapterTest.java index 41c3765b12..547ab66c74 100644 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/adapter/example/authorization/ServletAuthzCIPAdapterTest.java +++ b/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 Pedro Igor */ @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) diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/adapter/example/authorization/ServletAuthzCacheDisabledAdapterTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/adapter/example/authorization/ServletAuthzCacheDisabledAdapterTest.java index 8a862f111f..d9b57b6e67 100644 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/adapter/example/authorization/ServletAuthzCacheDisabledAdapterTest.java +++ b/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 Pedro Igor */ @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) diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/adapter/example/authorization/ServletAuthzCacheLifespanAdapterTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/adapter/example/authorization/ServletAuthzCacheLifespanAdapterTest.java index d61c26c009..59c467f8d5 100644 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/adapter/example/authorization/ServletAuthzCacheLifespanAdapterTest.java +++ b/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 Pedro Igor */ @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) diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/adapter/example/authorization/ServletAuthzLazyLoadPathsAdapterTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/adapter/example/authorization/ServletAuthzLazyLoadPathsAdapterTest.java index e129554464..47e171d1dd 100644 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/adapter/example/authorization/ServletAuthzLazyLoadPathsAdapterTest.java +++ b/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 Pedro Igor */ @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) diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/adapter/example/authorization/ServletAuthzNoLazyLoadPathsAdapterTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/adapter/example/authorization/ServletAuthzNoLazyLoadPathsAdapterTest.java index 8c54a29e72..ace86d76ce 100644 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/adapter/example/authorization/ServletAuthzNoLazyLoadPathsAdapterTest.java +++ b/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 Pedro Igor */ @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) diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/adapter/example/authorization/ServletPolicyEnforcerTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/adapter/example/authorization/ServletPolicyEnforcerTest.java index 1d54f2818c..b8963dd835 100644 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/adapter/example/authorization/ServletPolicyEnforcerTest.java +++ b/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 Pedro Igor */ @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) diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/adapter/example/cors/CorsExampleAdapterTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/adapter/example/cors/CorsExampleAdapterTest.java index 0b939d9734..56e2bc4a22 100644 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/adapter/example/cors/CorsExampleAdapterTest.java +++ b/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) diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/adapter/servlet/BrokerLinkAndTokenExchangeTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/adapter/servlet/BrokerLinkAndTokenExchangeTest.java index fbc67a9227..2194d2d011 100644 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/adapter/servlet/BrokerLinkAndTokenExchangeTest.java +++ b/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) diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/adapter/servlet/ClientInitiatedAccountLinkTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/adapter/servlet/ClientInitiatedAccountLinkTest.java index 71beb8f890..9ebba6b77a 100644 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/adapter/servlet/ClientInitiatedAccountLinkTest.java +++ b/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) diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/adapter/servlet/DemoFilterServletAdapterTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/adapter/servlet/DemoFilterServletAdapterTest.java index 5214b7feea..ac9d76f10e 100644 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/adapter/servlet/DemoFilterServletAdapterTest.java +++ b/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) diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/adapter/servlet/DemoServletsAdapterTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/adapter/servlet/DemoServletsAdapterTest.java index 550a9f9c27..f2fad1c40a 100644 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/adapter/servlet/DemoServletsAdapterTest.java +++ b/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_WILDFLY9) +@AppServerContainer(ContainerConstants.APP_SERVER_WILDFLY_DEPRECATED) @AppServerContainer(ContainerConstants.APP_SERVER_EAP) @AppServerContainer(ContainerConstants.APP_SERVER_EAP6) @AppServerContainer(ContainerConstants.APP_SERVER_EAP71) diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/adapter/servlet/OIDCPublicKeyRotationAdapterTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/adapter/servlet/OIDCPublicKeyRotationAdapterTest.java index ace3f80879..fc1f598455 100644 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/adapter/servlet/OIDCPublicKeyRotationAdapterTest.java +++ b/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_WILDFLY9) +@AppServerContainer(ContainerConstants.APP_SERVER_WILDFLY_DEPRECATED) @AppServerContainer(ContainerConstants.APP_SERVER_EAP) @AppServerContainer(ContainerConstants.APP_SERVER_EAP6) @AppServerContainer(ContainerConstants.APP_SERVER_EAP71) diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/adapter/servlet/OfflineServletsAdapterTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/adapter/servlet/OfflineServletsAdapterTest.java index fdcc9846ca..e278e96442 100644 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/adapter/servlet/OfflineServletsAdapterTest.java +++ b/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_WILDFLY9) +@AppServerContainer(ContainerConstants.APP_SERVER_WILDFLY_DEPRECATED) @AppServerContainer(ContainerConstants.APP_SERVER_EAP) @AppServerContainer(ContainerConstants.APP_SERVER_EAP6) @AppServerContainer(ContainerConstants.APP_SERVER_EAP71) diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/adapter/servlet/SAMLFilterServletAdapterTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/adapter/servlet/SAMLFilterServletAdapterTest.java index b7b3c64523..b53be7ab02 100644 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/adapter/servlet/SAMLFilterServletAdapterTest.java +++ b/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_WILDFLY9) +@AppServerContainer(ContainerConstants.APP_SERVER_WILDFLY_DEPRECATED) @AppServerContainer(ContainerConstants.APP_SERVER_EAP) @AppServerContainer(ContainerConstants.APP_SERVER_EAP6) @AppServerContainer(ContainerConstants.APP_SERVER_EAP71) diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/adapter/servlet/SAMLServletAdapterTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/adapter/servlet/SAMLServletAdapterTest.java index 5b7bf75d9d..d11b19b4ff 100644 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/adapter/servlet/SAMLServletAdapterTest.java +++ b/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_WILDFLY9) +@AppServerContainer(ContainerConstants.APP_SERVER_WILDFLY_DEPRECATED) @AppServerContainer(ContainerConstants.APP_SERVER_EAP) @AppServerContainer(ContainerConstants.APP_SERVER_EAP6) @AppServerContainer(ContainerConstants.APP_SERVER_EAP71) diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/adapter/servlet/SecuredDeploymentsAdapterTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/adapter/servlet/SecuredDeploymentsAdapterTest.java index 8cb4764641..00d9d1770c 100644 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/adapter/servlet/SecuredDeploymentsAdapterTest.java +++ b/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_WILDFLY9) +@AppServerContainer(ContainerConstants.APP_SERVER_WILDFLY_DEPRECATED) @AppServerContainer(ContainerConstants.APP_SERVER_EAP) @AppServerContainer(ContainerConstants.APP_SERVER_EAP6) @AppServerContainer(ContainerConstants.APP_SERVER_EAP71) diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/adapter/servlet/SessionServletAdapterTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/adapter/servlet/SessionServletAdapterTest.java index 573682a9f2..20cadaebb6 100644 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/adapter/servlet/SessionServletAdapterTest.java +++ b/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_WILDFLY9) +@AppServerContainer(ContainerConstants.APP_SERVER_WILDFLY_DEPRECATED) @AppServerContainer(ContainerConstants.APP_SERVER_EAP) @AppServerContainer(ContainerConstants.APP_SERVER_EAP6) @AppServerContainer(ContainerConstants.APP_SERVER_EAP71) diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/adapter/servlet/UserStorageConsentTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/adapter/servlet/UserStorageConsentTest.java index f9339d2607..788587656e 100644 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/adapter/servlet/UserStorageConsentTest.java +++ b/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) diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/adapter/servlet/cluster/SAMLAdapterClusterTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/adapter/servlet/cluster/SAMLAdapterClusterTest.java index daefe7da05..84e80aa66a 100644 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/adapter/servlet/cluster/SAMLAdapterClusterTest.java +++ b/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 { diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/adapter/servlet/crossdc/SAMLAdapterCrossDCTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/adapter/servlet/crossdc/SAMLAdapterCrossDCTest.java index 419d8e83c0..affe466db3 100644 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/adapter/servlet/crossdc/SAMLAdapterCrossDCTest.java +++ b/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 {