Replace org.lz4:lz4-java with at.yawk.lz4:lz4-java in Spark runner

sjvanrossum · sjvanrossum · commit 4da22b073d6e · 2026-07-11T01:12:06.000+02:00
diff --git a/runners/spark/job-server/spark_job_server.gradle b/runners/spark/job-server/spark_job_server.gradle
@@ -65,6 +65,11 @@ dependencies {
 //  TODO: Enable HDFS file system.
 }
 
+configurations.all {
+  // org.lz4:lz4-java has been relocated to at.yawk.lz4:lz4-java
+  resolveCapabilitiesConflict(it, "org.lz4:lz4-java", "at.yawk.lz4:lz4-java")
+}
+
 // NOTE: runShadow must be used in order to run the job server. The standard run
 // task will not work because the Spark runner classes only exist in the shadow
 // jar.
diff --git a/runners/spark/spark_runner.gradle b/runners/spark/spark_runner.gradle
@@ -318,6 +318,11 @@ dependencies {
   }
 }
 
+configurations.all {
+  // org.lz4:lz4-java has been relocated to at.yawk.lz4:lz4-java
+  resolveCapabilitiesConflict(it, "org.lz4:lz4-java", "at.yawk.lz4:lz4-java")
+}
+
 def gcpProject = project.findProperty('gcpProject') ?: 'apache-beam-testing'
 def tempLocation = project.findProperty('tempLocation') ?: 'gs://temp-storage-for-end-to-end-tests'
 

Original file line number	Diff line number	Diff line change
`@@ -318,6 +318,11 @@ dependencies {`
`318`	`318`	`}`
`319`	`319`	`}`
`320`	`320`
	`321`	`+configurations.all {`
	`322`	`+ // org.lz4:lz4-java has been relocated to at.yawk.lz4:lz4-java`
	`323`	`+ resolveCapabilitiesConflict(it, "org.lz4:lz4-java", "at.yawk.lz4:lz4-java")`
	`324`	`+}`
	`325`	`+`
`321`	`326`	`def gcpProject = project.findProperty('gcpProject') ?: 'apache-beam-testing'`
`322`	`327`	`def tempLocation = project.findProperty('tempLocation') ?: 'gs://temp-storage-for-end-to-end-tests'`
`323`	`328`