@@ -370,7 +370,10 @@ project(':iceberg-core') {
370370 exclude group : ' org.tukaani' // xz compression is not supported
371371 }
372372
373- implementation libs. aircompressor
373+ implementation(libs. aircompressor) {
374+ exclude group : ' org.lz4'
375+ }
376+ implementation libs. lz4Java
374377 implementation libs. httpcomponents. httpclient5
375378 implementation platform(libs. jackson. bom)
376379 implementation libs. jackson. core
@@ -667,6 +670,13 @@ project(':iceberg-delta-lake') {
667670 }
668671 }
669672
673+ configurations. all {
674+ resolutionStrategy. capabilitiesResolution. withCapability(" org.lz4:lz4-java" ) {
675+ select(" at.yawk.lz4:lz4-java:0" )
676+ because(" Resolve lz4-java capability conflict between Spark 3.5 (org.lz4:lz4-java:1.8.0) and Iceberg (at.yawk.lz4:lz4-java:1.10.2)" )
677+ }
678+ }
679+
670680 // The newest version of delta-core uses Spark 3.5.*. The integration test should only be built
671681 // if iceberg-spark-3.5 is available
672682 if (sparkVersions. contains(" 3.5" )) {
@@ -1230,3 +1240,17 @@ project(':iceberg-bom') {
12301240 // Needed to get the "faked" Scala artifacts into the bom
12311241 javaPlatform { allowDependencies() }
12321242}
1243+
1244+ subprojects {
1245+ if (project. name. startsWith(' iceberg-spark' ) ||
1246+ project. name. startsWith(' iceberg-flink' ) ||
1247+ project. name. startsWith(' iceberg-kafka-connect' )) {
1248+
1249+ configurations. all {
1250+ resolutionStrategy. capabilitiesResolution. withCapability(" org.lz4:lz4-java" ) {
1251+ select(" at.yawk.lz4:lz4-java:0" )
1252+ because(" Fix lz4-java capability conflict from relocation and CVE fixes" )
1253+ }
1254+ }
1255+ }
1256+ }
0 commit comments