Skip to content

Commit 1da0088

Browse files
committed
GEODE-10568: Remediation of CVE-2026-1605 and CVE-2025-11143 (#7992)
* GEODE-10568: Upgrade Jetty to 12.0.33 * GEODE-10568: Update integration test snapshots for Jetty 12.0.33
1 parent 7362e23 commit 1da0088

5 files changed

Lines changed: 53 additions & 53 deletions

File tree

build-tools/geode-dependency-management/src/main/groovy/org/apache/geode/gradle/plugins/DependencyConstraints.groovy

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -82,7 +82,7 @@ class DependencyConstraints {
8282
// at o.a.g.sessions.tests.GenericAppServerInstall.java
8383
// Jetty 12.0.x for Jakarta EE 10 (Servlet 6.0) compatibility
8484
// Jetty 12 reorganized modules under ee10, ee9, ee8 packages
85-
deps.put("jetty.version", "12.0.27")
85+
deps.put("jetty.version", "12.0.33")
8686

8787
// These versions are referenced in test.gradle, which is aggressively injected into all projects.
8888
deps.put("junit.version", "4.13.2")

geode-assembly/src/distributedTest/java/org/apache/geode/session/tests/GenericAppServerInstall.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@
3434
* specific code outside of the {@link GenericAppServerVersion}.
3535
*/
3636
public class GenericAppServerInstall extends ContainerInstall {
37-
private static final String JETTY_VERSION = "12.0.27";
37+
private static final String JETTY_VERSION = "12.0.33";
3838

3939
/**
4040
* Get the version number, download URL, and container name of a generic app server using

geode-assembly/src/integrationTest/resources/assembly_content.txt

Lines changed: 17 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -920,9 +920,9 @@ lib/ST4-4.3.3.jar
920920
lib/angus-activation-2.0.0.jar
921921
lib/antlr-2.7.7.jar
922922
lib/antlr-runtime-3.5.2.jar
923-
lib/asm-9.8.jar
924-
lib/asm-commons-9.8.jar
925-
lib/asm-tree-9.8.jar
923+
lib/asm-9.9.1.jar
924+
lib/asm-commons-9.9.1.jar
925+
lib/asm-tree-9.9.1.jar
926926
lib/classgraph-4.8.147.jar
927927
lib/classmate-1.5.1.jar
928928
lib/commons-beanutils-1.11.0.jar
@@ -985,20 +985,20 @@ lib/jakarta.xml.bind-api-4.0.2.jar
985985
lib/jaxb-core-4.0.2.jar
986986
lib/jaxb-runtime-4.0.2.jar
987987
lib/jboss-logging-3.4.3.Final.jar
988-
lib/jetty-ee-12.0.27.jar
989-
lib/jetty-ee10-annotations-12.0.27.jar
990-
lib/jetty-ee10-plus-12.0.27.jar
991-
lib/jetty-ee10-servlet-12.0.27.jar
992-
lib/jetty-ee10-webapp-12.0.27.jar
993-
lib/jetty-http-12.0.27.jar
994-
lib/jetty-io-12.0.27.jar
995-
lib/jetty-jndi-12.0.27.jar
996-
lib/jetty-plus-12.0.27.jar
997-
lib/jetty-security-12.0.27.jar
998-
lib/jetty-server-12.0.27.jar
999-
lib/jetty-session-12.0.27.jar
1000-
lib/jetty-util-12.0.27.jar
1001-
lib/jetty-xml-12.0.27.jar
988+
lib/jetty-ee-12.0.33.jar
989+
lib/jetty-ee10-annotations-12.0.33.jar
990+
lib/jetty-ee10-plus-12.0.33.jar
991+
lib/jetty-ee10-servlet-12.0.33.jar
992+
lib/jetty-ee10-webapp-12.0.33.jar
993+
lib/jetty-http-12.0.33.jar
994+
lib/jetty-io-12.0.33.jar
995+
lib/jetty-jndi-12.0.33.jar
996+
lib/jetty-plus-12.0.33.jar
997+
lib/jetty-security-12.0.33.jar
998+
lib/jetty-server-12.0.33.jar
999+
lib/jetty-session-12.0.33.jar
1000+
lib/jetty-util-12.0.33.jar
1001+
lib/jetty-xml-12.0.33.jar
10021002
lib/jgroups-3.6.20.Final.jar
10031003
lib/jline-builtins-3.26.3.jar
10041004
lib/jline-console-3.26.3.jar

geode-assembly/src/integrationTest/resources/gfsh_dependency_classpath.txt

Lines changed: 17 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -79,23 +79,23 @@ micrometer-core-1.14.0.jar
7979
HdrHistogram-2.2.2.jar
8080
fastutil-8.5.8.jar
8181
jakarta.resource-api-2.1.0.jar
82-
jetty-ee10-annotations-12.0.27.jar
83-
jetty-ee10-plus-12.0.27.jar
82+
jetty-ee10-annotations-12.0.33.jar
83+
jetty-ee10-plus-12.0.33.jar
8484
jakarta.enterprise.cdi-api-4.0.1.jar
8585
jakarta.interceptor-api-2.1.0.jar
8686
jakarta.annotation-api-2.1.1.jar
87-
jetty-ee10-webapp-12.0.27.jar
88-
jetty-ee10-servlet-12.0.27.jar
87+
jetty-ee10-webapp-12.0.33.jar
88+
jetty-ee10-servlet-12.0.33.jar
8989
jakarta.servlet-api-6.0.0.jar
9090
jakarta.transaction-api-2.0.1.jar
9191
joda-time-2.12.7.jar
9292
jna-platform-5.11.0.jar
9393
jna-5.11.0.jar
94-
jetty-ee-12.0.27.jar
95-
jetty-session-12.0.27.jar
96-
jetty-plus-12.0.27.jar
97-
jetty-security-12.0.27.jar
98-
jetty-server-12.0.27.jar
94+
jetty-ee-12.0.33.jar
95+
jetty-session-12.0.33.jar
96+
jetty-plus-12.0.33.jar
97+
jetty-security-12.0.33.jar
98+
jetty-server-12.0.33.jar
9999
snappy-0.5.jar
100100
jgroups-3.6.20.Final.jar
101101
shiro-cache-1.13.0.jar
@@ -105,13 +105,13 @@ shiro-config-core-1.13.0.jar
105105
shiro-event-1.13.0.jar
106106
shiro-crypto-core-1.13.0.jar
107107
shiro-lang-1.13.0.jar
108-
jetty-xml-12.0.27.jar
109-
jetty-http-12.0.27.jar
110-
jetty-io-12.0.27.jar
108+
jetty-xml-12.0.33.jar
109+
jetty-http-12.0.33.jar
110+
jetty-io-12.0.33.jar
111111
spring-boot-starter-logging-3.3.5.jar
112112
jul-to-slf4j-2.0.16.jar
113-
jetty-jndi-12.0.27.jar
114-
jetty-util-12.0.27.jar
113+
jetty-jndi-12.0.33.jar
114+
jetty-util-12.0.33.jar
115115
slf4j-api-2.0.17.jar
116116
micrometer-observation-1.14.0.jar
117117
spring-jcl-6.1.14.jar
@@ -126,9 +126,9 @@ jline-terminal-3.26.3.jar
126126
ST4-4.3.3.jar
127127
txw2-4.0.2.jar
128128
snakeyaml-2.3.jar
129-
asm-commons-9.8.jar
130-
asm-tree-9.8.jar
131-
asm-9.8.jar
129+
asm-commons-9.9.1.jar
130+
asm-tree-9.9.1.jar
131+
asm-9.9.1.jar
132132
reactive-streams-1.0.4.jar
133133
jline-native-3.26.3.jar
134134
antlr-runtime-3.5.2.jar

geode-server-all/src/integrationTest/resources/dependency_classpath.txt

Lines changed: 17 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -48,10 +48,10 @@ spring-shell-core-3.3.3.jar
4848
commons-io-2.19.0.jar
4949
micrometer-core-1.14.0.jar
5050
jakarta.resource-api-2.1.0.jar
51-
jetty-ee10-annotations-12.0.27.jar
51+
jetty-ee10-annotations-12.0.33.jar
5252
spring-boot-starter-validation-3.3.5.jar
5353
spring-boot-starter-3.3.5.jar
54-
jetty-ee10-plus-12.0.27.jar
54+
jetty-ee10-plus-12.0.33.jar
5555
jakarta.enterprise.cdi-api-4.0.1.jar
5656
jakarta.interceptor-api-2.1.0.jar
5757
jakarta.annotation-api-2.1.1.jar
@@ -89,37 +89,37 @@ commons-collections-3.2.2.jar
8989
commons-digester-2.1.jar
9090
commons-logging-1.3.5.jar
9191
HdrHistogram-2.2.2.jar
92-
jetty-ee10-webapp-12.0.27.jar
93-
jetty-ee10-servlet-12.0.27.jar
92+
jetty-ee10-webapp-12.0.33.jar
93+
jetty-ee10-servlet-12.0.33.jar
9494
jakarta.servlet-api-6.0.0.jar
9595
joda-time-2.12.7.jar
96-
jetty-ee-12.0.27.jar
97-
jetty-session-12.0.27.jar
98-
jetty-plus-12.0.27.jar
99-
jetty-security-12.0.27.jar
100-
jetty-server-12.0.27.jar
96+
jetty-ee-12.0.33.jar
97+
jetty-session-12.0.33.jar
98+
jetty-plus-12.0.33.jar
99+
jetty-security-12.0.33.jar
100+
jetty-server-12.0.33.jar
101101
shiro-cache-1.13.0.jar
102102
shiro-crypto-hash-1.13.0.jar
103103
shiro-crypto-cipher-1.13.0.jar
104104
shiro-config-core-1.13.0.jar
105105
shiro-event-1.13.0.jar
106106
shiro-crypto-core-1.13.0.jar
107107
shiro-lang-1.13.0.jar
108-
jetty-xml-12.0.27.jar
109-
jetty-http-12.0.27.jar
110-
jetty-io-12.0.27.jar
111-
jetty-jndi-12.0.27.jar
112-
jetty-util-12.0.27.jar
108+
jetty-xml-12.0.33.jar
109+
jetty-http-12.0.33.jar
110+
jetty-io-12.0.33.jar
111+
jetty-jndi-12.0.33.jar
112+
jetty-util-12.0.33.jar
113113
spring-boot-starter-logging-3.3.5.jar
114114
jul-to-slf4j-2.0.16.jar
115115
slf4j-api-2.0.17.jar
116116
micrometer-observation-1.14.0.jar
117117
micrometer-commons-1.14.0.jar
118118
LatencyUtils-2.0.3.jar
119119
spring-jcl-6.1.14.jar
120-
asm-commons-9.8.jar
121-
asm-tree-9.8.jar
122-
asm-9.8.jar
120+
asm-commons-9.9.1.jar
121+
asm-tree-9.9.1.jar
122+
asm-9.9.1.jar
123123
txw2-4.0.2.jar
124124
reactor-core-3.6.10.jar
125125
jline-console-3.26.3.jar

0 commit comments

Comments
 (0)