Remove Tomcat 7 adapter

Closes keycloak#9428
abbra · Feb 28, 2022 · 5ef8265 · 5ef8265
1 parent 74695c0
commit 5ef8265
Show file tree

Hide file tree

Showing 52 changed files with 6 additions and 1,013 deletions.
diff --git a/adapters/oidc/tomcat/pom.xml b/adapters/oidc/tomcat/pom.xml
@@ -35,17 +35,4 @@
         <module>tomcat</module>
     </modules>
 
-    <profiles>
-        <profile>
-            <id>community</id>
-            <activation>
-                <property>
-                    <name>!product</name>
-                </property>
-            </activation>
-            <modules>
-                <module>tomcat7</module>
-            </modules>
-        </profile>
-    </profiles>
 </project>
diff --git a/adapters/oidc/tomcat/tomcat-core/pom.xml b/adapters/oidc/tomcat/tomcat-core/pom.xml
@@ -93,7 +93,7 @@
         <dependency>
             <groupId>org.apache.tomcat</groupId>
             <artifactId>tomcat-catalina</artifactId>
-            <version>${tomcat7.version}</version>
+            <version>${tomcat8.version}</version>
             <scope>compile</scope>
         </dependency>
 

diff --git a/adapters/oidc/tomcat/tomcat7/pom.xml b/adapters/oidc/tomcat/tomcat7/pom.xml
diff --git a/.../tomcat/tomcat7/src/main/java/org/keycloak/adapters/tomcat/AuthenticatedActionsValve.java b/.../tomcat/tomcat7/src/main/java/org/keycloak/adapters/tomcat/AuthenticatedActionsValve.java
diff --git a/...tomcat/tomcat7/src/main/java/org/keycloak/adapters/tomcat/KeycloakAuthenticatorValve.java b/...tomcat/tomcat7/src/main/java/org/keycloak/adapters/tomcat/KeycloakAuthenticatorValve.java
diff --git a/adapters/saml/tomcat/pom.xml b/adapters/saml/tomcat/pom.xml
@@ -34,18 +34,4 @@
         <module>tomcat-core</module>
         <module>tomcat</module>
     </modules>
-
-    <profiles>
-        <profile>
-            <id>community</id>
-            <activation>
-                <property>
-                    <name>!product</name>
-                </property>
-            </activation>
-            <modules>
-                <module>tomcat7</module>
-            </modules>
-        </profile>
-    </profiles>
 </project>
diff --git a/adapters/saml/tomcat/tomcat-core/pom.xml b/adapters/saml/tomcat/tomcat-core/pom.xml
@@ -75,7 +75,7 @@
         <dependency>
             <groupId>org.apache.tomcat</groupId>
             <artifactId>tomcat-catalina</artifactId>
-            <version>${tomcat7.version}</version>
+            <version>${tomcat8.version}</version>
             <scope>compile</scope>
         </dependency>
 

diff --git a/adapters/saml/tomcat/tomcat7/pom.xml b/adapters/saml/tomcat/tomcat7/pom.xml