From 5b934727b6c79460ab404b7d322ec8ad3b9c1a87 Mon Sep 17 00:00:00 2001 From: Jinwoo Hwang <92374539+JinwooHwang@users.noreply.github.com> Date: Fri, 25 Sep 2026 10:11:51 -0400 Subject: [PATCH 1/3] [GEODE-10664] Upgrade Jackson to 2.21.7 (#8092) (cherry picked from commit d13e55ad2b89648cc32f6b6789f6115827617132) --- boms/geode-all-bom/src/test/resources/expected-pom.xml | 8 ++++---- .../geode/gradle/plugins/DependencyConstraints.groovy | 4 ++-- .../src/integrationTest/resources/assembly_content.txt | 10 +++++----- .../resources/gfsh_dependency_classpath.txt | 10 +++++----- .../integrationTest/resources/dependency_classpath.txt | 10 +++++----- 5 files changed, 21 insertions(+), 21 deletions(-) diff --git a/boms/geode-all-bom/src/test/resources/expected-pom.xml b/boms/geode-all-bom/src/test/resources/expected-pom.xml index 84d481c3276..fb8068c2a56 100644 --- a/boms/geode-all-bom/src/test/resources/expected-pom.xml +++ b/boms/geode-all-bom/src/test/resources/expected-pom.xml @@ -475,22 +475,22 @@ com.fasterxml.jackson.core jackson-core - 2.21.6 + 2.21.7 com.fasterxml.jackson.core jackson-databind - 2.21.6 + 2.21.7 com.fasterxml.jackson.datatype jackson-datatype-joda - 2.21.6 + 2.21.7 com.fasterxml.jackson.datatype jackson-datatype-jsr310 - 2.21.6 + 2.21.7 com.jayway.jsonpath 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 483208269ca..b354625acfa 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 @@ -55,9 +55,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") diff --git a/geode-assembly/src/integrationTest/resources/assembly_content.txt b/geode-assembly/src/integrationTest/resources/assembly_content.txt index c2c6ae29523..74e301e29b7 100644 --- a/geode-assembly/src/integrationTest/resources/assembly_content.txt +++ b/geode-assembly/src/integrationTest/resources/assembly_content.txt @@ -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 diff --git a/geode-assembly/src/integrationTest/resources/gfsh_dependency_classpath.txt b/geode-assembly/src/integrationTest/resources/gfsh_dependency_classpath.txt index 17273bef851..acfb3bfc64e 100644 --- a/geode-assembly/src/integrationTest/resources/gfsh_dependency_classpath.txt +++ b/geode-assembly/src/integrationTest/resources/gfsh_dependency_classpath.txt @@ -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 diff --git a/geode-server-all/src/integrationTest/resources/dependency_classpath.txt b/geode-server-all/src/integrationTest/resources/dependency_classpath.txt index fe2869ac30c..ec68ea2965d 100644 --- a/geode-server-all/src/integrationTest/resources/dependency_classpath.txt +++ b/geode-server-all/src/integrationTest/resources/dependency_classpath.txt @@ -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 From 6e32f627717f315224ea1ed1e52adafd741efc09 Mon Sep 17 00:00:00 2001 From: Jinwoo Hwang <92374539+JinwooHwang@users.noreply.github.com> Date: Fri, 25 Sep 2026 10:12:13 -0400 Subject: [PATCH 2/3] [GEODE-10665] Upgrade Jetty to 12.0.39 (#8093) (cherry picked from commit 0f6eb5bf71cd63a2a650ae2087b72c32adf439e1) --- .../plugins/DependencyConstraints.groovy | 2 +- .../tests/GenericAppServerInstall.java | 2 +- .../resources/assembly_content.txt | 28 +++++++++---------- .../resources/gfsh_dependency_classpath.txt | 28 +++++++++---------- .../resources/dependency_classpath.txt | 28 +++++++++---------- 5 files changed, 44 insertions(+), 44 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 b354625acfa..7bef4411ffd 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 59edba38218..0c0d36506b2 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 74e301e29b7..a9bea5fca51 100644 --- a/geode-assembly/src/integrationTest/resources/assembly_content.txt +++ b/geode-assembly/src/integrationTest/resources/assembly_content.txt @@ -986,20 +986,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 acfb3bfc64e..d91288c970d 100644 --- a/geode-assembly/src/integrationTest/resources/gfsh_dependency_classpath.txt +++ b/geode-assembly/src/integrationTest/resources/gfsh_dependency_classpath.txt @@ -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 @@ -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 @@ -109,13 +109,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 jline-console-3.26.3.jar diff --git a/geode-server-all/src/integrationTest/resources/dependency_classpath.txt b/geode-server-all/src/integrationTest/resources/dependency_classpath.txt index ec68ea2965d..4ab5f49ffc2 100644 --- a/geode-server-all/src/integrationTest/resources/dependency_classpath.txt +++ b/geode-server-all/src/integrationTest/resources/dependency_classpath.txt @@ -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 @@ -91,30 +91,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 From 891c0f72941e87d075f37a02463dade8131d796e Mon Sep 17 00:00:00 2001 From: Jinwoo Hwang <92374539+JinwooHwang@users.noreply.github.com> Date: Fri, 25 Sep 2026 10:12:32 -0400 Subject: [PATCH 3/3] [GEODE-10666] Upgrade JLine to 3.30.17 (#8094) (cherry picked from commit e19736e4bc0c596e214b9f1f814863387efc5dc0) --- .../gradle/plugins/DependencyConstraints.groovy | 11 +++++++++-- .../resources/assembly_content.txt | 16 ++++++++-------- .../resources/gfsh_dependency_classpath.txt | 16 ++++++++-------- .../resources/dependency_classpath.txt | 16 ++++++++-------- 4 files changed, 33 insertions(+), 26 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 7bef4411ffd..ff12f766b9f 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 @@ -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") @@ -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')) diff --git a/geode-assembly/src/integrationTest/resources/assembly_content.txt b/geode-assembly/src/integrationTest/resources/assembly_content.txt index a9bea5fca51..9a1b782f1e8 100644 --- a/geode-assembly/src/integrationTest/resources/assembly_content.txt +++ b/geode-assembly/src/integrationTest/resources/assembly_content.txt @@ -1001,14 +1001,14 @@ 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 diff --git a/geode-assembly/src/integrationTest/resources/gfsh_dependency_classpath.txt b/geode-assembly/src/integrationTest/resources/gfsh_dependency_classpath.txt index d91288c970d..22b6d989f38 100644 --- a/geode-assembly/src/integrationTest/resources/gfsh_dependency_classpath.txt +++ b/geode-assembly/src/integrationTest/resources/gfsh_dependency_classpath.txt @@ -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 @@ -118,12 +118,12 @@ 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 diff --git a/geode-server-all/src/integrationTest/resources/dependency_classpath.txt b/geode-server-all/src/integrationTest/resources/dependency_classpath.txt index 4ab5f49ffc2..8ae6edd72b7 100644 --- a/geode-server-all/src/integrationTest/resources/dependency_classpath.txt +++ b/geode-server-all/src/integrationTest/resources/dependency_classpath.txt @@ -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 @@ -118,12 +118,12 @@ 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