This is an automated email from the ASF dual-hosted git repository. Amar3tto pushed a commit to branch fix-sparkreceiver-perf in repository https://gitbox.apache.org/repos/asf/beam.git
commit 8601a8dfef64db6a7de7821c41334bad09563e1c Author: Vitaly Terentyev <[email protected]> AuthorDate: Thu Jul 23 12:42:03 2026 +0400 Fix lz4 conflicts --- it/build.gradle | 2 +- sdks/java/io/hadoop-format/build.gradle | 4 +++- sdks/java/io/sparkreceiver/3/build.gradle | 6 ++++++ 3 files changed, 10 insertions(+), 2 deletions(-) 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..4de21a7f676 100644 --- a/sdks/java/io/hadoop-format/build.gradle +++ b/sdks/java/io/hadoop-format/build.gradle @@ -89,7 +89,9 @@ dependencies { testImplementation library.java.cassandra_driver_core testImplementation library.java.cassandra_driver_mapping // TODO(yathu) bump to cassandra-5.x which uses newer jamm when released & beam runs test on Java11 - testImplementation "org.apache.cassandra:cassandra-all:3.11.10" + testImplementation ("org.apache.cassandra:cassandra-all:3.11.10") { + exclude group: "net.jpountz.lz4", module: "lz4" + } testImplementation library.java.hadoop_common testImplementation library.java.hadoop_hdfs testImplementation library.java.hadoop_mapreduce_client_core 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
