Ban hamcrest-all/mockito-all and migrate to hamcrest-core/mockito-core since...

Ban hamcrest-all/mockito-all and migrate to hamcrest-core/mockito-core since the yyy-all packages bundle older classes from other test libraries causing classpath ordering issues during test execution.

build.gradle

@@ -100,8 +100,8 @@ ext.library = [
     hadoop_minicluster: "org.apache.hadoop:hadoop-minicluster:$hadoop_version",
     hadoop_hdfs: "org.apache.hadoop:hadoop-hdfs:$hadoop_version",
     hadoop_hdfs_tests: "org.apache.hadoop:hadoop-hdfs:$hadoop_version:tests",
-    hamcrest_all: "org.hamcrest:hamcrest-all:$hamcrest_version",
     hamcrest_core: "org.hamcrest:hamcrest-core:$hamcrest_version",
+    hamcrest_library: "org.hamcrest:hamcrest-library:$hamcrest_version",
     jackson_annotations: "com.fasterxml.jackson.core:jackson-annotations:$jackson_version",
     jackson_core: "com.fasterxml.jackson.core:jackson-core:$jackson_version",
     jackson_databind: "com.fasterxml.jackson.core:jackson-databind:$jackson_version",
@@ -111,7 +111,7 @@ ext.library = [
     junit: "junit:junit:4.12",
     kafka_clients: "org.apache.kafka:kafka-clients:0.10.1.0",
     malhar_library: "org.apache.apex:malhar-library:3.4.0",
-    mockito_all: "org.mockito:mockito-all:1.9.5",
+    mockito_core: "org.mockito:mockito-core:1.9.5",
     netty_handler: "io.netty:netty-handler:$netty_version",
     netty_tcnative_boringssl_static: "io.netty:netty-tcnative-boringssl-static:1.1.33.Fork26",
     netty_transport_native_epoll: "io.netty:netty-transport-native-epoll:$netty_version",

build_rules.gradle

@@ -125,8 +125,15 @@ ext.applyJavaNature = {
 
   // Ban these dependencies from all configurations
   configurations.all {
+    // This is banned because it brings in classes which conflict with guava
     exclude group: "com.google.guava", module: "guava-jdk5"
+    // Ban the usage of the JDK tools as a library as this is system dependent
     exclude group: "jdk.tools", module: "jdk.tools"
+    // Exclude these test dependencies because they bundle other common
+    // test libraries classes causing version conflicts. Users should rely
+    // on using the yyy-core package instead of the yyy-all package.
+    exclude group: "org.hamcrest", module: "hamcrest-all"
+    exclude group: "org.mockito", module: "mockito-all"
   }
 
   // Force usage of the libraries defined within our common set

examples/java/build.gradle

@@ -51,9 +51,9 @@ dependencies {
   runtime project(":beam-runners-parent:beam-runners-direct-java")
   runtime library.java.slf4j_jdk14
   testCompile project(":beam-sdks-parent:beam-sdks-java-parent:beam-sdks-java-io-parent:beam-sdks-java-io-google-cloud-platform").sourceSets.test.output
-  testCompile library.java.hamcrest_all
+  testCompile library.java.hamcrest_core
   testCompile library.java.junit
-  testCompile library.java.mockito_all
+  testCompile library.java.mockito_core
 }
 
 task packageTests(type: Jar) {

examples/java8/build.gradle

@@ -37,8 +37,8 @@ dependencies {
   compile library.java.google_api_client
   runtime project(":beam-runners-parent:beam-runners-direct-java")
   runtime library.java.slf4j_jdk14
-  testCompile library.java.hamcrest_all
-  testCompile library.java.mockito_all
+  testCompile library.java.hamcrest_core
+  testCompile library.java.mockito_core
   testCompile library.java.junit
 }
 

runners/apex/build.gradle

@@ -46,9 +46,9 @@ dependencies {
   testCompile project(":beam-sdks-parent:beam-sdks-java-parent:beam-sdks-java-core").sourceSets.test.output
   testCompile project(":beam-model-parent:beam-model-fn-execution").sourceSets.test.output
   testCompile project(":beam-runners-parent:beam-runners-core-java").sourceSets.test.output
-  testCompile library.java.hamcrest_all
+  testCompile library.java.hamcrest_core
   testCompile library.java.junit
-  testCompile library.java.mockito_all
+  testCompile library.java.mockito_core
   testCompile library.java.jackson_dataformat_yaml
 }
 

runners/core-construction-java/build.gradle

@@ -44,9 +44,9 @@ dependencies {
   compile library.java.slf4j_api
   compile library.java.grpc_core
   compile library.java.grpc_stub
-  testCompile library.java.hamcrest_all
+  testCompile library.java.hamcrest_core
   testCompile library.java.junit
-  testCompile library.java.mockito_all
+  testCompile library.java.mockito_core
 }
 
 task packageTests(type: Jar) {

runners/core-java/build.gradle

@@ -50,8 +50,8 @@ dependencies {
   compile library.java.joda_time
   compile library.java.slf4j_api
   testCompile project(":beam-sdks-parent:beam-sdks-java-parent:beam-sdks-java-core").sourceSets.test.output
-  testCompile library.java.hamcrest_all
-  testCompile library.java.mockito_all
+  testCompile library.java.hamcrest_core
+  testCompile library.java.mockito_core
   testCompile library.java.junit
   testCompile library.java.slf4j_jdk14
   testCompile library.java.jackson_dataformat_yaml

runners/direct-java/build.gradle

@@ -41,14 +41,14 @@ dependencies {
   compile library.java.joda_time
   compile library.java.findbugs_jsr305
   compile library.java.slf4j_api
-  compileOnly library.java.hamcrest_all
-  compileOnly library.java.junit
+  provided library.java.hamcrest_core
+  provided library.java.junit
   testCompile project(":beam-sdks-parent:beam-sdks-java-parent:beam-sdks-java-core").sourceSets.test.output
   testCompile project(":beam-runners-parent:beam-runners-core-java").sourceSets.test.output
   testCompile project(":beam-model-parent:beam-model-fn-execution").sourceSets.test.output
   testCompile library.java.guava_testlib
   testCompile library.java.slf4j_jdk14
-  testCompile library.java.mockito_all
+  testCompile library.java.mockito_core
   testCompile library.java.stax2_api
   testCompile library.java.woodstox_core_asl
   testCompile library.java.google_cloud_dataflow_java_proto_library_all

runners/flink/build.gradle

@@ -62,9 +62,9 @@ dependencies {
   testCompile project(":beam-model-parent:beam-model-fn-execution").sourceSets.test.output
   testCompile project(":beam-runners-parent:beam-runners-core-java").sourceSets.test.output
   testCompile library.java.commons_lang3
-  testCompile library.java.hamcrest_all
+  testCompile library.java.hamcrest_core
   testCompile library.java.junit
-  testCompile library.java.mockito_all
+  testCompile library.java.mockito_core
   testCompile library.java.google_api_services_bigquery
   testCompile library.java.jackson_dataformat_yaml
   testCompile "org.apache.flink:flink-core:$flink_version:tests"

runners/gearpump/build.gradle

@@ -37,10 +37,10 @@ dependencies {
   compileOnly "org.scala-lang:scala-library:2.11.8"
   testCompile project(":beam-sdks-parent:beam-sdks-java-parent:beam-sdks-java-core")
   testCompile library.java.junit
-  testCompile library.java.hamcrest_all
+  testCompile library.java.hamcrest_core
   testCompile library.java.jackson_databind
   testCompile library.java.jackson_dataformat_yaml
-  testCompile library.java.mockito_all
+  testCompile library.java.mockito_core
 }
 
 task packageTests(type: Jar) {

runners/google-cloud-dataflow-java/build.gradle

@@ -70,7 +70,7 @@ dependencies {
   compile library.java.jackson_annotations
   compile library.java.jackson_databind
   compile library.java.slf4j_api
-  testCompile library.java.hamcrest_all
+  testCompile library.java.hamcrest_core
   testCompile library.java.junit
   testCompile project(":beam-sdks-parent:beam-sdks-java-parent:beam-sdks-java-io-parent:beam-sdks-java-io-google-cloud-platform").sourceSets.test.output
   testCompile project(":beam-sdks-parent:beam-sdks-java-parent:beam-sdks-java-core").sourceSets.test.output
@@ -78,7 +78,7 @@ dependencies {
   testCompile project(":beam-model-parent:beam-model-fn-execution").sourceSets.test.output
   testCompile library.java.guava_testlib
   testCompile library.java.slf4j_jdk14
-  testCompile library.java.mockito_all
+  testCompile library.java.mockito_core
   testCompile library.java.google_cloud_dataflow_java_proto_library_all
   testCompile library.java.datastore_v1_protos
   testCompile library.java.jackson_dataformat_yaml

runners/local-artifact-service-java/build.gradle

@@ -29,8 +29,9 @@ dependencies {
   compile library.java.grpc_stub
   compile library.java.protobuf_java
   compile library.java.slf4j_api
-  testCompile library.java.hamcrest_all
-  testCompile library.java.mockito_all
+  testCompile library.java.hamcrest_core
+  testCompile library.java.hamcrest_library
+  testCompile library.java.mockito_core
   testCompile library.java.junit
   testCompile library.java.slf4j_jdk14
 }

runners/spark/build.gradle

@@ -52,7 +52,7 @@ dependencies {
   provided library.java.commons_compress
   provided library.java.commons_lang3
   provided library.java.commons_io_2x
-  provided library.java.hamcrest_all
+  provided library.java.hamcrest_core
   provided "org.apache.zookeeper:zookeeper:3.4.6"
   provided "org.scala-lang:scala-library:2.10.5"
   provided "com.esotericsoftware.kryo:kryo:2.21"
@@ -63,7 +63,7 @@ dependencies {
   testCompile library.java.avro
   testCompile library.java.kafka_clients
   testCompile library.java.junit
-  testCompile library.java.mockito_all
+  testCompile library.java.mockito_core
   testCompile library.java.jackson_dataformat_yaml
   testCompile "org.apache.kafka:kafka_2.10:0.9.0.1"
 }

sdks/java/core/build.gradle

@@ -52,14 +52,15 @@ dependencies {
   compile library.java.commons_compress
   compile library.java.commons_lang3
   compile library.java.joda_time
-  compile library.java.hamcrest_all
+  compile library.java.hamcrest_core
+  compile library.java.hamcrest_library
   compile library.java.junit
   runtime "org.tukaani:xz:1.5"
   testCompile project(":beam-model-parent:beam-model-fn-execution")
   testCompile library.java.guava_testlib
   testCompile library.java.jackson_dataformat_yaml
   testCompile library.java.slf4j_jdk14
-  testCompile library.java.mockito_all
+  testCompile library.java.mockito_core
   testCompile "com.esotericsoftware.kryo:kryo:2.21"
 }
 

sdks/java/extensions/google-cloud-platform-core/build.gradle

@@ -55,11 +55,11 @@ dependencies {
   compile library.java.joda_time
   compile library.java.jackson_annotations
   compile library.java.jackson_databind
-  compileOnly library.java.hamcrest_all
+  compileOnly library.java.hamcrest_core
   compileOnly library.java.junit
   testCompile project(":beam-sdks-parent:beam-sdks-java-parent:beam-sdks-java-core").sourceSets.test.output
   testCompile library.java.guava_testlib
-  testCompile library.java.mockito_all
+  testCompile library.java.mockito_core
   testCompile library.java.slf4j_jdk14
 }
 

sdks/java/extensions/jackson/build.gradle

@@ -26,7 +26,7 @@ dependencies {
   compile library.java.jackson_databind
   compile library.java.guava
   testCompile project(":beam-runners-parent:beam-runners-direct-java")
-  testCompile library.java.hamcrest_all
+  testCompile library.java.hamcrest_core
   testCompile library.java.junit
 }
 

sdks/java/extensions/join-library/build.gradle

@@ -25,7 +25,7 @@ dependencies {
   compile project(":beam-sdks-parent:beam-sdks-java-parent:beam-sdks-java-core")
   compile library.java.guava
   testCompile project(":beam-runners-parent:beam-runners-direct-java")
-  testCompile library.java.hamcrest_all
+  testCompile library.java.hamcrest_core
   testCompile library.java.junit
 }
 

sdks/java/extensions/protobuf/build.gradle

@@ -27,8 +27,8 @@ dependencies {
   compile library.java.protobuf_java
   compile library.java.guava
   testCompile project(":beam-sdks-parent:beam-sdks-java-parent:beam-sdks-java-core")
-  testCompile library.java.hamcrest_all
-  testCompile library.java.mockito_all
+  testCompile library.java.hamcrest_core
+  testCompile library.java.mockito_core
   testCompile library.java.junit
   testCompile library.java.slf4j_jdk14
 }

sdks/java/extensions/sorter/build.gradle

@@ -27,8 +27,8 @@ dependencies {
   provided library.java.hadoop_mapreduce_client_core
   provided library.java.hadoop_common
   testCompile project(":beam-runners-parent:beam-runners-direct-java")
-  testCompile library.java.hamcrest_all
-  testCompile library.java.mockito_all
+  testCompile library.java.hamcrest_core
+  testCompile library.java.mockito_core
   testCompile library.java.junit
 }
 

sdks/java/extensions/sql/build.gradle

@@ -44,7 +44,7 @@ dependencies {
   runtime project(":beam-runners-parent:beam-runners-direct-java")
   testCompile library.java.slf4j_jdk14
   testCompile library.java.junit
-  testCompile library.java.hamcrest_all
+  testCompile library.java.hamcrest_core
 }
 
 task packageTests(type: Jar) {