From 132beade5cc2ed2864d530302bd62a723b037cd7 Mon Sep 17 00:00:00 2001 From: Jinwoo Hwang Date: Mon, 27 Oct 2025 10:51:13 -0400 Subject: [PATCH 1/2] Upgrade commons-io from 2.18.0 to 2.19.0 - Updated dependency version in DependencyConstraints.groovy - Updated expected-pom.xml test resource in geode-all-bom - Updated assembly_content.txt integration test resource - Updated gfsh_dependency_classpath.txt integration test resource - Updated dependency_classpath.txt integration test resource in geode-server-all All builds and tests pass successfully. --- boms/geode-all-bom/src/test/resources/expected-pom.xml | 2 +- .../apache/geode/gradle/plugins/DependencyConstraints.groovy | 2 +- .../src/integrationTest/resources/assembly_content.txt | 2 +- .../src/integrationTest/resources/gfsh_dependency_classpath.txt | 2 +- .../src/integrationTest/resources/dependency_classpath.txt | 2 +- 5 files changed, 5 insertions(+), 5 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 1e3a6a506f9..e1ca9d39d0c 100644 --- a/boms/geode-all-bom/src/test/resources/expected-pom.xml +++ b/boms/geode-all-bom/src/test/resources/expected-pom.xml @@ -160,7 +160,7 @@ commons-io commons-io - 2.18.0 + 2.19.0 commons-logging 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 c849c86f4a5..9fde6be6789 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 @@ -33,7 +33,7 @@ class DependencyConstraints { // These version numbers are consumed by :geode-modules-assembly:distAppServer filtering // Some of these are referenced below as well deps.put("antlr.version", "2.7.7") - deps.put("commons-io.version", "2.18.0") + deps.put("commons-io.version", "2.19.0") deps.put("commons-lang3.version", "3.12.0") deps.put("commons-validator.version", "1.7") deps.put("fastutil.version", "8.5.8") diff --git a/geode-assembly/src/integrationTest/resources/assembly_content.txt b/geode-assembly/src/integrationTest/resources/assembly_content.txt index 24a7d683b73..650e2c87db1 100644 --- a/geode-assembly/src/integrationTest/resources/assembly_content.txt +++ b/geode-assembly/src/integrationTest/resources/assembly_content.txt @@ -931,7 +931,7 @@ lib/commons-beanutils-1.11.0.jar lib/commons-codec-1.15.jar lib/commons-collections-3.2.2.jar lib/commons-digester-2.1.jar -lib/commons-io-2.18.0.jar +lib/commons-io-2.19.0.jar lib/commons-lang3-3.12.0.jar lib/commons-logging-1.3.5.jar lib/commons-modeler-2.0.1.jar diff --git a/geode-assembly/src/integrationTest/resources/gfsh_dependency_classpath.txt b/geode-assembly/src/integrationTest/resources/gfsh_dependency_classpath.txt index cf97cf946d1..6694eb6d38c 100644 --- a/geode-assembly/src/integrationTest/resources/gfsh_dependency_classpath.txt +++ b/geode-assembly/src/integrationTest/resources/gfsh_dependency_classpath.txt @@ -53,7 +53,7 @@ shiro-config-ogdl-1.13.0.jar commons-codec-1.15.jar commons-collections-3.2.2.jar commons-digester-2.1.jar -commons-io-2.18.0.jar +commons-io-2.19.0.jar commons-logging-1.3.5.jar classgraph-4.8.147.jar micrometer-core-1.9.1.jar diff --git a/geode-server-all/src/integrationTest/resources/dependency_classpath.txt b/geode-server-all/src/integrationTest/resources/dependency_classpath.txt index d0c12e21924..13d87df4080 100644 --- a/geode-server-all/src/integrationTest/resources/dependency_classpath.txt +++ b/geode-server-all/src/integrationTest/resources/dependency_classpath.txt @@ -80,7 +80,7 @@ lucene-analyzers-phonetic-6.6.6.jar spring-context-5.3.21.jar jetty-security-9.4.57.v20241219.jar geode-logging-0.0.0.jar -commons-io-2.18.0.jar +commons-io-2.19.0.jar shiro-lang-1.13.0.jar javax.transaction-api-1.3.jar geode-common-0.0.0.jar From e760d0c043041fd3093e0d68a9e1e0ab0bf9c14d Mon Sep 17 00:00:00 2001 From: Jinwoo Hwang Date: Mon, 27 Oct 2025 12:41:33 -0400 Subject: [PATCH 2/2] Upgrade commons-lang3 from 3.12.0 to 3.18.0 - Updated dependency version in DependencyConstraints.groovy - Updated expected-pom.xml test resource in geode-all-bom - Updated assembly_content.txt integration test resource - Updated gfsh_dependency_classpath.txt integration test resource - Updated dependency_classpath.txt integration test resource in geode-server-all This upgrade brings in the latest bug fixes and improvements from Apache Commons Lang. All builds and checks pass successfully. --- boms/geode-all-bom/src/test/resources/expected-pom.xml | 4 ++-- .../apache/geode/gradle/plugins/DependencyConstraints.groovy | 4 ++-- .../src/integrationTest/resources/assembly_content.txt | 4 ++-- .../integrationTest/resources/gfsh_dependency_classpath.txt | 4 ++-- .../src/integrationTest/resources/dependency_classpath.txt | 4 ++-- 5 files changed, 10 insertions(+), 10 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 e1ca9d39d0c..8486aa478d7 100644 --- a/boms/geode-all-bom/src/test/resources/expected-pom.xml +++ b/boms/geode-all-bom/src/test/resources/expected-pom.xml @@ -160,7 +160,7 @@ commons-io commons-io - 2.19.0 + 2.18.0 commons-logging @@ -305,7 +305,7 @@ org.apache.commons commons-lang3 - 3.12.0 + 3.18.0 org.apache.commons 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 ec11f542241..5177589ba63 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 @@ -33,8 +33,8 @@ class DependencyConstraints { // These version numbers are consumed by :geode-modules-assembly:distAppServer filtering // Some of these are referenced below as well deps.put("antlr.version", "2.7.7") - deps.put("commons-io.version", "2.19.0") - deps.put("commons-lang3.version", "3.12.0") + deps.put("commons-io.version", "2.18.0") + deps.put("commons-lang3.version", "3.18.0") deps.put("commons-validator.version", "1.7") deps.put("fastutil.version", "8.5.8") deps.put("javax.activation.version", "1.2.0") diff --git a/geode-assembly/src/integrationTest/resources/assembly_content.txt b/geode-assembly/src/integrationTest/resources/assembly_content.txt index 59180b16da1..6a057845b3b 100644 --- a/geode-assembly/src/integrationTest/resources/assembly_content.txt +++ b/geode-assembly/src/integrationTest/resources/assembly_content.txt @@ -931,8 +931,8 @@ lib/commons-beanutils-1.11.0.jar lib/commons-codec-1.15.jar lib/commons-collections-3.2.2.jar lib/commons-digester-2.1.jar -lib/commons-io-2.19.0.jar -lib/commons-lang3-3.12.0.jar +lib/commons-io-2.18.0.jar +lib/commons-lang3-3.18.0.jar lib/commons-logging-1.3.5.jar lib/commons-modeler-2.0.1.jar lib/commons-validator-1.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 3d76b2b6600..0f85efd76d2 100644 --- a/geode-assembly/src/integrationTest/resources/gfsh_dependency_classpath.txt +++ b/geode-assembly/src/integrationTest/resources/gfsh_dependency_classpath.txt @@ -19,7 +19,7 @@ geode-unsafe-0.0.0.jar geode-deployment-legacy-0.0.0.jar spring-shell-1.2.0.RELEASE.jar spring-web-5.3.21.jar -commons-lang3-3.12.0.jar +commons-lang3-3.18.0.jar rmiio-2.1.2.jar jackson-datatype-joda-2.17.0.jar jackson-annotations-2.17.0.jar @@ -53,7 +53,7 @@ shiro-config-ogdl-1.13.0.jar commons-codec-1.15.jar commons-collections-3.2.2.jar commons-digester-2.1.jar -commons-io-2.19.0.jar +commons-io-2.18.0.jar commons-logging-1.3.5.jar classgraph-4.8.147.jar micrometer-core-1.9.1.jar diff --git a/geode-server-all/src/integrationTest/resources/dependency_classpath.txt b/geode-server-all/src/integrationTest/resources/dependency_classpath.txt index 6f832fc57c5..62ee6365dea 100644 --- a/geode-server-all/src/integrationTest/resources/dependency_classpath.txt +++ b/geode-server-all/src/integrationTest/resources/dependency_classpath.txt @@ -51,7 +51,7 @@ log4j-slf4j-impl-2.17.2.jar lucene-analyzers-common-6.6.6.jar geode-membership-0.0.0.jar jetty-webapp-9.4.57.v20241219.jar -commons-lang3-3.12.0.jar +commons-lang3-3.18.0.jar jopt-simple-5.0.4.jar swagger-annotations-2.2.22.jar snappy-0.5.jar @@ -80,7 +80,7 @@ lucene-analyzers-phonetic-6.6.6.jar spring-context-5.3.21.jar jetty-security-9.4.57.v20241219.jar geode-logging-0.0.0.jar -commons-io-2.19.0.jar +commons-io-2.18.0.jar shiro-lang-1.13.0.jar javax.transaction-api-1.3.jar geode-common-0.0.0.jar