Merge pull request #14114 from sonam-vend/enable-global-dep-check

[BEAM-10961] turn on enableStrictDependencies globally
apache · Mar 10, 2021 · 6c2c284 · 6c2c284
2 parents ae5e1a3 + 7b31eb8
commit 6c2c284
Show file tree

Hide file tree

Showing 102 changed files with 33 additions and 96 deletions.
diff --git a/buildSrc/src/main/groovy/org/apache/beam/gradle/BeamModulePlugin.groovy b/buildSrc/src/main/groovy/org/apache/beam/gradle/BeamModulePlugin.groovy
@@ -95,7 +95,7 @@ class BeamModulePlugin implements Plugin<Project> {
     Map<String, String> classesTriggerCheckerBugs = [:]
 
     /** Controls whether the dependency analysis plugin is enabled. */
-    boolean enableStrictDependencies = false
+    boolean enableStrictDependencies = true
 
     /** Override the default "beam-" + `dash separated path` archivesBaseName. */
     String archivesBaseName = null
@@ -1838,6 +1838,7 @@ class BeamModulePlugin implements Plugin<Project> {
       }
 
       project.ext.applyJavaNature(
+          enableStrictDependencies: false,
           exportJavadoc: false,
           enableSpotbugs: false,
           publish: configuration.publish,

diff --git a/examples/java/build.gradle b/examples/java/build.gradle
@@ -25,7 +25,6 @@ plugins {
 }
 
 applyJavaNature(
-  enableStrictDependencies: true,
   exportJavadoc: false,
   automaticModuleName: 'org.apache.beam.examples',
 )

diff --git a/examples/kotlin/build.gradle b/examples/kotlin/build.gradle
@@ -22,7 +22,7 @@ plugins { id 'org.apache.beam.module'
     id 'org.jetbrains.kotlin.jvm' version '1.3.72'
 }
 
-applyJavaNature(enableStrictDependencies: true, exportJavadoc: false,  automaticModuleName: 'org.apache.beam.examples.kotlin')
+applyJavaNature(exportJavadoc: false,  automaticModuleName: 'org.apache.beam.examples.kotlin')
 provideIntegrationTestingDependencies()
 enableJavaPerformanceTesting()
 

diff --git a/release/build.gradle.kts b/release/build.gradle.kts
@@ -30,6 +30,7 @@ val library = project.extensions.extraProperties["library"] as Map<String, Map<S
 dependencies {
   compile(library.getValue("groovy").getValue("groovy_all"))
   compile("commons-cli:commons-cli:1.2")
+  permitUnusedDeclared("commons-cli:commons-cli:1.2") // BEAM-11761
 }
 
 task("runJavaExamplesValidationTask") {

diff --git a/runners/core-construction-java/build.gradle b/runners/core-construction-java/build.gradle
@@ -18,7 +18,6 @@
 
 plugins { id 'org.apache.beam.module' }
 applyJavaNature(
-  enableStrictDependencies: true,
   classesTriggerCheckerBugs: [
     'WindowIntoTranslation': 'https://github.com/typetools/checker-framework/issues/3791',
     'FlattenTranslator': 'https://github.com/typetools/checker-framework/issues/3791',

diff --git a/runners/core-java/build.gradle b/runners/core-java/build.gradle
@@ -18,7 +18,6 @@
 
 plugins { id 'org.apache.beam.module' }
 applyJavaNature(
-  enableStrictDependencies: true,
   classesTriggerCheckerBugs: [
     'InMemoryStateInternals': 'https://github.com/typetools/checker-framework/issues/3792',
     'MergingActiveWindowSetTest': 'https://github.com/typetools/checker-framework/issues/3792',

diff --git a/runners/direct-java/build.gradle b/runners/direct-java/build.gradle
@@ -30,7 +30,6 @@ def dependOnProjects = [":runners:core-construction-java",
                         ]
 
 applyJavaNature(
-        enableStrictDependencies:true,
         automaticModuleName: 'org.apache.beam.runners.direct',
         classesTriggerCheckerBugs: [
           'ImpulseEvaluatorFactory': 'https://github.com/typetools/checker-framework/issues/3791',

diff --git a/runners/extensions-java/metrics/build.gradle b/runners/extensions-java/metrics/build.gradle
@@ -18,7 +18,6 @@
 
 plugins { id 'org.apache.beam.module' }
 applyJavaNature(
-  enableStrictDependencies: true,
   exportJavadoc: false,
   automaticModuleName: 'org.apache.beam.runners.extensions.metrics',
 )

diff --git a/runners/flink/job-server/flink_job_server.gradle b/runners/flink/job-server/flink_job_server.gradle
@@ -30,7 +30,6 @@ 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,

diff --git a/runners/google-cloud-dataflow-java/build.gradle b/runners/google-cloud-dataflow-java/build.gradle
@@ -20,6 +20,7 @@ import groovy.json.JsonOutput
 
 plugins { id 'org.apache.beam.module' }
 applyJavaNature(
+  enableStrictDependencies: false,
   automaticModuleName: 'org.apache.beam.runners.dataflow',
   classesTriggerCheckerBugs: [
     'PrimitiveParDoSingleFactory': 'https://github.com/typetools/checker-framework/issues/3791',

diff --git a/runners/google-cloud-dataflow-java/examples-streaming/build.gradle b/runners/google-cloud-dataflow-java/examples-streaming/build.gradle
@@ -19,7 +19,7 @@
 import groovy.json.JsonOutput
 
 plugins { id 'org.apache.beam.module' }
-applyJavaNature(publish: false, exportJavadoc: false)
+applyJavaNature(enableStrictDependencies: false, publish: false, exportJavadoc: false)
 // Evaluate the given project before this one, to allow referencing
 // its sourceSets.test.output directly.
 evaluationDependsOn(":examples:java")

diff --git a/runners/google-cloud-dataflow-java/examples/build.gradle b/runners/google-cloud-dataflow-java/examples/build.gradle
@@ -19,7 +19,7 @@
 import groovy.json.JsonOutput
 
 plugins { id 'org.apache.beam.module' }
-applyJavaNature(publish: false, exportJavadoc: false)
+applyJavaNature(enableStrictDependencies: false, publish: false, exportJavadoc: false)
 // Evaluate the given project before this one, to allow referencing
 // its sourceSets.test.output directly.
 evaluationDependsOn(":examples:java")

diff --git a/runners/google-cloud-dataflow-java/worker/build.gradle b/runners/google-cloud-dataflow-java/worker/build.gradle
@@ -27,6 +27,7 @@ def DATAFLOW_VERSION = "dataflow.version"
 def google_api_services_dataflow = project.hasProperty(DATAFLOW_VERSION) ? "com.google.apis:google-api-services-dataflow:" + getProperty(DATAFLOW_VERSION) : library.java.google_api_services_dataflow
 
 applyJavaNature(
+  enableStrictDependencies: false,
   archivesBaseName: 'beam-runners-google-cloud-dataflow-java-fn-api-worker',
   publish: false,
   exportJavadoc: false,

diff --git a/runners/google-cloud-dataflow-java/worker/legacy-worker/build.gradle b/runners/google-cloud-dataflow-java/worker/legacy-worker/build.gradle
@@ -82,6 +82,7 @@ def excluded_dependencies = [
 ]
 
 applyJavaNature(
+        enableStrictDependencies: false,
         archivesBaseName: 'beam-runners-google-cloud-dataflow-java-legacy-worker',
         publish: false,
         classesTriggerCheckerBugs: [

diff --git a/runners/java-fn-execution/build.gradle b/runners/java-fn-execution/build.gradle
@@ -17,7 +17,6 @@
 
 plugins { id 'org.apache.beam.module' }
 applyJavaNature(
-  enableStrictDependencies: true,
   automaticModuleName: 'org.apache.beam.runners.fnexecution',
 )
 

diff --git a/runners/java-job-service/build.gradle b/runners/java-job-service/build.gradle
@@ -17,7 +17,6 @@
 
 plugins { id 'org.apache.beam.module' }
 applyJavaNature(
-  enableStrictDependencies: true,
   automaticModuleName: 'org.apache.beam.runners.jobservice',
 )
 

diff --git a/runners/jet/build.gradle b/runners/jet/build.gradle
@@ -20,7 +20,6 @@ import groovy.json.JsonOutput
 
 plugins { id 'org.apache.beam.module' }
 applyJavaNature(
-  enableStrictDependencies : true,
   automaticModuleName: 'org.apache.beam.runners.jet',
 )
 

diff --git a/runners/local-java/build.gradle b/runners/local-java/build.gradle
@@ -19,7 +19,6 @@
 plugins { id 'org.apache.beam.module' }
 
 applyJavaNature(
-    enableStrictDependencies: true,
     automaticModuleName: 'org.apache.beam.runners.local',
     archivesBaseName: 'beam-runners-local-java-core',
 

diff --git a/runners/portability/java/build.gradle b/runners/portability/java/build.gradle
@@ -19,7 +19,7 @@ import groovy.json.JsonOutput
  */
 
 plugins { id 'org.apache.beam.module' }
-applyJavaNature(enableStrictDependencies:true, automaticModuleName: 'org.apache.beam.runners.portability')
+applyJavaNature(automaticModuleName: 'org.apache.beam.runners.portability')
 applyPythonNature()
 
 description = "Apache Beam :: Runners :: Portability :: Java"

diff --git a/runners/samza/build.gradle b/runners/samza/build.gradle
@@ -20,7 +20,6 @@ import groovy.json.JsonOutput
 
 plugins { id 'org.apache.beam.module' }
 applyJavaNature(
-  enableStrictDependencies : true,
   exportJavadoc: false,
   classesTriggerCheckerBugs: [
     'GroupWithoutRepartition': 'https://github.com/typetools/checker-framework/issues/3791',

diff --git a/runners/samza/job-server/build.gradle b/runners/samza/job-server/build.gradle
@@ -22,7 +22,6 @@ apply plugin: 'application'
 mainClassName = "org.apache.beam.runners.samza.SamzaJobServerDriver"
 
 applyJavaNature(
-    enableStrictDependencies : true,
     automaticModuleName: 'org.apache.beam.runners.samza.jobserver',
     validateShadowJar: false,
 

diff --git a/runners/spark/build.gradle b/runners/spark/build.gradle
@@ -21,7 +21,6 @@ import java.util.stream.Collectors
 
 plugins { id 'org.apache.beam.module' }
 applyJavaNature(
-  enableStrictDependencies: true,
   automaticModuleName: 'org.apache.beam.runners.spark',
   classesTriggerCheckerBugs: [
     'SparkAssignWindowFn': 'https://github.com/typetools/checker-framework/issues/3793',

diff --git a/runners/spark/job-server/build.gradle b/runners/spark/job-server/build.gradle
@@ -28,7 +28,6 @@ apply plugin: 'application'
 mainClassName = "org.apache.beam.runners.spark.SparkJobServerDriver"
 
 applyJavaNature(
-  enableStrictDependencies: true,
   automaticModuleName: 'org.apache.beam.runners.spark.jobserver',
   validateShadowJar: false,
   exportJavadoc: false,

diff --git a/runners/twister2/build.gradle b/runners/twister2/build.gradle
@@ -21,7 +21,6 @@ import groovy.json.JsonOutput
 plugins { id 'org.apache.beam.module' }
 
 applyJavaNature(
-  enableStrictDependencies:true,
   automaticModuleName: 'org.apache.beam.runners.twister2',
 )
 

diff --git a/sdks/java/core/build.gradle b/sdks/java/core/build.gradle
@@ -18,7 +18,6 @@
 
 plugins { id 'org.apache.beam.module' }
 applyJavaNature(
-  enableStrictDependencies: true,
   automaticModuleName: 'org.apache.beam.sdk',
   classesTriggerCheckerBugs: [
     'DoFnTester': 'https://github.com/typetools/checker-framework/issues/3776',

diff --git a/sdks/java/expansion-service/build.gradle b/sdks/java/expansion-service/build.gradle
@@ -18,7 +18,6 @@
 
 plugins { id 'org.apache.beam.module' }
 applyJavaNature(
-  enableStrictDependencies: true,
   automaticModuleName: 'org.apache.beam.sdk.expansion.service')
 
 description = "Apache Beam :: SDKs :: Java :: Expansion Service"

diff --git a/sdks/java/extensions/euphoria/build.gradle b/sdks/java/extensions/euphoria/build.gradle
@@ -18,7 +18,6 @@
 
 plugins { id 'org.apache.beam.module' }
 applyJavaNature(
-  enableStrictDependencies: true,
   exportJavadoc: false,
   automaticModuleName: 'org.apache.beam.sdk.extensions.euphoria',
 )

diff --git a/sdks/java/extensions/google-cloud-platform-core/build.gradle b/sdks/java/extensions/google-cloud-platform-core/build.gradle
@@ -20,7 +20,6 @@ import groovy.json.JsonOutput
 
 plugins { id 'org.apache.beam.module' }
 applyJavaNature(
-  enableStrictDependencies: true,
   automaticModuleName: 'org.apache.beam.sdk.extensions.gcp')
 
 description = "Apache Beam :: SDKs :: Java :: Extensions :: Google Cloud Platform Core"

diff --git a/sdks/java/extensions/jackson/build.gradle b/sdks/java/extensions/jackson/build.gradle
@@ -18,7 +18,6 @@
 
 plugins { id 'org.apache.beam.module' }
 applyJavaNature(
-    enableStrictDependencies: true,
     automaticModuleName: 'org.apache.beam.sdk.extensions.jackson',
     archivesBaseName: 'beam-sdks-java-extensions-json-jackson'
 )

diff --git a/sdks/java/extensions/join-library/build.gradle b/sdks/java/extensions/join-library/build.gradle
@@ -18,7 +18,6 @@
 
 plugins { id 'org.apache.beam.module' }
 applyJavaNature(
-  enableStrictDependencies: true,
   automaticModuleName: 'org.apache.beam.sdk.extensions.joinlibrary'
 )
 

diff --git a/sdks/java/extensions/kryo/build.gradle b/sdks/java/extensions/kryo/build.gradle
@@ -23,7 +23,6 @@ ext {
 }
 
 applyJavaNature(automaticModuleName: 'org.apache.beam.sdk.extensions.kryo',
-    enableStrictDependencies: true,
     exportJavadoc: false,
     shadowClosure: {
     dependencies {

diff --git a/sdks/java/extensions/ml/build.gradle b/sdks/java/extensions/ml/build.gradle
@@ -22,7 +22,6 @@ import groovy.json.JsonOutput
 
 plugins { id 'org.apache.beam.module' }
 applyJavaNature(
-    enableStrictDependencies: true,
     automaticModuleName: 'org.apache.beam.sdk.extensions.ml'
 )
 

diff --git a/sdks/java/extensions/protobuf/build.gradle b/sdks/java/extensions/protobuf/build.gradle
@@ -18,7 +18,6 @@
 
 plugins { id 'org.apache.beam.module' }
 applyJavaNature(
-  enableStrictDependencies: true,
   generatedClassPatterns: [
     /^org\.apache\.beam\.sdk\.extensions\.protobuf\.PayloadMessages/,
     /^org\.apache\.beam\.sdk\.extensions\.protobuf\.Proto2CoderTestMessages/,

diff --git a/sdks/java/extensions/sketching/build.gradle b/sdks/java/extensions/sketching/build.gradle
@@ -18,7 +18,6 @@
 
 plugins { id 'org.apache.beam.module' }
 applyJavaNature(
-  enableStrictDependencies: true,
   automaticModuleName: 'org.apache.beam.sdk.extensions.sketching')
 
 description = "Apache Beam :: SDKs :: Java :: Extensions :: Sketching"

diff --git a/sdks/java/extensions/sorter/build.gradle b/sdks/java/extensions/sorter/build.gradle
@@ -20,7 +20,6 @@ import java.util.stream.Collectors
 
 plugins { id 'org.apache.beam.module' }
 applyJavaNature(
-  enableStrictDependencies: true,
   automaticModuleName: 'org.apache.beam.sdk.extensions.sorter')
 
 description = "Apache Beam :: SDKs :: Java :: Extensions :: Sorter"

diff --git a/sdks/java/extensions/sql/build.gradle b/sdks/java/extensions/sql/build.gradle
@@ -24,7 +24,6 @@ plugins {
   id 'ca.coglinc.javacc'
 }
 applyJavaNature(
-  enableStrictDependencies: true,
   generatedClassPatterns: [
     /^org\.apache\.beam\.sdk\.extensions\.sql\.impl\.parser\.impl.*/,
   ],

diff --git a/sdks/java/extensions/sql/datacatalog/build.gradle b/sdks/java/extensions/sql/datacatalog/build.gradle
@@ -21,7 +21,6 @@ import groovy.json.JsonOutput
 plugins { id 'org.apache.beam.module' }
 
 applyJavaNature(
-  enableStrictDependencies: true,
   automaticModuleName: 'org.apache.beam.sdk.extensions.sql.datacatalog')
 
 dependencies {

diff --git a/sdks/java/extensions/sql/expansion-service/build.gradle b/sdks/java/extensions/sql/expansion-service/build.gradle
@@ -18,7 +18,6 @@
 plugins { id 'org.apache.beam.module' }
 
 applyJavaNature(
-  enableStrictDependencies: true,
   automaticModuleName: 'org.apache.beam.sdks.extensions.sql.expansion',
   validateShadowJar: false,
   shadowClosure: {

diff --git a/sdks/java/extensions/sql/hcatalog/build.gradle b/sdks/java/extensions/sql/hcatalog/build.gradle
@@ -19,7 +19,6 @@
 plugins { id 'org.apache.beam.module' }
 
 applyJavaNature(
-  enableStrictDependencies: true,
   automaticModuleName: 'org.apache.beam.sdk.extensions.sql.meta.provider.hcatalog',
   classesTriggerCheckerBugs: [
     'HCatalogTable': 'TODO: file a bug report',

diff --git a/sdks/java/extensions/sql/jdbc/build.gradle b/sdks/java/extensions/sql/jdbc/build.gradle
@@ -20,7 +20,6 @@ import groovy.json.JsonOutput
 
 plugins { id 'org.apache.beam.module' }
 applyJavaNature(automaticModuleName: 'org.apache.beam.sdk.extensions.sql.jdbc',
-  enableStrictDependencies: true,
   exportJavadoc: false,
   testShadowJar: true,
   validateShadowJar: false,

diff --git a/sdks/java/extensions/sql/perf-tests/build.gradle b/sdks/java/extensions/sql/perf-tests/build.gradle
@@ -18,7 +18,6 @@
 
 plugins { id 'org.apache.beam.module' }
 applyJavaNature(
-  enableStrictDependencies: true,
   automaticModuleName: 'org.apache.beam.sdk.extensions.sql.meta.provider')
 provideIntegrationTestingDependencies()
 enableJavaPerformanceTesting()

diff --git a/sdks/java/extensions/sql/udf-test-provider/build.gradle b/sdks/java/extensions/sql/udf-test-provider/build.gradle
@@ -21,7 +21,6 @@ plugins {
 }
 
 applyJavaNature(
-    enableStrictDependencies: true,
     automaticModuleName: 'org.apache.beam.sdk.extensions.sql.provider',
     publish: false,
 )

diff --git a/sdks/java/extensions/sql/udf/build.gradle b/sdks/java/extensions/sql/udf/build.gradle
@@ -19,7 +19,6 @@
 plugins { id 'org.apache.beam.module' }
 
 applyJavaNature(
-  enableStrictDependencies: true,
   automaticModuleName: 'org.apache.beam.sdk.extensions.sql.udf')
 
 description = "Apache Beam :: SDKs :: Java :: Extensions :: SQL :: UDF"

diff --git a/sdks/java/extensions/sql/zetasql/build.gradle b/sdks/java/extensions/sql/zetasql/build.gradle
@@ -21,7 +21,6 @@ plugins {
 }
 
 applyJavaNature(
-  enableStrictDependencies: true,
   automaticModuleName: 'org.apache.beam.sdk.extensions.sql.zetasql',
 )
 

diff --git a/sdks/java/extensions/zetasketch/build.gradle b/sdks/java/extensions/zetasketch/build.gradle
@@ -20,7 +20,6 @@ import groovy.json.JsonOutput
 
 plugins { id 'org.apache.beam.module' }
 applyJavaNature(
-  enableStrictDependencies: true,
   automaticModuleName: 'org.apache.beam.sdk.extensions.zetasketch')
 
 description = "Apache Beam :: SDKs :: Java :: Extensions :: ZetaSketch"

diff --git a/sdks/java/fn-execution/build.gradle b/sdks/java/fn-execution/build.gradle
@@ -18,7 +18,6 @@
 
 plugins { id 'org.apache.beam.module' }
 applyJavaNature(
-  enableStrictDependencies: true,
   automaticModuleName: 'org.apache.beam.sdk.fn',
 )
 

diff --git a/sdks/java/harness/build.gradle b/sdks/java/harness/build.gradle
@@ -27,7 +27,6 @@ def dependOnProjects = [":sdks:java:fn-execution",
                         ":runners:core-java", ":runners:core-construction-java"]
 
 applyJavaNature(
-  enableStrictDependencies: true,
   classesTriggerCheckerBugs: [
     'AssignWindowsRunner': 'https://github.com/typetools/checker-framework/issues/3794',
     'WindowMergingFnRunner': 'https://github.com/typetools/checker-framework/issues/3794',

diff --git a/sdks/java/io/amazon-web-services/build.gradle b/sdks/java/io/amazon-web-services/build.gradle
@@ -23,7 +23,6 @@ plugins {
 }
 
 applyJavaNature(
-  enableStrictDependencies:true,
   automaticModuleName: 'org.apache.beam.sdk.io.aws',
 )