This is an automated email from the ASF dual-hosted git repository.
jinwoo pushed a commit to branch support/1.15
in repository https://gitbox.apache.org/repos/asf/geode.git
The following commit(s) were added to refs/heads/support/1.15 by this push:
new bd0303b715 Upgrade Jetty 9.4.57.v20241219 (#7894)
bd0303b715 is described below
commit bd0303b71576bc4298749af16fd087db81834430
Author: Jinwoo Hwang <[email protected]>
AuthorDate: Thu Apr 10 18:41:23 2025 -0400
Upgrade Jetty 9.4.57.v20241219 (#7894)
Co-authored-by: Niall Pemberton <[email protected]>
(cherry picked from commit 1b019f7ced0fb3ec8b31227dc80f315eb6792060)
---
.../geode/gradle/plugins/DependencyConstraints.groovy | 2 +-
.../geode/session/tests/GenericAppServerInstall.java | 2 +-
.../src/integrationTest/resources/assembly_content.txt | 18 +++++++++---------
.../resources/gfsh_dependency_classpath.txt | 8 ++++----
.../integrationTest/resources/dependency_classpath.txt | 14 +++++++-------
5 files changed, 22 insertions(+), 22 deletions(-)
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 fe74e0f93a..61c7141d69 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
@@ -61,7 +61,7 @@ class DependencyConstraints {
// The jetty version is also hard-coded in geode-assembly:test
// at o.a.g.sessions.tests.GenericAppServerInstall.java
- deps.put("jetty.version", "9.4.47.v20220610")
+ deps.put("jetty.version", "9.4.57.v20241219")
// 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 88d0e5c77b..006db8b10f 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 @@ import java.util.function.IntSupplier;
* specific code outside of the {@link GenericAppServerVersion}.
*/
public class GenericAppServerInstall extends ContainerInstall {
- private static final String JETTY_VERSION = "9.4.47.v20220610";
+ private static final String JETTY_VERSION = "9.4.57.v20241219";
/**
* 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 c1913192ce..6c80b4f6a7 100644
--- a/geode-assembly/src/integrationTest/resources/assembly_content.txt
+++ b/geode-assembly/src/integrationTest/resources/assembly_content.txt
@@ -1016,15 +1016,15 @@ lib/javax.servlet-api-3.1.0.jar
lib/javax.transaction-api-1.3.jar
lib/jaxb-api-2.3.1.jar
lib/jaxb-impl-2.3.2.jar
-lib/jetty-http-9.4.47.v20220610.jar
-lib/jetty-io-9.4.47.v20220610.jar
-lib/jetty-security-9.4.47.v20220610.jar
-lib/jetty-server-9.4.47.v20220610.jar
-lib/jetty-servlet-9.4.47.v20220610.jar
-lib/jetty-util-9.4.47.v20220610.jar
-lib/jetty-util-ajax-9.4.47.v20220610.jar
-lib/jetty-webapp-9.4.47.v20220610.jar
-lib/jetty-xml-9.4.47.v20220610.jar
+lib/jetty-http-9.4.57.v20241219.jar
+lib/jetty-io-9.4.57.v20241219.jar
+lib/jetty-security-9.4.57.v20241219.jar
+lib/jetty-server-9.4.57.v20241219.jar
+lib/jetty-servlet-9.4.57.v20241219.jar
+lib/jetty-util-9.4.57.v20241219.jar
+lib/jetty-util-ajax-9.4.57.v20241219.jar
+lib/jetty-webapp-9.4.57.v20241219.jar
+lib/jetty-xml-9.4.57.v20241219.jar
lib/jgroups-3.6.20.Final.jar
lib/jline-2.12.jar
lib/jna-5.11.0.jar
diff --git
a/geode-assembly/src/integrationTest/resources/gfsh_dependency_classpath.txt
b/geode-assembly/src/integrationTest/resources/gfsh_dependency_classpath.txt
index 06b7f88a0a..41fb4c8bf9 100644
--- a/geode-assembly/src/integrationTest/resources/gfsh_dependency_classpath.txt
+++ b/geode-assembly/src/integrationTest/resources/gfsh_dependency_classpath.txt
@@ -59,10 +59,10 @@ classgraph-4.8.146.jar
micrometer-core-1.9.0.jar
fastutil-8.5.8.jar
javax.resource-api-1.7.1.jar
-jetty-webapp-9.4.47.v20220610.jar
-jetty-servlet-9.4.47.v20220610.jar
-jetty-security-9.4.47.v20220610.jar
-jetty-server-9.4.47.v20220610.jar
+jetty-webapp-9.4.57.v20241219.jar
+jetty-servlet-9.4.57.v20241219.jar
+jetty-security-9.4.57.v20241219.jar
+jetty-server-9.4.57.v20241219.jar
javax.servlet-api-3.1.0.jar
joda-time-2.10.14.jar
jna-platform-5.11.0.jar
diff --git
a/geode-server-all/src/integrationTest/resources/dependency_classpath.txt
b/geode-server-all/src/integrationTest/resources/dependency_classpath.txt
index c10b955f17..8aa17a80cd 100644
--- a/geode-server-all/src/integrationTest/resources/dependency_classpath.txt
+++ b/geode-server-all/src/integrationTest/resources/dependency_classpath.txt
@@ -16,9 +16,9 @@ javax.activation-api-1.2.0.jar
javax.resource-api-1.7.1.jar
LatencyUtils-2.0.3.jar
jline-2.12.jar
-jetty-servlet-9.4.47.v20220610.jar
+jetty-servlet-9.4.57.v20241219.jar
spring-core-5.3.21.jar
-jetty-util-ajax-9.4.47.v20220610.jar
+jetty-util-ajax-9.4.57.v20241219.jar
geode-cq-0.0.0.jar
geode-old-client-support-0.0.0.jar
javax.servlet-api-3.1.0.jar
@@ -38,7 +38,7 @@ geode-lucene-0.0.0.jar
lucene-core-6.6.6.jar
fastutil-8.5.8.jar
geode-gfsh-0.0.0.jar
-jetty-http-9.4.47.v20220610.jar
+jetty-http-9.4.57.v20241219.jar
geode-memcached-0.0.0.jar
rmiio-2.1.2.jar
geode-tcp-server-0.0.0.jar
@@ -49,7 +49,7 @@ jetty-util-9.4.57.v20241219.jar
log4j-slf4j-impl-2.17.2.jar
lucene-analyzers-common-6.6.6.jar
geode-membership-0.0.0.jar
-jetty-webapp-9.4.47.v20220610.jar
+jetty-webapp-9.4.57.v20241219.jar
commons-lang3-3.12.0.jar
jopt-simple-5.0.4.jar
swagger-annotations-2.2.0.jar
@@ -59,7 +59,7 @@ log4j-api-2.17.2.jar
geode-serialization-0.0.0.jar
istack-commons-runtime-4.0.1.jar
lucene-queryparser-6.6.6.jar
-jetty-io-9.4.47.v20220610.jar
+jetty-io-9.4.57.v20241219.jar
geode-deployment-legacy-0.0.0.jar
commons-beanutils-1.11.0.jar
log4j-core-2.17.2.jar
@@ -77,14 +77,14 @@ shiro-config-ogdl-1.13.0.jar
geode-log4j-0.0.0.jar
lucene-analyzers-phonetic-6.6.6.jar
spring-context-5.3.21.jar
-jetty-security-9.4.47.v20220610.jar
+jetty-security-9.4.57.v20241219.jar
geode-logging-0.0.0.jar
commons-io-2.11.0.jar
shiro-lang-1.13.0.jar
javax.transaction-api-1.3.jar
geode-common-0.0.0.jar
antlr-2.7.7.jar
-jetty-xml-9.4.47.v20220610.jar
+jetty-xml-9.4.57.v20241219.jar
geode-rebalancer-0.0.0.jar
jetty-server-9.4.57.v20241219.jar
jackson-datatype-jsr310-2.17.0.jar
