set enableStrictDependencies =true

apache · Jan 22, 2021 · 0ef8888 · 0ef8888
1 parent 73be4b6
commit 0ef8888
Show file tree

Hide file tree

Showing 18 changed files with 24 additions and 23 deletions.
diff --git a/sdks/java/extensions/euphoria/build.gradle b/sdks/java/extensions/euphoria/build.gradle
@@ -18,6 +18,7 @@
 
 plugins { id 'org.apache.beam.module' }
 applyJavaNature(
+  enableStrictDependencies: true,
   exportJavadoc: false,
   automaticModuleName: 'org.apache.beam.sdk.extensions.euphoria',
 )
@@ -27,7 +28,7 @@ description = "Apache Beam :: SDKs :: Java :: Extensions :: Euphoria Java 8 DSL"
 dependencies {
   compile project(path: ":sdks:java:core", configuration: "shadow")
   implementation library.java.slf4j_api
-  implementation 'com.fasterxml.jackson.core:jackson-annotations:2.10.2'
+  implementation library.java.jackson_annotations
   implementation library.java.vendored_guava_26_0_jre
   implementation library.java.joda_time
   testCompile project(":sdks:java:extensions:kryo")

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,7 @@ 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"
@@ -38,7 +38,6 @@ test {
 dependencies {
   compile "org.apache.httpcomponents:httpclient:4.5.10"
   compile "org.apache.httpcomponents:httpcore:4.4.12"
-  compile "org.checkerframework:checker-qual:2.0.0"
   compile enforcedPlatform(library.java.google_cloud_platform_libraries_bom)
   compile library.java.vendored_guava_26_0_jre
   compile project(path: ":sdks:java:core", configuration: "shadow")
@@ -55,7 +54,7 @@ dependencies {
   compile library.java.slf4j_api
   compile library.java.joda_time
   compile library.java.jackson_annotations
-  testImplementation 'com.fasterxml.jackson.core:jackson-databind:2.10.2'
+  testImplementation library.java.jackson_databind
   provided library.java.hamcrest_core
   provided library.java.junit
   testCompile project(path: ":sdks:java:core", configuration: "shadowTest")

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

diff --git a/sdks/java/extensions/kryo/build.gradle b/sdks/java/extensions/kryo/build.gradle
@@ -22,7 +22,7 @@ ext {
     kryoVersion = '4.0.2'
 }
 
-applyJavaNature(automaticModuleName: 'org.apache.beam.sdk.extensions.kryo',
+applyJavaNature(enableStrictDependencies : true, automaticModuleName: 'org.apache.beam.sdk.extensions.kryo',
     exportJavadoc: false,
     shadowClosure: {
     dependencies {
@@ -41,7 +41,7 @@ description = 'Apache Beam :: SDKs :: Java :: Extensions :: Kryo'
 dependencies {
     compile "com.esotericsoftware:kryo:${kryoVersion}"
     compile library.java.jackson_annotations
-    compile "org.apache.beam:beam-vendor-guava-26_0-jre:0.1"
+    compile library.java.vendored_guava_26_0_jre
     compile "org.objenesis:objenesis:2.5.1"
     shadow project(path: ':sdks:java:core', configuration: 'shadow')
     testCompile project(path: ':sdks:java:core', configuration: 'shadowTest')

diff --git a/sdks/java/extensions/ml/build.gradle b/sdks/java/extensions/ml/build.gradle
@@ -21,7 +21,7 @@ import groovy.json.JsonOutput
  */
 
 plugins { id 'org.apache.beam.module' }
-applyJavaNature(automaticModuleName: 'org.apache.beam.sdk.extensions.ml')
+applyJavaNature(enableStrictDependencies : true, automaticModuleName: 'org.apache.beam.sdk.extensions.ml')
 
 description = 'Apache Beam :: SDKs :: Java :: Extensions :: ML'
 
@@ -35,13 +35,12 @@ dependencies {
     compile 'com.google.api.grpc:proto-google-cloud-video-intelligence-v1:1.2.0'
     compile 'com.google.api.grpc:proto-google-cloud-vision-v1:1.81.3'
     compile 'com.google.api:gax:1.57.1'
-    compile 'com.google.protobuf:protobuf-java:3.11.1'
-    compile 'org.checkerframework:checker-qual:2.0.0'
+    compile library.java.protobuf_java
     compile library.java.slf4j_api
     provided library.java.junit
     testCompile project(path: ':sdks:java:core', configuration: 'shadowTest')
     compile 'com.google.cloud:google-cloud-vision:1.99.3'
-    permitUsedUndeclared "com.google.auto.value:auto-value-annotations:1.7"
+    //permitUsedUndeclared "com.google.auto.value:auto-value-annotations:1.7"
     testCompile library.java.mockito_core
     testCompile 'com.google.cloud:google-cloud-video-intelligence:1.2.0'
     implementation 'com.google.cloud:google-cloud-dlp:1.1.4'

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

diff --git a/sdks/java/extensions/schemaio-expansion-service/build.gradle b/sdks/java/extensions/schemaio-expansion-service/build.gradle
@@ -20,6 +20,7 @@ plugins {
 }
 
 applyJavaNature(
+        enableStrictDependencies : true,
         automaticModuleName: 'org.apache.beam.sdk.extensions.schemaio.expansion',
         validateShadowJar: false,
         shadowClosure: {
@@ -33,10 +34,10 @@ dependencies {
     compile project(path: ":model:pipeline", configuration: "shadow")
     compile project(path: ":sdks:java:core", configuration: "shadow")
     compile library.java.vendored_grpc_1_26_0
-    compile "org.apache.beam:beam-vendor-guava-26_0-jre:0.1"
+    compile library.java.vendored_guava_26_0_jre
     testCompile library.java.junit
     testCompile library.java.mockito_core
     // TODO(BEAM-10632): remove this dependency
-    testCompile "org.checkerframework:checker-qual:3.5.0"
 }
 
+
diff --git a/sdks/java/extensions/sketching/build.gradle b/sdks/java/extensions/sketching/build.gradle
@@ -18,6 +18,7 @@
 
 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,6 +20,7 @@ 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
@@ -78,7 +78,6 @@ dependencies {
   compile library.java.slf4j_api
   compile library.java.joda_time
   compile library.java.vendored_guava_26_0_jre
-  compile "org.checkerframework:checker-qual:2.0.0"
   permitUnusedDeclared project(":sdks:java:core")
   provided project(":sdks:java:io:kafka")
   provided project(":sdks:java:io:google-cloud-platform")

diff --git a/sdks/java/extensions/sql/datacatalog/build.gradle b/sdks/java/extensions/sql/datacatalog/build.gradle
@@ -20,7 +20,7 @@ import groovy.json.JsonOutput
 
 plugins { id 'org.apache.beam.module' }
 
-applyJavaNature(automaticModuleName: 'org.apache.beam.sdk.extensions.sql.datacatalog')
+applyJavaNature(enableStrictDependencies : true, automaticModuleName: 'org.apache.beam.sdk.extensions.sql.datacatalog')
 
 dependencies {
   compile enforcedPlatform(library.java.google_cloud_platform_libraries_bom)
@@ -30,7 +30,6 @@ dependencies {
   compile "com.google.api.grpc:proto-google-cloud-datacatalog-v1beta1:0.32.1"
   compile "com.google.api:gax:1.57.1"
   compile "com.google.auth:google-auth-library-credentials:0.19.0"
-  compile "org.checkerframework:checker-qual:2.0.0"
   compile library.java.vendored_guava_26_0_jre
   compile library.java.slf4j_api
   compile project(path: ":sdks:java:core", configuration: "shadow")

diff --git a/sdks/java/extensions/sql/expansion-service/build.gradle b/sdks/java/extensions/sql/expansion-service/build.gradle
@@ -18,6 +18,7 @@
 plugins { id 'org.apache.beam.module' }
 
 applyJavaNature(
+  enableStrictDependencies : true,
   automaticModuleName: 'org.apache.beam.sdks.extensions.sql.expansion',
   validateShadowJar: false,
   shadowClosure: {
@@ -36,7 +37,6 @@ dependencies {
   compile project(path: ":sdks:java:extensions:sql:zetasql")
   compile project(path: ":sdks:java:core", configuration: "shadow")
   compile "org.apache.beam:beam-vendor-guava-26_0-jre:0.1"
-  compile "org.checkerframework:checker-qual:2.0.0"
 }
 
 task runExpansionService (type: JavaExec) {

diff --git a/sdks/java/extensions/sql/hcatalog/build.gradle b/sdks/java/extensions/sql/hcatalog/build.gradle
@@ -19,6 +19,7 @@
 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
@@ -19,7 +19,7 @@ import groovy.json.JsonOutput
  */
 
 plugins { id 'org.apache.beam.module' }
-applyJavaNature(automaticModuleName: 'org.apache.beam.sdk.extensions.sql.jdbc',
+applyJavaNature(enableStrictDependencies : true, automaticModuleName: 'org.apache.beam.sdk.extensions.sql.jdbc',
   exportJavadoc: false,
   testShadowJar: true,
   validateShadowJar: false,
@@ -42,7 +42,6 @@ dependencies {
   integrationTest sourceSets.main.output
   integrationTest library.java.junit
   compile project(path: ":sdks:java:core", configuration: "shadow")
-  compile "org.checkerframework:checker-qual:2.0.0"
 }
 
 processResources {

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

diff --git a/sdks/java/extensions/sql/udf/build.gradle b/sdks/java/extensions/sql/udf/build.gradle
@@ -18,7 +18,7 @@
 
 plugins { id 'org.apache.beam.module' }
 
-applyJavaNature(automaticModuleName: 'org.apache.beam.sdk.extensions.sql.udf')
+applyJavaNature(enableStrictDependencies : true, automaticModuleName: 'org.apache.beam.sdk.extensions.sql.udf')
 
 description = "Apache Beam :: SDKs :: Java :: Extensions :: SQL :: UDF"
 ext.summary = "Provides interfaces for defining user-defined functions in Beam SQL."

diff --git a/sdks/java/extensions/sql/zetasql/build.gradle b/sdks/java/extensions/sql/zetasql/build.gradle
@@ -21,6 +21,7 @@ plugins {
 }
 
 applyJavaNature(
+  enableStrictDependencies : true,
   automaticModuleName: 'org.apache.beam.sdk.extensions.sql.zetasql',
 )
 
@@ -41,7 +42,6 @@ dependencies {
   compile "com.google.zetasql:zetasql-types:$zetasql_version"
   compile library.java.joda_time
   compile library.java.vendored_guava_26_0_jre
-  compile "org.checkerframework:checker-qual:2.0.0"
   permitUnusedDeclared library.java.protobuf_java_util
   compile "com.google.zetasql:zetasql-jni-channel:$zetasql_version"
   permitUnusedDeclared "com.google.zetasql:zetasql-jni-channel:$zetasql_version"

diff --git a/sdks/java/extensions/zetasketch/build.gradle b/sdks/java/extensions/zetasketch/build.gradle
@@ -20,6 +20,7 @@ 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"
@@ -33,7 +34,6 @@ dependencies {
     compile library.java.vendored_guava_26_0_jre
     compile project(path: ":sdks:java:core", configuration: "shadow")
     compile "com.google.zetasketch:zetasketch:$zetasketch_version"
-    compile "org.checkerframework:checker-qual:2.8.1"
     testCompile library.java.junit
     testCompile project(":sdks:java:io:google-cloud-platform")
     testRuntimeOnly library.java.slf4j_simple