From 8c88425261c58014e1535312b2dbb9cc8411a20a Mon Sep 17 00:00:00 2001 From: Derrick Williams Date: Tue, 2 Jun 2026 20:12:06 +0000 Subject: [PATCH 1/6] pin commons-configuration2 version --- sdks/java/io/hbase/build.gradle | 8 ++++++++ sdks/java/io/iceberg/hive/build.gradle | 4 ++++ 2 files changed, 12 insertions(+) diff --git a/sdks/java/io/hbase/build.gradle b/sdks/java/io/hbase/build.gradle index c41e7edb3177..6772e6112a4a 100644 --- a/sdks/java/io/hbase/build.gradle +++ b/sdks/java/io/hbase/build.gradle @@ -50,3 +50,11 @@ dependencies { testImplementation("org.apache.hbase:hbase-shaded-testing-util:$hbase_version") testRuntimeOnly project(path: ":runners:direct-java", configuration: "shadow") } + +configurations.all { + resolutionStrategy { + // TODO: remove after higher version of hbase (>2.6.5) contains this minimum version. + force 'org.apache.commons:commons-configuration2:2.15.0' + } +} + diff --git a/sdks/java/io/iceberg/hive/build.gradle b/sdks/java/io/iceberg/hive/build.gradle index b6f30079cb2e..8f0beb250c38 100644 --- a/sdks/java/io/iceberg/hive/build.gradle +++ b/sdks/java/io/iceberg/hive/build.gradle @@ -78,4 +78,8 @@ dependencies { configurations.all { // the fatjar "parquet-hadoop-bundle" conflicts with "parquet-hadoop" used by org.apache.iceberg:iceberg-parquet exclude group: "org.apache.parquet", module: "parquet-hadoop-bundle" + // TODO: remove after higher version of hbase (>2.6.5) contains this minimum version. + resolutionStrategy { + force 'org.apache.commons:commons-configuration2:2.15.0' + } } From 024c3eec4ca2f40647f5724aeb2fc3fce8857753 Mon Sep 17 00:00:00 2001 From: Derrick Williams Date: Tue, 2 Jun 2026 21:05:46 +0000 Subject: [PATCH 2/6] add on commons-io pin --- sdks/java/io/hbase/build.gradle | 3 ++- sdks/java/io/iceberg/hive/build.gradle | 1 + 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/sdks/java/io/hbase/build.gradle b/sdks/java/io/hbase/build.gradle index 6772e6112a4a..849556b55f04 100644 --- a/sdks/java/io/hbase/build.gradle +++ b/sdks/java/io/hbase/build.gradle @@ -29,7 +29,7 @@ test { systemProperty "log4j.configuration", "log4j-test.properties" jvmArgs "-XX:-UseGCOverheadLimit" if (System.getProperty("beamSurefireArgline")) { - jvmArgs System.getProperty("beamSurefireArgline") + jvmArgs System.getProperty("beamSurefireArgline").split("\\s+") } jvmArgs "-Dtest.build.data.basedirectory=build/test-data" } @@ -55,6 +55,7 @@ configurations.all { resolutionStrategy { // TODO: remove after higher version of hbase (>2.6.5) contains this minimum version. force 'org.apache.commons:commons-configuration2:2.15.0' + force 'commons-io:commons-io:2.19.0' } } diff --git a/sdks/java/io/iceberg/hive/build.gradle b/sdks/java/io/iceberg/hive/build.gradle index 8f0beb250c38..5f04c02185c2 100644 --- a/sdks/java/io/iceberg/hive/build.gradle +++ b/sdks/java/io/iceberg/hive/build.gradle @@ -81,5 +81,6 @@ configurations.all { // TODO: remove after higher version of hbase (>2.6.5) contains this minimum version. resolutionStrategy { force 'org.apache.commons:commons-configuration2:2.15.0' + force 'commons-io:commons-io:2.19.0' } } From e8b658d77701c0741121dac1101f5ef8aced7aeb Mon Sep 17 00:00:00 2001 From: Derrick Williams Date: Tue, 2 Jun 2026 22:05:42 +0000 Subject: [PATCH 3/6] change commons-io pinning to global --- .../main/groovy/org/apache/beam/gradle/BeamModulePlugin.groovy | 2 +- sdks/java/io/hbase/build.gradle | 1 - sdks/java/io/iceberg/hive/build.gradle | 1 - 3 files changed, 1 insertion(+), 3 deletions(-) diff --git a/buildSrc/src/main/groovy/org/apache/beam/gradle/BeamModulePlugin.groovy b/buildSrc/src/main/groovy/org/apache/beam/gradle/BeamModulePlugin.groovy index 5ca0de9de846..49ddd92532c1 100644 --- a/buildSrc/src/main/groovy/org/apache/beam/gradle/BeamModulePlugin.groovy +++ b/buildSrc/src/main/groovy/org/apache/beam/gradle/BeamModulePlugin.groovy @@ -725,7 +725,7 @@ class BeamModulePlugin implements Plugin { commons_collections : "commons-collections:commons-collections:3.2.2", commons_compress : "org.apache.commons:commons-compress:1.26.2", commons_csv : "org.apache.commons:commons-csv:1.8", - commons_io : "commons-io:commons-io:2.16.1", + commons_io : "commons-io:commons-io:2.19.0", commons_lang3 : "org.apache.commons:commons-lang3:3.18.0", commons_logging : "commons-logging:commons-logging:1.2", commons_math3 : "org.apache.commons:commons-math3:3.6.1", diff --git a/sdks/java/io/hbase/build.gradle b/sdks/java/io/hbase/build.gradle index 849556b55f04..2600bca8bb45 100644 --- a/sdks/java/io/hbase/build.gradle +++ b/sdks/java/io/hbase/build.gradle @@ -55,7 +55,6 @@ configurations.all { resolutionStrategy { // TODO: remove after higher version of hbase (>2.6.5) contains this minimum version. force 'org.apache.commons:commons-configuration2:2.15.0' - force 'commons-io:commons-io:2.19.0' } } diff --git a/sdks/java/io/iceberg/hive/build.gradle b/sdks/java/io/iceberg/hive/build.gradle index 5f04c02185c2..8f0beb250c38 100644 --- a/sdks/java/io/iceberg/hive/build.gradle +++ b/sdks/java/io/iceberg/hive/build.gradle @@ -81,6 +81,5 @@ configurations.all { // TODO: remove after higher version of hbase (>2.6.5) contains this minimum version. resolutionStrategy { force 'org.apache.commons:commons-configuration2:2.15.0' - force 'commons-io:commons-io:2.19.0' } } From 3bc1205ab5e28989e5d9efc0c7083ab6676ee999 Mon Sep 17 00:00:00 2001 From: Derrick Williams Date: Wed, 3 Jun 2026 00:21:12 +0000 Subject: [PATCH 4/6] remove split --- sdks/java/io/hbase/build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sdks/java/io/hbase/build.gradle b/sdks/java/io/hbase/build.gradle index 2600bca8bb45..6772e6112a4a 100644 --- a/sdks/java/io/hbase/build.gradle +++ b/sdks/java/io/hbase/build.gradle @@ -29,7 +29,7 @@ test { systemProperty "log4j.configuration", "log4j-test.properties" jvmArgs "-XX:-UseGCOverheadLimit" if (System.getProperty("beamSurefireArgline")) { - jvmArgs System.getProperty("beamSurefireArgline").split("\\s+") + jvmArgs System.getProperty("beamSurefireArgline") } jvmArgs "-Dtest.build.data.basedirectory=build/test-data" } From cbac49b6b71926890c5c5c867fcc9978daff3e2e Mon Sep 17 00:00:00 2001 From: Derrick Williams Date: Wed, 3 Jun 2026 12:17:54 +0000 Subject: [PATCH 5/6] move to global pin for configuration2 --- .../org/apache/beam/gradle/BeamModulePlugin.groovy | 1 + sdks/java/io/hbase/build.gradle | 10 +--------- sdks/java/io/iceberg/hive/build.gradle | 4 ---- 3 files changed, 2 insertions(+), 13 deletions(-) diff --git a/buildSrc/src/main/groovy/org/apache/beam/gradle/BeamModulePlugin.groovy b/buildSrc/src/main/groovy/org/apache/beam/gradle/BeamModulePlugin.groovy index 49ddd92532c1..e4503d4ce31d 100644 --- a/buildSrc/src/main/groovy/org/apache/beam/gradle/BeamModulePlugin.groovy +++ b/buildSrc/src/main/groovy/org/apache/beam/gradle/BeamModulePlugin.groovy @@ -724,6 +724,7 @@ class BeamModulePlugin implements Plugin { commons_codec : "commons-codec:commons-codec:1.17.1", commons_collections : "commons-collections:commons-collections:3.2.2", commons_compress : "org.apache.commons:commons-compress:1.26.2", + commons_configuration2 : "org.apache.commons:commons-configuration2:2.15.0", commons_csv : "org.apache.commons:commons-csv:1.8", commons_io : "commons-io:commons-io:2.19.0", commons_lang3 : "org.apache.commons:commons-lang3:3.18.0", diff --git a/sdks/java/io/hbase/build.gradle b/sdks/java/io/hbase/build.gradle index 6772e6112a4a..e912b168bb3d 100644 --- a/sdks/java/io/hbase/build.gradle +++ b/sdks/java/io/hbase/build.gradle @@ -49,12 +49,4 @@ dependencies { // shaded-testing-utils has shaded all Hadoop/HBase dependencies testImplementation("org.apache.hbase:hbase-shaded-testing-util:$hbase_version") testRuntimeOnly project(path: ":runners:direct-java", configuration: "shadow") -} - -configurations.all { - resolutionStrategy { - // TODO: remove after higher version of hbase (>2.6.5) contains this minimum version. - force 'org.apache.commons:commons-configuration2:2.15.0' - } -} - +} \ No newline at end of file diff --git a/sdks/java/io/iceberg/hive/build.gradle b/sdks/java/io/iceberg/hive/build.gradle index 8f0beb250c38..b6f30079cb2e 100644 --- a/sdks/java/io/iceberg/hive/build.gradle +++ b/sdks/java/io/iceberg/hive/build.gradle @@ -78,8 +78,4 @@ dependencies { configurations.all { // the fatjar "parquet-hadoop-bundle" conflicts with "parquet-hadoop" used by org.apache.iceberg:iceberg-parquet exclude group: "org.apache.parquet", module: "parquet-hadoop-bundle" - // TODO: remove after higher version of hbase (>2.6.5) contains this minimum version. - resolutionStrategy { - force 'org.apache.commons:commons-configuration2:2.15.0' - } } From cd67124c404f0a10be20b1d71876b29cafec1d1f Mon Sep 17 00:00:00 2001 From: Derrick Williams Date: Wed, 3 Jun 2026 12:25:18 +0000 Subject: [PATCH 6/6] revert file --- sdks/java/io/hbase/build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sdks/java/io/hbase/build.gradle b/sdks/java/io/hbase/build.gradle index e912b168bb3d..c41e7edb3177 100644 --- a/sdks/java/io/hbase/build.gradle +++ b/sdks/java/io/hbase/build.gradle @@ -49,4 +49,4 @@ dependencies { // shaded-testing-utils has shaded all Hadoop/HBase dependencies testImplementation("org.apache.hbase:hbase-shaded-testing-util:$hbase_version") testRuntimeOnly project(path: ":runners:direct-java", configuration: "shadow") -} \ No newline at end of file +}