You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@beam.apache.org by lc...@apache.org on 2017/11/17 22:29:56 UTC
[25/50] [abbrv] beam git commit: 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.
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.
Project: http://git-wip-us.apache.org/repos/asf/beam/repo
Commit: http://git-wip-us.apache.org/repos/asf/beam/commit/afba5cb9
Tree: http://git-wip-us.apache.org/repos/asf/beam/tree/afba5cb9
Diff: http://git-wip-us.apache.org/repos/asf/beam/diff/afba5cb9
Branch: refs/heads/master
Commit: afba5cb98770e587764f004ab7828dd590d5bff3
Parents: e939146
Author: Luke Cwik <lc...@google.com>
Authored: Fri Nov 3 12:11:48 2017 -0700
Committer: Luke Cwik <lc...@google.com>
Committed: Fri Nov 17 14:27:15 2017 -0800
----------------------------------------------------------------------
build.gradle | 4 ++--
build_rules.gradle | 7 +++++++
examples/java/build.gradle | 4 ++--
examples/java8/build.gradle | 4 ++--
runners/apex/build.gradle | 4 ++--
runners/core-construction-java/build.gradle | 4 ++--
runners/core-java/build.gradle | 4 ++--
runners/direct-java/build.gradle | 6 +++---
runners/flink/build.gradle | 4 ++--
runners/gearpump/build.gradle | 4 ++--
runners/google-cloud-dataflow-java/build.gradle | 4 ++--
runners/local-artifact-service-java/build.gradle | 5 +++--
runners/spark/build.gradle | 4 ++--
sdks/java/core/build.gradle | 5 +++--
sdks/java/extensions/google-cloud-platform-core/build.gradle | 4 ++--
sdks/java/extensions/jackson/build.gradle | 2 +-
sdks/java/extensions/join-library/build.gradle | 2 +-
sdks/java/extensions/protobuf/build.gradle | 4 ++--
sdks/java/extensions/sorter/build.gradle | 4 ++--
sdks/java/extensions/sql/build.gradle | 2 +-
sdks/java/harness/build.gradle | 4 ++--
sdks/java/io/amqp/build.gradle | 2 +-
sdks/java/io/cassandra/build.gradle | 3 +--
.../io/elasticsearch-tests/elasticsearch-tests-2/build.gradle | 2 +-
.../io/elasticsearch-tests/elasticsearch-tests-5/build.gradle | 2 +-
.../elasticsearch-tests-common/build.gradle | 2 +-
sdks/java/io/google-cloud-platform/build.gradle | 4 ++--
sdks/java/io/hadoop-common/build.gradle | 2 +-
sdks/java/io/hadoop-file-system/build.gradle | 4 ++--
sdks/java/io/hadoop/input-format/build.gradle | 4 ++--
sdks/java/io/hadoop/jdk1.8-tests/build.gradle | 4 ++--
sdks/java/io/hbase/build.gradle | 2 +-
sdks/java/io/hcatalog/build.gradle | 2 +-
sdks/java/io/jdbc/build.gradle | 2 +-
sdks/java/io/jms/build.gradle | 2 +-
sdks/java/io/kafka/build.gradle | 2 +-
sdks/java/io/kinesis/build.gradle | 4 ++--
sdks/java/io/mongodb/build.gradle | 2 +-
sdks/java/io/mqtt/build.gradle | 2 +-
sdks/java/io/redis/build.gradle | 2 +-
sdks/java/io/solr/build.gradle | 1 -
sdks/java/io/tika/build.gradle | 1 -
sdks/java/io/xml/build.gradle | 1 -
sdks/java/java8tests/build.gradle | 2 +-
sdks/java/nexmark/build.gradle | 2 +-
45 files changed, 73 insertions(+), 68 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/beam/blob/afba5cb9/build.gradle
----------------------------------------------------------------------
diff --git a/build.gradle b/build.gradle
index 22d8ce0..316e2d5 100644
--- a/build.gradle
+++ b/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",
http://git-wip-us.apache.org/repos/asf/beam/blob/afba5cb9/build_rules.gradle
----------------------------------------------------------------------
diff --git a/build_rules.gradle b/build_rules.gradle
index 3c10cbd..de6ce43 100644
--- a/build_rules.gradle
+++ b/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
http://git-wip-us.apache.org/repos/asf/beam/blob/afba5cb9/examples/java/build.gradle
----------------------------------------------------------------------
diff --git a/examples/java/build.gradle b/examples/java/build.gradle
index 2d3fe44..c806bf6 100644
--- a/examples/java/build.gradle
+++ b/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) {
http://git-wip-us.apache.org/repos/asf/beam/blob/afba5cb9/examples/java8/build.gradle
----------------------------------------------------------------------
diff --git a/examples/java8/build.gradle b/examples/java8/build.gradle
index 95cc50e..eb0d52d 100644
--- a/examples/java8/build.gradle
+++ b/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
}
http://git-wip-us.apache.org/repos/asf/beam/blob/afba5cb9/runners/apex/build.gradle
----------------------------------------------------------------------
diff --git a/runners/apex/build.gradle b/runners/apex/build.gradle
index 983e21e..fb2c94c 100644
--- a/runners/apex/build.gradle
+++ b/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
}
http://git-wip-us.apache.org/repos/asf/beam/blob/afba5cb9/runners/core-construction-java/build.gradle
----------------------------------------------------------------------
diff --git a/runners/core-construction-java/build.gradle b/runners/core-construction-java/build.gradle
index 8af22b7..891f2fc 100644
--- a/runners/core-construction-java/build.gradle
+++ b/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) {
http://git-wip-us.apache.org/repos/asf/beam/blob/afba5cb9/runners/core-java/build.gradle
----------------------------------------------------------------------
diff --git a/runners/core-java/build.gradle b/runners/core-java/build.gradle
index 6c42971..7ab450a 100644
--- a/runners/core-java/build.gradle
+++ b/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
http://git-wip-us.apache.org/repos/asf/beam/blob/afba5cb9/runners/direct-java/build.gradle
----------------------------------------------------------------------
diff --git a/runners/direct-java/build.gradle b/runners/direct-java/build.gradle
index 90190fa..984fe2d 100644
--- a/runners/direct-java/build.gradle
+++ b/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
http://git-wip-us.apache.org/repos/asf/beam/blob/afba5cb9/runners/flink/build.gradle
----------------------------------------------------------------------
diff --git a/runners/flink/build.gradle b/runners/flink/build.gradle
index b45d730..7a318fe 100644
--- a/runners/flink/build.gradle
+++ b/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"
http://git-wip-us.apache.org/repos/asf/beam/blob/afba5cb9/runners/gearpump/build.gradle
----------------------------------------------------------------------
diff --git a/runners/gearpump/build.gradle b/runners/gearpump/build.gradle
index 0dd7a43..9136d97 100644
--- a/runners/gearpump/build.gradle
+++ b/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) {
http://git-wip-us.apache.org/repos/asf/beam/blob/afba5cb9/runners/google-cloud-dataflow-java/build.gradle
----------------------------------------------------------------------
diff --git a/runners/google-cloud-dataflow-java/build.gradle b/runners/google-cloud-dataflow-java/build.gradle
index 0143ab7..6e7e0f5 100644
--- a/runners/google-cloud-dataflow-java/build.gradle
+++ b/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
http://git-wip-us.apache.org/repos/asf/beam/blob/afba5cb9/runners/local-artifact-service-java/build.gradle
----------------------------------------------------------------------
diff --git a/runners/local-artifact-service-java/build.gradle b/runners/local-artifact-service-java/build.gradle
index b431757..bd7a846 100644
--- a/runners/local-artifact-service-java/build.gradle
+++ b/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
}
http://git-wip-us.apache.org/repos/asf/beam/blob/afba5cb9/runners/spark/build.gradle
----------------------------------------------------------------------
diff --git a/runners/spark/build.gradle b/runners/spark/build.gradle
index 0c5cb0f..3a4b70b 100644
--- a/runners/spark/build.gradle
+++ b/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"
}
http://git-wip-us.apache.org/repos/asf/beam/blob/afba5cb9/sdks/java/core/build.gradle
----------------------------------------------------------------------
diff --git a/sdks/java/core/build.gradle b/sdks/java/core/build.gradle
index f989265..0bcee08 100644
--- a/sdks/java/core/build.gradle
+++ b/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"
}
http://git-wip-us.apache.org/repos/asf/beam/blob/afba5cb9/sdks/java/extensions/google-cloud-platform-core/build.gradle
----------------------------------------------------------------------
diff --git a/sdks/java/extensions/google-cloud-platform-core/build.gradle b/sdks/java/extensions/google-cloud-platform-core/build.gradle
index 1e262ac..390a841 100644
--- a/sdks/java/extensions/google-cloud-platform-core/build.gradle
+++ b/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
}
http://git-wip-us.apache.org/repos/asf/beam/blob/afba5cb9/sdks/java/extensions/jackson/build.gradle
----------------------------------------------------------------------
diff --git a/sdks/java/extensions/jackson/build.gradle b/sdks/java/extensions/jackson/build.gradle
index ec69b3d..5db7b52 100644
--- a/sdks/java/extensions/jackson/build.gradle
+++ b/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
}
http://git-wip-us.apache.org/repos/asf/beam/blob/afba5cb9/sdks/java/extensions/join-library/build.gradle
----------------------------------------------------------------------
diff --git a/sdks/java/extensions/join-library/build.gradle b/sdks/java/extensions/join-library/build.gradle
index 537c1cd..57609da 100644
--- a/sdks/java/extensions/join-library/build.gradle
+++ b/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
}
http://git-wip-us.apache.org/repos/asf/beam/blob/afba5cb9/sdks/java/extensions/protobuf/build.gradle
----------------------------------------------------------------------
diff --git a/sdks/java/extensions/protobuf/build.gradle b/sdks/java/extensions/protobuf/build.gradle
index bed972f..95b5c72 100644
--- a/sdks/java/extensions/protobuf/build.gradle
+++ b/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
}
http://git-wip-us.apache.org/repos/asf/beam/blob/afba5cb9/sdks/java/extensions/sorter/build.gradle
----------------------------------------------------------------------
diff --git a/sdks/java/extensions/sorter/build.gradle b/sdks/java/extensions/sorter/build.gradle
index 93f5037..92a7424 100644
--- a/sdks/java/extensions/sorter/build.gradle
+++ b/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
}
http://git-wip-us.apache.org/repos/asf/beam/blob/afba5cb9/sdks/java/extensions/sql/build.gradle
----------------------------------------------------------------------
diff --git a/sdks/java/extensions/sql/build.gradle b/sdks/java/extensions/sql/build.gradle
index 260eb97..6142ab6 100644
--- a/sdks/java/extensions/sql/build.gradle
+++ b/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) {
http://git-wip-us.apache.org/repos/asf/beam/blob/afba5cb9/sdks/java/harness/build.gradle
----------------------------------------------------------------------
diff --git a/sdks/java/harness/build.gradle b/sdks/java/harness/build.gradle
index be75857..535ba13 100644
--- a/sdks/java/harness/build.gradle
+++ b/sdks/java/harness/build.gradle
@@ -40,9 +40,9 @@ dependencies {
compile library.java.slf4j_api
compileOnly library.java.error_prone_annotations
testCompile project(":beam-sdks-parent:beam-sdks-java-parent:beam-sdks-java-core")
- 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.slf4j_jdk14
}
http://git-wip-us.apache.org/repos/asf/beam/blob/afba5cb9/sdks/java/io/amqp/build.gradle
----------------------------------------------------------------------
diff --git a/sdks/java/io/amqp/build.gradle b/sdks/java/io/amqp/build.gradle
index b314d40..9f6dc3a 100644
--- a/sdks/java/io/amqp/build.gradle
+++ b/sdks/java/io/amqp/build.gradle
@@ -31,7 +31,7 @@ dependencies {
testCompile library.java.slf4j_api
testCompile library.java.slf4j_jdk14
testCompile library.java.junit
- testCompile library.java.hamcrest_all
+ testCompile library.java.hamcrest_core
testCompile library.java.activemq_broker
testCompile library.java.activemq_amqp
testCompile library.java.activemq_junit
http://git-wip-us.apache.org/repos/asf/beam/blob/afba5cb9/sdks/java/io/cassandra/build.gradle
----------------------------------------------------------------------
diff --git a/sdks/java/io/cassandra/build.gradle b/sdks/java/io/cassandra/build.gradle
index 46f6469..056572a 100644
--- a/sdks/java/io/cassandra/build.gradle
+++ b/sdks/java/io/cassandra/build.gradle
@@ -43,9 +43,8 @@ dependencies {
testCompile project(":beam-sdks-parent:beam-sdks-java-parent:beam-sdks-java-io-parent:beam-sdks-java-io-common").sourceSets.test.output
testCompile library.java.junit
testCompile library.java.hamcrest_core
- testCompile library.java.hamcrest_all
testCompile library.java.slf4j_jdk14
- testCompile library.java.mockito_all
+ testCompile library.java.mockito_core
}
task packageTests(type: Jar) {
http://git-wip-us.apache.org/repos/asf/beam/blob/afba5cb9/sdks/java/io/elasticsearch-tests/elasticsearch-tests-2/build.gradle
----------------------------------------------------------------------
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 6de22f5..4b27ac2 100644
--- a/sdks/java/io/elasticsearch-tests/elasticsearch-tests-2/build.gradle
+++ b/sdks/java/io/elasticsearch-tests/elasticsearch-tests-2/build.gradle
@@ -44,7 +44,7 @@ dependencies {
testCompile "net.java.dev.jna:jna:$jna_version"
testCompile "org.apache.logging.log4j:log4j-api:$log4j_version"
testCompile "org.apache.logging.log4j:log4j-core:$log4j_version"
- testCompile library.java.hamcrest_all
+ testCompile library.java.hamcrest_core
testCompile library.java.slf4j_jdk14
testCompile library.java.commons_io_1x
testCompile library.java.junit
http://git-wip-us.apache.org/repos/asf/beam/blob/afba5cb9/sdks/java/io/elasticsearch-tests/elasticsearch-tests-5/build.gradle
----------------------------------------------------------------------
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 6fbd3ed..aa4daad 100644
--- a/sdks/java/io/elasticsearch-tests/elasticsearch-tests-5/build.gradle
+++ b/sdks/java/io/elasticsearch-tests/elasticsearch-tests-5/build.gradle
@@ -54,7 +54,7 @@ dependencies {
testCompile "net.java.dev.jna:jna:$jna_version"
testCompile "org.apache.logging.log4j:log4j-api:$log4j_version"
testCompile "org.apache.logging.log4j:log4j-core:$log4j_version"
- testCompile library.java.hamcrest_all
+ testCompile library.java.hamcrest_core
testCompile library.java.slf4j_jdk14
testCompile library.java.commons_io_1x
testCompile library.java.junit
http://git-wip-us.apache.org/repos/asf/beam/blob/afba5cb9/sdks/java/io/elasticsearch-tests/elasticsearch-tests-common/build.gradle
----------------------------------------------------------------------
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 c837c4c..883a057 100644
--- a/sdks/java/io/elasticsearch-tests/elasticsearch-tests-common/build.gradle
+++ b/sdks/java/io/elasticsearch-tests/elasticsearch-tests-common/build.gradle
@@ -48,7 +48,7 @@ dependencies {
testCompile "net.java.dev.jna:jna:$jna_version"
testCompile "org.apache.logging.log4j:log4j-api:$log4j_version"
testCompile "org.apache.logging.log4j:log4j-core:$log4j_version"
- testCompile library.java.hamcrest_all
+ testCompile library.java.hamcrest_core
testCompile library.java.slf4j_jdk14
testCompile library.java.commons_io_1x
testCompile library.java.junit
http://git-wip-us.apache.org/repos/asf/beam/blob/afba5cb9/sdks/java/io/google-cloud-platform/build.gradle
----------------------------------------------------------------------
diff --git a/sdks/java/io/google-cloud-platform/build.gradle b/sdks/java/io/google-cloud-platform/build.gradle
index 1ec5ca6..20ac67f 100644
--- a/sdks/java/io/google-cloud-platform/build.gradle
+++ b/sdks/java/io/google-cloud-platform/build.gradle
@@ -72,8 +72,8 @@ dependencies {
testCompile project(":beam-sdks-parent:beam-sdks-java-parent:beam-sdks-java-core").sourceSets.test.output
testCompile project(":beam-sdks-parent:beam-sdks-java-parent:beam-sdks-java-extensions-parent:beam-sdks-java-extensions-google-cloud-platform-core").sourceSets.test.output
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
testCompile library.java.slf4j_jdk14
}
http://git-wip-us.apache.org/repos/asf/beam/blob/afba5cb9/sdks/java/io/hadoop-common/build.gradle
----------------------------------------------------------------------
diff --git a/sdks/java/io/hadoop-common/build.gradle b/sdks/java/io/hadoop-common/build.gradle
index 8f5234a..152475a 100644
--- a/sdks/java/io/hadoop-common/build.gradle
+++ b/sdks/java/io/hadoop-common/build.gradle
@@ -28,7 +28,7 @@ dependencies {
provided library.java.hadoop_common
provided library.java.hadoop_mapreduce_client_core
testCompile library.java.commons_lang3
- testCompile library.java.hamcrest_all
+ testCompile library.java.hamcrest_core
testCompile library.java.junit
}
http://git-wip-us.apache.org/repos/asf/beam/blob/afba5cb9/sdks/java/io/hadoop-file-system/build.gradle
----------------------------------------------------------------------
diff --git a/sdks/java/io/hadoop-file-system/build.gradle b/sdks/java/io/hadoop-file-system/build.gradle
index 27711de..7c180fc 100644
--- a/sdks/java/io/hadoop-file-system/build.gradle
+++ b/sdks/java/io/hadoop-file-system/build.gradle
@@ -43,8 +43,8 @@ dependencies {
testCompile project(":beam-runners-parent:beam-runners-direct-java")
testCompile project(":beam-sdks-parent:beam-sdks-java-parent:beam-sdks-java-core").sourceSets.test.output
testCompile library.java.guava
- 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.hadoop_minicluster
testCompile library.java.hadoop_hdfs_tests
http://git-wip-us.apache.org/repos/asf/beam/blob/afba5cb9/sdks/java/io/hadoop/input-format/build.gradle
----------------------------------------------------------------------
diff --git a/sdks/java/io/hadoop/input-format/build.gradle b/sdks/java/io/hadoop/input-format/build.gradle
index ec11e49..4ee9742 100644
--- a/sdks/java/io/hadoop/input-format/build.gradle
+++ b/sdks/java/io/hadoop/input-format/build.gradle
@@ -39,14 +39,14 @@ dependencies {
compile library.java.findbugs_jsr305
provided library.java.hadoop_common
provided library.java.hadoop_mapreduce_client_core
- testCompile library.java.hamcrest_all
+ testCompile library.java.hamcrest_core
compile project(":beam-sdks-parent:beam-sdks-java-parent:beam-sdks-java-core")
compile project(":beam-sdks-parent:beam-sdks-java-parent:beam-sdks-java-core").sourceSets.test.output
testCompile project(":beam-runners-parent:beam-runners-direct-java")
testCompile "org.apache.logging.log4j:log4j-core:$log4j_version"
testCompile library.java.junit
- testCompile library.java.mockito_all
+ testCompile library.java.mockito_core
}
task packageTests(type: Jar) {
http://git-wip-us.apache.org/repos/asf/beam/blob/afba5cb9/sdks/java/io/hadoop/jdk1.8-tests/build.gradle
----------------------------------------------------------------------
diff --git a/sdks/java/io/hadoop/jdk1.8-tests/build.gradle b/sdks/java/io/hadoop/jdk1.8-tests/build.gradle
index 167c038..e7252e7 100644
--- a/sdks/java/io/hadoop/jdk1.8-tests/build.gradle
+++ b/sdks/java/io/hadoop/jdk1.8-tests/build.gradle
@@ -41,7 +41,7 @@ dependencies {
runtime library.java.commons_io_2x
testCompile project(":beam-sdks-parent:beam-sdks-java-parent:beam-sdks-java-io-parent:beam-sdks-java-io-common")
testCompile project(":beam-sdks-parent:beam-sdks-java-parent:beam-sdks-java-io-parent:beam-sdks-java-io-common").sourceSets.test.output
- testCompile library.java.hamcrest_all
+ testCompile library.java.hamcrest_core
testCompile group: "org.elasticsearch.plugin", name: "transport-netty4-client", version:"5.0.0"
testCompile group: "org.elasticsearch.client", name: "transport", version:"5.0.0"
testCompile group: "io.netty", name: "netty-transport-native-epoll", version:"4.1.0.CR3"
@@ -54,7 +54,7 @@ dependencies {
testCompile project(":beam-runners-parent:beam-runners-direct-java")
testCompile "org.apache.logging.log4j:log4j-core:$log4j_version"
testCompile library.java.junit
- testCompile library.java.mockito_all
+ testCompile library.java.mockito_core
}
task packageTests(type: Jar) {
http://git-wip-us.apache.org/repos/asf/beam/blob/afba5cb9/sdks/java/io/hbase/build.gradle
----------------------------------------------------------------------
diff --git a/sdks/java/io/hbase/build.gradle b/sdks/java/io/hbase/build.gradle
index f61750a..7afdd7f 100644
--- a/sdks/java/io/hbase/build.gradle
+++ b/sdks/java/io/hbase/build.gradle
@@ -49,7 +49,7 @@ dependencies {
testCompile project(":beam-runners-parent:beam-runners-direct-java")
testCompile library.java.commons_lang3
testCompile library.java.junit
- testCompile library.java.hamcrest_all
+ testCompile library.java.hamcrest_core
testCompile library.java.hadoop_minicluster
testCompile library.java.hadoop_hdfs
testCompile library.java.hadoop_common
http://git-wip-us.apache.org/repos/asf/beam/blob/afba5cb9/sdks/java/io/hcatalog/build.gradle
----------------------------------------------------------------------
diff --git a/sdks/java/io/hcatalog/build.gradle b/sdks/java/io/hcatalog/build.gradle
index e823405..26cf1d2 100644
--- a/sdks/java/io/hcatalog/build.gradle
+++ b/sdks/java/io/hcatalog/build.gradle
@@ -36,7 +36,7 @@ dependencies {
testCompile project(":beam-runners-parent:beam-runners-direct-java")
testCompile library.java.commons_io_2x
testCompile library.java.junit
- testCompile library.java.hamcrest_all
+ testCompile library.java.hamcrest_core
testCompile "org.apache.hive.hcatalog:hive-hcatalog-core:2.1.0:tests"
testCompile "org.apache.hive:hive-exec:2.1.0"
testCompile "org.apache.hive:hive-common:2.1.0"
http://git-wip-us.apache.org/repos/asf/beam/blob/afba5cb9/sdks/java/io/jdbc/build.gradle
----------------------------------------------------------------------
diff --git a/sdks/java/io/jdbc/build.gradle b/sdks/java/io/jdbc/build.gradle
index f69679f..096f77c 100644
--- a/sdks/java/io/jdbc/build.gradle
+++ b/sdks/java/io/jdbc/build.gradle
@@ -39,7 +39,7 @@ dependencies {
testCompile project(":beam-sdks-parent:beam-sdks-java-parent:beam-sdks-java-io-parent:beam-sdks-java-io-common")
testCompile project(":beam-sdks-parent:beam-sdks-java-parent:beam-sdks-java-io-parent:beam-sdks-java-io-common").sourceSets.test.output
testCompile library.java.junit
- testCompile library.java.hamcrest_all
+ testCompile library.java.hamcrest_core
testCompile library.java.slf4j_api
testCompile library.java.slf4j_jdk14
testCompile group: "org.apache.derby", name: "derby", version:"10.12.1.1"
http://git-wip-us.apache.org/repos/asf/beam/blob/afba5cb9/sdks/java/io/jms/build.gradle
----------------------------------------------------------------------
diff --git a/sdks/java/io/jms/build.gradle b/sdks/java/io/jms/build.gradle
index c51568a..314b16a 100644
--- a/sdks/java/io/jms/build.gradle
+++ b/sdks/java/io/jms/build.gradle
@@ -34,7 +34,7 @@ dependencies {
testCompile library.java.activemq_kahadb_store
testCompile library.java.activemq_client
testCompile library.java.junit
- testCompile library.java.hamcrest_all
+ testCompile library.java.hamcrest_core
testCompile library.java.slf4j_jdk14
}
http://git-wip-us.apache.org/repos/asf/beam/blob/afba5cb9/sdks/java/io/kafka/build.gradle
----------------------------------------------------------------------
diff --git a/sdks/java/io/kafka/build.gradle b/sdks/java/io/kafka/build.gradle
index 9f4249b..7ea367b 100644
--- a/sdks/java/io/kafka/build.gradle
+++ b/sdks/java/io/kafka/build.gradle
@@ -42,7 +42,7 @@ dependencies {
compile "org.springframework:spring-expression:4.3.5.RELEASE"
testCompile project(":beam-runners-parent:beam-runners-direct-java")
testCompile project(":beam-sdks-parent:beam-sdks-java-parent:beam-sdks-java-core").sourceSets.test.output
- testCompile library.java.hamcrest_all
+ testCompile library.java.hamcrest_core
testCompile library.java.junit
testCompile library.java.slf4j_jdk14
}
http://git-wip-us.apache.org/repos/asf/beam/blob/afba5cb9/sdks/java/io/kinesis/build.gradle
----------------------------------------------------------------------
diff --git a/sdks/java/io/kinesis/build.gradle b/sdks/java/io/kinesis/build.gradle
index 0475dec..5e7895b 100644
--- a/sdks/java/io/kinesis/build.gradle
+++ b/sdks/java/io/kinesis/build.gradle
@@ -36,9 +36,9 @@ dependencies {
compile "commons-lang:commons-lang:2.6"
testCompile project(":beam-runners-parent:beam-runners-direct-java")
testCompile library.java.junit
- testCompile library.java.mockito_all
+ testCompile library.java.mockito_core
testCompile library.java.guava_testlib
- testCompile library.java.hamcrest_all
+ testCompile library.java.hamcrest_core
testCompile "org.assertj:assertj-core:2.5.0"
}
http://git-wip-us.apache.org/repos/asf/beam/blob/afba5cb9/sdks/java/io/mongodb/build.gradle
----------------------------------------------------------------------
diff --git a/sdks/java/io/mongodb/build.gradle b/sdks/java/io/mongodb/build.gradle
index 22187f7..bab3ec9 100644
--- a/sdks/java/io/mongodb/build.gradle
+++ b/sdks/java/io/mongodb/build.gradle
@@ -31,7 +31,7 @@ dependencies {
testCompile project(":beam-runners-parent:beam-runners-direct-java")
testCompile library.java.junit
testCompile library.java.slf4j_jdk14
- testCompile library.java.hamcrest_all
+ testCompile library.java.hamcrest_core
testCompile "de.flapdoodle.embed:de.flapdoodle.embed.mongo:1.50.1"
testCompile "de.flapdoodle.embed:de.flapdoodle.embed.process:1.50.1"
}
http://git-wip-us.apache.org/repos/asf/beam/blob/afba5cb9/sdks/java/io/mqtt/build.gradle
----------------------------------------------------------------------
diff --git a/sdks/java/io/mqtt/build.gradle b/sdks/java/io/mqtt/build.gradle
index ab65734..71cab93 100644
--- a/sdks/java/io/mqtt/build.gradle
+++ b/sdks/java/io/mqtt/build.gradle
@@ -34,7 +34,7 @@ dependencies {
testCompile library.java.activemq_mqtt
testCompile library.java.activemq_kahadb_store
testCompile library.java.junit
- testCompile library.java.hamcrest_all
+ testCompile library.java.hamcrest_core
testCompile library.java.slf4j_jdk14
}
http://git-wip-us.apache.org/repos/asf/beam/blob/afba5cb9/sdks/java/io/redis/build.gradle
----------------------------------------------------------------------
diff --git a/sdks/java/io/redis/build.gradle b/sdks/java/io/redis/build.gradle
index 7daa1b3..5962819 100644
--- a/sdks/java/io/redis/build.gradle
+++ b/sdks/java/io/redis/build.gradle
@@ -29,7 +29,7 @@ dependencies {
testCompile project(":beam-runners-parent:beam-runners-direct-java")
testCompile library.java.junit
testCompile library.java.slf4j_jdk14
- testCompile library.java.hamcrest_all
+ testCompile library.java.hamcrest_core
testCompile "com.github.kstyrc:embedded-redis:0.6"
}
http://git-wip-us.apache.org/repos/asf/beam/blob/afba5cb9/sdks/java/io/solr/build.gradle
----------------------------------------------------------------------
diff --git a/sdks/java/io/solr/build.gradle b/sdks/java/io/solr/build.gradle
index e9d2f92..7d4946e 100644
--- a/sdks/java/io/solr/build.gradle
+++ b/sdks/java/io/solr/build.gradle
@@ -31,7 +31,6 @@ dependencies {
testCompile project(":beam-sdks-parent:beam-sdks-java-parent:beam-sdks-java-io-parent:beam-sdks-java-io-common")
testCompile project(":beam-runners-parent:beam-runners-direct-java")
testCompile library.java.hamcrest_core
- testCompile library.java.hamcrest_all
testCompile library.java.junit
testCompile library.java.slf4j_api
testCompile library.java.slf4j_log4j12
http://git-wip-us.apache.org/repos/asf/beam/blob/afba5cb9/sdks/java/io/tika/build.gradle
----------------------------------------------------------------------
diff --git a/sdks/java/io/tika/build.gradle b/sdks/java/io/tika/build.gradle
index 8b00e35..915ef0e 100644
--- a/sdks/java/io/tika/build.gradle
+++ b/sdks/java/io/tika/build.gradle
@@ -39,7 +39,6 @@ dependencies {
testCompile project(":beam-runners-parent:beam-runners-direct-java")
testCompile library.java.junit
testCompile library.java.hamcrest_core
- testCompile library.java.hamcrest_all
testCompile "org.apache.tika:tika-parsers:1.16"
}
http://git-wip-us.apache.org/repos/asf/beam/blob/afba5cb9/sdks/java/io/xml/build.gradle
----------------------------------------------------------------------
diff --git a/sdks/java/io/xml/build.gradle b/sdks/java/io/xml/build.gradle
index 498158b..282e30d 100644
--- a/sdks/java/io/xml/build.gradle
+++ b/sdks/java/io/xml/build.gradle
@@ -41,7 +41,6 @@ dependencies {
testCompile library.java.junit
testCompile library.java.slf4j_jdk14
testCompile library.java.hamcrest_core
- testCompile library.java.hamcrest_all
}
task packageTests(type: Jar) {
http://git-wip-us.apache.org/repos/asf/beam/blob/afba5cb9/sdks/java/java8tests/build.gradle
----------------------------------------------------------------------
diff --git a/sdks/java/java8tests/build.gradle b/sdks/java/java8tests/build.gradle
index b718730..e70a869 100644
--- a/sdks/java/java8tests/build.gradle
+++ b/sdks/java/java8tests/build.gradle
@@ -26,7 +26,7 @@ dependencies {
testCompile project(":beam-runners-parent:beam-runners-direct-java")
testCompile library.java.guava
testCompile library.java.joda_time
- testCompile library.java.hamcrest_all
+ testCompile library.java.hamcrest_core
testCompile library.java.junit
}
http://git-wip-us.apache.org/repos/asf/beam/blob/afba5cb9/sdks/java/nexmark/build.gradle
----------------------------------------------------------------------
diff --git a/sdks/java/nexmark/build.gradle b/sdks/java/nexmark/build.gradle
index efd82ea..70536c2 100644
--- a/sdks/java/nexmark/build.gradle
+++ b/sdks/java/nexmark/build.gradle
@@ -38,7 +38,7 @@ dependencies {
compile library.java.hamcrest_core
runtime project(":beam-runners-parent:beam-runners-direct-java")
runtime library.java.slf4j_jdk14
- testCompile library.java.hamcrest_all
+ testCompile library.java.hamcrest_core
}
task packageTests(type: Jar) {