diff --git a/adapters/oidc/fuse7/pom.xml b/adapters/oidc/fuse7/pom.xml index 418b945e23e..0e4305f0953 100644 --- a/adapters/oidc/fuse7/pom.xml +++ b/adapters/oidc/fuse7/pom.xml @@ -32,7 +32,6 @@ 7.0.1-SNAPSHOT - ${tomcat8.version} 9.4.2.v20170220 diff --git a/adapters/oidc/fuse7/tomcat8/pom.xml b/adapters/oidc/fuse7/tomcat8/pom.xml index f130da3a3f9..ae094e71cec 100644 --- a/adapters/oidc/fuse7/tomcat8/pom.xml +++ b/adapters/oidc/fuse7/tomcat8/pom.xml @@ -63,7 +63,7 @@ org.apache.tomcat tomcat-catalina - ${tomcat.version} + ${tomcat8.version} provided diff --git a/adapters/oidc/tomcat/pom.xml b/adapters/oidc/tomcat/pom.xml index 4c3420b7e18..e1551ee1e0a 100755 --- a/adapters/oidc/tomcat/pom.xml +++ b/adapters/oidc/tomcat/pom.xml @@ -44,7 +44,6 @@ - tomcat6 tomcat7 diff --git a/adapters/oidc/tomcat/tomcat-core/pom.xml b/adapters/oidc/tomcat/tomcat-core/pom.xml index 59786893cfe..c1d5e3e73a5 100755 --- a/adapters/oidc/tomcat/tomcat-core/pom.xml +++ b/adapters/oidc/tomcat/tomcat-core/pom.xml @@ -31,8 +31,6 @@ 1.7 1.7 - - 6.0.41 @@ -94,8 +92,8 @@ --> org.apache.tomcat - catalina - ${tomcat.version} + tomcat-catalina + ${tomcat7.version} compile diff --git a/adapters/oidc/tomcat/tomcat6/pom.xml b/adapters/oidc/tomcat/tomcat6/pom.xml deleted file mode 100755 index 2b674ffc871..00000000000 --- a/adapters/oidc/tomcat/tomcat6/pom.xml +++ /dev/null @@ -1,113 +0,0 @@ - - - - - - keycloak-tomcat-integration-pom - org.keycloak - 7.0.0-SNAPSHOT - ../pom.xml - - 4.0.0 - - keycloak-tomcat6-adapter - Keycloak Tomcat 6 Integration - - 6.0.41 - - - - - - org.jboss.logging - jboss-logging - ${jboss.logging.version} - - - 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 - catalina - ${tomcat.version} - provided - - - junit - junit - test - - - - - - org.apache.maven.plugins - maven-compiler-plugin - - 1.6 - 1.6 - - - - - - diff --git a/adapters/oidc/tomcat/tomcat6/src/main/java/org/keycloak/adapters/tomcat/AuthenticatedActionsValve.java b/adapters/oidc/tomcat/tomcat6/src/main/java/org/keycloak/adapters/tomcat/AuthenticatedActionsValve.java deleted file mode 100644 index 496eed3e684..00000000000 --- a/adapters/oidc/tomcat/tomcat6/src/main/java/org/keycloak/adapters/tomcat/AuthenticatedActionsValve.java +++ /dev/null @@ -1,12 +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); - } -} diff --git a/adapters/oidc/tomcat/tomcat6/src/main/java/org/keycloak/adapters/tomcat/KeycloakAuthenticatorValve.java b/adapters/oidc/tomcat/tomcat6/src/main/java/org/keycloak/adapters/tomcat/KeycloakAuthenticatorValve.java deleted file mode 100755 index 8e0732487e2..00000000000 --- a/adapters/oidc/tomcat/tomcat6/src/main/java/org/keycloak/adapters/tomcat/KeycloakAuthenticatorValve.java +++ /dev/null @@ -1,83 +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.LifecycleException; -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 { - @Override - public boolean authenticate(Request request, Response response, LoginConfig config) throws java.io.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; - } - - @Override - protected AbstractAuthenticatedActionsValve createAuthenticatedActionsValve(AdapterDeploymentContext deploymentContext, Valve next, Container container) { - return new AuthenticatedActionsValve(deploymentContext, next, container); - } - - @Override - public void start() throws LifecycleException { - StandardContext standardContext = (StandardContext) context; - standardContext.addLifecycleListener(this); - super.start(); - } - - 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(null, userPrincipal.getName(), null, roles, userPrincipal, null); - } - }; - } - -} diff --git a/adapters/oidc/tomcat/tomcat7/pom.xml b/adapters/oidc/tomcat/tomcat7/pom.xml index b954204e1f0..2e4785dafe8 100755 --- a/adapters/oidc/tomcat/tomcat7/pom.xml +++ b/adapters/oidc/tomcat/tomcat7/pom.xml @@ -28,10 +28,10 @@ keycloak-tomcat7-adapter Keycloak Tomcat 7 Integration - - - ${tomcat7.version} - + + 1.7 + 1.7 + @@ -86,16 +86,16 @@ jackson-annotations - org.apache.tomcat - tomcat-servlet-api - ${tomcat.version} - provided + org.apache.tomcat + tomcat-servlet-api + ${tomcat7.version} + provided - org.apache.tomcat - tomcat-catalina - ${tomcat.version} - provided + org.apache.tomcat + tomcat-catalina + ${tomcat7.version} + provided @@ -104,17 +104,4 @@ test - - - - org.apache.maven.plugins - maven-compiler-plugin - - 1.6 - 1.6 - - - - - diff --git a/adapters/oidc/tomcat/tomcat8/pom.xml b/adapters/oidc/tomcat/tomcat8/pom.xml index 899319b1092..721d56980f2 100755 --- a/adapters/oidc/tomcat/tomcat8/pom.xml +++ b/adapters/oidc/tomcat/tomcat8/pom.xml @@ -31,8 +31,6 @@ 1.7 1.7 - - ${tomcat8.version} @@ -52,13 +50,13 @@ org.apache.tomcat tomcat-servlet-api - ${tomcat.version} + ${tomcat8.version} provided org.apache.tomcat tomcat-catalina - ${tomcat.version} + ${tomcat8.version} provided diff --git a/adapters/saml/tomcat/pom.xml b/adapters/saml/tomcat/pom.xml index 3a84cdce984..b662da1098a 100755 --- a/adapters/saml/tomcat/pom.xml +++ b/adapters/saml/tomcat/pom.xml @@ -44,7 +44,6 @@ - tomcat6 tomcat7 diff --git a/adapters/saml/tomcat/tomcat-core/pom.xml b/adapters/saml/tomcat/tomcat-core/pom.xml index 7abb48687a2..51e151593ac 100755 --- a/adapters/saml/tomcat/tomcat-core/pom.xml +++ b/adapters/saml/tomcat/tomcat-core/pom.xml @@ -31,10 +31,6 @@ 1.7 1.7 - - - - 6.0.41 @@ -75,18 +71,11 @@ org.keycloak keycloak-saml-adapter-core - + org.apache.tomcat - catalina - ${tomcat.version} + tomcat-catalina + ${tomcat7.version} compile diff --git a/adapters/saml/tomcat/tomcat6/pom.xml b/adapters/saml/tomcat/tomcat6/pom.xml deleted file mode 100755 index f4f8d8b5669..00000000000 --- a/adapters/saml/tomcat/tomcat6/pom.xml +++ /dev/null @@ -1,93 +0,0 @@ - - - - - - keycloak-saml-tomcat-integration-pom - org.keycloak - 7.0.0-SNAPSHOT - ../pom.xml - - 4.0.0 - - keycloak-saml-tomcat6-adapter - Keycloak Tomcat 6 Saml Integration - - 6.0.41 - - - - - - org.jboss.logging - jboss-logging - ${jboss.logging.version} - - - 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 - catalina - ${tomcat.version} - provided - - - junit - junit - test - - - - - - org.apache.maven.plugins - maven-compiler-plugin - - 1.6 - 1.6 - - - - - - diff --git a/adapters/saml/tomcat/tomcat6/src/main/java/org/keycloak/adapters/saml/tomcat/SamlAuthenticatorValve.java b/adapters/saml/tomcat/tomcat6/src/main/java/org/keycloak/adapters/saml/tomcat/SamlAuthenticatorValve.java deleted file mode 100755 index a184251799d..00000000000 --- a/adapters/saml/tomcat/tomcat6/src/main/java/org/keycloak/adapters/saml/tomcat/SamlAuthenticatorValve.java +++ /dev/null @@ -1,77 +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.LifecycleException; -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 { - @Override - public boolean authenticate(Request request, Response 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; - } - - - @Override - public void start() throws LifecycleException { - StandardContext standardContext = (StandardContext) context; - standardContext.addLifecycleListener(this); - super.start(); - } - - 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(null, userPrincipal.getName(), null, roles, userPrincipal, null); - } - }; - } -} diff --git a/adapters/saml/tomcat/tomcat7/pom.xml b/adapters/saml/tomcat/tomcat7/pom.xml index 455193fc802..1f65154097f 100755 --- a/adapters/saml/tomcat/tomcat7/pom.xml +++ b/adapters/saml/tomcat/tomcat7/pom.xml @@ -28,17 +28,16 @@ keycloak-saml-tomcat7-adapter Keycloak Tomcat 7 SAML Integration - - - ${tomcat7.version} - + + 1.7 + 1.7 + org.jboss.logging jboss-logging - ${jboss.logging.version} org.keycloak @@ -67,16 +66,16 @@ bcprov-jdk15on - org.apache.tomcat - tomcat-servlet-api - ${tomcat.version} - provided + org.apache.tomcat + tomcat-servlet-api + ${tomcat7.version} + provided - org.apache.tomcat - tomcat-catalina - ${tomcat.version} - provided + org.apache.tomcat + tomcat-catalina + ${tomcat7.version} + provided @@ -85,17 +84,4 @@ test - - - - org.apache.maven.plugins - maven-compiler-plugin - - 1.6 - 1.6 - - - - - diff --git a/adapters/saml/tomcat/tomcat8/pom.xml b/adapters/saml/tomcat/tomcat8/pom.xml index 683815e50eb..13af9e075fd 100755 --- a/adapters/saml/tomcat/tomcat8/pom.xml +++ b/adapters/saml/tomcat/tomcat8/pom.xml @@ -31,8 +31,6 @@ 1.7 1.7 - - ${tomcat8.version} @@ -44,13 +42,13 @@ org.apache.tomcat tomcat-servlet-api - ${tomcat.version} + ${tomcat8.version} provided org.apache.tomcat tomcat-catalina - ${tomcat.version} + ${tomcat8.version} provided diff --git a/adapters/spi/tomcat-adapter-spi/pom.xml b/adapters/spi/tomcat-adapter-spi/pom.xml index cc2161073cf..e5982240536 100755 --- a/adapters/spi/tomcat-adapter-spi/pom.xml +++ b/adapters/spi/tomcat-adapter-spi/pom.xml @@ -31,10 +31,6 @@ 1.7 1.7 - - - - 6.0.41 @@ -61,8 +57,8 @@ --> org.apache.tomcat - catalina - ${tomcat.version} + tomcat-catalina + ${tomcat7.version} compile diff --git a/boms/adapter/pom.xml b/boms/adapter/pom.xml index 09d37e521e0..f8f558ba1c1 100644 --- a/boms/adapter/pom.xml +++ b/boms/adapter/pom.xml @@ -74,11 +74,6 @@ keycloak-tomcat7-adapter 7.0.0-SNAPSHOT - - org.keycloak - keycloak-tomcat6-adapter - 7.0.0-SNAPSHOT - org.keycloak keycloak-jetty92-adapter diff --git a/distribution/adapters/pom.xml b/distribution/adapters/pom.xml index a9ccc82f21c..a871eb72bef 100755 --- a/distribution/adapters/pom.xml +++ b/distribution/adapters/pom.xml @@ -48,7 +48,6 @@ - tomcat6-adapter-zip tomcat7-adapter-zip tomcat8-adapter-zip jetty92-adapter-zip diff --git a/distribution/adapters/tomcat6-adapter-zip/assembly.xml b/distribution/adapters/tomcat6-adapter-zip/assembly.xml deleted file mode 100755 index 359119e32d1..00000000000 --- a/distribution/adapters/tomcat6-adapter-zip/assembly.xml +++ /dev/null @@ -1,41 +0,0 @@ - - - - war-dist - - - zip - tar.gz - - false - - - - false - true - true - - org.keycloak:keycloak-tomcat6-adapter - - - org.apache.tomcat:catalina - - - - - diff --git a/distribution/adapters/tomcat6-adapter-zip/pom.xml b/distribution/adapters/tomcat6-adapter-zip/pom.xml deleted file mode 100755 index 4a1df036535..00000000000 --- a/distribution/adapters/tomcat6-adapter-zip/pom.xml +++ /dev/null @@ -1,68 +0,0 @@ - - - - 4.0.0 - - keycloak-parent - org.keycloak - 7.0.0-SNAPSHOT - ../../../pom.xml - - - keycloak-tomcat6-adapter-dist - pom - Keycloak Tomcat 6 Adapter Distro - - - - - org.keycloak - keycloak-tomcat6-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 34b6486f1dc..736f6601150 100644 --- a/distribution/downloads/src/main/resources/files +++ b/distribution/downloads/src/main/resources/files @@ -11,7 +11,6 @@ keycloak-jetty93-adapter-dist keycloak-jetty94-adapter-dist keycloak-js-adapter-dist - keycloak-tomcat6-adapter-dist keycloak-tomcat7-adapter-dist keycloak-tomcat8-adapter-dist keycloak-wf8-adapter-dist @@ -24,7 +23,6 @@ keycloak-saml-jetty92-adapter-dist keycloak-saml-jetty93-adapter-dist keycloak-saml-jetty94-adapter-dist - keycloak-saml-tomcat6-adapter-dist keycloak-saml-tomcat7-adapter-dist keycloak-saml-tomcat8-adapter-dist keycloak-saml-wildfly-adapter-dist \ No newline at end of file diff --git a/distribution/saml-adapters/pom.xml b/distribution/saml-adapters/pom.xml index f92f0063923..4a5dd58e6d0 100755 --- a/distribution/saml-adapters/pom.xml +++ b/distribution/saml-adapters/pom.xml @@ -47,7 +47,6 @@ jetty92-adapter-zip jetty93-adapter-zip jetty94-adapter-zip - tomcat6-adapter-zip tomcat7-adapter-zip tomcat8-adapter-zip diff --git a/distribution/saml-adapters/tomcat6-adapter-zip/assembly.xml b/distribution/saml-adapters/tomcat6-adapter-zip/assembly.xml deleted file mode 100755 index 7b23ebebc2d..00000000000 --- a/distribution/saml-adapters/tomcat6-adapter-zip/assembly.xml +++ /dev/null @@ -1,41 +0,0 @@ - - - - war-dist - - - zip - tar.gz - - false - - - - false - true - true - - org.keycloak:keycloak-saml-tomcat6-adapter - - - org.apache.tomcat:catalina - - - - - diff --git a/distribution/saml-adapters/tomcat6-adapter-zip/pom.xml b/distribution/saml-adapters/tomcat6-adapter-zip/pom.xml deleted file mode 100755 index f87e2cbd039..00000000000 --- a/distribution/saml-adapters/tomcat6-adapter-zip/pom.xml +++ /dev/null @@ -1,68 +0,0 @@ - - - - 4.0.0 - - keycloak-parent - org.keycloak - 7.0.0-SNAPSHOT - ../../../pom.xml - - - keycloak-saml-tomcat6-adapter-dist - pom - Keycloak SAML Tomcat 6 Adapter Distro - - - - - org.keycloak - keycloak-saml-tomcat6-adapter - - - - - - maven-assembly-plugin - - - assemble - package - - single - - - - assembly.xml - - - target - - - target/assembly/work - - false - - - - - - - - diff --git a/pom.xml b/pom.xml index 963fe343f96..6eb2be86bc4 100755 --- a/pom.xml +++ b/pom.xml @@ -985,11 +985,6 @@ keycloak-tomcat-core-adapter ${project.version} - - org.keycloak - keycloak-tomcat6-adapter - ${project.version} - org.keycloak keycloak-saml-servlet-filter-adapter @@ -1000,11 +995,6 @@ keycloak-servlet-filter-adapter ${project.version} - - org.keycloak - keycloak-saml-tomcat6-adapter - ${project.version} - org.keycloak keycloak-saml-as7-adapter @@ -1280,12 +1270,6 @@ ${project.version} zip - - org.keycloak - keycloak-tomcat6-adapter-dist - ${project.version} - zip - org.keycloak keycloak-tomcat7-adapter-dist @@ -1346,12 +1330,6 @@ ${project.version} zip - - org.keycloak - keycloak-saml-tomcat6-adapter-dist - ${project.version} - zip - org.keycloak keycloak-saml-tomcat7-adapter-dist