diff --git a/adapters/oidc/tomcat/pom.xml b/adapters/oidc/tomcat/pom.xml index 367477e27f7..cdd67ecf711 100755 --- a/adapters/oidc/tomcat/pom.xml +++ b/adapters/oidc/tomcat/pom.xml @@ -35,17 +35,4 @@ tomcat - - - community - - - !product - - - - tomcat7 - - - diff --git a/adapters/oidc/tomcat/tomcat-core/pom.xml b/adapters/oidc/tomcat/tomcat-core/pom.xml index b68653295e7..3503a72607f 100755 --- a/adapters/oidc/tomcat/tomcat-core/pom.xml +++ b/adapters/oidc/tomcat/tomcat-core/pom.xml @@ -93,7 +93,7 @@ org.apache.tomcat tomcat-catalina - ${tomcat7.version} + ${tomcat8.version} compile diff --git a/adapters/oidc/tomcat/tomcat7/pom.xml b/adapters/oidc/tomcat/tomcat7/pom.xml deleted file mode 100755 index 52fc0eb6a70..00000000000 --- a/adapters/oidc/tomcat/tomcat7/pom.xml +++ /dev/null @@ -1,107 +0,0 @@ - - - - - - keycloak-tomcat-integration-pom - org.keycloak - 18.0.0-SNAPSHOT - ../pom.xml - - 4.0.0 - - keycloak-tomcat7-adapter - Keycloak Tomcat 7 Integration - - 1.7 - 1.7 - - - - - - org.jboss.logging - jboss-logging - - - org.keycloak - keycloak-core - - - org.keycloak - keycloak-adapter-core - - - org.keycloak - keycloak-tomcat-core-adapter - - - org.apache.tomcat - tomcat-servlet-api - - - org.apache.tomcat - tomcat-catalina - - - org.apache.tomcat - catalina - - - - - org.apache.httpcomponents - httpclient - - - org.bouncycastle - bcprov-jdk15on - - - com.fasterxml.jackson.core - jackson-core - - - com.fasterxml.jackson.core - jackson-databind - - - com.fasterxml.jackson.core - jackson-annotations - - - org.apache.tomcat - tomcat-servlet-api - ${tomcat7.version} - provided - - - org.apache.tomcat - tomcat-catalina - ${tomcat7.version} - provided - - - - junit - junit - test - - - diff --git a/adapters/oidc/tomcat/tomcat7/src/main/java/org/keycloak/adapters/tomcat/AuthenticatedActionsValve.java b/adapters/oidc/tomcat/tomcat7/src/main/java/org/keycloak/adapters/tomcat/AuthenticatedActionsValve.java deleted file mode 100644 index 82796d66abe..00000000000 --- a/adapters/oidc/tomcat/tomcat7/src/main/java/org/keycloak/adapters/tomcat/AuthenticatedActionsValve.java +++ /dev/null @@ -1,17 +0,0 @@ -package org.keycloak.adapters.tomcat; - -import org.apache.catalina.Container; -import org.apache.catalina.Valve; -import org.keycloak.adapters.AdapterDeploymentContext; - -public class AuthenticatedActionsValve extends AbstractAuthenticatedActionsValve { - - public AuthenticatedActionsValve(AdapterDeploymentContext deploymentContext, Valve next, Container container) { - super(deploymentContext, next, container); - } - - @Override - public boolean isAsyncSupported() { - return true; - } -} diff --git a/adapters/oidc/tomcat/tomcat7/src/main/java/org/keycloak/adapters/tomcat/KeycloakAuthenticatorValve.java b/adapters/oidc/tomcat/tomcat7/src/main/java/org/keycloak/adapters/tomcat/KeycloakAuthenticatorValve.java deleted file mode 100755 index 49854ff81d1..00000000000 --- a/adapters/oidc/tomcat/tomcat7/src/main/java/org/keycloak/adapters/tomcat/KeycloakAuthenticatorValve.java +++ /dev/null @@ -1,80 +0,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. - */ - -package org.keycloak.adapters.tomcat; - -import org.apache.catalina.Container; -import org.apache.catalina.Valve; -import org.apache.catalina.connector.Request; -import org.apache.catalina.connector.Response; -import org.apache.catalina.core.StandardContext; -import org.apache.catalina.deploy.LoginConfig; -import org.apache.catalina.realm.GenericPrincipal; -import org.keycloak.adapters.AdapterDeploymentContext; - -import javax.servlet.ServletException; -import javax.servlet.http.HttpServletResponse; -import java.io.IOException; -import java.security.Principal; -import java.util.List; - -/** - * Keycloak authentication valve - * - * @author Bill Burke - * @version $Revision: 1 $ - */ -public class KeycloakAuthenticatorValve extends AbstractKeycloakAuthenticatorValve { - public boolean authenticate(Request request, HttpServletResponse response, LoginConfig config) throws IOException { - return authenticateInternal(request, response, config); - } - - @Override - protected boolean forwardToErrorPageInternal(Request request, HttpServletResponse response, Object loginConfig) throws IOException { - if (loginConfig == null) return false; - LoginConfig config = (LoginConfig)loginConfig; - if (config.getErrorPage() == null) return false; - forwardToErrorPage(request, (Response)response, config); - return true; - } - - - protected void initInternal() { - StandardContext standardContext = (StandardContext) context; - standardContext.addLifecycleListener(this); - } - - public void logout(Request request) throws ServletException { - logoutInternal(request); - } - - @Override - protected GenericPrincipalFactory createPrincipalFactory() { - return new GenericPrincipalFactory() { - @Override - protected GenericPrincipal createPrincipal(Principal userPrincipal, List roles) { - return new GenericPrincipal(userPrincipal.getName(), null, roles, userPrincipal, null); - } - }; - } - - @Override - protected AbstractAuthenticatedActionsValve createAuthenticatedActionsValve(AdapterDeploymentContext deploymentContext, Valve next, Container container) { - return new AuthenticatedActionsValve(deploymentContext, next, container); - } - -} diff --git a/adapters/saml/tomcat/pom.xml b/adapters/saml/tomcat/pom.xml index 9d5d4bae28b..b052e148594 100755 --- a/adapters/saml/tomcat/pom.xml +++ b/adapters/saml/tomcat/pom.xml @@ -34,18 +34,4 @@ tomcat-core tomcat - - - - community - - - !product - - - - tomcat7 - - - diff --git a/adapters/saml/tomcat/tomcat-core/pom.xml b/adapters/saml/tomcat/tomcat-core/pom.xml index 1e09f7bf783..c26f08b029b 100755 --- a/adapters/saml/tomcat/tomcat-core/pom.xml +++ b/adapters/saml/tomcat/tomcat-core/pom.xml @@ -75,7 +75,7 @@ org.apache.tomcat tomcat-catalina - ${tomcat7.version} + ${tomcat8.version} compile diff --git a/adapters/saml/tomcat/tomcat7/pom.xml b/adapters/saml/tomcat/tomcat7/pom.xml deleted file mode 100755 index 5cc1ae460f1..00000000000 --- a/adapters/saml/tomcat/tomcat7/pom.xml +++ /dev/null @@ -1,87 +0,0 @@ - - - - - - keycloak-saml-tomcat-integration-pom - org.keycloak - 18.0.0-SNAPSHOT - ../pom.xml - - 4.0.0 - - keycloak-saml-tomcat7-adapter - Keycloak Tomcat 7 SAML Integration - - 1.7 - 1.7 - - - - - - org.jboss.logging - jboss-logging - - - org.keycloak - keycloak-saml-tomcat-adapter-core - - - org.apache.tomcat - tomcat-servlet-api - - - org.apache.tomcat - tomcat-catalina - - - org.apache.tomcat - catalina - - - - - org.apache.httpcomponents - httpclient - - - org.bouncycastle - bcprov-jdk15on - - - org.apache.tomcat - tomcat-servlet-api - ${tomcat7.version} - provided - - - org.apache.tomcat - tomcat-catalina - ${tomcat7.version} - provided - - - - junit - junit - test - - - diff --git a/adapters/saml/tomcat/tomcat7/src/main/java/org/keycloak/adapters/saml/tomcat/SamlAuthenticatorValve.java b/adapters/saml/tomcat/tomcat7/src/main/java/org/keycloak/adapters/saml/tomcat/SamlAuthenticatorValve.java deleted file mode 100755 index bdc2270fdda..00000000000 --- a/adapters/saml/tomcat/tomcat7/src/main/java/org/keycloak/adapters/saml/tomcat/SamlAuthenticatorValve.java +++ /dev/null @@ -1,73 +0,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. - */ - -package org.keycloak.adapters.saml.tomcat; - -import org.apache.catalina.connector.Request; -import org.apache.catalina.connector.Response; -import org.apache.catalina.core.StandardContext; -import org.apache.catalina.deploy.LoginConfig; -import org.apache.catalina.realm.GenericPrincipal; -import org.keycloak.adapters.saml.AbstractSamlAuthenticatorValve; -import org.keycloak.adapters.tomcat.GenericPrincipalFactory; - -import javax.servlet.ServletException; -import javax.servlet.http.HttpServletResponse; -import java.io.IOException; -import java.security.Principal; -import java.util.List; - -/** - * Keycloak authentication valve - * - * @author Bill Burke - * @version $Revision: 1 $ - */ -public class SamlAuthenticatorValve extends AbstractSamlAuthenticatorValve { - public boolean authenticate(Request request, HttpServletResponse response, LoginConfig config) throws IOException { - return authenticateInternal(request, response, config); - } - - @Override - protected boolean forwardToErrorPageInternal(Request request, HttpServletResponse response, Object loginConfig) throws IOException { - if (loginConfig == null) return false; - LoginConfig config = (LoginConfig)loginConfig; - if (config.getErrorPage() == null) return false; - forwardToErrorPage(request, (Response)response, config); - return true; - } - - - protected void initInternal() { - StandardContext standardContext = (StandardContext) context; - standardContext.addLifecycleListener(this); - } - - public void logout(Request request) throws ServletException { - logoutInternal(request); - } - - @Override - protected GenericPrincipalFactory createPrincipalFactory() { - return new GenericPrincipalFactory() { - @Override - protected GenericPrincipal createPrincipal(Principal userPrincipal, List roles) { - return new GenericPrincipal(userPrincipal.getName(), null, roles, userPrincipal, null); - } - }; - } -} diff --git a/adapters/spi/tomcat-adapter-spi/pom.xml b/adapters/spi/tomcat-adapter-spi/pom.xml index 50ecaf3b8d0..33a1eaef79d 100755 --- a/adapters/spi/tomcat-adapter-spi/pom.xml +++ b/adapters/spi/tomcat-adapter-spi/pom.xml @@ -58,7 +58,7 @@ org.apache.tomcat tomcat-catalina - ${tomcat7.version} + ${tomcat8.version} compile diff --git a/boms/adapter/pom.xml b/boms/adapter/pom.xml index 149e6a9f728..287bab7c0d5 100644 --- a/boms/adapter/pom.xml +++ b/boms/adapter/pom.xml @@ -64,11 +64,6 @@ keycloak-tomcat-adapter ${project.version} - - org.keycloak - keycloak-tomcat7-adapter - ${project.version} - org.keycloak keycloak-jetty92-adapter diff --git a/distribution/adapters/pom.xml b/distribution/adapters/pom.xml index 367ae29a6d8..394e4b658d7 100755 --- a/distribution/adapters/pom.xml +++ b/distribution/adapters/pom.xml @@ -47,7 +47,6 @@ tomcat-adapter-zip - tomcat7-adapter-zip jetty92-adapter-zip jetty93-adapter-zip jetty94-adapter-zip diff --git a/distribution/adapters/tomcat7-adapter-zip/assembly.xml b/distribution/adapters/tomcat7-adapter-zip/assembly.xml deleted file mode 100755 index d9c4310913b..00000000000 --- a/distribution/adapters/tomcat7-adapter-zip/assembly.xml +++ /dev/null @@ -1,42 +0,0 @@ - - - - war-dist - - - zip - tar.gz - - false - - - - false - true - true - - org.keycloak:keycloak-tomcat7-adapter - - - org.apache.tomcat:tomcat-servlet-api - org.apache.tomcat:tomcat-catalina - - - - - diff --git a/distribution/adapters/tomcat7-adapter-zip/pom.xml b/distribution/adapters/tomcat7-adapter-zip/pom.xml deleted file mode 100755 index 677e5299f6c..00000000000 --- a/distribution/adapters/tomcat7-adapter-zip/pom.xml +++ /dev/null @@ -1,68 +0,0 @@ - - - - 4.0.0 - - keycloak-parent - org.keycloak - 18.0.0-SNAPSHOT - ../../../pom.xml - - - keycloak-tomcat7-adapter-dist - pom - Keycloak Tomcat 7 Adapter Distro - - - - - org.keycloak - keycloak-tomcat7-adapter - - - - - - maven-assembly-plugin - - - assemble - package - - single - - - - assembly.xml - - - target - - - target/assembly/work - - false - - - - - - - - diff --git a/distribution/downloads/src/main/resources/files b/distribution/downloads/src/main/resources/files index 0bc69947ed1..5deb03e746b 100644 --- a/distribution/downloads/src/main/resources/files +++ b/distribution/downloads/src/main/resources/files @@ -8,7 +8,6 @@ keycloak-jetty94-adapter-dist:keycloak-oidc-jetty94-adapter keycloak-js-adapter-dist:keycloak-oidc-js-adapter keycloak-tomcat-adapter-dist:keycloak-oidc-tomcat-adapter - keycloak-tomcat7-adapter-dist:keycloak-oidc-tomcat7-adapter keycloak-wildfly-adapter-dist:keycloak-oidc-wildfly-adapter keycloak-fuse-adapter-dist:keycloak-oidc-fuse-adapter @@ -16,5 +15,4 @@ keycloak-saml-jetty93-adapter-dist:keycloak-saml-jetty93-adapter keycloak-saml-jetty94-adapter-dist:keycloak-saml-jetty94-adapter keycloak-saml-tomcat-adapter-dist:keycloak-saml-tomcat-adapter - keycloak-saml-tomcat7-adapter-dist:keycloak-saml-tomcat7-adapter keycloak-saml-wildfly-adapter-dist:keycloak-saml-wildfly-adapter diff --git a/distribution/saml-adapters/pom.xml b/distribution/saml-adapters/pom.xml index 1dd0bf6d295..f275ef0a7fc 100755 --- a/distribution/saml-adapters/pom.xml +++ b/distribution/saml-adapters/pom.xml @@ -47,7 +47,6 @@ jetty93-adapter-zip jetty94-adapter-zip tomcat-adapter-zip - tomcat7-adapter-zip diff --git a/distribution/saml-adapters/tomcat7-adapter-zip/assembly.xml b/distribution/saml-adapters/tomcat7-adapter-zip/assembly.xml deleted file mode 100755 index a537c62bc31..00000000000 --- a/distribution/saml-adapters/tomcat7-adapter-zip/assembly.xml +++ /dev/null @@ -1,42 +0,0 @@ - - - - war-dist - - - zip - tar.gz - - false - - - - false - true - true - - org.keycloak:keycloak-saml-tomcat7-adapter - - - org.apache.tomcat:tomcat-servlet-api - org.apache.tomcat:tomcat-catalina - - - - - diff --git a/distribution/saml-adapters/tomcat7-adapter-zip/pom.xml b/distribution/saml-adapters/tomcat7-adapter-zip/pom.xml deleted file mode 100755 index 1cfe8788124..00000000000 --- a/distribution/saml-adapters/tomcat7-adapter-zip/pom.xml +++ /dev/null @@ -1,68 +0,0 @@ - - - - 4.0.0 - - keycloak-parent - org.keycloak - 18.0.0-SNAPSHOT - ../../../pom.xml - - - keycloak-saml-tomcat7-adapter-dist - pom - Keycloak SAML Tomcat 7 Adapter Distro - - - - - org.keycloak - keycloak-saml-tomcat7-adapter - - - - - - maven-assembly-plugin - - - assemble - package - - single - - - - assembly.xml - - - target - - - target/assembly/work - - false - - - - - - - - diff --git a/misc/scripts/upgrade-wildfly/lib/wildfly/upgrade/__init__.py b/misc/scripts/upgrade-wildfly/lib/wildfly/upgrade/__init__.py index 3654304a847..2cc32ee5d91 100644 --- a/misc/scripts/upgrade-wildfly/lib/wildfly/upgrade/__init__.py +++ b/misc/scripts/upgrade-wildfly/lib/wildfly/upgrade/__init__.py @@ -660,7 +660,6 @@ _keycloakSpecificProperties = [ "surefire.memory.metaspace", "surefire.memory.metaspace.max", "surefire.memory.settings", - "tomcat7.version", "tomcat8.version", "tomcat9.version", "spring-boot24.version", @@ -768,7 +767,7 @@ _keycloakToWildflyProperties = { # Skip "nexus.staging.plugin.version" since Keycloak specific # Skip "frontend.plugin.version" since Keycloak specific # Skip "docker.maven.plugin.version" since Keycloak specific - # Skip "tomcat7.version", "tomcat8.version", and "tomcat9.version" since Keycloak specific + # Skip "tomcat8.version", and "tomcat9.version" since Keycloak specific # Skip "spring-boot24.version" and "spring-boot26.version" since Keycloak specific # Skip "webauthn4j.version" since Keycloak specific # Skip "org.apache.kerby.kerby-asn1.version" since Keycloak specific diff --git a/pom.xml b/pom.xml index 8ca61787a4f..675a2ea66f2 100644 --- a/pom.xml +++ b/pom.xml @@ -187,7 +187,6 @@ - 7.0.92 8.5.38 9.0.16 @@ -1205,21 +1204,11 @@ keycloak-saml-as7-subsystem ${project.version} - - org.keycloak - keycloak-saml-tomcat7-adapter - ${project.version} - org.keycloak keycloak-saml-tomcat-adapter ${project.version} - - org.keycloak - keycloak-tomcat7-adapter - ${project.version} - org.keycloak keycloak-tomcat-adapter @@ -1490,12 +1479,6 @@ ${project.version} zip - - org.keycloak - keycloak-tomcat7-adapter-dist - ${project.version} - zip - org.keycloak keycloak-tomcat-adapter-dist @@ -1550,12 +1533,6 @@ ${project.version} zip - - org.keycloak - keycloak-saml-tomcat7-adapter-dist - ${project.version} - zip - org.keycloak keycloak-saml-tomcat-adapter-dist diff --git a/testsuite/integration-arquillian/pom.xml b/testsuite/integration-arquillian/pom.xml index 694ac05c3c9..3bc6fd9520f 100644 --- a/testsuite/integration-arquillian/pom.xml +++ b/testsuite/integration-arquillian/pom.xml @@ -57,7 +57,6 @@ 1.0.0.CR3 2.2.0.Final 1.2.0.Beta3 - 1.1.0.Final 1.1.0.Final 1.1.0.Final 1.0.0.Alpha2 diff --git a/testsuite/integration-arquillian/servers/app-server/README.md b/testsuite/integration-arquillian/servers/app-server/README.md index d3666eaeafe..496832e66fe 100644 --- a/testsuite/integration-arquillian/servers/app-server/README.md +++ b/testsuite/integration-arquillian/servers/app-server/README.md @@ -34,6 +34,5 @@ Configures SSL in `standalone.xml`. See profile `ssl`. ## App Server - Tomcat Submodules are enabled with profiles: `-Papp-server-MODULE` ### Modules -* __`tomcat7` Tomcat 7__ * __`tomcat8` Tomcat 8__ * __`tomcat9` Tomcat 9__ diff --git a/testsuite/integration-arquillian/servers/app-server/tomcat/pom.xml b/testsuite/integration-arquillian/servers/app-server/tomcat/pom.xml index 4b89382f667..165c03100a7 100644 --- a/testsuite/integration-arquillian/servers/app-server/tomcat/pom.xml +++ b/testsuite/integration-arquillian/servers/app-server/tomcat/pom.xml @@ -295,14 +295,7 @@ - - - app-server-tomcat7 - - tomcat7 - common - - + app-server-tomcat8 diff --git a/testsuite/integration-arquillian/servers/app-server/tomcat/tomcat7/pom.xml b/testsuite/integration-arquillian/servers/app-server/tomcat/tomcat7/pom.xml deleted file mode 100644 index 454a235cd10..00000000000 --- a/testsuite/integration-arquillian/servers/app-server/tomcat/tomcat7/pom.xml +++ /dev/null @@ -1,113 +0,0 @@ - - - - - - org.keycloak.testsuite - integration-arquillian-servers-app-server-tomcat - 18.0.0-SNAPSHOT - - 4.0.0 - - integration-arquillian-servers-app-server-tomcat7 - App Server - Tomcat 7 - - - tomcat7 - - org.apache.tomcat - tomcat - ${tomcat7.version} - apache-tomcat-${tomcat7.version} - - keycloak-tomcat7-adapter-dist - keycloak-saml-tomcat7-adapter-dist - - true - - - 2.3.1.GA - 1.0.3 - 3.18.2-GA - 7.0 - 2.2 - - - - - org.keycloak.testsuite - integration-arquillian-servers-app-server-tomcat-common - ${project.version} - - - org.jboss.arquillian.container - arquillian-tomcat-managed-7 - ${arquillian-tomcat7-container-version} - - - - - - - maven-dependency-plugin - - - libs-for-tomcat-7 - generate-test-resources - - copy - - - - - org.jboss.resteasy - resteasy-jaxrs - ${tomcat.resteasy.version} - - - org.scannotation - scannotation - ${tomcat.scannotation.version} - - - org.javassist - javassist - ${tomcat.javassist.version} - - - javax - javaee-api - ${tomcat.javaee-api.version} - - - - org.glassfish.web - el-impl - ${tomcat.org.glassfish.web.el-impl.version} - - - ${app.server.tomcat.home}/lib - true - - - - - - - diff --git a/testsuite/integration-arquillian/servers/app-server/tomcat/tomcat7/src/main/java/org/keycloak/testsuite/arquillian/tomcat/Tomcat7AppServerArquillianExtension.java b/testsuite/integration-arquillian/servers/app-server/tomcat/tomcat7/src/main/java/org/keycloak/testsuite/arquillian/tomcat/Tomcat7AppServerArquillianExtension.java deleted file mode 100644 index 1c3592acad3..00000000000 --- a/testsuite/integration-arquillian/servers/app-server/tomcat/tomcat7/src/main/java/org/keycloak/testsuite/arquillian/tomcat/Tomcat7AppServerArquillianExtension.java +++ /dev/null @@ -1,30 +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.tomcat; - -import org.jboss.arquillian.container.test.spi.client.deployment.ApplicationArchiveProcessor; -import org.jboss.arquillian.core.spi.LoadableExtension; -import org.keycloak.testsuite.arquillian.tomcat.container.Tomcat7DeploymentArchiveProcessor; - -public class Tomcat7AppServerArquillianExtension implements LoadableExtension { - - @Override - public void register(ExtensionBuilder builder) { - builder.service(ApplicationArchiveProcessor.class, Tomcat7DeploymentArchiveProcessor.class); - } - -} diff --git a/testsuite/integration-arquillian/servers/app-server/tomcat/tomcat7/src/main/java/org/keycloak/testsuite/arquillian/tomcat/container/Tomcat7AppServerProvider.java b/testsuite/integration-arquillian/servers/app-server/tomcat/tomcat7/src/main/java/org/keycloak/testsuite/arquillian/tomcat/container/Tomcat7AppServerProvider.java deleted file mode 100644 index 51dc5934fb5..00000000000 --- a/testsuite/integration-arquillian/servers/app-server/tomcat/tomcat7/src/main/java/org/keycloak/testsuite/arquillian/tomcat/container/Tomcat7AppServerProvider.java +++ /dev/null @@ -1,41 +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.tomcat.container; - -import java.util.ArrayList; -import java.util.List; - -import org.jboss.arquillian.container.tomcat.managed.Tomcat7ManagedContainer; -import org.jboss.arquillian.core.spi.Validate; -import org.jboss.shrinkwrap.descriptor.spi.node.Node; -import org.keycloak.testsuite.arquillian.container.AppServerContainerProvider; -import org.keycloak.testsuite.utils.arquillian.tomcat.TomcatAppServerConfigurationUtils; - -public class Tomcat7AppServerProvider extends AbstractTomcatAppServerProvider { - - - @Override - public String getName() { - return "tomcat7"; - } - - @Override - protected String getContainerClassName() { - return Tomcat7ManagedContainer.class.getName(); - } -} diff --git a/testsuite/integration-arquillian/servers/app-server/tomcat/tomcat7/src/main/java/org/keycloak/testsuite/arquillian/tomcat/container/Tomcat7DeploymentArchiveProcessor.java b/testsuite/integration-arquillian/servers/app-server/tomcat/tomcat7/src/main/java/org/keycloak/testsuite/arquillian/tomcat/container/Tomcat7DeploymentArchiveProcessor.java deleted file mode 100644 index 720a78b0e06..00000000000 --- a/testsuite/integration-arquillian/servers/app-server/tomcat/tomcat7/src/main/java/org/keycloak/testsuite/arquillian/tomcat/container/Tomcat7DeploymentArchiveProcessor.java +++ /dev/null @@ -1,113 +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.tomcat.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.jboss.shrinkwrap.api.asset.StringAsset; -import org.keycloak.testsuite.utils.annotation.UseServletFilter; -import org.keycloak.testsuite.utils.arquillian.DeploymentArchiveProcessorUtils; -import org.keycloak.testsuite.utils.arquillian.tomcat.TomcatDeploymentArchiveProcessorUtils; -import org.keycloak.testsuite.utils.io.IOUtil; -import org.w3c.dom.Document; -import org.w3c.dom.Element; - -import java.util.Set; - -import static org.keycloak.testsuite.utils.arquillian.DeploymentArchiveProcessorUtils.WEBXML_PATH; -import static org.keycloak.testsuite.utils.io.IOUtil.documentToString; - -public class Tomcat7DeploymentArchiveProcessor extends CommonTomcatDeploymentArchiveProcessor { - - @Override - public void process(Archive archive, TestClass testClass) { - super.process(archive, testClass); - if (DeploymentArchiveProcessorUtils.checkRunOnServerDeployment(archive)) return; - - Set> configClasses = TomcatDeploymentArchiveProcessorUtils.getApplicationConfigClasses(archive); - - if (!configClasses.isEmpty()) { - // Tomcat 7 doesn't work with resteasy-servlet-initializer therefore we need to configure Tomcat the old way - // jax-rs docs: http://docs.jboss.org/resteasy/docs/3.6.1.Final/userguide/html_single/#d4e161 - Document webXmlDoc; - try { - webXmlDoc = IOUtil.loadXML( - archive.get(WEBXML_PATH).getAsset().openStream()); - } catch (Exception ex) { - throw new RuntimeException("Error when processing " + archive.getName(), ex); - } - - addContextParam(webXmlDoc); - addServlet(webXmlDoc, configClasses.iterator().next().getName()); - addServletMapping(webXmlDoc); - - archive.add(new StringAsset((documentToString(webXmlDoc))), DeploymentArchiveProcessorUtils.WEBXML_PATH); - } - } - - private void addServletMapping(Document doc) { - Element servletMapping = doc.createElement("servlet-mapping"); - Element servetName = doc.createElement("servlet-name"); - Element urlPattern = doc.createElement("url-pattern"); - - servetName.setTextContent("Resteasy"); - urlPattern.setTextContent("/*"); - - servletMapping.appendChild(servetName); - servletMapping.appendChild(urlPattern); - IOUtil.appendChildInDocument(doc, "web-app", servletMapping); - } - - private void addServlet(Document doc, String configClassName) { - Element servlet = doc.createElement("servlet"); - Element servletName = doc.createElement("servlet-name"); - Element servletClass = doc.createElement("servlet-class"); - Element initParam = doc.createElement("init-param"); - Element paramName = doc.createElement("param-name"); - Element paramValue = doc.createElement("param-value"); - - servletName.setTextContent("Resteasy"); - servletClass.setTextContent("org.jboss.resteasy.plugins.server.servlet.HttpServletDispatcher"); - paramName.setTextContent("javax.ws.rs.Application"); - paramValue.setTextContent(configClassName); - - servlet.appendChild(servletName); - servlet.appendChild(servletClass); - - initParam.appendChild(paramName); - initParam.appendChild(paramValue); - - servlet.appendChild(initParam); - - IOUtil.appendChildInDocument(doc, "web-app", servlet); - } - - private void addContextParam(Document doc) { - Element contextParam = doc.createElement("context-param"); - Element paramName = doc.createElement("param-name"); - Element paramValue = doc.createElement("param-value"); - - paramName.setTextContent("resteasy.scan.resources"); - paramValue.setTextContent("true"); - - contextParam.appendChild(paramName); - contextParam.appendChild(paramValue); - IOUtil.appendChildInDocument(doc, "web-app", contextParam); - } -} diff --git a/testsuite/integration-arquillian/servers/app-server/tomcat/tomcat7/src/main/resources/META-INF/services/org.jboss.arquillian.core.spi.LoadableExtension b/testsuite/integration-arquillian/servers/app-server/tomcat/tomcat7/src/main/resources/META-INF/services/org.jboss.arquillian.core.spi.LoadableExtension deleted file mode 100644 index d4399d19e9a..00000000000 --- a/testsuite/integration-arquillian/servers/app-server/tomcat/tomcat7/src/main/resources/META-INF/services/org.jboss.arquillian.core.spi.LoadableExtension +++ /dev/null @@ -1 +0,0 @@ -org.keycloak.testsuite.arquillian.tomcat.Tomcat7AppServerArquillianExtension \ No newline at end of file diff --git a/testsuite/integration-arquillian/servers/app-server/tomcat/tomcat7/src/main/resources/META-INF/services/org.keycloak.testsuite.arquillian.container.AppServerContainerProvider b/testsuite/integration-arquillian/servers/app-server/tomcat/tomcat7/src/main/resources/META-INF/services/org.keycloak.testsuite.arquillian.container.AppServerContainerProvider deleted file mode 100644 index eb593bf635b..00000000000 --- a/testsuite/integration-arquillian/servers/app-server/tomcat/tomcat7/src/main/resources/META-INF/services/org.keycloak.testsuite.arquillian.container.AppServerContainerProvider +++ /dev/null @@ -1 +0,0 @@ -org.keycloak.testsuite.arquillian.tomcat.container.Tomcat7AppServerProvider diff --git a/testsuite/integration-arquillian/servers/app-server/tomcat/tomcat7/src/saml-adapter-supported b/testsuite/integration-arquillian/servers/app-server/tomcat/tomcat7/src/saml-adapter-supported deleted file mode 100644 index 8b137891791..00000000000 --- a/testsuite/integration-arquillian/servers/app-server/tomcat/tomcat7/src/saml-adapter-supported +++ /dev/null @@ -1 +0,0 @@ - diff --git a/testsuite/integration-arquillian/servers/app-server/tomcat/tomcat7/src/tomcat-submodule b/testsuite/integration-arquillian/servers/app-server/tomcat/tomcat7/src/tomcat-submodule deleted file mode 100644 index 8b137891791..00000000000 --- a/testsuite/integration-arquillian/servers/app-server/tomcat/tomcat7/src/tomcat-submodule +++ /dev/null @@ -1 +0,0 @@ - diff --git a/testsuite/integration-arquillian/test-apps/spring-boot-adapter-app/pom.xml b/testsuite/integration-arquillian/test-apps/spring-boot-adapter-app/pom.xml index c659d3f057e..b3fc0304bf1 100644 --- a/testsuite/integration-arquillian/test-apps/spring-boot-adapter-app/pom.xml +++ b/testsuite/integration-arquillian/test-apps/spring-boot-adapter-app/pom.xml @@ -252,4 +252,4 @@ - \ No newline at end of file + diff --git a/testsuite/integration-arquillian/tests/base/pom.xml b/testsuite/integration-arquillian/tests/base/pom.xml index 332e9bad925..7e2aa716e4e 100644 --- a/testsuite/integration-arquillian/tests/base/pom.xml +++ b/testsuite/integration-arquillian/tests/base/pom.xml @@ -889,40 +889,6 @@ - - app-server-tomcat7 - - - app.server - tomcat7 - - - - tomcat7 - false - integration-arquillian-servers-app-server-tomcat7 - 0 - 8080 - 9990 - ${app.server.home}/lib - - - - org.keycloak.testsuite - integration-arquillian-servers-app-server-tomcat7 - ${project.version} - runtime - - - - - - org.commonjava.maven.plugins - directory-maven-plugin - - - - app-server-tomcat8 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 5fdd927c982..60a91e2be68 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 @@ -54,7 +54,6 @@ import static org.keycloak.testsuite.utils.io.IOUtil.loadRealm; @AppServerContainer(ContainerConstants.APP_SERVER_EAP6) @AppServerContainer(ContainerConstants.APP_SERVER_UNDERTOW) @AppServerContainer(ContainerConstants.APP_SERVER_EAP71) -@AppServerContainer(ContainerConstants.APP_SERVER_TOMCAT7) @AppServerContainer(ContainerConstants.APP_SERVER_TOMCAT8) @AppServerContainer(ContainerConstants.APP_SERVER_TOMCAT9) public class DefaultAuthzConfigAdapterTest extends AbstractExampleAdapterTest { 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 b8a3b45a4d4..a50b80d3fd5 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 @@ -42,7 +42,6 @@ import static org.hamcrest.Matchers.is; @AppServerContainer(ContainerConstants.APP_SERVER_EAP6) @AppServerContainer(ContainerConstants.APP_SERVER_UNDERTOW) @AppServerContainer(ContainerConstants.APP_SERVER_EAP71) -@AppServerContainer(ContainerConstants.APP_SERVER_TOMCAT7) @AppServerContainer(ContainerConstants.APP_SERVER_TOMCAT8) @AppServerContainer(ContainerConstants.APP_SERVER_TOMCAT9) public class PermissiveModeAdapterTest extends AbstractBaseServletAuthzAdapterTest { 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 74ec87cdec6..d738ada5136 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 @@ -44,7 +44,6 @@ import org.keycloak.testsuite.utils.arquillian.ContainerConstants; @AppServerContainer(ContainerConstants.APP_SERVER_EAP6) @AppServerContainer(ContainerConstants.APP_SERVER_UNDERTOW) @AppServerContainer(ContainerConstants.APP_SERVER_EAP71) -@AppServerContainer(ContainerConstants.APP_SERVER_TOMCAT7) public class ServletAuthzCIPAdapterTest extends AbstractServletAuthzAdapterTest { @Deployment(name = RESOURCE_SERVER_ID, managed = false) 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 defc42d78a9..fa6c715d6f2 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 @@ -36,7 +36,6 @@ import org.keycloak.testsuite.utils.arquillian.ContainerConstants; @AppServerContainer(ContainerConstants.APP_SERVER_EAP6) @AppServerContainer(ContainerConstants.APP_SERVER_UNDERTOW) @AppServerContainer(ContainerConstants.APP_SERVER_EAP71) -@AppServerContainer(ContainerConstants.APP_SERVER_TOMCAT7) @AppServerContainer(ContainerConstants.APP_SERVER_TOMCAT8) @AppServerContainer(ContainerConstants.APP_SERVER_TOMCAT9) public class ServletAuthzCacheDisabledAdapterTest extends AbstractServletAuthzAdapterTest { 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 a6ad1c3b1b5..78cf1e2be25 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 @@ -35,7 +35,6 @@ import org.keycloak.testsuite.utils.arquillian.ContainerConstants; @AppServerContainer(ContainerConstants.APP_SERVER_EAP6) @AppServerContainer(ContainerConstants.APP_SERVER_UNDERTOW) @AppServerContainer(ContainerConstants.APP_SERVER_EAP71) -@AppServerContainer(ContainerConstants.APP_SERVER_TOMCAT7) @AppServerContainer(ContainerConstants.APP_SERVER_TOMCAT8) @AppServerContainer(ContainerConstants.APP_SERVER_TOMCAT9) public class ServletAuthzCacheLifespanAdapterTest extends AbstractServletAuthzAdapterTest { 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 705f1bf454f..eadcb59e1b4 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 @@ -34,7 +34,6 @@ import org.keycloak.testsuite.utils.arquillian.ContainerConstants; @AppServerContainer(ContainerConstants.APP_SERVER_EAP6) @AppServerContainer(ContainerConstants.APP_SERVER_UNDERTOW) @AppServerContainer(ContainerConstants.APP_SERVER_EAP71) -@AppServerContainer(ContainerConstants.APP_SERVER_TOMCAT7) @AppServerContainer(ContainerConstants.APP_SERVER_TOMCAT8) @AppServerContainer(ContainerConstants.APP_SERVER_TOMCAT9) public class ServletAuthzLazyLoadPathsAdapterTest extends AbstractServletAuthzAdapterTest { 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 305f1a10420..52fe32aaaa9 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 @@ -32,7 +32,6 @@ import org.keycloak.testsuite.utils.arquillian.ContainerConstants; @AppServerContainer(ContainerConstants.APP_SERVER_EAP6) @AppServerContainer(ContainerConstants.APP_SERVER_UNDERTOW) @AppServerContainer(ContainerConstants.APP_SERVER_EAP71) -@AppServerContainer(ContainerConstants.APP_SERVER_TOMCAT7) @AppServerContainer(ContainerConstants.APP_SERVER_TOMCAT8) @AppServerContainer(ContainerConstants.APP_SERVER_TOMCAT9) public class ServletAuthzNoLazyLoadPathsAdapterTest extends AbstractServletAuthzAdapterTest { diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/adapter/example/authorization/ServletPolicyEnforcerLifespanTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/adapter/example/authorization/ServletPolicyEnforcerLifespanTest.java index efee064e051..f6fc833f20d 100644 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/adapter/example/authorization/ServletPolicyEnforcerLifespanTest.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/adapter/example/authorization/ServletPolicyEnforcerLifespanTest.java @@ -35,7 +35,6 @@ import org.keycloak.testsuite.utils.arquillian.ContainerConstants; @AppServerContainer(ContainerConstants.APP_SERVER_EAP6) @AppServerContainer(ContainerConstants.APP_SERVER_UNDERTOW) @AppServerContainer(ContainerConstants.APP_SERVER_EAP71) -@AppServerContainer(ContainerConstants.APP_SERVER_TOMCAT7) @AppServerContainer(ContainerConstants.APP_SERVER_TOMCAT8) @AppServerContainer(ContainerConstants.APP_SERVER_TOMCAT9) @EnableFeature(value = UPLOAD_SCRIPTS, skipRestart = true) 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 e16cfbbd97f..895004ca14d 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 @@ -33,7 +33,6 @@ import org.keycloak.testsuite.utils.arquillian.ContainerConstants; @AppServerContainer(ContainerConstants.APP_SERVER_EAP6) @AppServerContainer(ContainerConstants.APP_SERVER_UNDERTOW) @AppServerContainer(ContainerConstants.APP_SERVER_EAP71) -@AppServerContainer(ContainerConstants.APP_SERVER_TOMCAT7) @AppServerContainer(ContainerConstants.APP_SERVER_TOMCAT8) @AppServerContainer(ContainerConstants.APP_SERVER_TOMCAT9) @EnableFeature(value = UPLOAD_SCRIPTS, skipRestart = true) 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 fac4482376b..2c6b893f5e7 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 @@ -147,7 +147,6 @@ import static org.keycloak.testsuite.util.WaitUtils.waitForPageToLoad; @AppServerContainer(ContainerConstants.APP_SERVER_EAP) @AppServerContainer(ContainerConstants.APP_SERVER_EAP6) @AppServerContainer(ContainerConstants.APP_SERVER_EAP71) -@AppServerContainer(ContainerConstants.APP_SERVER_TOMCAT7) @AppServerContainer(ContainerConstants.APP_SERVER_TOMCAT8) @AppServerContainer(ContainerConstants.APP_SERVER_TOMCAT9) @DisableFeature(value = Profile.Feature.ACCOUNT2, skipRestart = true) // TODO remove this (KEYCLOAK-16228) diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/adapter/servlet/SAMLClockSkewAdapterTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/adapter/servlet/SAMLClockSkewAdapterTest.java index 21f130f184b..e4c44613d37 100644 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/adapter/servlet/SAMLClockSkewAdapterTest.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/adapter/servlet/SAMLClockSkewAdapterTest.java @@ -135,7 +135,6 @@ public class SAMLClockSkewAdapterTest extends AbstractSAMLServletAdapterTest { } @Test - @AppServerContainer(ContainerConstants.APP_SERVER_TOMCAT7) @AppServerContainer(ContainerConstants.APP_SERVER_TOMCAT8) @AppServerContainer(ContainerConstants.APP_SERVER_TOMCAT9) @AppServerContainer(value = ContainerConstants.APP_SERVER_UNDERTOW, skip = true) diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/adapter/servlet/SAMLLoginResponseHandlingTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/adapter/servlet/SAMLLoginResponseHandlingTest.java index 52a6eacaf09..64df3d11e19 100644 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/adapter/servlet/SAMLLoginResponseHandlingTest.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/adapter/servlet/SAMLLoginResponseHandlingTest.java @@ -60,7 +60,6 @@ import static org.keycloak.testsuite.util.WaitUtils.waitUntilElement; @AppServerContainer(ContainerConstants.APP_SERVER_EAP) @AppServerContainer(ContainerConstants.APP_SERVER_EAP6) @AppServerContainer(ContainerConstants.APP_SERVER_EAP71) -@AppServerContainer(ContainerConstants.APP_SERVER_TOMCAT7) @AppServerContainer(ContainerConstants.APP_SERVER_TOMCAT8) @AppServerContainer(ContainerConstants.APP_SERVER_TOMCAT9) @AppServerContainer(ContainerConstants.APP_SERVER_JETTY92) diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/adapter/servlet/SAMLLogoutAdapterTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/adapter/servlet/SAMLLogoutAdapterTest.java index ace2122fcb3..3b76722a5a7 100644 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/adapter/servlet/SAMLLogoutAdapterTest.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/adapter/servlet/SAMLLogoutAdapterTest.java @@ -55,7 +55,6 @@ import static org.keycloak.testsuite.util.SamlClient.Binding.REDIRECT; @AppServerContainer(ContainerConstants.APP_SERVER_EAP) @AppServerContainer(ContainerConstants.APP_SERVER_EAP6) @AppServerContainer(ContainerConstants.APP_SERVER_EAP71) -@AppServerContainer(ContainerConstants.APP_SERVER_TOMCAT7) @AppServerContainer(ContainerConstants.APP_SERVER_TOMCAT8) @AppServerContainer(ContainerConstants.APP_SERVER_TOMCAT9) public class SAMLLogoutAdapterTest extends AbstractServletsAdapterTest { 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 040b243754d..48db3beae60 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 @@ -177,7 +177,6 @@ import org.xml.sax.SAXException; @AppServerContainer(ContainerConstants.APP_SERVER_EAP) @AppServerContainer(ContainerConstants.APP_SERVER_EAP6) @AppServerContainer(ContainerConstants.APP_SERVER_EAP71) -@AppServerContainer(ContainerConstants.APP_SERVER_TOMCAT7) @AppServerContainer(ContainerConstants.APP_SERVER_TOMCAT8) @AppServerContainer(ContainerConstants.APP_SERVER_TOMCAT9) public class SAMLServletAdapterTest extends AbstractSAMLServletAdapterTest { diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/adapter/servlet/SAMLServletSessionTimeoutTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/adapter/servlet/SAMLServletSessionTimeoutTest.java index 7e19bc00228..a87821f5ed5 100644 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/adapter/servlet/SAMLServletSessionTimeoutTest.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/adapter/servlet/SAMLServletSessionTimeoutTest.java @@ -41,7 +41,6 @@ import static org.keycloak.testsuite.util.Matchers.bodyHC; @AppServerContainer(ContainerConstants.APP_SERVER_EAP) @AppServerContainer(ContainerConstants.APP_SERVER_EAP6) @AppServerContainer(ContainerConstants.APP_SERVER_EAP71) -@AppServerContainer(ContainerConstants.APP_SERVER_TOMCAT7) @AppServerContainer(ContainerConstants.APP_SERVER_TOMCAT8) @AppServerContainer(ContainerConstants.APP_SERVER_TOMCAT9) @AppServerContainer(ContainerConstants.APP_SERVER_JETTY92) diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/adapter/servlet/SamlSignatureTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/adapter/servlet/SamlSignatureTest.java index 6d6ee3e5eac..a62b7eb4b27 100644 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/adapter/servlet/SamlSignatureTest.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/adapter/servlet/SamlSignatureTest.java @@ -82,7 +82,6 @@ import static org.keycloak.testsuite.saml.AbstractSamlTest.REALM_SIGNING_CERTIFI @AppServerContainer(ContainerConstants.APP_SERVER_EAP) @AppServerContainer(ContainerConstants.APP_SERVER_EAP6) @AppServerContainer(ContainerConstants.APP_SERVER_EAP71) -@AppServerContainer(ContainerConstants.APP_SERVER_TOMCAT7) @AppServerContainer(ContainerConstants.APP_SERVER_TOMCAT8) @AppServerContainer(ContainerConstants.APP_SERVER_TOMCAT9) public class SamlSignatureTest extends AbstractAdapterTest { 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 f3f7224a1ef..d6d28192bcb 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 @@ -57,7 +57,6 @@ import static org.keycloak.testsuite.util.URLAssert.assertCurrentUrlStartsWithLo @AppServerContainer(ContainerConstants.APP_SERVER_EAP) @AppServerContainer(ContainerConstants.APP_SERVER_EAP6) @AppServerContainer(ContainerConstants.APP_SERVER_EAP71) -@AppServerContainer(ContainerConstants.APP_SERVER_TOMCAT7) @AppServerContainer(ContainerConstants.APP_SERVER_TOMCAT8) @AppServerContainer(ContainerConstants.APP_SERVER_TOMCAT9) public class SessionServletAdapterTest extends AbstractServletsAdapterTest { diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/saml/SamlXMLAttacksTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/saml/SamlXMLAttacksTest.java index a10731473af..c0d07a5872b 100644 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/saml/SamlXMLAttacksTest.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/saml/SamlXMLAttacksTest.java @@ -38,7 +38,6 @@ import static org.keycloak.testsuite.util.Matchers.statusCodeIsHC; @AppServerContainer(ContainerConstants.APP_SERVER_EAP) @AppServerContainer(ContainerConstants.APP_SERVER_EAP6) @AppServerContainer(ContainerConstants.APP_SERVER_EAP71) -@AppServerContainer(ContainerConstants.APP_SERVER_TOMCAT7) @AppServerContainer(ContainerConstants.APP_SERVER_TOMCAT8) @AppServerContainer(ContainerConstants.APP_SERVER_TOMCAT9) public class SamlXMLAttacksTest extends AbstractSamlTest { diff --git a/testsuite/integration-arquillian/util/src/main/java/org/keycloak/testsuite/utils/arquillian/ContainerConstants.java b/testsuite/integration-arquillian/util/src/main/java/org/keycloak/testsuite/utils/arquillian/ContainerConstants.java index 58963177d8e..31d2b7ae607 100644 --- a/testsuite/integration-arquillian/util/src/main/java/org/keycloak/testsuite/utils/arquillian/ContainerConstants.java +++ b/testsuite/integration-arquillian/util/src/main/java/org/keycloak/testsuite/utils/arquillian/ContainerConstants.java @@ -42,7 +42,6 @@ public interface ContainerConstants { public static final String APP_SERVER_JETTY93 = APP_SERVER_PREFIX + "jetty93"; public static final String APP_SERVER_JETTY92 = APP_SERVER_PREFIX + "jetty92"; - public static final String APP_SERVER_TOMCAT7 = APP_SERVER_PREFIX + "tomcat7"; public static final String APP_SERVER_TOMCAT8 = APP_SERVER_PREFIX + "tomcat8"; public static final String APP_SERVER_TOMCAT9 = APP_SERVER_PREFIX + "tomcat9";