Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
21 changes: 20 additions & 1 deletion build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -370,7 +370,10 @@ project(':iceberg-core') {
exclude group: 'org.tukaani' // xz compression is not supported
}

implementation libs.aircompressor
implementation(libs.aircompressor) {
exclude group: 'org.lz4'
}
implementation libs.lz4Java
implementation libs.httpcomponents.httpclient5
implementation platform(libs.jackson.bom)
implementation libs.jackson.core
Expand Down Expand Up @@ -1230,3 +1233,19 @@ project(':iceberg-bom') {
// Needed to get the "faked" Scala artifacts into the bom
javaPlatform { allowDependencies() }
}

subprojects {
if (project.name.startsWith('iceberg-spark') ||
project.name.startsWith('iceberg-flink') ||
project.name.startsWith('iceberg-delta-lake') ||
project.name.startsWith('iceberg-kafka-connect')) {

configurations.all {
exclude group: 'org.lz4', module: 'lz4-java'
resolutionStrategy.capabilitiesResolution.withCapability("org.lz4:lz4-java") {
select("at.yawk.lz4:lz4-java:0")
because("Fix lz4-java capability conflict from relocation and CVE fixes")
}
}
}
}
2 changes: 2 additions & 0 deletions gradle/libs.versions.toml
Original file line number Diff line number Diff line change
Expand Up @@ -72,6 +72,7 @@ junit = "5.14.1"
junit-platform = "1.14.1"
kafka = "3.9.1"
kryo-shaded = "4.0.3"
lz4Java = "1.10.2"
microprofile-openapi-api = "3.1.2"
mockito = "4.11.0"
mockserver = "5.15.0"
Expand Down Expand Up @@ -162,6 +163,7 @@ kafka-clients = { module = "org.apache.kafka:kafka-clients", version.ref = "kafk
kafka-connect-api = { module = "org.apache.kafka:connect-api", version.ref = "kafka" }
kafka-connect-json = { module = "org.apache.kafka:connect-json", version.ref = "kafka" }
kafka-connect-transforms = { module = "org.apache.kafka:connect-transforms", version.ref = "kafka" }
lz4Java = { module = "at.yawk.lz4:lz4-java", version.ref = "lz4Java" }
microprofile-openapi-api = { module = "org.eclipse.microprofile.openapi:microprofile-openapi-api", version.ref = "microprofile-openapi-api" }
nessie-client = { module = "org.projectnessie.nessie:nessie-client", version.ref = "nessie" }
netty-buffer = { module = "io.netty:netty-buffer", version.ref = "netty-buffer" }
Expand Down