diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index d5a23da97..41a265e9d 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -9,7 +9,7 @@ jobs: matrix: cache: [maven] distribution: [temurin] - java: [17, 21, 22, 23-ea] + java: [17, 21, 23, 24-ea] os: [ubuntu-latest, macos-latest, windows-latest] fail-fast: false max-parallel: 4 diff --git a/.github/workflows/support.yaml b/.github/workflows/support.yaml index 7e2a1c9fc..62df2c83b 100644 --- a/.github/workflows/support.yaml +++ b/.github/workflows/support.yaml @@ -26,7 +26,7 @@ jobs: os: [ubuntu-latest, macOS-latest, windows-latest] java: [17] distribution: ['zulu'] - token: ["tomcat85", "tomcat9", "tomee71", "tomee80", "wildfly13", "wildfly26", "liberty-ee7", "liberty-ee8", "jetty", "glassfish4", "glassfish5", "resin"] + token: ["tomcat9", "tomee80", "wildfly26", "liberty-ee8", "jetty", "glassfish5", "resin"] fail-fast: false max-parallel: 4 name: Test JDK ${{ matrix.java }}, ${{ matrix.os }}, ${{ matrix.token }} diff --git a/pom.xml b/pom.xml index 3946d209b..338694136 100644 --- a/pom.xml +++ b/pom.xml @@ -326,24 +326,16 @@ - tomcat90 + tomcat9 true 9 - 9.0.85 + 9.0.97 - - - tomcat85 - - 8 - 8.5.98 - - - + tomee80 8 @@ -353,17 +345,7 @@ - - tomee71 - - 7 - 7.1.4 - tomee${tomee.major-version}x - https://repo1.maven.org/maven2/org/apache/tomee/apache-tomee/${tomee.version}/apache-tomee-${tomee.version}-plume.zip - - - - wildfly26 + wildfly26 26 26.1.3.Final @@ -371,37 +353,19 @@ https://github.com/wildfly/wildfly/releases/download/${wildfly.version}/wildfly-${wildfly.version}.zip - - - wildfly13 - - 13 - 13.0.0.Final - wildfly${wildfly.major-version}x - https://download.jboss.org/wildfly/${wildfly.version}/wildfly-${wildfly.version}.zip - - liberty-ee8 - 24.0.0.1 + 24.0.0.9 liberty https://repo1.maven.org/maven2/com/ibm/websphere/appserver/runtime/wlp-javaee8/${liberty.version}/wlp-javaee8-${liberty.version}.zip - - liberty-ee7 - - 24.0.0.1 - liberty - https://repo1.maven.org/maven2/com/ibm/websphere/appserver/runtime/wlp-javaee7/${liberty.version}/wlp-javaee7-${liberty.version}.zip - - - + jetty 9 - 9.4.53.v20231009 + 9.4.56.v20240826 jetty${jetty.major-version}x https://repo1.maven.org/maven2/org/eclipse/jetty/jetty-distribution/${jetty.version}/jetty-distribution-${jetty.version}.tar.gz @@ -415,21 +379,11 @@ https://repo.maven.apache.org/maven2/org/glassfish/main/distributions/glassfish/${glassfish.version}/glassfish-${glassfish.version}.zip - - - glassfish4 - - 4 - 4.1.2 - glassfish${glassfish.major-version}x - https://download.java.net/glassfish/${glassfish.version}/release/glassfish-${glassfish.version}.zip - - resin 4 - 4.0.66 + 4.0.67 resin${resin.major-version}x https://www.caucho.com/download/resin-${resin.version}.zip