diff --git a/build-tools/geode-dependency-management/src/main/groovy/org/apache/geode/gradle/plugins/DependencyConstraints.groovy b/build-tools/geode-dependency-management/src/main/groovy/org/apache/geode/gradle/plugins/DependencyConstraints.groovy index 1a6e6f032e63..dd11b4494b01 100644 --- a/build-tools/geode-dependency-management/src/main/groovy/org/apache/geode/gradle/plugins/DependencyConstraints.groovy +++ b/build-tools/geode-dependency-management/src/main/groovy/org/apache/geode/gradle/plugins/DependencyConstraints.groovy @@ -88,7 +88,7 @@ class DependencyConstraints { // at o.a.g.sessions.tests.GenericAppServerInstall.java // Jetty 12.0.x for Jakarta EE 10 (Servlet 6.0) compatibility // Jetty 12 reorganized modules under ee10, ee9, ee8 packages - deps.put("jetty.version", "12.0.37") + deps.put("jetty.version", "12.0.39") // These versions are referenced in test.gradle, which is aggressively injected into all projects. deps.put("junit.version", "4.13.2") diff --git a/geode-assembly/src/distributedTest/java/org/apache/geode/session/tests/GenericAppServerInstall.java b/geode-assembly/src/distributedTest/java/org/apache/geode/session/tests/GenericAppServerInstall.java index 59edba382180..0c0d36506b20 100644 --- a/geode-assembly/src/distributedTest/java/org/apache/geode/session/tests/GenericAppServerInstall.java +++ b/geode-assembly/src/distributedTest/java/org/apache/geode/session/tests/GenericAppServerInstall.java @@ -34,7 +34,7 @@ * specific code outside of the {@link GenericAppServerVersion}. */ public class GenericAppServerInstall extends ContainerInstall { - private static final String JETTY_VERSION = "12.0.37"; + private static final String JETTY_VERSION = "12.0.39"; /** * Get the version number, download URL, and container name of a generic app server using diff --git a/geode-assembly/src/integrationTest/resources/assembly_content.txt b/geode-assembly/src/integrationTest/resources/assembly_content.txt index bb903288049b..6b94ae880b2b 100644 --- a/geode-assembly/src/integrationTest/resources/assembly_content.txt +++ b/geode-assembly/src/integrationTest/resources/assembly_content.txt @@ -987,20 +987,20 @@ lib/jakarta.xml.bind-api-4.0.2.jar lib/jaxb-core-4.0.2.jar lib/jaxb-runtime-4.0.2.jar lib/jboss-logging-3.4.3.Final.jar -lib/jetty-ee-12.0.37.jar -lib/jetty-ee10-annotations-12.0.37.jar -lib/jetty-ee10-plus-12.0.37.jar -lib/jetty-ee10-servlet-12.0.37.jar -lib/jetty-ee10-webapp-12.0.37.jar -lib/jetty-http-12.0.37.jar -lib/jetty-io-12.0.37.jar -lib/jetty-jndi-12.0.37.jar -lib/jetty-plus-12.0.37.jar -lib/jetty-security-12.0.37.jar -lib/jetty-server-12.0.37.jar -lib/jetty-session-12.0.37.jar -lib/jetty-util-12.0.37.jar -lib/jetty-xml-12.0.37.jar +lib/jetty-ee-12.0.39.jar +lib/jetty-ee10-annotations-12.0.39.jar +lib/jetty-ee10-plus-12.0.39.jar +lib/jetty-ee10-servlet-12.0.39.jar +lib/jetty-ee10-webapp-12.0.39.jar +lib/jetty-http-12.0.39.jar +lib/jetty-io-12.0.39.jar +lib/jetty-jndi-12.0.39.jar +lib/jetty-plus-12.0.39.jar +lib/jetty-security-12.0.39.jar +lib/jetty-server-12.0.39.jar +lib/jetty-session-12.0.39.jar +lib/jetty-util-12.0.39.jar +lib/jetty-xml-12.0.39.jar lib/jgroups-3.6.20.Final.jar lib/jline-builtins-3.26.3.jar lib/jline-console-3.26.3.jar diff --git a/geode-assembly/src/integrationTest/resources/gfsh_dependency_classpath.txt b/geode-assembly/src/integrationTest/resources/gfsh_dependency_classpath.txt index 489b45aba271..cded5d618cb4 100644 --- a/geode-assembly/src/integrationTest/resources/gfsh_dependency_classpath.txt +++ b/geode-assembly/src/integrationTest/resources/gfsh_dependency_classpath.txt @@ -79,13 +79,13 @@ micrometer-core-1.16.7.jar HdrHistogram-2.2.2.jar fastutil-8.5.8.jar jakarta.resource-api-2.1.0.jar -jetty-ee10-annotations-12.0.37.jar -jetty-ee10-plus-12.0.37.jar +jetty-ee10-annotations-12.0.39.jar +jetty-ee10-plus-12.0.39.jar jakarta.enterprise.cdi-api-4.0.1.jar jakarta.interceptor-api-2.1.0.jar jakarta.annotation-api-2.1.1.jar -jetty-ee10-webapp-12.0.37.jar -jetty-ee10-servlet-12.0.37.jar +jetty-ee10-webapp-12.0.39.jar +jetty-ee10-servlet-12.0.39.jar jakarta.servlet-api-6.0.0.jar jakarta.transaction-api-2.0.1.jar joda-time-2.12.7.jar @@ -95,11 +95,11 @@ shiro-hashes-argon2-3.0.0.jar shiro-hashes-bcrypt-3.0.0.jar shiro-crypto-hash-3.0.0.jar bcprov-jdk18on-1.85.jar -jetty-ee-12.0.37.jar -jetty-session-12.0.37.jar -jetty-plus-12.0.37.jar -jetty-security-12.0.37.jar -jetty-server-12.0.37.jar +jetty-ee-12.0.39.jar +jetty-session-12.0.39.jar +jetty-plus-12.0.39.jar +jetty-security-12.0.39.jar +jetty-server-12.0.39.jar snappy-0.5.jar jgroups-3.6.20.Final.jar shiro-cache-3.0.0.jar @@ -108,13 +108,13 @@ shiro-config-core-3.0.0.jar shiro-event-3.0.0.jar shiro-crypto-core-3.0.0.jar shiro-lang-3.0.0.jar -jetty-xml-12.0.37.jar -jetty-http-12.0.37.jar -jetty-io-12.0.37.jar +jetty-xml-12.0.39.jar +jetty-http-12.0.39.jar +jetty-io-12.0.39.jar spring-boot-starter-logging-3.3.13.jar jul-to-slf4j-2.0.17.jar -jetty-jndi-12.0.37.jar -jetty-util-12.0.37.jar +jetty-jndi-12.0.39.jar +jetty-util-12.0.39.jar slf4j-api-2.0.18.jar jackson-annotations-2.21.jar micrometer-observation-1.16.7.jar diff --git a/geode-server-all/src/integrationTest/resources/dependency_classpath.txt b/geode-server-all/src/integrationTest/resources/dependency_classpath.txt index 7300c0dd4912..ef9acdb44bb5 100644 --- a/geode-server-all/src/integrationTest/resources/dependency_classpath.txt +++ b/geode-server-all/src/integrationTest/resources/dependency_classpath.txt @@ -48,10 +48,10 @@ spring-shell-core-3.3.3.jar commons-io-2.19.0.jar micrometer-core-1.16.7.jar jakarta.resource-api-2.1.0.jar -jetty-ee10-annotations-12.0.37.jar +jetty-ee10-annotations-12.0.39.jar spring-boot-starter-validation-3.3.13.jar spring-boot-starter-3.3.13.jar -jetty-ee10-plus-12.0.37.jar +jetty-ee10-plus-12.0.39.jar jakarta.enterprise.cdi-api-4.0.1.jar jakarta.interceptor-api-2.1.0.jar jakarta.annotation-api-2.1.1.jar @@ -90,30 +90,30 @@ commons-collections-3.2.2.jar commons-digester-2.1.jar commons-logging-1.3.5.jar HdrHistogram-2.2.2.jar -jetty-ee10-webapp-12.0.37.jar -jetty-ee10-servlet-12.0.37.jar +jetty-ee10-webapp-12.0.39.jar +jetty-ee10-servlet-12.0.39.jar jakarta.servlet-api-6.0.0.jar joda-time-2.12.7.jar shiro-hashes-argon2-3.0.0.jar shiro-hashes-bcrypt-3.0.0.jar shiro-crypto-hash-3.0.0.jar bcprov-jdk18on-1.85.jar -jetty-ee-12.0.37.jar -jetty-session-12.0.37.jar -jetty-plus-12.0.37.jar -jetty-security-12.0.37.jar -jetty-server-12.0.37.jar +jetty-ee-12.0.39.jar +jetty-session-12.0.39.jar +jetty-plus-12.0.39.jar +jetty-security-12.0.39.jar +jetty-server-12.0.39.jar shiro-cache-3.0.0.jar shiro-crypto-cipher-3.0.0.jar shiro-config-core-3.0.0.jar shiro-event-3.0.0.jar shiro-crypto-core-3.0.0.jar shiro-lang-3.0.0.jar -jetty-xml-12.0.37.jar -jetty-http-12.0.37.jar -jetty-io-12.0.37.jar -jetty-jndi-12.0.37.jar -jetty-util-12.0.37.jar +jetty-xml-12.0.39.jar +jetty-http-12.0.39.jar +jetty-io-12.0.39.jar +jetty-jndi-12.0.39.jar +jetty-util-12.0.39.jar spring-boot-starter-logging-3.3.13.jar jul-to-slf4j-2.0.17.jar slf4j-api-2.0.18.jar