Merge pull request #14115 from sonam-vend/fix-flink-job-server

[BEAM-10961] enable strict dependency checking for flink/job-server
apache · Mar 1, 2021 · 7450e57 · 7450e57
2 parents 0aa07a5 + 3eea80d
commit 7450e57
Show file tree

Hide file tree

Showing 6 changed files with 2 additions and 20 deletions.
diff --git a/runners/flink/1.10/job-server/build.gradle b/runners/flink/1.10/job-server/build.gradle
@@ -29,7 +29,3 @@ project.ext {
 
 // Load the main build script which contains all build logic.
 apply from: "$basePath/flink_job_server.gradle"
-
-dependencies {
-  runtimeOnly project(":runners:flink:1.10")
-}
diff --git a/runners/flink/1.11/job-server/build.gradle b/runners/flink/1.11/job-server/build.gradle
@@ -29,7 +29,3 @@ project.ext {
 
 // Load the main build script which contains all build logic.
 apply from: "$basePath/flink_job_server.gradle"
-
-dependencies {
-  runtimeOnly project(":runners:flink:1.11")
-}
diff --git a/runners/flink/1.12/job-server/build.gradle b/runners/flink/1.12/job-server/build.gradle
@@ -29,7 +29,3 @@ project.ext {
 
 // Load the main build script which contains all build logic.
 apply from: "$basePath/flink_job_server.gradle"
-
-dependencies {
-  runtimeOnly project(":runners:flink:1.12")
-}
diff --git a/runners/flink/1.8/job-server/build.gradle b/runners/flink/1.8/job-server/build.gradle
@@ -29,7 +29,3 @@ project.ext {
 
 // Load the main build script which contains all build logic.
 apply from: "$basePath/flink_job_server.gradle"
-
-dependencies {
-  runtimeOnly project(":runners:flink:1.8")
-}
diff --git a/runners/flink/1.9/job-server/build.gradle b/runners/flink/1.9/job-server/build.gradle
@@ -29,7 +29,3 @@ project.ext {
 
 // Load the main build script which contains all build logic.
 apply from: "$basePath/flink_job_server.gradle"
-
-dependencies {
-  runtimeOnly project(":runners:flink:1.9")
-}
diff --git a/runners/flink/job-server/flink_job_server.gradle b/runners/flink/job-server/flink_job_server.gradle
@@ -30,6 +30,7 @@ apply plugin: 'application'
 mainClassName = "org.apache.beam.runners.flink.FlinkJobServerDriver"
 
 applyJavaNature(
+  enableStrictDependencies: true,
   automaticModuleName: 'org.apache.beam.runners.flink.jobserver',
   archivesBaseName: project.hasProperty('archives_base_name') ? archives_base_name : archivesBaseName,
   validateShadowJar: false,
@@ -78,6 +79,7 @@ configurations.all {
 
 dependencies {
   compile project(flinkRunnerProject)
+  permitUnusedDeclared project(flinkRunnerProject) // BEAM-11761
   runtime group: "org.slf4j", name: "jcl-over-slf4j", version: dependencies.create(project.library.java.slf4j_api).getVersion()
   validatesPortableRunner project(path: flinkRunnerProject, configuration: "testRuntime")
   validatesPortableRunner project(path: ":sdks:java:core", configuration: "shadowTest")