Merge pull request #719 from rhusar/MODCLUSTER-796

MODCLUSTER-796 Drop support for end-of-lifed Tomcat 10.0
modcluster · Aug 3, 2023 · 9364d90 · 9364d90
2 parents 44a3996 + 7a04699
commit 9364d90
Show file tree

Hide file tree

Showing 35 changed files with 0 additions and 4,300 deletions.
diff --git a/.github/dependabot.yml b/.github/dependabot.yml
@@ -52,24 +52,6 @@ updates:
       - dependency-name: org.apache.tomcat:tomcat-util
         versions:
           - ">= 10"
-  - package-ecosystem: maven
-    directory: "/container/tomcat-10.0"
-    # Workaround for MODCLUSTER-778 Dependabot stopped working for Tomcat updates due to bogus tomcat releases in repository.jboss.org
-    registries:
-      - maven-central
-    schedule:
-      interval: daily
-    open-pull-requests-limit: 10
-    ignore:
-      - dependency-name: org.apache.tomcat:tomcat-catalina
-        versions:
-          - ">= 10.1"
-      - dependency-name: org.apache.tomcat:tomcat-coyote
-        versions:
-          - ">= 10.1"
-      - dependency-name: org.apache.tomcat:tomcat-util
-        versions:
-          - ">= 10.1"
   - package-ecosystem: maven
     directory: "/container/tomcat-10.1"
     # Workaround for MODCLUSTER-778 Dependabot stopped working for Tomcat updates due to bogus tomcat releases in repository.jboss.org

diff --git a/README.md b/README.md
@@ -62,7 +62,6 @@ container
   spi (SPI classes for container integrations, has no dependencies on a specific web container)
   tomcat-8.5 (Tomcat 8.5 container implementation)
   tomcat-9.0 (Tomcat 9.0 container implementation)
-  tomcat-10.0 (Tomcat 10.0 container implementation)
   tomcat-10.1 (Tomcat 10.1 container implementation)
 load-spi (SPI classes for load metric computation)
 demo

diff --git a/code-coverage/pom.xml b/code-coverage/pom.xml
@@ -45,10 +45,6 @@
             <groupId>org.jboss.mod_cluster</groupId>
             <artifactId>mod_cluster-container-tomcat-9.0</artifactId>
         </dependency>
-        <dependency>
-            <groupId>org.jboss.mod_cluster</groupId>
-            <artifactId>mod_cluster-container-tomcat-10.0</artifactId>
-        </dependency>
         <dependency>
             <groupId>org.jboss.mod_cluster</groupId>
             <artifactId>mod_cluster-core</artifactId>

diff --git a/container/pom.xml b/container/pom.xml
@@ -34,7 +34,6 @@
         <module>spi</module>
         <module>tomcat-8.5</module>
         <module>tomcat-9.0</module>
-        <module>tomcat-10.0</module>
         <module>tomcat-10.1</module>
     </modules>
 </project>
diff --git a/container/tomcat-10.0/pom.xml b/container/tomcat-10.0/pom.xml
diff --git a/.../src/main/java/org/jboss/modcluster/container/catalina/standalone/ModClusterListener.java b/.../src/main/java/org/jboss/modcluster/container/catalina/standalone/ModClusterListener.java
diff --git a/...c/main/java/org/jboss/modcluster/container/tomcat/ConfigurableProxyConnectorProvider.java b/...c/main/java/org/jboss/modcluster/container/tomcat/ConfigurableProxyConnectorProvider.java
diff --git a/...er/tomcat-10.0/src/main/java/org/jboss/modcluster/container/tomcat/JMXServerProvider.java b/...er/tomcat-10.0/src/main/java/org/jboss/modcluster/container/tomcat/JMXServerProvider.java
diff --git a/...-10.0/src/main/java/org/jboss/modcluster/container/tomcat/JakartaHttpSessionListener.java b/...-10.0/src/main/java/org/jboss/modcluster/container/tomcat/JakartaHttpSessionListener.java