This is an automated email from the ASF dual-hosted git repository. lcwik pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/beam.git
The following commit(s) were added to refs/heads/master by this push: new 88f61a0 [BEAM-3690] swapping to use mockito-core, hamcrest-core and hamcrest-library to solve the dependency conflicts replace mockito-all new 35f159f [BEAM-3690] swapping to use mockito-core, hamcrest-core and hamcrest-library to solve the dependency conflicts 88f61a0 is described below commit 88f61a00bb8126c5c8e7673bc3284047343066fe Author: 1028332163 <1028332...@qq.com> AuthorDate: Mon Feb 19 12:22:53 2018 +0800 [BEAM-3690] swapping to use mockito-core, hamcrest-core and hamcrest-library to solve the dependency conflicts replace mockito-all --- examples/java/pom.xml | 9 +++++++-- pom.xml | 4 ++-- runners/apex/pom.xml | 9 +++++++-- runners/core-construction-java/pom.xml | 10 +++++++--- runners/core-java/pom.xml | 12 ++++++++--- runners/direct-java/pom.xml | 10 ++++++++-- runners/flink/pom.xml | 10 ++++++++-- runners/gearpump/pom.xml | 9 +++++++-- runners/google-cloud-dataflow-java/pom.xml | 12 ++++++++--- runners/java-fn-execution/pom.xml | 10 ++++++++-- runners/local-artifact-service-java/pom.xml | 10 ++++++++-- runners/local-java/pom.xml | 7 ++++++- runners/reference/java/pom.xml | 10 ++++++++-- runners/reference/job-server/pom.xml | 3 ++- runners/spark/pom.xml | 10 ++++++++-- sdks/java/core/pom.xml | 19 +++++++++++++++--- .../extensions/google-cloud-platform-core/pom.xml | 10 ++++++++-- sdks/java/extensions/jackson/pom.xml | 8 +++++++- sdks/java/extensions/join-library/pom.xml | 8 +++++++- sdks/java/extensions/protobuf/pom.xml | 10 ++++++++-- sdks/java/extensions/sketching/pom.xml | 8 +++++++- sdks/java/extensions/sorter/pom.xml | 12 ++++++++--- sdks/java/extensions/sql/pom.xml | 6 +++--- sdks/java/fn-execution/pom.xml | 12 ++++++++--- sdks/java/harness/pom.xml | 10 ++++++++-- sdks/java/io/amazon-web-services/pom.xml | 10 ++++++++-- sdks/java/io/amqp/pom.xml | 9 +++++++-- sdks/java/io/cassandra/pom.xml | 6 +++--- .../elasticsearch-tests-5/pom.xml | 16 +++++++++++++++ .../elasticsearch-tests-common/pom.xml | 2 +- sdks/java/io/elasticsearch-tests/pom.xml | 8 +++++++- sdks/java/io/elasticsearch/pom.xml | 2 +- sdks/java/io/file-based-io-tests/pom.xml | 7 ++++++- sdks/java/io/google-cloud-platform/pom.xml | 10 ++++++++-- sdks/java/io/hadoop-common/pom.xml | 8 +++++++- sdks/java/io/hadoop-file-system/pom.xml | 10 ++++++++-- sdks/java/io/hadoop-input-format/pom.xml | 9 +++++++-- sdks/java/io/hbase/pom.xml | 7 ++++++- sdks/java/io/hcatalog/pom.xml | 9 +++++++-- sdks/java/io/jdbc/pom.xml | 7 ++++++- sdks/java/io/jms/pom.xml | 7 ++++++- sdks/java/io/kafka/pom.xml | 8 ++++++-- sdks/java/io/kinesis/pom.xml | 10 +++++++--- sdks/java/io/mongodb/pom.xml | 7 ++++++- sdks/java/io/mqtt/pom.xml | 7 ++++++- sdks/java/io/redis/pom.xml | 7 ++++++- sdks/java/io/solr/pom.xml | 6 +++--- sdks/java/io/tika/pom.xml | 11 ++++++----- sdks/java/io/xml/pom.xml | 5 +++-- sdks/java/java8tests/pom.xml | 8 +++++++- sdks/java/javadoc/pom.xml | 8 +++++++- .../src/main/resources/archetype-resources/pom.xml | 10 ++++++++-- sdks/java/nexmark/pom.xml | 23 +++++++++++++++++++--- 53 files changed, 375 insertions(+), 100 deletions(-) diff --git a/examples/java/pom.xml b/examples/java/pom.xml index 7504857..46f1f8c 100644 --- a/examples/java/pom.xml +++ b/examples/java/pom.xml @@ -511,7 +511,12 @@ <dependency> <groupId>org.hamcrest</groupId> - <artifactId>hamcrest-all</artifactId> + <artifactId>hamcrest-core</artifactId> + </dependency> + + <dependency> + <groupId>org.hamcrest</groupId> + <artifactId>hamcrest-library</artifactId> </dependency> <dependency> @@ -539,7 +544,7 @@ <dependency> <groupId>org.mockito</groupId> - <artifactId>mockito-all</artifactId> + <artifactId>mockito-core</artifactId> <scope>test</scope> </dependency> </dependencies> diff --git a/pom.xml b/pom.xml index 7fe67cb..4b876f7 100644 --- a/pom.xml +++ b/pom.xml @@ -1429,7 +1429,7 @@ <dependency> <groupId>org.hamcrest</groupId> - <artifactId>hamcrest-all</artifactId> + <artifactId>hamcrest-library</artifactId> <version>${hamcrest.version}</version> <scope>test</scope> </dependency> @@ -1466,7 +1466,7 @@ <dependency> <groupId>org.mockito</groupId> - <artifactId>mockito-all</artifactId> + <artifactId>mockito-core</artifactId> <version>${mockito.version}</version> <scope>test</scope> </dependency> diff --git a/runners/apex/pom.xml b/runners/apex/pom.xml index b4fe650..9a7db04 100644 --- a/runners/apex/pom.xml +++ b/runners/apex/pom.xml @@ -124,7 +124,12 @@ <dependency> <groupId>org.hamcrest</groupId> - <artifactId>hamcrest-all</artifactId> + <artifactId>hamcrest-core</artifactId> + <scope>test</scope> + </dependency> + <dependency> + <groupId>org.hamcrest</groupId> + <artifactId>hamcrest-library</artifactId> <scope>test</scope> </dependency> <dependency> @@ -134,7 +139,7 @@ </dependency> <dependency> <groupId>org.mockito</groupId> - <artifactId>mockito-all</artifactId> + <artifactId>mockito-core</artifactId> <scope>test</scope> </dependency> diff --git a/runners/core-construction-java/pom.xml b/runners/core-construction-java/pom.xml index 03123d1..38157d2 100644 --- a/runners/core-construction-java/pom.xml +++ b/runners/core-construction-java/pom.xml @@ -145,10 +145,14 @@ <dependency> <groupId>org.hamcrest</groupId> - <artifactId>hamcrest-all</artifactId> + <artifactId>hamcrest-core</artifactId> + <scope>test</scope> + </dependency> + <dependency> + <groupId>org.hamcrest</groupId> + <artifactId>hamcrest-library</artifactId> <scope>test</scope> </dependency> - <dependency> <groupId>junit</groupId> <artifactId>junit</artifactId> @@ -157,7 +161,7 @@ <dependency> <groupId>org.mockito</groupId> - <artifactId>mockito-all</artifactId> + <artifactId>mockito-core</artifactId> <scope>test</scope> </dependency> </dependencies> diff --git a/runners/core-java/pom.xml b/runners/core-java/pom.xml index 586114b..215faf4 100644 --- a/runners/core-java/pom.xml +++ b/runners/core-java/pom.xml @@ -112,13 +112,19 @@ <dependency> <groupId>org.hamcrest</groupId> - <artifactId>hamcrest-all</artifactId> + <artifactId>hamcrest-core</artifactId> <scope>test</scope> </dependency> - + + <dependency> + <groupId>org.hamcrest</groupId> + <artifactId>hamcrest-library</artifactId> + <scope>test</scope> + </dependency> + <dependency> <groupId>org.mockito</groupId> - <artifactId>mockito-all</artifactId> + <artifactId>mockito-core</artifactId> <scope>test</scope> </dependency> diff --git a/runners/direct-java/pom.xml b/runners/direct-java/pom.xml index 99ebd76..a678e01 100644 --- a/runners/direct-java/pom.xml +++ b/runners/direct-java/pom.xml @@ -246,11 +246,17 @@ <!-- test dependencies --> <dependency> <groupId>org.hamcrest</groupId> - <artifactId>hamcrest-all</artifactId> + <artifactId>hamcrest-core</artifactId> <scope>provided</scope> </dependency> <dependency> + <groupId>org.hamcrest</groupId> + <artifactId>hamcrest-library</artifactId> + <scope>provided</scope> + </dependency> + + <dependency> <groupId>junit</groupId> <artifactId>junit</artifactId> <scope>provided</scope> @@ -264,7 +270,7 @@ <dependency> <groupId>org.mockito</groupId> - <artifactId>mockito-all</artifactId> + <artifactId>mockito-core</artifactId> <scope>test</scope> </dependency> diff --git a/runners/flink/pom.xml b/runners/flink/pom.xml index ae135a3..46917e9 100644 --- a/runners/flink/pom.xml +++ b/runners/flink/pom.xml @@ -299,11 +299,17 @@ <dependency> <groupId>org.hamcrest</groupId> - <artifactId>hamcrest-all</artifactId> + <artifactId>hamcrest-core</artifactId> <scope>test</scope> </dependency> <dependency> + <groupId>org.hamcrest</groupId> + <artifactId>hamcrest-library</artifactId> + <scope>test</scope> + </dependency> + + <dependency> <groupId>junit</groupId> <artifactId>junit</artifactId> <scope>test</scope> @@ -311,7 +317,7 @@ <dependency> <groupId>org.mockito</groupId> - <artifactId>mockito-all</artifactId> + <artifactId>mockito-core</artifactId> <scope>test</scope> </dependency> diff --git a/runners/gearpump/pom.xml b/runners/gearpump/pom.xml index f127438..54348d9 100644 --- a/runners/gearpump/pom.xml +++ b/runners/gearpump/pom.xml @@ -175,7 +175,12 @@ </dependency> <dependency> <groupId>org.hamcrest</groupId> - <artifactId>hamcrest-all</artifactId> + <artifactId>hamcrest-core</artifactId> + <scope>test</scope> + </dependency> + <dependency> + <groupId>org.hamcrest</groupId> + <artifactId>hamcrest-library</artifactId> <scope>test</scope> </dependency> <dependency> @@ -202,7 +207,7 @@ </dependency> <dependency> <groupId>org.mockito</groupId> - <artifactId>mockito-all</artifactId> + <artifactId>mockito-core</artifactId> <scope>test</scope> </dependency> <dependency> diff --git a/runners/google-cloud-dataflow-java/pom.xml b/runners/google-cloud-dataflow-java/pom.xml index 7367a84..206bb04 100644 --- a/runners/google-cloud-dataflow-java/pom.xml +++ b/runners/google-cloud-dataflow-java/pom.xml @@ -461,10 +461,16 @@ <!-- test dependencies --> <dependency> <groupId>org.hamcrest</groupId> - <artifactId>hamcrest-all</artifactId> + <artifactId>hamcrest-core</artifactId> <scope>provided</scope> </dependency> - + + <dependency> + <groupId>org.hamcrest</groupId> + <artifactId>hamcrest-library</artifactId> + <scope>provided</scope> + </dependency> + <dependency> <groupId>junit</groupId> <artifactId>junit</artifactId> @@ -479,7 +485,7 @@ <dependency> <groupId>org.mockito</groupId> - <artifactId>mockito-all</artifactId> + <artifactId>mockito-core</artifactId> <scope>test</scope> </dependency> diff --git a/runners/java-fn-execution/pom.xml b/runners/java-fn-execution/pom.xml index 09683f5..cd637cb 100644 --- a/runners/java-fn-execution/pom.xml +++ b/runners/java-fn-execution/pom.xml @@ -103,7 +103,13 @@ <dependency> <groupId>org.hamcrest</groupId> - <artifactId>hamcrest-all</artifactId> + <artifactId>hamcrest-library</artifactId> + <scope>test</scope> + </dependency> + + <dependency> + <groupId>org.hamcrest</groupId> + <artifactId>hamcrest-core</artifactId> <scope>test</scope> </dependency> @@ -116,7 +122,7 @@ <dependency> <groupId>org.mockito</groupId> - <artifactId>mockito-all</artifactId> + <artifactId>mockito-core</artifactId> <scope>test</scope> </dependency> diff --git a/runners/local-artifact-service-java/pom.xml b/runners/local-artifact-service-java/pom.xml index 7423702..a7174ee 100644 --- a/runners/local-artifact-service-java/pom.xml +++ b/runners/local-artifact-service-java/pom.xml @@ -100,13 +100,19 @@ <!-- test dependencies --> <dependency> <groupId>org.hamcrest</groupId> - <artifactId>hamcrest-all</artifactId> + <artifactId>hamcrest-core</artifactId> + <scope>test</scope> + </dependency> + + <dependency> + <groupId>org.hamcrest</groupId> + <artifactId>hamcrest-library</artifactId> <scope>test</scope> </dependency> <dependency> <groupId>org.mockito</groupId> - <artifactId>mockito-all</artifactId> + <artifactId>mockito-core</artifactId> <scope>test</scope> </dependency> diff --git a/runners/local-java/pom.xml b/runners/local-java/pom.xml index 6b29598..04ead0b 100644 --- a/runners/local-java/pom.xml +++ b/runners/local-java/pom.xml @@ -68,7 +68,12 @@ <dependency> <groupId>org.hamcrest</groupId> - <artifactId>hamcrest-all</artifactId> + <artifactId>hamcrest-core</artifactId> + <scope>test</scope> + </dependency> + <dependency> + <groupId>org.hamcrest</groupId> + <artifactId>hamcrest-library</artifactId> <scope>test</scope> </dependency> </dependencies> diff --git a/runners/reference/java/pom.xml b/runners/reference/java/pom.xml index 2db15a0..d07d7c9 100644 --- a/runners/reference/java/pom.xml +++ b/runners/reference/java/pom.xml @@ -62,10 +62,16 @@ <!-- test dependencies --> <dependency> <groupId>org.hamcrest</groupId> - <artifactId>hamcrest-all</artifactId> + <artifactId>hamcrest-core</artifactId> <scope>test</scope> </dependency> - + + <dependency> + <groupId>org.hamcrest</groupId> + <artifactId>hamcrest-library</artifactId> + <scope>test</scope> + </dependency> + <dependency> <groupId>junit</groupId> <artifactId>junit</artifactId> diff --git a/runners/reference/job-server/pom.xml b/runners/reference/job-server/pom.xml index a42491d..cea1e7d 100644 --- a/runners/reference/job-server/pom.xml +++ b/runners/reference/job-server/pom.xml @@ -137,8 +137,9 @@ <dependency> <groupId>org.hamcrest</groupId> - <artifactId>hamcrest-all</artifactId> + <artifactId>hamcrest-library</artifactId> <scope>test</scope> </dependency> + </dependencies> </project> diff --git a/runners/spark/pom.xml b/runners/spark/pom.xml index fca7b9b..16cec1c 100644 --- a/runners/spark/pom.xml +++ b/runners/spark/pom.xml @@ -324,12 +324,18 @@ </exclusion> </exclusions> </dependency> + <dependency> <groupId>org.hamcrest</groupId> - <artifactId>hamcrest-all</artifactId> + <artifactId>hamcrest-core</artifactId> <scope>provided</scope> </dependency> + <dependency> + <groupId>org.hamcrest</groupId> + <artifactId>hamcrest-library</artifactId> + <scope>provided</scope> + </dependency> <!-- Depend on test jar to scan for ValidatesRunner tests --> <dependency> <groupId>org.apache.beam</groupId> @@ -346,7 +352,7 @@ <dependency> <groupId>org.mockito</groupId> - <artifactId>mockito-all</artifactId> + <artifactId>mockito-core</artifactId> <scope>test</scope> </dependency> diff --git a/sdks/java/core/pom.xml b/sdks/java/core/pom.xml index 0e2d844..bb90f43 100644 --- a/sdks/java/core/pom.xml +++ b/sdks/java/core/pom.xml @@ -323,7 +323,13 @@ <dependency> <groupId>org.hamcrest</groupId> - <artifactId>hamcrest-all</artifactId> + <artifactId>hamcrest-core</artifactId> + <scope>provided</scope> + </dependency> + + <dependency> + <groupId>org.hamcrest</groupId> + <artifactId>hamcrest-library</artifactId> <scope>provided</scope> </dependency> @@ -341,10 +347,17 @@ <dependency> <groupId>org.mockito</groupId> - <artifactId>mockito-all</artifactId> + <artifactId>mockito-core</artifactId> <scope>test</scope> </dependency> - + + <dependency> + <groupId>org.objenesis</groupId> + <artifactId>objenesis</artifactId> + <version>1.0</version> + <scope>test</scope> + </dependency> + <dependency> <groupId>com.esotericsoftware.kryo</groupId> <artifactId>kryo</artifactId> diff --git a/sdks/java/extensions/google-cloud-platform-core/pom.xml b/sdks/java/extensions/google-cloud-platform-core/pom.xml index d6632f0..29ab535 100644 --- a/sdks/java/extensions/google-cloud-platform-core/pom.xml +++ b/sdks/java/extensions/google-cloud-platform-core/pom.xml @@ -184,13 +184,19 @@ <dependency> <groupId>org.hamcrest</groupId> - <artifactId>hamcrest-all</artifactId> + <artifactId>hamcrest-core</artifactId> + <scope>provided</scope> + </dependency> + + <dependency> + <groupId>org.hamcrest</groupId> + <artifactId>hamcrest-library</artifactId> <scope>provided</scope> </dependency> <dependency> <groupId>org.mockito</groupId> - <artifactId>mockito-all</artifactId> + <artifactId>mockito-core</artifactId> <scope>test</scope> </dependency> diff --git a/sdks/java/extensions/jackson/pom.xml b/sdks/java/extensions/jackson/pom.xml index 23de0af..1b3fcc0 100644 --- a/sdks/java/extensions/jackson/pom.xml +++ b/sdks/java/extensions/jackson/pom.xml @@ -57,11 +57,17 @@ <dependency> <groupId>org.hamcrest</groupId> - <artifactId>hamcrest-all</artifactId> + <artifactId>hamcrest-core</artifactId> <scope>test</scope> </dependency> <dependency> + <groupId>org.hamcrest</groupId> + <artifactId>hamcrest-library</artifactId> + <scope>test</scope> + </dependency> + + <dependency> <groupId>junit</groupId> <artifactId>junit</artifactId> <scope>test</scope> diff --git a/sdks/java/extensions/join-library/pom.xml b/sdks/java/extensions/join-library/pom.xml index 838233b..4f3892e 100644 --- a/sdks/java/extensions/join-library/pom.xml +++ b/sdks/java/extensions/join-library/pom.xml @@ -49,11 +49,17 @@ <dependency> <groupId>org.hamcrest</groupId> - <artifactId>hamcrest-all</artifactId> + <artifactId>hamcrest-core</artifactId> <scope>test</scope> </dependency> <dependency> + <groupId>org.hamcrest</groupId> + <artifactId>hamcrest-library</artifactId> + <scope>test</scope> + </dependency> + + <dependency> <groupId>junit</groupId> <artifactId>junit</artifactId> <scope>test</scope> diff --git a/sdks/java/extensions/protobuf/pom.xml b/sdks/java/extensions/protobuf/pom.xml index 394fd57..099a7f0 100644 --- a/sdks/java/extensions/protobuf/pom.xml +++ b/sdks/java/extensions/protobuf/pom.xml @@ -96,13 +96,19 @@ <dependency> <groupId>org.hamcrest</groupId> - <artifactId>hamcrest-all</artifactId> + <artifactId>hamcrest-core</artifactId> <scope>test</scope> </dependency> <dependency> + <groupId>org.hamcrest</groupId> + <artifactId>hamcrest-library</artifactId> + <scope>test</scope> + </dependency> + + <dependency> <groupId>org.mockito</groupId> - <artifactId>mockito-all</artifactId> + <artifactId>mockito-core</artifactId> <scope>test</scope> </dependency> diff --git a/sdks/java/extensions/sketching/pom.xml b/sdks/java/extensions/sketching/pom.xml index dfc21b2..d5ca7af 100755 --- a/sdks/java/extensions/sketching/pom.xml +++ b/sdks/java/extensions/sketching/pom.xml @@ -94,11 +94,17 @@ <dependency> <groupId>org.hamcrest</groupId> - <artifactId>hamcrest-all</artifactId> + <artifactId>hamcrest-core</artifactId> <scope>test</scope> </dependency> <dependency> + <groupId>org.hamcrest</groupId> + <artifactId>hamcrest-library</artifactId> + <scope>test</scope> + </dependency> + + <dependency> <groupId>junit</groupId> <artifactId>junit</artifactId> <scope>test</scope> diff --git a/sdks/java/extensions/sorter/pom.xml b/sdks/java/extensions/sorter/pom.xml index 977b303..86601c3 100644 --- a/sdks/java/extensions/sorter/pom.xml +++ b/sdks/java/extensions/sorter/pom.xml @@ -61,13 +61,19 @@ <dependency> <groupId>org.hamcrest</groupId> - <artifactId>hamcrest-all</artifactId> + <artifactId>hamcrest-core</artifactId> <scope>test</scope> </dependency> - + + <dependency> + <groupId>org.hamcrest</groupId> + <artifactId>hamcrest-library</artifactId> + <scope>test</scope> + </dependency> + <dependency> <groupId>org.mockito</groupId> - <artifactId>mockito-all</artifactId> + <artifactId>mockito-core</artifactId> <scope>test</scope> </dependency> diff --git a/sdks/java/extensions/sql/pom.xml b/sdks/java/extensions/sql/pom.xml index 9166c9f..2de6f0e 100644 --- a/sdks/java/extensions/sql/pom.xml +++ b/sdks/java/extensions/sql/pom.xml @@ -405,17 +405,17 @@ <dependency> <groupId>org.hamcrest</groupId> - <artifactId>hamcrest-all</artifactId> + <artifactId>hamcrest-core</artifactId> <scope>test</scope> </dependency> <dependency> <groupId>org.hamcrest</groupId> - <artifactId>hamcrest-core</artifactId> + <artifactId>hamcrest-library</artifactId> <scope>test</scope> </dependency> <dependency> <groupId>org.mockito</groupId> - <artifactId>mockito-all</artifactId> + <artifactId>mockito-core</artifactId> <version>${mockito.version}</version> <scope>test</scope> </dependency> diff --git a/sdks/java/fn-execution/pom.xml b/sdks/java/fn-execution/pom.xml index 52a9b98..0535f7e 100644 --- a/sdks/java/fn-execution/pom.xml +++ b/sdks/java/fn-execution/pom.xml @@ -111,16 +111,22 @@ <artifactId>junit</artifactId> <scope>test</scope> </dependency> - + + <dependency> + <groupId>org.hamcrest</groupId> + <artifactId>hamcrest-core</artifactId> + <scope>test</scope> + </dependency> + <dependency> <groupId>org.hamcrest</groupId> - <artifactId>hamcrest-all</artifactId> + <artifactId>hamcrest-library</artifactId> <scope>test</scope> </dependency> <dependency> <groupId>org.mockito</groupId> - <artifactId>mockito-all</artifactId> + <artifactId>mockito-core</artifactId> <scope>test</scope> </dependency> </dependencies> diff --git a/sdks/java/harness/pom.xml b/sdks/java/harness/pom.xml index f82c160..6d83017 100644 --- a/sdks/java/harness/pom.xml +++ b/sdks/java/harness/pom.xml @@ -266,11 +266,17 @@ <!-- test dependencies --> <dependency> <groupId>org.hamcrest</groupId> - <artifactId>hamcrest-all</artifactId> + <artifactId>hamcrest-core</artifactId> <scope>test</scope> </dependency> <dependency> + <groupId>org.hamcrest</groupId> + <artifactId>hamcrest-library</artifactId> + <scope>test</scope> + </dependency> + + <dependency> <groupId>junit</groupId> <artifactId>junit</artifactId> <scope>test</scope> @@ -278,7 +284,7 @@ <dependency> <groupId>org.mockito</groupId> - <artifactId>mockito-all</artifactId> + <artifactId>mockito-core</artifactId> <scope>test</scope> </dependency> diff --git a/sdks/java/io/amazon-web-services/pom.xml b/sdks/java/io/amazon-web-services/pom.xml index c68fb2b..5fdf6a7 100644 --- a/sdks/java/io/amazon-web-services/pom.xml +++ b/sdks/java/io/amazon-web-services/pom.xml @@ -144,13 +144,19 @@ <dependency> <groupId>org.hamcrest</groupId> - <artifactId>hamcrest-all</artifactId> + <artifactId>hamcrest-core</artifactId> <scope>provided</scope> </dependency> <dependency> + <groupId>org.hamcrest</groupId> + <artifactId>hamcrest-library</artifactId> + <scope>provided</scope> + </dependency> + + <dependency> <groupId>org.mockito</groupId> - <artifactId>mockito-all</artifactId> + <artifactId>mockito-core</artifactId> <scope>test</scope> </dependency> diff --git a/sdks/java/io/amqp/pom.xml b/sdks/java/io/amqp/pom.xml index 2654cca..90cb4f1 100644 --- a/sdks/java/io/amqp/pom.xml +++ b/sdks/java/io/amqp/pom.xml @@ -92,7 +92,12 @@ </dependency> <dependency> <groupId>org.hamcrest</groupId> - <artifactId>hamcrest-all</artifactId> + <artifactId>hamcrest-core</artifactId> + <scope>test</scope> + </dependency> + <dependency> + <groupId>org.hamcrest</groupId> + <artifactId>hamcrest-library</artifactId> <scope>test</scope> </dependency> <dependency> @@ -120,4 +125,4 @@ </dependency> </dependencies> -</project> \ No newline at end of file +</project> diff --git a/sdks/java/io/cassandra/pom.xml b/sdks/java/io/cassandra/pom.xml index cb042df..7aa4911 100644 --- a/sdks/java/io/cassandra/pom.xml +++ b/sdks/java/io/cassandra/pom.xml @@ -84,7 +84,7 @@ </dependency> <dependency> <groupId>org.hamcrest</groupId> - <artifactId>hamcrest-all</artifactId> + <artifactId>hamcrest-library</artifactId> <scope>test</scope> </dependency> <dependency> @@ -99,7 +99,7 @@ </dependency> <dependency> <groupId>org.mockito</groupId> - <artifactId>mockito-all</artifactId> + <artifactId>mockito-core</artifactId> <scope>test</scope> </dependency> <dependency> @@ -110,4 +110,4 @@ </dependency> </dependencies> -</project> \ No newline at end of file +</project> diff --git a/sdks/java/io/elasticsearch-tests/elasticsearch-tests-5/pom.xml b/sdks/java/io/elasticsearch-tests/elasticsearch-tests-5/pom.xml index 1dd9027..6fd24c4 100644 --- a/sdks/java/io/elasticsearch-tests/elasticsearch-tests-5/pom.xml +++ b/sdks/java/io/elasticsearch-tests/elasticsearch-tests-5/pom.xml @@ -77,6 +77,22 @@ <plugins> <plugin> <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-dependency-plugin</artifactId> + <executions> + <execution> + <goals> + <goal>analyze-only</goal> + </goals> + <configuration> + <ignoredUsedUndeclaredDependencies> + <ignoredUsedUndeclaredDependency>org.hamcrest:hamcrest-all:jar:${hamcrest.version}</ignoredUsedUndeclaredDependency> + </ignoredUsedUndeclaredDependencies> + </configuration> + </execution> + </executions> + </plugin> + <plugin> + <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-surefire-plugin</artifactId> <!--needed for ESIntegTestCase--> <configuration> diff --git a/sdks/java/io/elasticsearch-tests/elasticsearch-tests-common/pom.xml b/sdks/java/io/elasticsearch-tests/elasticsearch-tests-common/pom.xml index 1187f22..ec3ce91 100644 --- a/sdks/java/io/elasticsearch-tests/elasticsearch-tests-common/pom.xml +++ b/sdks/java/io/elasticsearch-tests/elasticsearch-tests-common/pom.xml @@ -74,4 +74,4 @@ </dependency> </dependencies> -</project> \ No newline at end of file +</project> diff --git a/sdks/java/io/elasticsearch-tests/pom.xml b/sdks/java/io/elasticsearch-tests/pom.xml index 0e42bce..f30e133 100644 --- a/sdks/java/io/elasticsearch-tests/pom.xml +++ b/sdks/java/io/elasticsearch-tests/pom.xml @@ -84,7 +84,13 @@ <dependency> <groupId>org.hamcrest</groupId> - <artifactId>hamcrest-all</artifactId> + <artifactId>hamcrest-core</artifactId> + <scope>test</scope> + </dependency> + + <dependency> + <groupId>org.hamcrest</groupId> + <artifactId>hamcrest-library</artifactId> <scope>test</scope> </dependency> diff --git a/sdks/java/io/elasticsearch/pom.xml b/sdks/java/io/elasticsearch/pom.xml index 9060041..b4a2e4c 100644 --- a/sdks/java/io/elasticsearch/pom.xml +++ b/sdks/java/io/elasticsearch/pom.xml @@ -104,4 +104,4 @@ </dependencies> -</project> \ No newline at end of file +</project> diff --git a/sdks/java/io/file-based-io-tests/pom.xml b/sdks/java/io/file-based-io-tests/pom.xml index f44c63d..6f6d40a 100644 --- a/sdks/java/io/file-based-io-tests/pom.xml +++ b/sdks/java/io/file-based-io-tests/pom.xml @@ -326,10 +326,15 @@ </dependency> <dependency> <groupId>org.hamcrest</groupId> - <artifactId>hamcrest-all</artifactId> + <artifactId>hamcrest-core</artifactId> <scope>test</scope> </dependency> <dependency> + <groupId>org.hamcrest</groupId> + <artifactId>hamcrest-library</artifactId> + <scope>test</scope> + </dependency> + <dependency> <groupId>org.apache.beam</groupId> <artifactId>beam-sdks-java-io-common</artifactId> <scope>test</scope> diff --git a/sdks/java/io/google-cloud-platform/pom.xml b/sdks/java/io/google-cloud-platform/pom.xml index 7aae03b..9b783ee 100644 --- a/sdks/java/io/google-cloud-platform/pom.xml +++ b/sdks/java/io/google-cloud-platform/pom.xml @@ -382,13 +382,19 @@ <dependency> <groupId>org.hamcrest</groupId> - <artifactId>hamcrest-all</artifactId> + <artifactId>hamcrest-core</artifactId> <scope>test</scope> </dependency> <dependency> + <groupId>org.hamcrest</groupId> + <artifactId>hamcrest-library</artifactId> + <scope>test</scope> + </dependency> + + <dependency> <groupId>org.mockito</groupId> - <artifactId>mockito-all</artifactId> + <artifactId>mockito-core</artifactId> <scope>test</scope> </dependency> diff --git a/sdks/java/io/hadoop-common/pom.xml b/sdks/java/io/hadoop-common/pom.xml index b90242d..a9c181b 100644 --- a/sdks/java/io/hadoop-common/pom.xml +++ b/sdks/java/io/hadoop-common/pom.xml @@ -68,11 +68,17 @@ <dependency> <groupId>org.hamcrest</groupId> - <artifactId>hamcrest-all</artifactId> + <artifactId>hamcrest-core</artifactId> <scope>test</scope> </dependency> <dependency> + <groupId>org.hamcrest</groupId> + <artifactId>hamcrest-library</artifactId> + <scope>test</scope> + </dependency> + + <dependency> <groupId>junit</groupId> <artifactId>junit</artifactId> <scope>test</scope> diff --git a/sdks/java/io/hadoop-file-system/pom.xml b/sdks/java/io/hadoop-file-system/pom.xml index 9c55b74..e890cf6 100644 --- a/sdks/java/io/hadoop-file-system/pom.xml +++ b/sdks/java/io/hadoop-file-system/pom.xml @@ -126,13 +126,19 @@ <dependency> <groupId>org.hamcrest</groupId> - <artifactId>hamcrest-all</artifactId> + <artifactId>hamcrest-core</artifactId> <scope>test</scope> </dependency> <dependency> + <groupId>org.hamcrest</groupId> + <artifactId>hamcrest-library</artifactId> + <scope>test</scope> + </dependency> + + <dependency> <groupId>org.mockito</groupId> - <artifactId>mockito-all</artifactId> + <artifactId>mockito-core</artifactId> <scope>test</scope> </dependency> diff --git a/sdks/java/io/hadoop-input-format/pom.xml b/sdks/java/io/hadoop-input-format/pom.xml index f4ed2ce..e5d00f2 100644 --- a/sdks/java/io/hadoop-input-format/pom.xml +++ b/sdks/java/io/hadoop-input-format/pom.xml @@ -423,7 +423,12 @@ </dependency> <dependency> <groupId>org.hamcrest</groupId> - <artifactId>hamcrest-all</artifactId> + <artifactId>hamcrest-core</artifactId> + <scope>test</scope> + </dependency> + <dependency> + <groupId>org.hamcrest</groupId> + <artifactId>hamcrest-library</artifactId> <scope>test</scope> </dependency> <dependency> @@ -439,7 +444,7 @@ </dependency> <dependency> <groupId>org.mockito</groupId> - <artifactId>mockito-all</artifactId> + <artifactId>mockito-core</artifactId> <scope>test</scope> </dependency> <!-- runtime dependencies --> diff --git a/sdks/java/io/hbase/pom.xml b/sdks/java/io/hbase/pom.xml index 7e7dd0a..e363834 100644 --- a/sdks/java/io/hbase/pom.xml +++ b/sdks/java/io/hbase/pom.xml @@ -171,7 +171,12 @@ <dependency> <groupId>org.hamcrest</groupId> - <artifactId>hamcrest-all</artifactId> + <artifactId>hamcrest-core</artifactId> + <scope>test</scope> + </dependency> + <dependency> + <groupId>org.hamcrest</groupId> + <artifactId>hamcrest-library</artifactId> <scope>test</scope> </dependency> </dependencies> diff --git a/sdks/java/io/hcatalog/pom.xml b/sdks/java/io/hcatalog/pom.xml index 0016850..f5c15ba 100644 --- a/sdks/java/io/hcatalog/pom.xml +++ b/sdks/java/io/hcatalog/pom.xml @@ -172,8 +172,13 @@ <dependency> <groupId>org.hamcrest</groupId> - <artifactId>hamcrest-all</artifactId> + <artifactId>hamcrest-core</artifactId> + <scope>test</scope> + </dependency> + <dependency> + <groupId>org.hamcrest</groupId> + <artifactId>hamcrest-library</artifactId> <scope>test</scope> </dependency> </dependencies> -</project> \ No newline at end of file +</project> diff --git a/sdks/java/io/jdbc/pom.xml b/sdks/java/io/jdbc/pom.xml index 58fea35..2a0d352 100644 --- a/sdks/java/io/jdbc/pom.xml +++ b/sdks/java/io/jdbc/pom.xml @@ -325,10 +325,15 @@ </dependency> <dependency> <groupId>org.hamcrest</groupId> - <artifactId>hamcrest-all</artifactId> + <artifactId>hamcrest-core</artifactId> <scope>test</scope> </dependency> <dependency> + <groupId>org.hamcrest</groupId> + <artifactId>hamcrest-library</artifactId> + <scope>test</scope> + </dependency> + <dependency> <groupId>org.slf4j</groupId> <artifactId>slf4j-jdk14</artifactId> <scope>test</scope> diff --git a/sdks/java/io/jms/pom.xml b/sdks/java/io/jms/pom.xml index 67400f9..71aaeb4 100644 --- a/sdks/java/io/jms/pom.xml +++ b/sdks/java/io/jms/pom.xml @@ -107,9 +107,14 @@ </dependency> <dependency> <groupId>org.hamcrest</groupId> - <artifactId>hamcrest-all</artifactId> + <artifactId>hamcrest-core</artifactId> <scope>test</scope> </dependency> + <dependency> + <groupId>org.hamcrest</groupId> + <artifactId>hamcrest-library</artifactId> + <scope>test</scope> + </dependency> </dependencies> </project> diff --git a/sdks/java/io/kafka/pom.xml b/sdks/java/io/kafka/pom.xml index 93fe24f..e8292c4 100644 --- a/sdks/java/io/kafka/pom.xml +++ b/sdks/java/io/kafka/pom.xml @@ -119,10 +119,14 @@ <dependency> <groupId>org.hamcrest</groupId> - <artifactId>hamcrest-all</artifactId> + <artifactId>hamcrest-core</artifactId> + <scope>test</scope> + </dependency> + <dependency> + <groupId>org.hamcrest</groupId> + <artifactId>hamcrest-library</artifactId> <scope>test</scope> </dependency> - <dependency> <groupId>junit</groupId> <artifactId>junit</artifactId> diff --git a/sdks/java/io/kinesis/pom.xml b/sdks/java/io/kinesis/pom.xml index b39476f..acc462a 100644 --- a/sdks/java/io/kinesis/pom.xml +++ b/sdks/java/io/kinesis/pom.xml @@ -134,7 +134,7 @@ <dependency> <groupId>org.mockito</groupId> - <artifactId>mockito-all</artifactId> + <artifactId>mockito-core</artifactId> <scope>test</scope> </dependency> @@ -153,10 +153,14 @@ <dependency> <groupId>org.hamcrest</groupId> - <artifactId>hamcrest-all</artifactId> + <artifactId>hamcrest-core</artifactId> + <scope>test</scope> + </dependency> + <dependency> + <groupId>org.hamcrest</groupId> + <artifactId>hamcrest-library</artifactId> <scope>test</scope> </dependency> - <dependency> <groupId>org.apache.beam</groupId> <artifactId>beam-runners-direct-java</artifactId> diff --git a/sdks/java/io/mongodb/pom.xml b/sdks/java/io/mongodb/pom.xml index 666b4b0..0fab9b4 100644 --- a/sdks/java/io/mongodb/pom.xml +++ b/sdks/java/io/mongodb/pom.xml @@ -101,9 +101,14 @@ </dependency> <dependency> <groupId>org.hamcrest</groupId> - <artifactId>hamcrest-all</artifactId> + <artifactId>hamcrest-core</artifactId> <scope>test</scope> </dependency> + <dependency> + <groupId>org.hamcrest</groupId> + <artifactId>hamcrest-library</artifactId> + <scope>test</scope> + </dependency> </dependencies> </project> diff --git a/sdks/java/io/mqtt/pom.xml b/sdks/java/io/mqtt/pom.xml index 646dd50..ea58135 100644 --- a/sdks/java/io/mqtt/pom.xml +++ b/sdks/java/io/mqtt/pom.xml @@ -109,10 +109,15 @@ </dependency> <dependency> <groupId>org.hamcrest</groupId> - <artifactId>hamcrest-all</artifactId> + <artifactId>hamcrest-core</artifactId> <scope>test</scope> </dependency> <dependency> + <groupId>org.hamcrest</groupId> + <artifactId>hamcrest-library</artifactId> + <scope>test</scope> + </dependency> + <dependency> <groupId>org.slf4j</groupId> <artifactId>slf4j-jdk14</artifactId> <scope>test</scope> diff --git a/sdks/java/io/redis/pom.xml b/sdks/java/io/redis/pom.xml index 0566683..fdc177f 100644 --- a/sdks/java/io/redis/pom.xml +++ b/sdks/java/io/redis/pom.xml @@ -76,10 +76,15 @@ </dependency> <dependency> <groupId>org.hamcrest</groupId> - <artifactId>hamcrest-all</artifactId> + <artifactId>hamcrest-core</artifactId> <scope>test</scope> </dependency> <dependency> + <groupId>org.hamcrest</groupId> + <artifactId>hamcrest-library</artifactId> + <scope>test</scope> + </dependency> + <dependency> <groupId>com.github.kstyrc</groupId> <artifactId>embedded-redis</artifactId> <version>0.6</version> diff --git a/sdks/java/io/solr/pom.xml b/sdks/java/io/solr/pom.xml index beb989e..b6027d5 100644 --- a/sdks/java/io/solr/pom.xml +++ b/sdks/java/io/solr/pom.xml @@ -84,10 +84,10 @@ <dependency> <groupId>org.hamcrest</groupId> - <artifactId>hamcrest-all</artifactId> + <artifactId>hamcrest-library</artifactId> <scope>test</scope> </dependency> - + <dependency> <groupId>junit</groupId> <artifactId>junit</artifactId> @@ -149,4 +149,4 @@ </dependency> </dependencies> -</project> \ No newline at end of file +</project> diff --git a/sdks/java/io/tika/pom.xml b/sdks/java/io/tika/pom.xml index 91a9826..4aa481b 100644 --- a/sdks/java/io/tika/pom.xml +++ b/sdks/java/io/tika/pom.xml @@ -73,6 +73,12 @@ </dependency> <dependency> + <groupId>org.hamcrest</groupId> + <artifactId>hamcrest-library</artifactId> + <scope>test</scope> + </dependency> + + <dependency> <groupId>org.apache.beam</groupId> <artifactId>beam-sdks-java-core</artifactId> <classifier>tests</classifier> @@ -85,11 +91,6 @@ <scope>test</scope> </dependency> - <dependency> - <groupId>org.hamcrest</groupId> - <artifactId>hamcrest-all</artifactId> - <scope>test</scope> - </dependency> <dependency> <groupId>org.apache.tika</groupId> diff --git a/sdks/java/io/xml/pom.xml b/sdks/java/io/xml/pom.xml index fab385e..f478344 100644 --- a/sdks/java/io/xml/pom.xml +++ b/sdks/java/io/xml/pom.xml @@ -103,12 +103,13 @@ <artifactId>hamcrest-core</artifactId> <scope>test</scope> </dependency> - + <dependency> <groupId>org.hamcrest</groupId> - <artifactId>hamcrest-all</artifactId> + <artifactId>hamcrest-library</artifactId> <scope>test</scope> </dependency> + </dependencies> <profiles> diff --git a/sdks/java/java8tests/pom.xml b/sdks/java/java8tests/pom.xml index 195cb91..3709339 100644 --- a/sdks/java/java8tests/pom.xml +++ b/sdks/java/java8tests/pom.xml @@ -70,11 +70,17 @@ <dependency> <groupId>org.hamcrest</groupId> - <artifactId>hamcrest-all</artifactId> + <artifactId>hamcrest-core</artifactId> <scope>test</scope> </dependency> <dependency> + <groupId>org.hamcrest</groupId> + <artifactId>hamcrest-library</artifactId> + <scope>test</scope> + </dependency> + + <dependency> <groupId>junit</groupId> <artifactId>junit</artifactId> <scope>test</scope> diff --git a/sdks/java/javadoc/pom.xml b/sdks/java/javadoc/pom.xml index b6a0be1..17b11cd 100644 --- a/sdks/java/javadoc/pom.xml +++ b/sdks/java/javadoc/pom.xml @@ -273,11 +273,17 @@ <!-- fix scope to be 'compile'.--> <dependency> <groupId>org.hamcrest</groupId> - <artifactId>hamcrest-all</artifactId> + <artifactId>hamcrest-core</artifactId> <scope>compile</scope> </dependency> <dependency> + <groupId>org.hamcrest</groupId> + <artifactId>hamcrest-library</artifactId> + <scope>compile</scope> + </dependency> + + <dependency> <groupId>junit</groupId> <artifactId>junit</artifactId> <scope>compile</scope> diff --git a/sdks/java/maven-archetypes/examples/src/main/resources/archetype-resources/pom.xml b/sdks/java/maven-archetypes/examples/src/main/resources/archetype-resources/pom.xml index 9e306e1..e714616 100644 --- a/sdks/java/maven-archetypes/examples/src/main/resources/archetype-resources/pom.xml +++ b/sdks/java/maven-archetypes/examples/src/main/resources/archetype-resources/pom.xml @@ -400,7 +400,13 @@ which is used in the main code of DebuggingWordCount example. --> <dependency> <groupId>org.hamcrest</groupId> - <artifactId>hamcrest-all</artifactId> + <artifactId>hamcrest-core</artifactId> + <version>${hamcrest.version}</version> + </dependency> + + <dependency> + <groupId>org.hamcrest</groupId> + <artifactId>hamcrest-library</artifactId> <version>${hamcrest.version}</version> </dependency> @@ -420,7 +426,7 @@ <dependency> <groupId>org.mockito</groupId> - <artifactId>mockito-all</artifactId> + <artifactId>mockito-core</artifactId> <version>${mockito.version}</version> <scope>test</scope> </dependency> diff --git a/sdks/java/nexmark/pom.xml b/sdks/java/nexmark/pom.xml index 3a5c5e9..77f88f2 100644 --- a/sdks/java/nexmark/pom.xml +++ b/sdks/java/nexmark/pom.xml @@ -120,6 +120,22 @@ <plugins> <plugin> <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-dependency-plugin</artifactId> + <executions> + <execution> + <goals> + <goal>analyze-only</goal> + </goals> + <configuration> + <ignoredUnusedDeclaredDependencies> + <ignoredUnusedDeclaredDependency>org.hamcrest:hamcrest-library:jar:${hamcrest.version}</ignoredUnusedDeclaredDependency> + </ignoredUnusedDeclaredDependencies> + </configuration> + </execution> + </executions> + </plugin> + <plugin> + <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-shade-plugin</artifactId> <executions> <execution> @@ -257,12 +273,13 @@ <artifactId>hamcrest-core</artifactId> <scope>compile</scope> </dependency> - + <dependency> <groupId>org.hamcrest</groupId> - <artifactId>hamcrest-all</artifactId> + <artifactId>hamcrest-library</artifactId> + <scope>compile</scope> </dependency> - + <dependency> <groupId>org.apache.beam</groupId> <artifactId>beam-runners-direct-java</artifactId> -- To stop receiving notification emails like this one, please contact lc...@apache.org.