commit ec359f019731c1f01fc00ce99f152bbe31ce0ad4 Author: Ivan Suller Date: Tue Apr 30 16:13:13 2019 +0200 HIVE-21670: replacing mockito-all with mockito-core dependency - and removing all the mockito direct mentions in subprojects as mockito is pulled in in the parent pom anyway diff --git a/accumulo-handler/pom.xml b/accumulo-handler/pom.xml index ec9575e86a..1c18daf238 100644 --- a/accumulo-handler/pom.xml +++ b/accumulo-handler/pom.xml @@ -145,11 +145,6 @@ junit test - - org.mockito - mockito-all - test - diff --git a/cli/pom.xml b/cli/pom.xml index 7c50ace7af..6dd5856a81 100644 --- a/cli/pom.xml +++ b/cli/pom.xml @@ -122,12 +122,6 @@ ${junit.version} test - - org.mockito - mockito-all - ${mockito-all.version} - test - diff --git a/hcatalog/pom.xml b/hcatalog/pom.xml index d9c450671c..e8c863feaf 100644 --- a/hcatalog/pom.xml +++ b/hcatalog/pom.xml @@ -47,12 +47,6 @@ - - org.mockito - mockito-all - ${mockito-all.version} - test - org.apache.hadoop hadoop-common diff --git a/itests/hive-minikdc/pom.xml b/itests/hive-minikdc/pom.xml index 10801a0f05..5f675cc95a 100644 --- a/itests/hive-minikdc/pom.xml +++ b/itests/hive-minikdc/pom.xml @@ -157,12 +157,6 @@ ${junit.version} test - - org.mockito - mockito-all - ${mockito-all.version} - test - org.apache.hadoop hadoop-common diff --git a/itests/hive-unit-hadoop2/pom.xml b/itests/hive-unit-hadoop2/pom.xml index 4ebb8668a2..8647d87f9f 100644 --- a/itests/hive-unit-hadoop2/pom.xml +++ b/itests/hive-unit-hadoop2/pom.xml @@ -136,12 +136,6 @@ ${junit.version} test - - org.mockito - mockito-all - ${mockito-all.version} - test - org.apache.hive hive-it-unit diff --git a/itests/hive-unit/pom.xml b/itests/hive-unit/pom.xml index 6c83217a6e..6d6c8d260f 100644 --- a/itests/hive-unit/pom.xml +++ b/itests/hive-unit/pom.xml @@ -226,12 +226,6 @@ ${junit.version} test - - org.mockito - mockito-all - ${mockito-all.version} - test - org.apache.hadoop hadoop-hdfs diff --git a/itests/qtest-spark/pom.xml b/itests/qtest-spark/pom.xml index d7dff93834..43b087e1d4 100644 --- a/itests/qtest-spark/pom.xml +++ b/itests/qtest-spark/pom.xml @@ -105,12 +105,6 @@ ${spark.kryo.version} test - - org.mockito - mockito-all - ${mockito-all.version} - test - diff --git a/jdbc-handler/pom.xml b/jdbc-handler/pom.xml index 8bc9bba91d..268f38ef11 100644 --- a/jdbc-handler/pom.xml +++ b/jdbc-handler/pom.xml @@ -106,13 +106,6 @@ test - - org.mockito - mockito-all - ${mockito-all.version} - test - - org.powermock powermock-module-junit4 diff --git a/jdbc/pom.xml b/jdbc/pom.xml index 1b0b0ec175..50a3456cc3 100644 --- a/jdbc/pom.xml +++ b/jdbc/pom.xml @@ -116,11 +116,6 @@ ${junit.version} test - - org.mockito - mockito-all - test - diff --git a/llap-client/pom.xml b/llap-client/pom.xml index dc1380364c..6923c3505b 100644 --- a/llap-client/pom.xml +++ b/llap-client/pom.xml @@ -107,12 +107,6 @@ ${junit.version} test - - org.mockito - mockito-all - ${mockito-all.version} - test - org.apache.hadoop hadoop-common diff --git a/llap-common/pom.xml b/llap-common/pom.xml index 35f9b260a1..fb6e1ce995 100644 --- a/llap-common/pom.xml +++ b/llap-common/pom.xml @@ -155,12 +155,6 @@ ${junit.version} test - - org.mockito - mockito-all - ${mockito-all.version} - test - diff --git a/llap-ext-client/pom.xml b/llap-ext-client/pom.xml index 70e641d708..cfc3468342 100644 --- a/llap-ext-client/pom.xml +++ b/llap-ext-client/pom.xml @@ -125,12 +125,6 @@ ${commons-lang3.version} test - - org.mockito - mockito-all - ${mockito-all.version} - test - org.apache.hadoop hadoop-common diff --git a/llap-server/pom.xml b/llap-server/pom.xml index e7932b31fd..2a9a9f178d 100644 --- a/llap-server/pom.xml +++ b/llap-server/pom.xml @@ -309,12 +309,6 @@ ${junit.version} test - - org.mockito - mockito-all - ${mockito-all.version} - test - com.sun.jersey jersey-servlet diff --git a/llap-tez/pom.xml b/llap-tez/pom.xml index 3fdfe318da..ec42e23d8c 100644 --- a/llap-tez/pom.xml +++ b/llap-tez/pom.xml @@ -188,12 +188,6 @@ ${junit.version} test - - org.mockito - mockito-all - ${mockito-all.version} - test - org.apache.hadoop hadoop-common diff --git a/metastore/pom.xml b/metastore/pom.xml index a75ab97ae7..419a125d75 100644 --- a/metastore/pom.xml +++ b/metastore/pom.xml @@ -239,12 +239,6 @@ ${junit.version} test - - org.mockito - mockito-all - ${mockito-all.version} - test - com.lmax disruptor diff --git a/pom.xml b/pom.xml index 601557523e..0fd8b8799b 100644 --- a/pom.xml +++ b/pom.xml @@ -189,7 +189,7 @@ 2.10.0 2.3 1.5.4 - 1.10.19 + 1.10.19 1.7.4 2.0.0-M5 4.1.17.Final @@ -716,8 +716,8 @@ org.mockito - mockito-all - ${mockito-all.version} + mockito-core + ${mockito-core.version} org.slf4j @@ -976,7 +976,7 @@ org.mockito - mockito-all + mockito-core test diff --git a/ql/pom.xml b/ql/pom.xml index 7f51888868..7c4d26f512 100644 --- a/ql/pom.xml +++ b/ql/pom.xml @@ -482,12 +482,6 @@ ${junit.version} test - - org.mockito - mockito-all - ${mockito-all.version} - test - org.apache.tez tez-api diff --git a/serde/pom.xml b/serde/pom.xml index 375658208d..970074ef92 100644 --- a/serde/pom.xml +++ b/serde/pom.xml @@ -140,12 +140,6 @@ ${junit.version} test - - org.mockito - mockito-all - ${mockito-all.version} - test - com.sun.jersey jersey-servlet diff --git a/service/pom.xml b/service/pom.xml index 242844e57d..6723a70098 100644 --- a/service/pom.xml +++ b/service/pom.xml @@ -286,12 +286,6 @@ - - org.mockito - mockito-all - ${mockito-all.version} - test - org.apache.directory.client.ldap diff --git a/spark-client/pom.xml b/spark-client/pom.xml index 9a1e1c2758..a3cf922528 100644 --- a/spark-client/pom.xml +++ b/spark-client/pom.xml @@ -110,11 +110,6 @@ junit test - - org.mockito - mockito-all - test - com.sun.jersey jersey-servlet diff --git a/standalone-metastore/pom.xml b/standalone-metastore/pom.xml index fdebd8f6bf..be1f45291d 100644 --- a/standalone-metastore/pom.xml +++ b/standalone-metastore/pom.xml @@ -88,7 +88,7 @@ 0.9.3 0.9.3 2.8.2 - 1.10.19 + 1.10.19 1.5.1 2.5.0 1.3.0 @@ -286,7 +286,7 @@ org.mockito mockito-core - ${mockito-all.version} + ${mockito-core.version} test diff --git a/testutils/ptest2/pom.xml b/testutils/ptest2/pom.xml index fbc0181299..3fa906f0d8 100644 --- a/testutils/ptest2/pom.xml +++ b/testutils/ptest2/pom.xml @@ -166,7 +166,7 @@ limitations under the License. org.mockito - mockito-all + mockito-core 1.9.0 test