diff --git a/buildSrc/src/main/groovy/org/apache/beam/gradle/BeamModulePlugin.groovy b/buildSrc/src/main/groovy/org/apache/beam/gradle/BeamModulePlugin.groovy index 70ab9c3ff7559..b49ac4956b8c1 100644 --- a/buildSrc/src/main/groovy/org/apache/beam/gradle/BeamModulePlugin.groovy +++ b/buildSrc/src/main/groovy/org/apache/beam/gradle/BeamModulePlugin.groovy @@ -60,7 +60,7 @@ class BeamModulePlugin implements Plugin { boolean enableErrorProne = true /** Controls whether compiler warnings are treated as errors. */ - boolean failOnWarning = false + boolean failOnWarning = true /** * List of additional lint warnings to disable. @@ -351,7 +351,6 @@ class BeamModulePlugin implements Plugin { datastore_v1_proto_client : "com.google.cloud.datastore:datastore-v1-proto-client:1.4.0", datastore_v1_protos : "com.google.cloud.datastore:datastore-v1-protos:1.3.0", error_prone_annotations : "com.google.errorprone:error_prone_annotations:2.0.15", - findbugs_annotations : "com.github.stephenc.findbugs:findbugs-annotations:1.3.9-1", findbugs_jsr305 : "com.google.code.findbugs:jsr305:3.0.1", gax_grpc : "com.google.api:gax-grpc:0.20.0", google_api_client : "com.google.api-client:google-api-client:$google_clients_version", @@ -595,6 +594,14 @@ class BeamModulePlugin implements Plugin { apt auto_service testCompileOnly auto_service testApt auto_service + + // These dependencies are needed to avoid error-prone warnings on package-info.java files, + // also to include the annotations to supress warnings. + def findbugs_annotations = "com.github.stephenc.findbugs:findbugs-annotations:1.3.9-1" + compileOnly findbugs_annotations + apt findbugs_annotations + testCompileOnly findbugs_annotations + testApt findbugs_annotations } // Add the optional and provided configurations for dependencies diff --git a/examples/java/build.gradle b/examples/java/build.gradle index b882b7ef55700..decc6f9b8bd36 100644 --- a/examples/java/build.gradle +++ b/examples/java/build.gradle @@ -19,7 +19,7 @@ import groovy.json.JsonOutput apply plugin: org.apache.beam.gradle.BeamModulePlugin -applyJavaNature(failOnWarning: true) +applyJavaNature() description = "Apache Beam :: Examples :: Java" ext.summary = """Apache Beam SDK provides a simple, Java-based diff --git a/runners/apex/build.gradle b/runners/apex/build.gradle index 816eee3df82c8..26d30ee16a2d5 100644 --- a/runners/apex/build.gradle +++ b/runners/apex/build.gradle @@ -19,7 +19,7 @@ import groovy.json.JsonOutput apply plugin: org.apache.beam.gradle.BeamModulePlugin -applyJavaNature(failOnWarning: true) +applyJavaNature() description = "Apache Beam :: Runners :: Apex" @@ -35,7 +35,6 @@ configurations { } dependencies { - compileOnly library.java.findbugs_annotations shadow project(path: ":beam-model-pipeline", configuration: "shadow") shadow project(path: ":beam-sdks-java-core", configuration: "shadow") shadow project(path: ":beam-runners-core-construction-java", configuration: "shadow") @@ -46,7 +45,6 @@ dependencies { shadow library.java.commons_lang3 shadow library.java.findbugs_jsr305 shadow library.java.apex_engine - testCompileOnly library.java.findbugs_annotations shadowTest project(path: ":beam-sdks-java-core", configuration: "shadowTest") // ApexStateInternalsTest extends abstract StateInternalsTest shadowTest project(path: ":beam-runners-core-java", configuration: "shadowTest") diff --git a/runners/core-construction-java/build.gradle b/runners/core-construction-java/build.gradle index 774de1cc5486c..b379c3c68875c 100644 --- a/runners/core-construction-java/build.gradle +++ b/runners/core-construction-java/build.gradle @@ -17,7 +17,7 @@ */ apply plugin: org.apache.beam.gradle.BeamModulePlugin -applyJavaNature(failOnWarning: true) +applyJavaNature() description = "Apache Beam :: Runners :: Core Construction Java" ext.summary = """Beam Runners Core provides utilities to aid runner authors interact with a Pipeline @@ -34,7 +34,6 @@ test { dependencies { compile library.java.guava - compileOnly library.java.findbugs_annotations shadow project(path: ":beam-model-pipeline", configuration: "shadow") shadow project(path: ":beam-model-job-management", configuration: "shadow") shadow project(path: ":beam-sdks-java-core", configuration: "shadow") @@ -47,7 +46,6 @@ dependencies { shadow library.java.slf4j_api shadow library.java.grpc_core shadow library.java.grpc_stub - testCompileOnly library.java.findbugs_annotations shadowTest library.java.hamcrest_core shadowTest library.java.hamcrest_library shadowTest library.java.junit diff --git a/runners/core-java/build.gradle b/runners/core-java/build.gradle index 9f46cbaab01c4..5b28bd9459ea5 100644 --- a/runners/core-java/build.gradle +++ b/runners/core-java/build.gradle @@ -17,7 +17,7 @@ */ apply plugin: org.apache.beam.gradle.BeamModulePlugin -applyJavaNature(failOnWarning: true) +applyJavaNature() description = "Apache Beam :: Runners :: Core Java" ext.summary = "Beam Runners Core provides utilities to aid runner authors." @@ -32,7 +32,6 @@ test { dependencies { compile library.java.guava - compileOnly library.java.findbugs_annotations shadow project(path: ":beam-model-pipeline", configuration: "shadow") shadow project(path: ":beam-sdks-java-core", configuration: "shadow") shadow project(path: ":beam-model-fn-execution", configuration: "shadow") @@ -41,7 +40,6 @@ dependencies { shadow library.java.grpc_core shadow library.java.grpc_stub shadow library.java.joda_time - testCompileOnly library.java.findbugs_annotations shadowTest project(path: ":beam-sdks-java-core", configuration: "shadowTest") shadowTest library.java.junit shadowTest library.java.hamcrest_core diff --git a/runners/direct-java/build.gradle b/runners/direct-java/build.gradle index add62dce9e7e0..076a3fe8cb934 100644 --- a/runners/direct-java/build.gradle +++ b/runners/direct-java/build.gradle @@ -24,7 +24,7 @@ def dependOnProjects = [":beam-model-pipeline", ":beam-runners-core-construction ":beam-runners-java-fn-execution", ":beam-sdks-java-fn-execution"] apply plugin: org.apache.beam.gradle.BeamModulePlugin -applyJavaNature(failOnWarning: true, shadowClosure: DEFAULT_SHADOW_CLOSURE << { +applyJavaNature(shadowClosure: DEFAULT_SHADOW_CLOSURE << { dependencies { include(dependency(library.java.protobuf_java)) include(dependency(library.java.protobuf_java_util)) diff --git a/runners/extensions-java/metrics/build.gradle b/runners/extensions-java/metrics/build.gradle index 71d70123e69b4..843864d9f6625 100644 --- a/runners/extensions-java/metrics/build.gradle +++ b/runners/extensions-java/metrics/build.gradle @@ -17,20 +17,17 @@ */ apply plugin: org.apache.beam.gradle.BeamModulePlugin -applyJavaNature(failOnWarning: true) +applyJavaNature() description = "Apache Beam :: Runners :: Extensions Java :: Metrics" ext.summary = "Beam Runners Extensions Metrics provides implementations of runners core metrics APIs." - dependencies { - compile library.java.guava - compileOnly library.java.findbugs_annotations - shadow project(path: ":beam-sdks-java-core", configuration: "shadow") - shadow library.java.jackson_databind - shadow library.java.jackson_datatype_joda - shadow library.java.findbugs_jsr305 - testCompileOnly library.java.findbugs_annotations - shadowTest library.java.joda_time - shadowTest library.java.junit + compile library.java.guava + shadow project(path: ":beam-sdks-java-core", configuration: "shadow") + shadow library.java.jackson_databind + shadow library.java.jackson_datatype_joda + shadow library.java.findbugs_jsr305 + shadowTest library.java.joda_time + shadowTest library.java.junit } diff --git a/runners/flink/build.gradle b/runners/flink/build.gradle index 8a6d22b381e39..d4aead772d0c5 100644 --- a/runners/flink/build.gradle +++ b/runners/flink/build.gradle @@ -19,7 +19,7 @@ import groovy.json.JsonOutput apply plugin: org.apache.beam.gradle.BeamModulePlugin -applyJavaNature(failOnWarning: true) +applyJavaNature() description = "Apache Beam :: Runners :: Flink" @@ -49,7 +49,6 @@ def flink_version = "1.5.0" dependencies { compile library.java.guava - compileOnly library.java.findbugs_annotations shadow project(path: ":beam-sdks-java-core", configuration: "shadow") shadow project(path: ":beam-runners-core-java", configuration: "shadow") shadow project(path: ":beam-runners-core-construction-java", configuration: "shadow") diff --git a/runners/gearpump/build.gradle b/runners/gearpump/build.gradle index cd9bf10b71ed3..2098ef8e46866 100644 --- a/runners/gearpump/build.gradle +++ b/runners/gearpump/build.gradle @@ -19,7 +19,7 @@ import groovy.json.JsonOutput apply plugin: org.apache.beam.gradle.BeamModulePlugin -applyJavaNature(failOnWarning: true) +applyJavaNature() description = "Apache Beam :: Runners :: Gearpump" @@ -38,7 +38,6 @@ configurations { dependencies { compile library.java.guava - compileOnly library.java.findbugs_annotations compileOnly "com.typesafe:config:1.3.0" compileOnly "org.scala-lang:scala-library:2.11.8" shadow project(path: ":beam-sdks-java-core", configuration: "shadow") @@ -49,7 +48,6 @@ dependencies { shadow library.java.joda_time shadow library.java.jackson_annotations shadow library.java.findbugs_jsr305 - testCompileOnly library.java.findbugs_annotations shadowTest project(path: ":beam-sdks-java-core", configuration: "shadowTest") shadowTest library.java.junit shadowTest library.java.hamcrest_core diff --git a/runners/google-cloud-dataflow-java/build.gradle b/runners/google-cloud-dataflow-java/build.gradle index 85403d91ae91d..aa3714405cffc 100644 --- a/runners/google-cloud-dataflow-java/build.gradle +++ b/runners/google-cloud-dataflow-java/build.gradle @@ -19,7 +19,7 @@ import groovy.json.JsonOutput apply plugin: org.apache.beam.gradle.BeamModulePlugin -applyJavaNature(failOnWarning: true) +applyJavaNature() description = "Apache Beam :: Runners :: Google Cloud Dataflow" diff --git a/runners/java-fn-execution/build.gradle b/runners/java-fn-execution/build.gradle index 8f33fa41be2d1..d82954a88577e 100644 --- a/runners/java-fn-execution/build.gradle +++ b/runners/java-fn-execution/build.gradle @@ -16,13 +16,12 @@ */ apply plugin: org.apache.beam.gradle.BeamModulePlugin -applyJavaNature(failOnWarning: true) +applyJavaNature() description = "Apache Beam :: Runners :: Java Fn Execution" dependencies { compile library.java.guava - compile library.java.findbugs_annotations compile project(path: ":beam-runners-core-construction-java", configuration: "shadow") provided project(path: ":beam-sdks-java-harness") shadow project(path: ":beam-model-pipeline", configuration: "shadow") diff --git a/runners/local-java/build.gradle b/runners/local-java/build.gradle index 426268de42648..da08d021c3327 100644 --- a/runners/local-java/build.gradle +++ b/runners/local-java/build.gradle @@ -17,7 +17,7 @@ */ apply plugin: org.apache.beam.gradle.BeamModulePlugin -applyJavaNature(failOnWarning: true) +applyJavaNature() description = "Apache Beam :: Runners :: Local Java Core" @@ -31,7 +31,6 @@ dependencies { shadow project(path: ":beam-sdks-java-core", configuration: "shadow") shadow library.java.joda_time shadow library.java.findbugs_jsr305 - shadow library.java.findbugs_annotations shadowTest library.java.hamcrest_core shadowTest library.java.hamcrest_library shadowTest library.java.junit diff --git a/runners/reference/java/build.gradle b/runners/reference/java/build.gradle index b58e8a1457c1b..79d5d71fcbd5b 100644 --- a/runners/reference/java/build.gradle +++ b/runners/reference/java/build.gradle @@ -17,7 +17,7 @@ */ apply plugin: org.apache.beam.gradle.BeamModulePlugin -applyJavaNature(failOnWarning: true) +applyJavaNature() description = "Apache Beam :: Runners :: Reference :: Java" ext.summary = """A Java implementation of the Beam Model which utilizes the portability @@ -25,12 +25,10 @@ framework to execute user-definied functions.""" dependencies { - compileOnly library.java.findbugs_annotations shadow project(path: ":beam-model-pipeline", configuration: "shadow") shadow project(path: ":beam-runners-core-construction-java", configuration: "shadow") shadow project(path: ":beam-sdks-java-fn-execution", configuration: "shadow") shadow library.java.slf4j_api - testCompileOnly library.java.findbugs_annotations shadowTest project(path: ":beam-runners-core-construction-java", configuration: "shadowTest") testCompile library.java.hamcrest_core testCompile library.java.junit diff --git a/runners/spark/build.gradle b/runners/spark/build.gradle index cd6a8a1d58c64..c27ae6a379651 100644 --- a/runners/spark/build.gradle +++ b/runners/spark/build.gradle @@ -19,7 +19,7 @@ import groovy.json.JsonOutput apply plugin: org.apache.beam.gradle.BeamModulePlugin -applyJavaNature(failOnWarning: true) +applyJavaNature() description = "Apache Beam :: Runners :: Spark" @@ -53,7 +53,6 @@ test { } dependencies { - compileOnly library.java.findbugs_annotations shadow project(path: ":beam-model-pipeline", configuration: "shadow") shadow project(path: ":beam-sdks-java-core", configuration: "shadow") shadow project(path: ":beam-runners-core-construction-java", configuration: "shadow") @@ -78,7 +77,6 @@ dependencies { provided "org.apache.zookeeper:zookeeper:3.4.11" provided "org.scala-lang:scala-library:2.11.8" provided "com.esotericsoftware.kryo:kryo:2.21" - testCompileOnly library.java.findbugs_annotations shadowTest project(path: ":beam-sdks-java-io-kafka", configuration: "shadow") shadowTest project(path: ":beam-sdks-java-core", configuration: "shadowTest") // SparkStateInternalsTest extends abstract StateInternalsTest diff --git a/sdks/java/build-tools/build.gradle b/sdks/java/build-tools/build.gradle index 8d5d1fbb17ba9..4f5656014fb37 100644 --- a/sdks/java/build-tools/build.gradle +++ b/sdks/java/build-tools/build.gradle @@ -17,6 +17,6 @@ */ apply plugin: org.apache.beam.gradle.BeamModulePlugin -applyJavaNature(failOnWarning: true) +applyJavaNature() description = "Apache Beam :: SDKs :: Java :: Build Tools" diff --git a/sdks/java/core/build.gradle b/sdks/java/core/build.gradle index 44cbed6f910f7..89086330469de 100644 --- a/sdks/java/core/build.gradle +++ b/sdks/java/core/build.gradle @@ -58,8 +58,6 @@ dependencies { compile library.java.commons_compress compile library.java.commons_lang3 compile library.java.guava_testlib - compileOnly library.java.findbugs_annotations - testCompileOnly library.java.findbugs_annotations shadow library.java.jackson_core shadow library.java.jackson_annotations shadow library.java.jackson_databind diff --git a/sdks/java/extensions/google-cloud-platform-core/src/main/java/org/apache/beam/sdk/extensions/gcp/options/GcpOptions.java b/sdks/java/extensions/google-cloud-platform-core/src/main/java/org/apache/beam/sdk/extensions/gcp/options/GcpOptions.java index 37c01e04409a0..8492d3714beb4 100644 --- a/sdks/java/extensions/google-cloud-platform-core/src/main/java/org/apache/beam/sdk/extensions/gcp/options/GcpOptions.java +++ b/sdks/java/extensions/google-cloud-platform-core/src/main/java/org/apache/beam/sdk/extensions/gcp/options/GcpOptions.java @@ -350,7 +350,7 @@ private static long getProjectNumber( @VisibleForTesting static String getRegionFromZone(String zone) { - String[] zoneParts = zone.split("-"); + String[] zoneParts = zone.split("-", -1); checkArgument(zoneParts.length >= 2, "Invalid zone provided: %s", zone); return zoneParts[0] + "-" + zoneParts[1]; } diff --git a/sdks/java/extensions/google-cloud-platform-core/src/main/java/org/apache/beam/sdk/extensions/gcp/storage/GcsFileSystem.java b/sdks/java/extensions/google-cloud-platform-core/src/main/java/org/apache/beam/sdk/extensions/gcp/storage/GcsFileSystem.java index c4ce2fdbd8029..90bad3afd7621 100644 --- a/sdks/java/extensions/google-cloud-platform-core/src/main/java/org/apache/beam/sdk/extensions/gcp/storage/GcsFileSystem.java +++ b/sdks/java/extensions/google-cloud-platform-core/src/main/java/org/apache/beam/sdk/extensions/gcp/storage/GcsFileSystem.java @@ -33,9 +33,9 @@ import java.math.BigInteger; import java.nio.channels.ReadableByteChannel; import java.nio.channels.WritableByteChannel; +import java.util.ArrayList; import java.util.Collection; import java.util.Iterator; -import java.util.LinkedList; import java.util.List; import java.util.regex.Pattern; import javax.annotation.Nullable; @@ -184,7 +184,7 @@ MatchResult expand(GcsPath gcsPattern) throws IOException { prefix, p.toString()); String pageToken = null; - List results = new LinkedList<>(); + List results = new ArrayList<>(); do { Objects objects = options.getGcsUtil().listObjects(gcsPattern.getBucket(), prefix, pageToken); if (objects.getItems() == null) { diff --git a/sdks/java/extensions/google-cloud-platform-core/src/main/java/org/apache/beam/sdk/util/GcsUtil.java b/sdks/java/extensions/google-cloud-platform-core/src/main/java/org/apache/beam/sdk/util/GcsUtil.java index 5b3c27f2237d2..71aa846b95be6 100644 --- a/sdks/java/extensions/google-cloud-platform-core/src/main/java/org/apache/beam/sdk/util/GcsUtil.java +++ b/sdks/java/extensions/google-cloud-platform-core/src/main/java/org/apache/beam/sdk/util/GcsUtil.java @@ -54,7 +54,6 @@ import java.util.ArrayList; import java.util.Collection; import java.util.Collections; -import java.util.LinkedList; import java.util.List; import java.util.concurrent.CompletionStage; import java.util.concurrent.ExecutionException; @@ -259,7 +258,7 @@ public List expand(GcsPath gcsPattern) throws IOException { prefix, p.toString()); String pageToken = null; - List results = new LinkedList<>(); + List results = new ArrayList<>(); do { Objects objects = listObjects(gcsPattern.getBucket(), prefix, pageToken); if (objects.getItems() == null) { @@ -586,7 +585,7 @@ private static void executeBatches(List batches) throws IOExceptio TimeUnit.MILLISECONDS, new LinkedBlockingQueue<>()))); - List> futures = new LinkedList<>(); + List> futures = new ArrayList<>(); for (final BatchRequest batch : batches) { futures.add(MoreFutures.runAsync( () -> batch.execute(), @@ -620,7 +619,7 @@ private static void executeBatches(List batches) throws IOExceptio List makeGetBatches( Collection paths, List results) throws IOException { - List batches = new LinkedList<>(); + List batches = new ArrayList<>(); for (List filesToGet : Lists.partition(Lists.newArrayList(paths), MAX_REQUESTS_PER_BATCH)) { BatchRequest batch = createBatchRequest(); @@ -647,7 +646,7 @@ List makeCopyBatches(Iterable srcFilenames, Iterable batches = new LinkedList<>(); + List batches = new ArrayList<>(); BatchRequest batch = createBatchRequest(); for (int i = 0; i < srcList.size(); i++) { final GcsPath sourcePath = GcsPath.fromUri(srcList.get(i)); @@ -665,7 +664,7 @@ List makeCopyBatches(Iterable srcFilenames, Iterable makeRemoveBatches(Collection filenames) throws IOException { - List batches = new LinkedList<>(); + List batches = new ArrayList<>(); for (List filesToDelete : Lists.partition(Lists.newArrayList(filenames), MAX_REQUESTS_PER_BATCH)) { BatchRequest batch = createBatchRequest(); diff --git a/sdks/java/extensions/google-cloud-platform-core/src/test/java/org/apache/beam/sdk/util/RetryHttpRequestInitializerTest.java b/sdks/java/extensions/google-cloud-platform-core/src/test/java/org/apache/beam/sdk/util/RetryHttpRequestInitializerTest.java index d426d8fd56662..cddd38f30ee99 100644 --- a/sdks/java/extensions/google-cloud-platform-core/src/test/java/org/apache/beam/sdk/util/RetryHttpRequestInitializerTest.java +++ b/sdks/java/extensions/google-cloud-platform-core/src/test/java/org/apache/beam/sdk/util/RetryHttpRequestInitializerTest.java @@ -255,6 +255,7 @@ public Integer answer(InvocationOnMock invocation) { * is invoked. */ @Test + @SuppressWarnings("AssertionFailureIgnored") public void testIOExceptionHandlerIsInvokedOnTimeout() throws Exception { FastNanoClockAndSleeper fakeClockAndSleeper = new FastNanoClockAndSleeper(); // Counts the number of calls to execute the HTTP request. @@ -288,13 +289,15 @@ public LowLevelHttpResponse execute() throws IOException { Get getRequest = storage.objects().get("gs://fake", "file"); + Throwable thrown = null; try { getRequest.execute(); - fail(); } catch (Throwable e) { - assertThat(e, Matchers.instanceOf(SocketTimeoutException.class)); - assertEquals(1 + defaultNumberOfRetries, executeCount.get()); - expectedLogs.verifyWarn("performed 10 retries due to IOExceptions"); + thrown = e; } + assertNotNull("Expected execute to throw an exception", thrown); + assertThat(thrown, Matchers.instanceOf(SocketTimeoutException.class)); + assertEquals(1 + defaultNumberOfRetries, executeCount.get()); + expectedLogs.verifyWarn("performed 10 retries due to IOExceptions"); } } diff --git a/sdks/java/extensions/jackson/build.gradle b/sdks/java/extensions/jackson/build.gradle index a2f8486b21496..dcfbb5b153abd 100644 --- a/sdks/java/extensions/jackson/build.gradle +++ b/sdks/java/extensions/jackson/build.gradle @@ -17,19 +17,17 @@ */ apply plugin: org.apache.beam.gradle.BeamModulePlugin -applyJavaNature(failOnWarning: true) +applyJavaNature() description = "Apache Beam :: SDKs :: Java :: Extensions :: Jackson" ext.summary = "Jackson extension provides PTransforms for deserializing and generating JSON strings." dependencies { compile library.java.guava - compileOnly library.java.findbugs_annotations shadow project(path: ":beam-sdks-java-core", configuration: "shadow") shadow library.java.jackson_databind testCompile project(path: ":beam-runners-direct-java", configuration: "shadow") testCompile library.java.hamcrest_core testCompile library.java.hamcrest_library testCompile library.java.junit - testCompileOnly library.java.findbugs_annotations } diff --git a/sdks/java/extensions/join-library/build.gradle b/sdks/java/extensions/join-library/build.gradle index 7b26a7ac4cc8a..521265647394b 100644 --- a/sdks/java/extensions/join-library/build.gradle +++ b/sdks/java/extensions/join-library/build.gradle @@ -17,17 +17,15 @@ */ apply plugin: org.apache.beam.gradle.BeamModulePlugin -applyJavaNature(failOnWarning: true) +applyJavaNature() description = "Apache Beam :: SDKs :: Java :: Extensions :: Join library" dependencies { compile library.java.guava - compileOnly library.java.findbugs_annotations shadow project(path: ":beam-sdks-java-core", configuration: "shadow") testCompile project(path: ":beam-runners-direct-java", configuration: "shadow") testCompile library.java.hamcrest_core testCompile library.java.hamcrest_library testCompile library.java.junit - testCompileOnly library.java.findbugs_annotations } diff --git a/sdks/java/extensions/protobuf/build.gradle b/sdks/java/extensions/protobuf/build.gradle index f098600ede8bc..cae9cc6380aa2 100644 --- a/sdks/java/extensions/protobuf/build.gradle +++ b/sdks/java/extensions/protobuf/build.gradle @@ -17,7 +17,7 @@ */ apply plugin: org.apache.beam.gradle.BeamModulePlugin -applyJavaNature(failOnWarning: true) +applyJavaNature() applyGrpcNature() description = "Apache Beam :: SDKs :: Java :: Extensions :: Protobuf" @@ -27,7 +27,6 @@ dependencies { compile library.java.guava shadow project(path: ":beam-sdks-java-core", configuration: "shadow") shadow library.java.protobuf_java - shadow library.java.findbugs_annotations testCompile project(path: ":beam-sdks-java-core", configuration: "shadowTest") testCompile library.java.hamcrest_core testCompile library.java.hamcrest_library diff --git a/sdks/java/extensions/sketching/build.gradle b/sdks/java/extensions/sketching/build.gradle index d6fe561d78f4e..cbf6e473084f1 100644 --- a/sdks/java/extensions/sketching/build.gradle +++ b/sdks/java/extensions/sketching/build.gradle @@ -17,7 +17,7 @@ */ apply plugin: org.apache.beam.gradle.BeamModulePlugin -applyJavaNature(failOnWarning: true) +applyJavaNature() description = "Apache Beam :: SDKs :: Java :: Extensions :: Sketching" @@ -26,12 +26,10 @@ def tdigest_version = "3.2" dependencies { compile library.java.guava - compileOnly library.java.findbugs_annotations shadow project(path: ":beam-sdks-java-core", configuration: "shadow") shadow "com.clearspring.analytics:stream:$streamlib_version" shadow "com.tdunning:t-digest:$tdigest_version" shadow library.java.slf4j_api - testCompileOnly library.java.findbugs_annotations shadowTest library.java.avro shadowTest library.java.commons_lang3 shadowTest project(path: ":beam-sdks-java-core", configuration: "shadowTest") diff --git a/sdks/java/extensions/sorter/build.gradle b/sdks/java/extensions/sorter/build.gradle index 7f96e30c4f886..34db5e4179660 100644 --- a/sdks/java/extensions/sorter/build.gradle +++ b/sdks/java/extensions/sorter/build.gradle @@ -17,13 +17,12 @@ */ apply plugin: org.apache.beam.gradle.BeamModulePlugin -applyJavaNature(failOnWarning: true) +applyJavaNature() description = "Apache Beam :: SDKs :: Java :: Extensions :: Sorter" dependencies { compile library.java.guava - compileOnly library.java.findbugs_annotations shadow project(path: ":beam-sdks-java-core", configuration: "shadow") provided library.java.hadoop_mapreduce_client_core provided library.java.hadoop_common @@ -32,5 +31,4 @@ dependencies { testCompile library.java.hamcrest_library testCompile library.java.mockito_core testCompile library.java.junit - testCompileOnly library.java.findbugs_annotations } diff --git a/sdks/java/extensions/sql/build.gradle b/sdks/java/extensions/sql/build.gradle index 9df7dae17c094..ad485463a1243 100644 --- a/sdks/java/extensions/sql/build.gradle +++ b/sdks/java/extensions/sql/build.gradle @@ -21,7 +21,6 @@ import groovy.json.JsonOutput apply plugin: org.apache.beam.gradle.BeamModulePlugin applyJavaNature( enableSpotless: true, - failOnWarning: true, // javacc generated code produces lint warnings disableLintWarnings: ['dep-ann'], testShadowJar: true, @@ -70,7 +69,6 @@ dependencies { compile "org.apache.calcite:calcite-linq4j:$calcite_version" compile "org.apache.calcite.avatica:avatica-core:$avatica_version" compileOnly library.java.findbugs_jsr305 - compileOnly library.java.findbugs_annotations shadow project(path: ":beam-sdks-java-core", configuration: "shadow") shadow project(path: ":beam-sdks-java-extensions-join-library", configuration: "shadow") shadow library.java.slf4j_api diff --git a/sdks/java/extensions/sql/jdbc/build.gradle b/sdks/java/extensions/sql/jdbc/build.gradle index 98eeeca927705..6083d12b57fb4 100644 --- a/sdks/java/extensions/sql/jdbc/build.gradle +++ b/sdks/java/extensions/sql/jdbc/build.gradle @@ -17,7 +17,7 @@ */ apply plugin: org.apache.beam.gradle.BeamModulePlugin -applyJavaNature(failOnWarning: true, enableSpotless: true, testShadowJar: true, shadowClosure: {}) +applyJavaNature(enableSpotless: true, testShadowJar: true, shadowClosure: {}) configurations { integrationTest @@ -28,8 +28,6 @@ dependencies { compile "jline:jline:2.14.6" compile "sqlline:sqlline:1.3.0" compile library.java.slf4j_jdk14 - compileOnly library.java.findbugs_annotations - testCompileOnly library.java.findbugs_annotations testCompile library.java.junit // Depending on outputs so integrationTest can run with only test dependencies. // This enables us to test the JDBC jar being loaded on a custom classloader. diff --git a/sdks/java/fn-execution/build.gradle b/sdks/java/fn-execution/build.gradle index 9f9f3995d57f6..3a699cee1a985 100644 --- a/sdks/java/fn-execution/build.gradle +++ b/sdks/java/fn-execution/build.gradle @@ -17,7 +17,7 @@ */ apply plugin: org.apache.beam.gradle.BeamModulePlugin -applyJavaNature(failOnWarning: true) +applyJavaNature() description = "Apache Beam :: SDKs :: Java :: Fn Execution" ext.summary = """Contains code shared across the Beam Java SDK Harness and Java Runners to execute using @@ -27,7 +27,6 @@ the Beam Portability Framework.""" dependencies { compile library.java.guava compile library.java.findbugs_jsr305 - compileOnly library.java.findbugs_annotations shadow project(path: ":beam-model-pipeline", configuration: "shadow") shadow project(path: ":beam-model-fn-execution", configuration: "shadow") shadow project(path: ":beam-sdks-java-core", configuration: "shadow") @@ -43,5 +42,4 @@ dependencies { testCompile library.java.hamcrest_library testCompile library.java.mockito_core testCompile library.java.slf4j_jdk14 - testCompileOnly library.java.findbugs_annotations } diff --git a/sdks/java/harness/build.gradle b/sdks/java/harness/build.gradle index 5eafe58dfae12..8a10650c55110 100644 --- a/sdks/java/harness/build.gradle +++ b/sdks/java/harness/build.gradle @@ -26,7 +26,7 @@ def dependOnProjects = [":beam-model-pipeline", ":beam-model-fn-execution", ":be ":beam-runners-core-java", ":beam-runners-core-construction-java"] apply plugin: org.apache.beam.gradle.BeamModulePlugin -applyJavaNature(failOnWarning: true, shadowClosure: DEFAULT_SHADOW_CLOSURE << +applyJavaNature(shadowClosure: DEFAULT_SHADOW_CLOSURE << // Create an uber jar without repackaging for the SDK harness // TODO: We have been releasing this in the past, consider not // releasing it since its typically bad practice to release 'all' @@ -49,7 +49,6 @@ dependencies { dependOnProjects.each { compile project(path: it, configuration: "shadow") } - compileOnly library.java.findbugs_annotations compile library.java.jackson_databind compile library.java.findbugs_jsr305 compile library.java.guava @@ -61,7 +60,6 @@ dependencies { compile library.java.joda_time compile library.java.slf4j_api provided library.java.error_prone_annotations - testCompileOnly library.java.findbugs_annotations testCompile library.java.hamcrest_core testCompile library.java.hamcrest_library testCompile library.java.junit diff --git a/sdks/java/io/amazon-web-services/build.gradle b/sdks/java/io/amazon-web-services/build.gradle index 467da252d3258..614efcef7d591 100644 --- a/sdks/java/io/amazon-web-services/build.gradle +++ b/sdks/java/io/amazon-web-services/build.gradle @@ -17,7 +17,7 @@ */ apply plugin: org.apache.beam.gradle.BeamModulePlugin -applyJavaNature(failOnWarning: true) +applyJavaNature() description = "Apache Beam :: SDKs :: Java :: IO :: Amazon Web Services" ext.summary = "IO library to read and write Amazon Web Services services from Beam." @@ -26,7 +26,6 @@ def aws_java_sdk_version = "1.11.319" dependencies { compile library.java.guava - compileOnly library.java.findbugs_annotations shadow project(path: ":beam-sdks-java-core", configuration: "shadow") shadow "com.amazonaws:aws-java-sdk-core:$aws_java_sdk_version" shadow "com.amazonaws:aws-java-sdk-s3:$aws_java_sdk_version" @@ -38,7 +37,6 @@ dependencies { runtime 'commons-codec:commons-codec:1.9' runtime "org.apache.httpcomponents:httpclient:4.5.2" testCompile project(path: ":beam-runners-direct-java", configuration: "shadow") - testCompileOnly library.java.findbugs_annotations shadowTest library.java.guava_testlib shadowTest library.java.hamcrest_core shadowTest library.java.hamcrest_library diff --git a/sdks/java/io/amqp/build.gradle b/sdks/java/io/amqp/build.gradle index b2b9ad3b1fda2..33cb8c0e15d48 100644 --- a/sdks/java/io/amqp/build.gradle +++ b/sdks/java/io/amqp/build.gradle @@ -17,14 +17,13 @@ */ apply plugin: org.apache.beam.gradle.BeamModulePlugin -applyJavaNature(failOnWarning: true) +applyJavaNature() description = "Apache Beam :: SDKs :: Java :: IO :: AMQP" ext.summary = "IO to read and write using AMQP 1.0 protocol (http://www.amqp.org)." dependencies { compile library.java.guava - compileOnly library.java.findbugs_annotations shadow project(path: ":beam-sdks-java-core", configuration: "shadow") shadow library.java.joda_time shadow library.java.findbugs_jsr305 @@ -38,5 +37,4 @@ dependencies { testCompile library.java.activemq_broker testCompile library.java.activemq_amqp testCompile library.java.activemq_junit - testCompileOnly library.java.findbugs_annotations } diff --git a/sdks/java/io/cassandra/build.gradle b/sdks/java/io/cassandra/build.gradle index 4bfc06b007e69..eb611fad3d4a8 100644 --- a/sdks/java/io/cassandra/build.gradle +++ b/sdks/java/io/cassandra/build.gradle @@ -17,7 +17,7 @@ */ apply plugin: org.apache.beam.gradle.BeamModulePlugin -applyJavaNature(failOnWarning: true) +applyJavaNature() provideIntegrationTestingDependencies() enableJavaPerformanceTesting() @@ -31,7 +31,6 @@ dependencies { shadow project(path: ":beam-sdks-java-core", configuration: "shadow") shadow library.java.slf4j_api shadow library.java.findbugs_jsr305 - compileOnly library.java.findbugs_annotations shadow "com.datastax.cassandra:cassandra-driver-core:$cassandra_version" shadow "com.datastax.cassandra:cassandra-driver-mapping:$cassandra_version" testCompile project(path: ":beam-runners-direct-java", configuration: "shadow") @@ -41,5 +40,4 @@ dependencies { testCompile library.java.hamcrest_library testCompile library.java.slf4j_jdk14 testCompile library.java.mockito_core - testCompileOnly library.java.findbugs_annotations } diff --git a/sdks/java/io/common/build.gradle b/sdks/java/io/common/build.gradle index 599ada0e0c09c..0dbb7907e9b5f 100644 --- a/sdks/java/io/common/build.gradle +++ b/sdks/java/io/common/build.gradle @@ -17,7 +17,7 @@ */ apply plugin: org.apache.beam.gradle.BeamModulePlugin -applyJavaNature(failOnWarning: true) +applyJavaNature() description = "Apache Beam :: SDKs :: Java :: IO :: Common" ext.summary = "Code used by all Beam IOs" @@ -26,6 +26,5 @@ dependencies { testCompile library.java.guava testCompile library.java.junit testCompile library.java.postgres - testCompileOnly library.java.findbugs_annotations shadowTest project(path: ":beam-sdks-java-core", configuration: "shadow") } diff --git a/sdks/java/io/elasticsearch-tests/elasticsearch-tests-2/build.gradle b/sdks/java/io/elasticsearch-tests/elasticsearch-tests-2/build.gradle index 1f3a406d51ca9..851b9681d3400 100644 --- a/sdks/java/io/elasticsearch-tests/elasticsearch-tests-2/build.gradle +++ b/sdks/java/io/elasticsearch-tests/elasticsearch-tests-2/build.gradle @@ -17,7 +17,7 @@ */ apply plugin: org.apache.beam.gradle.BeamModulePlugin -applyJavaNature(failOnWarning: true) +applyJavaNature() provideIntegrationTestingDependencies() enableJavaPerformanceTesting() @@ -46,5 +46,4 @@ dependencies { testCompile "org.elasticsearch.client:elasticsearch-rest-client:5.6.3" testCompile library.java.guava testCompile "org.elasticsearch:elasticsearch:$elastic_search_version" - testCompileOnly library.java.findbugs_annotations } diff --git a/sdks/java/io/elasticsearch-tests/elasticsearch-tests-5/build.gradle b/sdks/java/io/elasticsearch-tests/elasticsearch-tests-5/build.gradle index 306f2d1c8cbfd..c24add294373c 100644 --- a/sdks/java/io/elasticsearch-tests/elasticsearch-tests-5/build.gradle +++ b/sdks/java/io/elasticsearch-tests/elasticsearch-tests-5/build.gradle @@ -17,7 +17,7 @@ */ apply plugin: org.apache.beam.gradle.BeamModulePlugin -applyJavaNature(failOnWarning: true) +applyJavaNature() provideIntegrationTestingDependencies() enableJavaPerformanceTesting() @@ -63,5 +63,4 @@ dependencies { testCompile library.java.commons_io_1x testCompile library.java.junit testCompile "org.elasticsearch.client:elasticsearch-rest-client:$elastic_search_version" - testCompileOnly library.java.findbugs_annotations } diff --git a/sdks/java/io/elasticsearch-tests/elasticsearch-tests-common/build.gradle b/sdks/java/io/elasticsearch-tests/elasticsearch-tests-common/build.gradle index 3d50f1de9c338..6c0d3bb52e8d6 100644 --- a/sdks/java/io/elasticsearch-tests/elasticsearch-tests-common/build.gradle +++ b/sdks/java/io/elasticsearch-tests/elasticsearch-tests-common/build.gradle @@ -17,7 +17,7 @@ */ apply plugin: org.apache.beam.gradle.BeamModulePlugin -applyJavaNature(failOnWarning: true) +applyJavaNature() description = "Apache Beam :: SDKs :: Java :: IO :: Elasticsearch-Tests :: Common" ext.summary = "Common test classes for ElasticsearchIO" @@ -46,5 +46,4 @@ dependencies { testCompile library.java.commons_io_1x testCompile library.java.junit testCompile "org.elasticsearch.client:elasticsearch-rest-client:5.6.3" - testCompileOnly library.java.findbugs_annotations } diff --git a/sdks/java/io/elasticsearch/build.gradle b/sdks/java/io/elasticsearch/build.gradle index bf6811c6620f6..480e35fcf0932 100644 --- a/sdks/java/io/elasticsearch/build.gradle +++ b/sdks/java/io/elasticsearch/build.gradle @@ -17,14 +17,13 @@ */ apply plugin: org.apache.beam.gradle.BeamModulePlugin -applyJavaNature(failOnWarning: true) +applyJavaNature() description = "Apache Beam :: SDKs :: Java :: IO :: Elasticsearch" ext.summary = "IO to read and write on Elasticsearch" dependencies { compile library.java.guava - compileOnly library.java.findbugs_annotations shadow project(path: ":beam-sdks-java-core", configuration: "shadow") shadow library.java.jackson_databind shadow library.java.findbugs_jsr305 diff --git a/sdks/java/io/file-based-io-tests/build.gradle b/sdks/java/io/file-based-io-tests/build.gradle index e957c2fda26cd..26267833b6519 100644 --- a/sdks/java/io/file-based-io-tests/build.gradle +++ b/sdks/java/io/file-based-io-tests/build.gradle @@ -17,7 +17,7 @@ */ apply plugin: org.apache.beam.gradle.BeamModulePlugin -applyJavaNature(failOnWarning: true) +applyJavaNature() provideIntegrationTestingDependencies() enableJavaPerformanceTesting() @@ -25,7 +25,6 @@ description = "Apache Beam :: SDKs :: Java :: File-based-io-tests" ext.summary = "Integration tests for reading/writing using file-based sources/sinks." dependencies { - compileOnly library.java.findbugs_annotations shadowTest project(path: ":beam-sdks-java-core", configuration: "shadowTest") shadowTest project(path: ":beam-sdks-java-io-common", configuration: "shadowTest") shadowTest project(path: ":beam-sdks-java-io-xml", configuration: "shadowTest") @@ -34,5 +33,4 @@ dependencies { shadowTest library.java.junit shadowTest library.java.hamcrest_core shadowTest library.java.jaxb_api - testCompileOnly library.java.findbugs_annotations } diff --git a/sdks/java/io/google-cloud-platform/build.gradle b/sdks/java/io/google-cloud-platform/build.gradle index b70cb36db9fed..65f11aa50ee01 100644 --- a/sdks/java/io/google-cloud-platform/build.gradle +++ b/sdks/java/io/google-cloud-platform/build.gradle @@ -18,7 +18,6 @@ apply plugin: org.apache.beam.gradle.BeamModulePlugin applyJavaNature( - failOnWarning: true, enableFindbugs: false, // Override the default shading configuration to exclude everything since // Bigtable needs to expose Guava types. @@ -32,7 +31,6 @@ description = "Apache Beam :: SDKs :: Java :: IO :: Google Cloud Platform" ext.summary = "IO library to read and write Google Cloud Platform systems from Beam." dependencies { - compileOnly library.java.findbugs_annotations shadow project(path: ":beam-sdks-java-core", configuration: "shadow") shadow project(path: ":beam-sdks-java-extensions-google-cloud-platform-core", configuration: "shadow") shadow project(path: ":beam-sdks-java-extensions-protobuf", configuration: "shadow") @@ -70,7 +68,6 @@ dependencies { shadow library.java.proto_google_common_protos shadow library.java.grpc_all shadow library.java.netty_tcnative_boringssl_static - testCompileOnly library.java.findbugs_annotations shadowTest project(path: ":beam-sdks-java-core", configuration: "shadowTest") shadowTest project(path: ":beam-sdks-java-extensions-google-cloud-platform-core", configuration: "shadowTest") shadowTest project(path: ":beam-runners-direct-java", configuration: "shadow") diff --git a/sdks/java/io/hadoop-common/build.gradle b/sdks/java/io/hadoop-common/build.gradle index 341d1192a95ca..38245155e8106 100644 --- a/sdks/java/io/hadoop-common/build.gradle +++ b/sdks/java/io/hadoop-common/build.gradle @@ -17,13 +17,12 @@ */ apply plugin: org.apache.beam.gradle.BeamModulePlugin -applyJavaNature(failOnWarning: true) +applyJavaNature() description = "Apache Beam :: SDKs :: Java :: IO :: Hadoop Common" ext.summary = "Library to add shared Hadoop classes among Beam IOs." dependencies { - compileOnly library.java.findbugs_annotations shadow project(path: ":beam-sdks-java-core", configuration: "shadow") shadow library.java.findbugs_jsr305 provided library.java.hadoop_client @@ -33,5 +32,4 @@ dependencies { testCompile library.java.hamcrest_core testCompile library.java.hamcrest_library testCompile library.java.junit - testCompileOnly library.java.findbugs_annotations } diff --git a/sdks/java/io/hadoop-file-system/build.gradle b/sdks/java/io/hadoop-file-system/build.gradle index b821b38e18a2f..ddd0a6f521a8e 100644 --- a/sdks/java/io/hadoop-file-system/build.gradle +++ b/sdks/java/io/hadoop-file-system/build.gradle @@ -17,14 +17,13 @@ */ apply plugin: org.apache.beam.gradle.BeamModulePlugin -applyJavaNature(failOnWarning: true) +applyJavaNature() description = "Apache Beam :: SDKs :: Java :: IO :: Hadoop File System" ext.summary = "Library to read and write Hadoop/HDFS file formats from Beam." dependencies { compile library.java.guava - compileOnly library.java.findbugs_annotations shadow project(path: ":beam-sdks-java-core", configuration: "shadow") shadow library.java.jackson_core shadow library.java.jackson_databind @@ -42,5 +41,4 @@ dependencies { testCompile library.java.junit testCompile library.java.hadoop_minicluster testCompile library.java.hadoop_hdfs_tests - testCompileOnly library.java.findbugs_annotations } diff --git a/sdks/java/io/hadoop-input-format/build.gradle b/sdks/java/io/hadoop-input-format/build.gradle index 95e6c71576dd5..54dd2b0a742f6 100644 --- a/sdks/java/io/hadoop-input-format/build.gradle +++ b/sdks/java/io/hadoop-input-format/build.gradle @@ -17,7 +17,7 @@ */ apply plugin: org.apache.beam.gradle.BeamModulePlugin -applyJavaNature(failOnWarning: true) +applyJavaNature() provideIntegrationTestingDependencies() enableJavaPerformanceTesting() @@ -41,7 +41,6 @@ configurations.testRuntimeClasspath { dependencies { shadow project(path: ":beam-sdks-java-core", configuration: "shadow") compile library.java.guava - compileOnly library.java.findbugs_annotations shadow library.java.slf4j_api shadow library.java.findbugs_jsr305 shadow project(path: ":beam-sdks-java-io-hadoop-common", configuration: "shadow") @@ -77,7 +76,6 @@ dependencies { testCompile library.java.hamcrest_core testCompile library.java.hamcrest_library shadow library.java.commons_io_2x - testCompileOnly library.java.findbugs_annotations } // The cassandra.yaml file currently assumes "target/..." exists. diff --git a/sdks/java/io/hbase/build.gradle b/sdks/java/io/hbase/build.gradle index 765dc1399062b..e8944b8dfcbbb 100644 --- a/sdks/java/io/hbase/build.gradle +++ b/sdks/java/io/hbase/build.gradle @@ -17,7 +17,7 @@ */ apply plugin: org.apache.beam.gradle.BeamModulePlugin -applyJavaNature(failOnWarning: true) +applyJavaNature() provideIntegrationTestingDependencies() enableJavaPerformanceTesting() @@ -38,7 +38,6 @@ def hbase_version = "1.2.6" dependencies { compile library.java.guava - compileOnly library.java.findbugs_annotations shadow project(path: ":beam-sdks-java-core", configuration: "shadow") shadow project(path: ":beam-sdks-java-io-hadoop-common", configuration: "shadow") shadow library.java.findbugs_jsr305 @@ -67,6 +66,5 @@ dependencies { } testCompile "org.apache.hbase:hbase-hadoop-compat:$hbase_version:tests" testCompile "org.apache.hbase:hbase-hadoop2-compat:$hbase_version:tests" - testCompileOnly library.java.findbugs_annotations } diff --git a/sdks/java/io/hcatalog/build.gradle b/sdks/java/io/hcatalog/build.gradle index 04208ac6315cd..05b879786037c 100644 --- a/sdks/java/io/hcatalog/build.gradle +++ b/sdks/java/io/hcatalog/build.gradle @@ -17,7 +17,7 @@ */ apply plugin: org.apache.beam.gradle.BeamModulePlugin -applyJavaNature(failOnWarning: true) +applyJavaNature() description = "Apache Beam :: SDKs :: Java :: IO :: HCatalog" ext.summary = "IO to read and write for HCatalog source." @@ -42,7 +42,6 @@ evaluationDependsOn(":beam-sdks-java-io-common") dependencies { compile library.java.guava - compileOnly library.java.findbugs_annotations shadow project(path: ":beam-sdks-java-core", configuration: "shadow") shadow project(path: ":beam-sdks-java-io-hadoop-common", configuration: "shadow") shadow library.java.slf4j_api @@ -71,6 +70,5 @@ dependencies { testCompile "org.apache.hive:hive-exec:$hive_version" testCompile "org.apache.hive:hive-common:$hive_version" testCompile "org.apache.hive:hive-cli:$hive_version" - testCompileOnly library.java.findbugs_annotations } diff --git a/sdks/java/io/jdbc/build.gradle b/sdks/java/io/jdbc/build.gradle index 444c5b915cdd4..4a6a7b1116f2f 100644 --- a/sdks/java/io/jdbc/build.gradle +++ b/sdks/java/io/jdbc/build.gradle @@ -17,7 +17,7 @@ */ apply plugin: org.apache.beam.gradle.BeamModulePlugin -applyJavaNature(failOnWarning: true, enableFindbugs: false) +applyJavaNature(enableFindbugs: false) provideIntegrationTestingDependencies() enableJavaPerformanceTesting() @@ -26,7 +26,6 @@ ext.summary = "IO to read and write on JDBC datasource." dependencies { compile library.java.guava - compileOnly library.java.findbugs_annotations shadow project(path: ":beam-sdks-java-core", configuration: "shadow") shadow library.java.findbugs_jsr305 shadow "org.apache.commons:commons-dbcp2:2.1.1" @@ -43,5 +42,4 @@ dependencies { testCompile group: "org.apache.derby", name: "derby", version:"10.12.1.1" testCompile group: "org.apache.derby", name: "derbyclient", version:"10.12.1.1" testCompile group: "org.apache.derby", name: "derbynet", version:"10.12.1.1" - testCompileOnly library.java.findbugs_annotations } diff --git a/sdks/java/io/jms/build.gradle b/sdks/java/io/jms/build.gradle index c82a06c782661..85248c53e5038 100644 --- a/sdks/java/io/jms/build.gradle +++ b/sdks/java/io/jms/build.gradle @@ -17,7 +17,7 @@ */ apply plugin: org.apache.beam.gradle.BeamModulePlugin -applyJavaNature(failOnWarning: true) +applyJavaNature() description = "Apache Beam :: SDKs :: Java :: IO :: JMS" ext.summary = """IO to read and write to JMS (Java Messaging Service) @@ -25,7 +25,6 @@ destinations (queues and topics).""" dependencies { compile library.java.guava - compileOnly library.java.findbugs_annotations shadow project(path: ":beam-sdks-java-core", configuration: "shadow") shadow library.java.slf4j_api shadow library.java.joda_time @@ -40,5 +39,4 @@ dependencies { testCompile library.java.hamcrest_core testCompile library.java.hamcrest_library testCompile library.java.slf4j_jdk14 - testCompileOnly library.java.findbugs_annotations } diff --git a/sdks/java/io/kafka/build.gradle b/sdks/java/io/kafka/build.gradle index 07db554afef69..b03c644e62451 100644 --- a/sdks/java/io/kafka/build.gradle +++ b/sdks/java/io/kafka/build.gradle @@ -17,14 +17,13 @@ */ apply plugin: org.apache.beam.gradle.BeamModulePlugin -applyJavaNature(failOnWarning: true, enableFindbugs: false) +applyJavaNature(enableFindbugs: false) description = "Apache Beam :: SDKs :: Java :: IO :: Kafka" ext.summary = "Library to read Kafka topics." dependencies { compile library.java.guava - compileOnly library.java.findbugs_annotations shadow project(path: ":beam-sdks-java-core", configuration: "shadow") shadow library.java.kafka_clients shadow library.java.slf4j_api @@ -39,5 +38,4 @@ dependencies { testCompile library.java.hamcrest_library testCompile library.java.junit testCompile library.java.slf4j_jdk14 - testCompileOnly library.java.findbugs_annotations } diff --git a/sdks/java/io/kinesis/build.gradle b/sdks/java/io/kinesis/build.gradle index d7444be5c4d10..ed32f04ba3f45 100644 --- a/sdks/java/io/kinesis/build.gradle +++ b/sdks/java/io/kinesis/build.gradle @@ -17,7 +17,7 @@ */ apply plugin: org.apache.beam.gradle.BeamModulePlugin -applyJavaNature(failOnWarning: true) +applyJavaNature() provideIntegrationTestingDependencies() enableJavaPerformanceTesting() @@ -32,7 +32,6 @@ test { def aws_version = "1.11.255" dependencies { - compileOnly library.java.findbugs_annotations shadow project(path: ":beam-sdks-java-core", configuration: "shadow") shadow library.java.guava shadow library.java.slf4j_api @@ -53,5 +52,4 @@ dependencies { testCompile library.java.hamcrest_library testCompile library.java.slf4j_jdk14 testCompile "org.assertj:assertj-core:2.5.0" - testCompileOnly library.java.findbugs_annotations } diff --git a/sdks/java/io/mongodb/build.gradle b/sdks/java/io/mongodb/build.gradle index 31fb189169e4d..92b5d0d345976 100644 --- a/sdks/java/io/mongodb/build.gradle +++ b/sdks/java/io/mongodb/build.gradle @@ -17,7 +17,7 @@ */ apply plugin: org.apache.beam.gradle.BeamModulePlugin -applyJavaNature(failOnWarning: true) +applyJavaNature() provideIntegrationTestingDependencies() enableJavaPerformanceTesting() @@ -26,7 +26,6 @@ ext.summary = "IO to read and write on MongoDB." dependencies { compile library.java.guava - compileOnly library.java.findbugs_annotations shadow project(path: ":beam-sdks-java-core", configuration: "shadow") shadow library.java.slf4j_api shadow library.java.findbugs_jsr305 @@ -41,5 +40,4 @@ dependencies { testCompile project(path: ":beam-sdks-java-io-common", configuration: "shadowTest") testCompile "de.flapdoodle.embed:de.flapdoodle.embed.mongo:1.50.1" testCompile "de.flapdoodle.embed:de.flapdoodle.embed.process:1.50.1" - testCompileOnly library.java.findbugs_annotations } diff --git a/sdks/java/io/mqtt/build.gradle b/sdks/java/io/mqtt/build.gradle index 88bb5d348375c..e61bf188a0421 100644 --- a/sdks/java/io/mqtt/build.gradle +++ b/sdks/java/io/mqtt/build.gradle @@ -17,14 +17,13 @@ */ apply plugin: org.apache.beam.gradle.BeamModulePlugin -applyJavaNature(failOnWarning: true) +applyJavaNature() description = "Apache Beam :: SDKs :: Java :: IO :: MQTT" ext.summary = "IO to read and write to a MQTT broker." dependencies { compile library.java.guava - compileOnly library.java.findbugs_annotations shadow project(path: ":beam-sdks-java-core", configuration: "shadow") shadow library.java.slf4j_api shadow library.java.joda_time @@ -39,5 +38,4 @@ dependencies { testCompile library.java.hamcrest_core testCompile library.java.hamcrest_library testCompile library.java.slf4j_jdk14 - testCompileOnly library.java.findbugs_annotations } diff --git a/sdks/java/io/parquet/build.gradle b/sdks/java/io/parquet/build.gradle index cf8585a258be2..5b149f5962440 100644 --- a/sdks/java/io/parquet/build.gradle +++ b/sdks/java/io/parquet/build.gradle @@ -17,7 +17,7 @@ */ apply plugin: org.apache.beam.gradle.BeamModulePlugin -applyJavaNature(failOnWarning: true) +applyJavaNature() description = "Apache Beam :: SDKs :: Java :: IO :: Parquet" ext.summary = "IO to read and write on Parquet storage format." @@ -26,7 +26,6 @@ def parquet_version = "1.10.0" dependencies { compile library.java.guava - compileOnly library.java.findbugs_annotations shadow project(path: ":beam-sdks-java-core", configuration: "shadow") shadow library.java.slf4j_api shadow library.java.findbugs_jsr305 @@ -42,5 +41,4 @@ dependencies { testCompile library.java.hamcrest_core testCompile library.java.hamcrest_library testCompile library.java.slf4j_jdk14 - testCompileOnly library.java.findbugs_annotations } diff --git a/sdks/java/io/redis/build.gradle b/sdks/java/io/redis/build.gradle index 2e16df8c08905..b424254c677f0 100644 --- a/sdks/java/io/redis/build.gradle +++ b/sdks/java/io/redis/build.gradle @@ -17,14 +17,13 @@ */ apply plugin: org.apache.beam.gradle.BeamModulePlugin -applyJavaNature(failOnWarning: true) +applyJavaNature() description = "Apache Beam :: SDKs :: Java :: IO :: Redis" ext.summary ="IO to read and write on a Redis keystore." dependencies { compile library.java.guava - compileOnly library.java.findbugs_annotations shadow project(path: ":beam-sdks-java-core", configuration: "shadow") shadow library.java.findbugs_jsr305 shadow "redis.clients:jedis:2.9.0" @@ -34,5 +33,4 @@ dependencies { testCompile library.java.hamcrest_core testCompile library.java.hamcrest_library testCompile "com.github.kstyrc:embedded-redis:0.6" - testCompileOnly library.java.findbugs_annotations } diff --git a/sdks/java/io/solr/build.gradle b/sdks/java/io/solr/build.gradle index 5ee6ab76e0b77..1a9f541602e14 100644 --- a/sdks/java/io/solr/build.gradle +++ b/sdks/java/io/solr/build.gradle @@ -17,7 +17,7 @@ */ apply plugin: org.apache.beam.gradle.BeamModulePlugin -applyJavaNature(failOnWarning: true) +applyJavaNature() description = "Apache Beam :: SDKs :: Java :: IO :: Solr" ext.summary = "IO to read and write from/to Solr." @@ -29,7 +29,6 @@ dependencies { shadow library.java.commons_compress shadow "org.apache.solr:solr-solrj:5.5.4" compileOnly "org.apache.httpcomponents:httpclient:4.4.1" - compileOnly library.java.findbugs_annotations testCompile project(path: ":beam-sdks-java-core", configuration: "shadowTest") testCompile project(path: ":beam-sdks-java-io-common", configuration: "shadow") testCompile project(path: ":beam-runners-direct-java", configuration: "shadow") @@ -40,6 +39,5 @@ dependencies { testCompile "org.apache.solr:solr-test-framework:5.5.4" testCompile "org.apache.solr:solr-core:5.5.4" testCompile "com.carrotsearch.randomizedtesting:randomizedtesting-runner:2.3.2" - testCompileOnly library.java.findbugs_annotations shadowTest library.java.slf4j_jdk14 } diff --git a/sdks/java/io/tika/build.gradle b/sdks/java/io/tika/build.gradle index e664f1003bc7b..daadaca4f6b30 100644 --- a/sdks/java/io/tika/build.gradle +++ b/sdks/java/io/tika/build.gradle @@ -17,7 +17,7 @@ */ apply plugin: org.apache.beam.gradle.BeamModulePlugin -applyJavaNature(failOnWarning: true) +applyJavaNature() description = "Apache Beam :: SDKs :: Java :: IO :: Tika" ext.summary = "Tika Input to parse files." @@ -27,7 +27,6 @@ def bndlib_version = "1.43.0" dependencies { compile library.java.guava - compileOnly library.java.findbugs_annotations compileOnly "biz.aQute:bndlib:$bndlib_version" shadow project(path: ":beam-sdks-java-core", configuration: "shadow") shadow library.java.findbugs_jsr305 @@ -38,6 +37,5 @@ dependencies { testCompile library.java.hamcrest_core testCompile library.java.hamcrest_library testCompile "org.apache.tika:tika-parsers:$tika_version" - testCompileOnly library.java.findbugs_annotations testCompileOnly "biz.aQute:bndlib:$bndlib_version" } diff --git a/sdks/java/io/xml/build.gradle b/sdks/java/io/xml/build.gradle index fb12da53359f6..25c70a0e2bc6d 100644 --- a/sdks/java/io/xml/build.gradle +++ b/sdks/java/io/xml/build.gradle @@ -17,14 +17,13 @@ */ apply plugin: org.apache.beam.gradle.BeamModulePlugin -applyJavaNature(failOnWarning: true) +applyJavaNature() description = "Apache Beam :: SDKs :: Java :: IO :: XML" ext.summary = "IO to read and write XML files." dependencies { compile library.java.guava - compileOnly library.java.findbugs_annotations shadow project(path: ":beam-sdks-java-core", configuration: "shadow") shadow library.java.stax2_api shadow library.java.findbugs_jsr305 @@ -36,5 +35,4 @@ dependencies { testCompile library.java.slf4j_jdk14 testCompile library.java.hamcrest_core testCompile library.java.hamcrest_library - testCompileOnly library.java.findbugs_annotations } diff --git a/sdks/java/nexmark/build.gradle b/sdks/java/nexmark/build.gradle index c19cc72b45856..0e2031d33b35f 100644 --- a/sdks/java/nexmark/build.gradle +++ b/sdks/java/nexmark/build.gradle @@ -17,7 +17,7 @@ */ apply plugin: org.apache.beam.gradle.BeamModulePlugin -applyJavaNature(failOnWarning: true) +applyJavaNature() description = "Apache Beam :: SDKs :: Java :: Nexmark" @@ -43,7 +43,6 @@ configurations { dependencies { compile library.java.guava - compileOnly library.java.findbugs_annotations shadow project(path: ":beam-sdks-java-core", configuration: "shadow") shadow project(path: ":beam-sdks-java-io-google-cloud-platform", configuration: "shadow") shadow project(path: ":beam-sdks-java-extensions-google-cloud-platform-core", configuration: "shadow") @@ -68,8 +67,6 @@ dependencies { testCompile library.java.hamcrest_core testCompile library.java.hamcrest_library - testCompileOnly library.java.findbugs_annotations - gradleRun project(path: project.path, configuration: "shadow") gradleRun project(path: nexmarkRunnerDependency, configuration: "shadow")