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

Author: sjvanrossum

examples/java/common.gradle

@@ -35,7 +35,6 @@ configurations.sparkRunnerPreCommit {
   exclude group: "org.slf4j", module: "jul-to-slf4j"
   exclude group: "org.slf4j", module: "slf4j-jdk14"
 }
-resolveCapabilitiesConflict(configurations.flinkRunnerPreCommit, 'org.lz4:lz4-java', 'at.yawk.lz4')
 
 
 dependencies {

runners/flink/2.1/build.gradle

@@ -41,10 +41,3 @@ project.ext {
 
 // Load the main build script which contains all build logic.
 apply from: "../flink_runner.gradle"
-
-// Flink 2.1 uses at.yawk.lz4:lz4-java instead of org.lz4:lz4-java
-// Explicitly prefer Flink's at.yawk.lz4 version to resolve capability conflict
-configurations.all {
-  resolveCapabilitiesConflict(it, 'org.lz4:lz4-java', 'at.yawk.lz4')
-}
-

runners/flink/2.1/job-server/build.gradle

@@ -29,10 +29,3 @@ project.ext {
 
 // Load the main build script which contains all build logic.
 apply from: "$basePath/flink_job_server.gradle"
-
-// Flink 2.1 uses at.yawk.lz4:lz4-java instead of org.lz4:lz4-java
-// Explicitly prefer Flink's at.yawk.lz4 version to resolve capability conflict
-configurations.all {
-  resolveCapabilitiesConflict(it, 'org.lz4:lz4-java', 'at.yawk.lz4')
-}
-

runners/flink/2.2/build.gradle

@@ -56,10 +56,3 @@ project.ext {
 
 // Load the main build script which contains all build logic.
 apply from: "../flink_runner.gradle"
-
-// Flink 2.2 uses at.yawk.lz4:lz4-java instead of org.lz4:lz4-java
-// Explicitly prefer Flink's at.yawk.lz4 version to resolve capability conflict
-configurations.all {
-  resolveCapabilitiesConflict(it, 'org.lz4:lz4-java', 'at.yawk.lz4')
-}
-

runners/flink/2.2/job-server/build.gradle

@@ -29,10 +29,3 @@ project.ext {
 
 // Load the main build script which contains all build logic.
 apply from: "$basePath/flink_job_server.gradle"
-
-// Flink 2.2 uses at.yawk.lz4:lz4-java instead of org.lz4:lz4-java
-// Explicitly prefer Flink's at.yawk.lz4 version to resolve capability conflict
-configurations.all {
-  resolveCapabilitiesConflict(it, 'org.lz4:lz4-java', 'at.yawk.lz4')
-}
-

runners/flink/flink_runner.gradle

@@ -302,6 +302,11 @@ dependencies {
   examplesJavaIntegrationTest project(path: ":examples:java", configuration: "testRuntimeMigration")
 }
 
+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'
 

runners/flink/job-server/flink_job_server.gradle

@@ -101,6 +101,11 @@ dependencies {
   runtimeOnly project(":sdks:java:extensions:sql:expansion-service")
 }
 
+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 flink runner classes only exist in the shadow
 // jar.

sdks/java/testing/nexmark/build.gradle

@@ -103,10 +103,6 @@ dependencies {
   gradleRun project(path: nexmarkRunnerDependency, configuration: runnerConfiguration)
 }
 
-if (isFlink2) {
-  resolveCapabilitiesConflict(configurations.gradleRun, 'org.lz4:lz4-java', 'at.yawk.lz4')
-}
-
 if (isSparkRunner) {
   configurations.gradleRun {
     // Using Spark runner causes a StackOverflowError if slf4j-jdk14 is on the classpath

sdks/java/testing/tpcds/build.gradle

@@ -94,10 +94,6 @@ dependencies {
     gradleRun project(path: tpcdsRunnerDependency, configuration: runnerConfiguration)
 }
 
-if (isFlink2) {
-    resolveCapabilitiesConflict(configurations.gradleRun, 'org.lz4:lz4-java', 'at.yawk.lz4')
-}
-
 if (isSpark) {
     configurations.gradleRun {
       exclude group: "org.slf4j", module: "slf4j-jdk14"