(beam) branch master updated: Fix lz4 conflicts (#39454)

[yhu]

This is an automated email from the ASF dual-hosted git repository.

Abacn pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/beam.git


The following commit(s) were added to refs/heads/master by this push:
     new b0a7099e1f1 Fix lz4 conflicts (#39454)
b0a7099e1f1 is described below

commit b0a7099e1f1fba976bd01e90ac3bbe6b041fd9cf
Author: Vitaly Terentyev <vitaly.terentyev....@gmail.com>
AuthorDate: Thu Jul 23 16:28:32 2026 +0400

    Fix lz4 conflicts (#39454)
---
 it/build.gradle                           | 2 +-
 sdks/java/io/hadoop-format/build.gradle   | 1 +
 sdks/java/io/sparkreceiver/3/build.gradle | 6 ++++++
 3 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/it/build.gradle b/it/build.gradle
index c550e26d305..ad6ba19f383 100644
--- a/it/build.gradle
+++ b/it/build.gradle
@@ -37,5 +37,5 @@ tasks.register('BigQueryStorageApiStreamingPerformanceTest') {
 }
 
 tasks.register('IcebergPerformanceTest') {
-  dependsOn(":it:iceberg:IcebergPerformanceTest")
+    dependsOn(":it:iceberg:IcebergPerformanceTest")
 }
diff --git a/sdks/java/io/hadoop-format/build.gradle 
b/sdks/java/io/hadoop-format/build.gradle
index 83dfcf22d86..6bb581568d7 100644
--- a/sdks/java/io/hadoop-format/build.gradle
+++ b/sdks/java/io/hadoop-format/build.gradle
@@ -49,6 +49,7 @@ configurations.testRuntimeClasspath {
   resolutionStrategy.force 'com.github.jbellis:jamm:0.3.0'
   // Pin snakeyaml version due to cassandra-all does not support 2.x
   resolutionStrategy.force 'org.yaml:snakeyaml:1.33'
+  exclude group: "at.yawk.lz4", module: "lz4-java"
 }
 
 dependencies {
diff --git a/sdks/java/io/sparkreceiver/3/build.gradle 
b/sdks/java/io/sparkreceiver/3/build.gradle
index c57cbac2fd3..a35a7f3d1fd 100644
--- a/sdks/java/io/sparkreceiver/3/build.gradle
+++ b/sdks/java/io/sparkreceiver/3/build.gradle
@@ -39,6 +39,12 @@ configurations.all {
     exclude group: "org.slf4j", module: "jul-to-slf4j"
 }
 
+configurations.configureEach {
+  resolutionStrategy.capabilitiesResolution.withCapability("org.lz4:lz4-java") 
{
+    select("at.yawk.lz4:lz4-java:1.10.2")
+  }
+}
+
 dependencies {
     implementation library.java.commons_lang3
     implementation library.java.joda_time