From 8b88846b2377a3b92eb4594f1d46930618a9e591 Mon Sep 17 00:00:00 2001 From: JinwooHwang Date: Mon, 13 Jul 2026 07:34:57 -0400 Subject: [PATCH 1/2] feature/GEODE-10589 --- .../src/test/resources/expected-pom.xml | 8 ++--- .../plugins/DependencyConstraints.groovy | 4 +-- .../resources/assembly_content.txt | 10 +++---- .../resources/gfsh_dependency_classpath.txt | 10 +++---- .../src/test/resources/expected-pom.xml | 30 +++++++++++++++++++ .../resources/dependency_classpath.txt | 10 +++---- 6 files changed, 51 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 65f6a24015d..fecea109a7a 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.2 + 2.21.5 com.fasterxml.jackson.core jackson-databind - 2.21.2 + 2.21.5 com.fasterxml.jackson.datatype jackson-datatype-joda - 2.21.2 + 2.21.5 com.fasterxml.jackson.datatype jackson-datatype-jsr310 - 2.21.2 + 2.21.5 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 d71e6717bad..ed0cca04bbb 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.17") deps.put("jakarta.transaction-api.version", "2.0.1") deps.put("jboss-modules.version", "1.11.0.Final") - deps.put("jackson.version", "2.21.2") + deps.put("jackson.version", "2.21.5") deps.put("jackson.annotations.version", "2.21") - deps.put("jackson.databind.version", "2.21.2") + deps.put("jackson.databind.version", "2.21.5") // 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 c769db89d0e..1835ec93388 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.3.6.jar lib/httpcore5-h2-5.3.6.jar lib/istack-commons-runtime-4.1.1.jar lib/jackson-annotations-2.21.jar -lib/jackson-core-2.21.2.jar -lib/jackson-databind-2.21.2.jar -lib/jackson-dataformat-yaml-2.21.2.jar -lib/jackson-datatype-joda-2.21.2.jar -lib/jackson-datatype-jsr310-2.21.2.jar +lib/jackson-core-2.21.5.jar +lib/jackson-databind-2.21.5.jar +lib/jackson-dataformat-yaml-2.21.5.jar +lib/jackson-datatype-joda-2.21.5.jar +lib/jackson-datatype-jsr310-2.21.5.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 b39d44afd5e..6ab3b574cdc 100644 --- a/geode-assembly/src/integrationTest/resources/gfsh_dependency_classpath.txt +++ b/geode-assembly/src/integrationTest/resources/gfsh_dependency_classpath.txt @@ -21,12 +21,12 @@ 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-joda-2.21.2.jar +jackson-datatype-joda-2.21.5.jar jackson-annotations-2.21.jar -jackson-dataformat-yaml-2.21.2.jar -jackson-core-2.21.2.jar -jackson-datatype-jsr310-2.21.2.jar -jackson-databind-2.21.2.jar +jackson-dataformat-yaml-2.21.5.jar +jackson-core-2.21.5.jar +jackson-datatype-jsr310-2.21.5.jar +jackson-databind-2.21.5.jar swagger-annotations-2.2.22.jar jaxb-runtime-4.0.2.jar jaxb-core-4.0.2.jar diff --git a/geode-core/src/test/resources/expected-pom.xml b/geode-core/src/test/resources/expected-pom.xml index f8a4cf1f007..23f621c0261 100644 --- a/geode-core/src/test/resources/expected-pom.xml +++ b/geode-core/src/test/resources/expected-pom.xml @@ -241,6 +241,36 @@ + + com.fasterxml.jackson.datatype + jackson-datatype-jdk8 + runtime + + + log4j-to-slf4j + org.apache.logging.log4j + + + * + ch.qos.logback + + + + + com.fasterxml.jackson.datatype + jackson-datatype-jsr310 + runtime + + + log4j-to-slf4j + org.apache.logging.log4j + + + * + ch.qos.logback + + + commons-validator commons-validator diff --git a/geode-server-all/src/integrationTest/resources/dependency_classpath.txt b/geode-server-all/src/integrationTest/resources/dependency_classpath.txt index 6b665995a61..f85732d315e 100644 --- a/geode-server-all/src/integrationTest/resources/dependency_classpath.txt +++ b/geode-server-all/src/integrationTest/resources/dependency_classpath.txt @@ -19,12 +19,12 @@ 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.2.jar +jackson-datatype-jsr310-2.21.5.jar jackson-annotations-2.21.jar -jackson-dataformat-yaml-2.21.2.jar -jackson-core-2.21.2.jar -jackson-datatype-joda-2.21.2.jar -jackson-databind-2.21.2.jar +jackson-dataformat-yaml-2.21.5.jar +jackson-core-2.21.5.jar +jackson-datatype-joda-2.21.5.jar +jackson-databind-2.21.5.jar httpclient5-5.4.4.jar httpcore5-h2-5.3.6.jar httpcore5-5.3.6.jar From 435c1209e14a797c43d5ad3a00917ab183f159d4 Mon Sep 17 00:00:00 2001 From: JinwooHwang Date: Mon, 13 Jul 2026 14:48:37 -0400 Subject: [PATCH 2/2] CI build failure --- .github/workflows/gradle.yml | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/.github/workflows/gradle.yml b/.github/workflows/gradle.yml index 8d5a5e36df7..5c7da171a26 100644 --- a/.github/workflows/gradle.yml +++ b/.github/workflows/gradle.yml @@ -39,7 +39,7 @@ jobs: java-version: '17' distribution: 'liberica' - name: Setup Gradle - uses: gradle/actions/setup-gradle@v5 + uses: gradle/actions/setup-gradle@0723195856401067f7a2779048b490ace7a47d7c with: gradle-version: wrapper - name: Run 'build install javadoc spotlessCheck rat checkPom resolveDependencies pmdMain' with Gradle @@ -104,7 +104,7 @@ jobs: java-version: | 17 - name: Setup Gradle - uses: gradle/actions/setup-gradle@v5 + uses: gradle/actions/setup-gradle@0723195856401067f7a2779048b490ace7a47d7c with: gradle-version: wrapper - name: Set JAVA_TEST_PATH to 17 @@ -153,7 +153,7 @@ jobs: java-version: | 17 - name: Setup Gradle - uses: gradle/actions/setup-gradle@v5 + uses: gradle/actions/setup-gradle@0723195856401067f7a2779048b490ace7a47d7c with: gradle-version: wrapper - name: Run integration tests @@ -199,7 +199,7 @@ jobs: distribution: ${{ matrix.distribution }} java-version: ${{ matrix.java }} - name: Setup Gradle - uses: gradle/actions/setup-gradle@v5 + uses: gradle/actions/setup-gradle@0723195856401067f7a2779048b490ace7a47d7c with: gradle-version: wrapper - name: Run acceptance tests @@ -243,7 +243,7 @@ jobs: distribution: ${{ matrix.distribution }} java-version: ${{ matrix.java }} - name: Setup Gradle - uses: gradle/actions/setup-gradle@v5 + uses: gradle/actions/setup-gradle@0723195856401067f7a2779048b490ace7a47d7c with: gradle-version: wrapper - name: Run wan distributed tests @@ -289,7 +289,7 @@ jobs: distribution: ${{ matrix.distribution }} java-version: ${{ matrix.java }} - name: Setup Gradle - uses: gradle/actions/setup-gradle@v5 + uses: gradle/actions/setup-gradle@0723195856401067f7a2779048b490ace7a47d7c with: gradle-version: wrapper - name: Run cq distributed tests @@ -333,7 +333,7 @@ jobs: distribution: ${{ matrix.distribution }} java-version: ${{ matrix.java }} - name: Setup Gradle - uses: gradle/actions/setup-gradle@v5 + uses: gradle/actions/setup-gradle@0723195856401067f7a2779048b490ace7a47d7c with: gradle-version: wrapper - name: Run lucene distributed tests @@ -379,7 +379,7 @@ jobs: distribution: ${{ matrix.distribution }} java-version: ${{ matrix.java }} - name: Setup Gradle - uses: gradle/actions/setup-gradle@v5 + uses: gradle/actions/setup-gradle@0723195856401067f7a2779048b490ace7a47d7c with: gradle-version: wrapper - name: Run gfsh, web-mgmt, web distributed tests @@ -427,7 +427,7 @@ jobs: distribution: ${{ matrix.distribution }} java-version: ${{ matrix.java }} - name: Setup Gradle - uses: gradle/actions/setup-gradle@v5 + uses: gradle/actions/setup-gradle@0723195856401067f7a2779048b490ace7a47d7c with: gradle-version: wrapper - name: Run assembly, connectors, old-client, extensions distributed tests