Skip to content

Commit b0a7099

Browse files
authored
Fix lz4 conflicts (#39454)
1 parent c7ab90e commit b0a7099

3 files changed

Lines changed: 8 additions & 1 deletion

File tree

it/build.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,5 +37,5 @@ tasks.register('BigQueryStorageApiStreamingPerformanceTest') {
3737
}
3838

3939
tasks.register('IcebergPerformanceTest') {
40-
dependsOn(":it:iceberg:IcebergPerformanceTest")
40+
dependsOn(":it:iceberg:IcebergPerformanceTest")
4141
}

sdks/java/io/hadoop-format/build.gradle

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -49,6 +49,7 @@ configurations.testRuntimeClasspath {
4949
resolutionStrategy.force 'com.github.jbellis:jamm:0.3.0'
5050
// Pin snakeyaml version due to cassandra-all does not support 2.x
5151
resolutionStrategy.force 'org.yaml:snakeyaml:1.33'
52+
exclude group: "at.yawk.lz4", module: "lz4-java"
5253
}
5354

5455
dependencies {

sdks/java/io/sparkreceiver/3/build.gradle

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -39,6 +39,12 @@ configurations.all {
3939
exclude group: "org.slf4j", module: "jul-to-slf4j"
4040
}
4141

42+
configurations.configureEach {
43+
resolutionStrategy.capabilitiesResolution.withCapability("org.lz4:lz4-java") {
44+
select("at.yawk.lz4:lz4-java:1.10.2")
45+
}
46+
}
47+
4248
dependencies {
4349
implementation library.java.commons_lang3
4450
implementation library.java.joda_time

0 commit comments

Comments
 (0)