Fixes #4535 - Remove Tomcat 10.x compatibility extension (#4538)

piranhacloud · Jan 17, 2025 · 22658e5 · 22658e5
1 parent fedb1cf
commit 22658e5
Show file tree

Hide file tree

Showing 10 changed files with 1 addition and 262 deletions.
diff --git a/debug/pom.xml b/debug/pom.xml
@@ -88,12 +88,6 @@
             <version>${project.version}</version>
             <scope>compile</scope>
         </dependency>
-        <dependency>
-            <groupId>cloud.piranha.extension</groupId>
-            <artifactId>piranha-extension-compat-tomcat10x</artifactId>
-            <version>${project.version}</version>
-            <scope>compile</scope>
-        </dependency>
         <dependency>
             <groupId>cloud.piranha.extension</groupId>
             <artifactId>piranha-extension-concurro</artifactId>

diff --git a/extension/compat-tomcat10x/pom.xml b/extension/compat-tomcat10x/pom.xml
diff --git a/.../compat-tomcat10x/src/main/java/cloud/piranha/extension/tomcat10x/Tomcat10xExtension.java b/.../compat-tomcat10x/src/main/java/cloud/piranha/extension/tomcat10x/Tomcat10xExtension.java
diff --git a/extension/compat-tomcat10x/src/main/java/module-info.java b/extension/compat-tomcat10x/src/main/java/module-info.java
diff --git a/...mcat10x/src/test/java/cloud/piranha/extension/tomcat10x/tests/Tomcat10xExtensionTest.java b/...mcat10x/src/test/java/cloud/piranha/extension/tomcat10x/tests/Tomcat10xExtensionTest.java
diff --git a/extension/compat-tomcat10x/src/test/tomcat/contextpath/META-INF/context.xml b/extension/compat-tomcat10x/src/test/tomcat/contextpath/META-INF/context.xml
diff --git a/extension/pom.xml b/extension/pom.xml
@@ -20,10 +20,9 @@
         <module>annotationscan-classfile</module>
         <module>angus</module>
         <module>bytesstreamhandler</module>
-        <module>compat-tomcat10x</module>
         <module>concurro</module>
         <module>coreprofile</module>
-	<module>declared</module>
+      	<module>declared</module>
         <module>default-datasource</module>
         <module>eclipselink</module>
         <module>epicyro</module>

diff --git a/extension/servlet/pom.xml b/extension/servlet/pom.xml
@@ -50,12 +50,6 @@
             <version>${project.version}</version>
             <scope>compile</scope>
         </dependency>
-        <dependency>
-            <groupId>cloud.piranha.extension</groupId>
-            <artifactId>piranha-extension-compat-tomcat10x</artifactId>
-            <version>${project.version}</version>
-            <scope>compile</scope>
-        </dependency>
         <dependency>
             <groupId>cloud.piranha.extension</groupId>
             <artifactId>piranha-extension-expressly</artifactId>

diff --git a/extension/servlet/src/main/java/cloud/piranha/extension/servlet/ServletExtension.java b/extension/servlet/src/main/java/cloud/piranha/extension/servlet/ServletExtension.java
@@ -40,7 +40,6 @@
 import cloud.piranha.extension.security.servlet.ServletSecurityManagerExtension;
 import cloud.piranha.extension.servletannotations.ServletAnnotationsExtension;
 import cloud.piranha.extension.tempdir.TempDirExtension;
-import cloud.piranha.extension.tomcat10x.Tomcat10xExtension;
 import cloud.piranha.extension.wasp.WaspExtension;
 import cloud.piranha.extension.wasp.WaspJspManagerExtension;
 import cloud.piranha.extension.webxml.WebXmlExtension;
@@ -69,7 +68,6 @@ public void extend(WebApplicationExtensionContext context) {
         context.add(WaspExtension.class);                           // WaSP
         context.add(ServletContainerInitializerExtension.class);    // ServletContainerInitializer
         context.add(ServletSecurityExtension.class);                // Security implementation
-        context.add(Tomcat10xExtension.class);                      // Tomcat 10x compatbility
     }
 
     private static Class<? extends WebApplicationExtension> getAnnotationScanExtensionClass() {

diff --git a/extension/servlet/src/main/java/module-info.java b/extension/servlet/src/main/java/module-info.java
@@ -57,7 +57,6 @@
     requires cloud.piranha.extension.declared;
     requires cloud.piranha.extension.fileupload;
     requires cloud.piranha.extension.herring;
-    requires cloud.piranha.extension.tomcat10x;
     requires cloud.piranha.extension.expressly;
     requires cloud.piranha.extension.policy;
     requires cloud.piranha.extension.scinitializer;