Skip to content

[GEODE-10664] support 2.0 upgrades #8107

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
JinwooHwang merged 3 commits into from
Oct 9, 2026
Merged

[GEODE-10664] support 2.0 upgrades #8107

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
5b93472
[GEODE-10664] Upgrade Jackson to 2.21.7 (#8092)
JinwooHwang Sep 25, 2026
6e32f62
[GEODE-10665] Upgrade Jetty to 12.0.39 (#8093)
JinwooHwang Sep 25, 2026
891c0f7
[GEODE-10666] Upgrade JLine to 3.30.17 (#8094)
JinwooHwang Sep 25, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions boms/geode-all-bom/src/test/resources/expected-pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -475,22 +475,22 @@
<dependency>
<groupId>com.fasterxml.jackson.core</groupId>
<artifactId>jackson-core</artifactId>
<version>2.21.6</version>
<version>2.21.7</version>
</dependency>
<dependency>
<groupId>com.fasterxml.jackson.core</groupId>
<artifactId>jackson-databind</artifactId>
<version>2.21.6</version>
<version>2.21.7</version>
</dependency>
<dependency>
<groupId>com.fasterxml.jackson.datatype</groupId>
<artifactId>jackson-datatype-joda</artifactId>
<version>2.21.6</version>
<version>2.21.7</version>
</dependency>
<dependency>
<groupId>com.fasterxml.jackson.datatype</groupId>
<artifactId>jackson-datatype-jsr310</artifactId>
<version>2.21.6</version>
<version>2.21.7</version>
</dependency>
<dependency>
<groupId>com.jayway.jsonpath</groupId>
Expand Down
17 changes: 12 additions & 5 deletions ...y-management/src/main/groovy/org/apache/geode/gradle/plugins/DependencyConstraints.groovy
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,6 +46,7 @@ class DependencyConstraints {
deps.put("jakarta.annotation.version", "2.1.1")
deps.put("jakarta.ejb.version", "4.0.1")
deps.put("jgroups.version", "3.6.20.Final")
deps.put("jline.version", "3.30.17")
deps.put("log4j.version", "2.25.5")
deps.put("log4j-slf4j2-impl.version", "2.23.1")
deps.put("micrometer.version", "1.16.7")
Expand All @@ -55,9 +56,9 @@ class DependencyConstraints {
deps.put("slf4j-api.version", "2.0.18")
deps.put("jakarta.transaction-api.version", "2.0.1")
deps.put("jboss-modules.version", "1.11.0.Final")
deps.put("jackson.version", "2.21.6")
deps.put("jackson.version", "2.21.7")
deps.put("jackson.annotations.version", "2.21")
deps.put("jackson.databind.version", "2.21.6")
deps.put("jackson.databind.version", "2.21.7")
// Spring Framework 6.x Migration
deps.put("springshell.version", "3.3.3")
deps.put("springframework.version", "6.1.21")
Expand Down Expand Up @@ -88,7 +89,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")
Expand All @@ -111,8 +112,14 @@ class DependencyConstraints {

project.dependencies {
constraints {
api('org.jline:jline-terminal-jni:3.26.3')
api('org.jline:jline-terminal-ffm:3.26.3')
api(group: 'org.jline', name: 'jline-builtins', version: get('jline.version'))
api(group: 'org.jline', name: 'jline-console', version: get('jline.version'))
api(group: 'org.jline', name: 'jline-native', version: get('jline.version'))
api(group: 'org.jline', name: 'jline-reader', version: get('jline.version'))
api(group: 'org.jline', name: 'jline-style', version: get('jline.version'))
api(group: 'org.jline', name: 'jline-terminal', version: get('jline.version'))
api(group: 'org.jline', name: 'jline-terminal-ffm', version: get('jline.version'))
api(group: 'org.jline', name: 'jline-terminal-jni', version: get('jline.version'))
// informal, inter-group dependencySet
api(group: 'antlr', name: 'antlr', version: get('antlr.version'))
api(group: 'cglib', name: 'cglib', version: get('cglib.version'))
Expand Down
2 changes: 1 addition & 1 deletion ...mbly/src/distributedTest/java/org/apache/geode/session/tests/GenericAppServerInstall.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
54 changes: 27 additions & 27 deletions geode-assembly/src/integrationTest/resources/assembly_content.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -965,11 +965,11 @@ lib/httpcore5-5.4.3.jar
lib/httpcore5-h2-5.4.3.jar
lib/istack-commons-runtime-4.1.1.jar
lib/jackson-annotations-2.21.jar
lib/jackson-core-2.21.6.jar
lib/jackson-databind-2.21.6.jar
lib/jackson-dataformat-yaml-2.21.6.jar
lib/jackson-datatype-joda-2.21.6.jar
lib/jackson-datatype-jsr310-2.21.6.jar
lib/jackson-core-2.21.7.jar
lib/jackson-databind-2.21.7.jar
lib/jackson-dataformat-yaml-2.21.7.jar
lib/jackson-datatype-joda-2.21.7.jar
lib/jackson-datatype-jsr310-2.21.7.jar
lib/jakarta.activation-api-2.1.3.jar
lib/jakarta.annotation-api-2.1.1.jar
lib/jakarta.el-api-5.0.0.jar
Expand All @@ -986,29 +986,29 @@ 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
lib/jline-native-3.26.3.jar
lib/jline-reader-3.26.3.jar
lib/jline-style-3.26.3.jar
lib/jline-terminal-3.26.3.jar
lib/jline-terminal-ffm-3.26.3.jar
lib/jline-terminal-jni-3.26.3.jar
lib/jline-builtins-3.30.17.jar
lib/jline-console-3.30.17.jar
lib/jline-native-3.30.17.jar
lib/jline-reader-3.30.17.jar
lib/jline-style-3.30.17.jar
lib/jline-terminal-3.30.17.jar
lib/jline-terminal-ffm-3.30.17.jar
lib/jline-terminal-jni-3.30.17.jar
lib/jna-5.11.0.jar
lib/jna-platform-5.11.0.jar
lib/joda-time-2.12.7.jar
Expand Down
54 changes: 27 additions & 27 deletions geode-assembly/src/integrationTest/resources/gfsh_dependency_classpath.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,11 +21,11 @@ spring-shell-starter-3.3.3.jar
spring-web-6.1.21.jar
commons-lang3-3.18.0.jar
rmiio-2.1.2.jar
jackson-datatype-jsr310-2.21.6.jar
jackson-datatype-joda-2.21.6.jar
jackson-core-2.21.6.jar
jackson-dataformat-yaml-2.21.6.jar
jackson-databind-2.21.6.jar
jackson-datatype-jsr310-2.21.7.jar
jackson-datatype-joda-2.21.7.jar
jackson-core-2.21.7.jar
jackson-dataformat-yaml-2.21.7.jar
jackson-databind-2.21.7.jar
swagger-annotations-2.2.22.jar
jaxb-runtime-4.0.2.jar
jaxb-core-4.0.2.jar
Expand All @@ -51,8 +51,8 @@ spring-context-6.1.21.jar
spring-beans-6.1.21.jar
spring-expression-6.1.21.jar
spring-core-6.1.21.jar
jline-terminal-jni-3.26.3.jar
jline-terminal-ffm-3.26.3.jar
jline-terminal-jni-3.30.17.jar
jline-terminal-ffm-3.30.17.jar
angus-activation-2.0.0.jar
jakarta.activation-api-2.1.3.jar
lucene-analysis-phonetic-9.12.3.jar
Expand Down Expand Up @@ -80,13 +80,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
Expand All @@ -96,11 +96,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
Expand All @@ -109,21 +109,21 @@ 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
jline-console-3.26.3.jar
jline-builtins-3.26.3.jar
jline-reader-3.26.3.jar
jline-style-3.26.3.jar
jline-terminal-3.26.3.jar
jline-native-3.26.3.jar
jline-console-3.30.17.jar
jline-builtins-3.30.17.jar
jline-reader-3.30.17.jar
jline-style-3.30.17.jar
jline-terminal-3.30.17.jar
jline-native-3.30.17.jar
micrometer-observation-1.16.7.jar
spring-jcl-6.1.21.jar
micrometer-commons-1.16.7.jar
Expand Down
54 changes: 27 additions & 27 deletions geode-server-all/src/integrationTest/resources/dependency_classpath.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,11 +19,11 @@ geode-unsafe-0.0.0.jar
geode-deployment-legacy-0.0.0.jar
snappy-0.5.jar
swagger-annotations-2.2.22.jar
jackson-datatype-jsr310-2.21.6.jar
jackson-dataformat-yaml-2.21.6.jar
jackson-core-2.21.6.jar
jackson-datatype-joda-2.21.6.jar
jackson-databind-2.21.6.jar
jackson-datatype-jsr310-2.21.7.jar
jackson-dataformat-yaml-2.21.7.jar
jackson-core-2.21.7.jar
jackson-datatype-joda-2.21.7.jar
jackson-databind-2.21.7.jar
httpclient5-5.6.4.jar
httpcore5-h2-5.4.3.jar
httpcore5-5.4.3.jar
Expand All @@ -47,10 +47,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
Expand All @@ -77,8 +77,8 @@ spring-context-6.1.21.jar
spring-beans-6.1.21.jar
spring-expression-6.1.21.jar
spring-core-6.1.21.jar
jline-terminal-jni-3.26.3.jar
jline-terminal-ffm-3.26.3.jar
jline-terminal-jni-3.30.17.jar
jline-terminal-ffm-3.30.17.jar
lucene-analysis-phonetic-9.12.3.jar
lucene-analysis-common-9.12.3.jar
lucene-queryparser-9.12.3.jar
Expand All @@ -91,39 +91,39 @@ 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
jline-console-3.26.3.jar
jline-builtins-3.26.3.jar
jline-reader-3.26.3.jar
jline-style-3.26.3.jar
jline-terminal-3.26.3.jar
jline-native-3.26.3.jar
jline-console-3.30.17.jar
jline-builtins-3.30.17.jar
jline-reader-3.30.17.jar
jline-style-3.30.17.jar
jline-terminal-3.30.17.jar
jline-native-3.30.17.jar
micrometer-observation-1.16.7.jar
micrometer-commons-1.16.7.jar
jspecify-1.0.1.jar
Expand Down
Loading