diff options
author | Josh Rosen <joshrosen@databricks.com> | 2015-06-27 23:27:52 -0700 |
---|---|---|
committer | Josh Rosen <joshrosen@databricks.com> | 2015-06-27 23:27:52 -0700 |
commit | f51004519c4c4915711fb9992e3aa4f05fd143ec (patch) | |
tree | bc9cee6336e3b4217a68dffab2d952847f43610b | |
parent | 42db3a1c2fb6db61e01756be7fe88c4110ae638e (diff) | |
download | spark-f51004519c4c4915711fb9992e3aa4f05fd143ec.tar.gz spark-f51004519c4c4915711fb9992e3aa4f05fd143ec.tar.bz2 spark-f51004519c4c4915711fb9992e3aa4f05fd143ec.zip |
[SPARK-8683] [BUILD] Depend on mockito-core instead of mockito-all
Spark's tests currently depend on `mockito-all`, which bundles Hamcrest and Objenesis classes. Instead, it should depend on `mockito-core`, which declares those libraries as Maven dependencies. This is necessary in order to fix a dependency conflict that leads to a NoSuchMethodError when using certain Hamcrest matchers.
See https://github.com/mockito/mockito/wiki/Declaring-mockito-dependency for more details.
Author: Josh Rosen <joshrosen@databricks.com>
Closes #7061 from JoshRosen/mockito-core-instead-of-all and squashes the following commits:
70eccbe [Josh Rosen] Depend on mockito-core instead of mockito-all.
-rw-r--r-- | LICENSE | 2 | ||||
-rw-r--r-- | core/pom.xml | 2 | ||||
-rw-r--r-- | extras/kinesis-asl/pom.xml | 2 | ||||
-rw-r--r-- | launcher/pom.xml | 2 | ||||
-rw-r--r-- | mllib/pom.xml | 2 | ||||
-rw-r--r-- | network/common/pom.xml | 2 | ||||
-rw-r--r-- | network/shuffle/pom.xml | 2 | ||||
-rw-r--r-- | pom.xml | 2 | ||||
-rw-r--r-- | repl/pom.xml | 2 | ||||
-rw-r--r-- | unsafe/pom.xml | 2 | ||||
-rw-r--r-- | yarn/pom.xml | 2 |
11 files changed, 11 insertions, 11 deletions
@@ -948,6 +948,6 @@ The following components are provided under the MIT License. See project link fo (MIT License) SLF4J LOG4J-12 Binding (org.slf4j:slf4j-log4j12:1.7.5 - http://www.slf4j.org) (MIT License) pyrolite (org.spark-project:pyrolite:2.0.1 - http://pythonhosted.org/Pyro4/) (MIT License) scopt (com.github.scopt:scopt_2.10:3.2.0 - https://github.com/scopt/scopt) - (The MIT License) Mockito (org.mockito:mockito-all:1.8.5 - http://www.mockito.org) + (The MIT License) Mockito (org.mockito:mockito-core:1.8.5 - http://www.mockito.org) (MIT License) jquery (https://jquery.org/license/) (MIT License) AnchorJS (https://github.com/bryanbraun/anchorjs) diff --git a/core/pom.xml b/core/pom.xml index 40a64beccd..565437c486 100644 --- a/core/pom.xml +++ b/core/pom.xml @@ -354,7 +354,7 @@ </dependency> <dependency> <groupId>org.mockito</groupId> - <artifactId>mockito-all</artifactId> + <artifactId>mockito-core</artifactId> <scope>test</scope> </dependency> <dependency> diff --git a/extras/kinesis-asl/pom.xml b/extras/kinesis-asl/pom.xml index c6f60bc907..c242e7a57b 100644 --- a/extras/kinesis-asl/pom.xml +++ b/extras/kinesis-asl/pom.xml @@ -66,7 +66,7 @@ </dependency> <dependency> <groupId>org.mockito</groupId> - <artifactId>mockito-all</artifactId> + <artifactId>mockito-core</artifactId> <scope>test</scope> </dependency> <dependency> diff --git a/launcher/pom.xml b/launcher/pom.xml index 48dd0d5f91..a853e67f5c 100644 --- a/launcher/pom.xml +++ b/launcher/pom.xml @@ -49,7 +49,7 @@ </dependency> <dependency> <groupId>org.mockito</groupId> - <artifactId>mockito-all</artifactId> + <artifactId>mockito-core</artifactId> <scope>test</scope> </dependency> <dependency> diff --git a/mllib/pom.xml b/mllib/pom.xml index b16058ddc2..a5db14407b 100644 --- a/mllib/pom.xml +++ b/mllib/pom.xml @@ -106,7 +106,7 @@ </dependency> <dependency> <groupId>org.mockito</groupId> - <artifactId>mockito-all</artifactId> + <artifactId>mockito-core</artifactId> <scope>test</scope> </dependency> <dependency> diff --git a/network/common/pom.xml b/network/common/pom.xml index a85e0a66f4..7dc3068ab8 100644 --- a/network/common/pom.xml +++ b/network/common/pom.xml @@ -77,7 +77,7 @@ </dependency> <dependency> <groupId>org.mockito</groupId> - <artifactId>mockito-all</artifactId> + <artifactId>mockito-core</artifactId> <scope>test</scope> </dependency> <dependency> diff --git a/network/shuffle/pom.xml b/network/shuffle/pom.xml index 4b5bfcb6f0..532463e96f 100644 --- a/network/shuffle/pom.xml +++ b/network/shuffle/pom.xml @@ -79,7 +79,7 @@ </dependency> <dependency> <groupId>org.mockito</groupId> - <artifactId>mockito-all</artifactId> + <artifactId>mockito-core</artifactId> <scope>test</scope> </dependency> </dependencies> @@ -681,7 +681,7 @@ </dependency> <dependency> <groupId>org.mockito</groupId> - <artifactId>mockito-all</artifactId> + <artifactId>mockito-core</artifactId> <version>1.9.5</version> <scope>test</scope> </dependency> diff --git a/repl/pom.xml b/repl/pom.xml index 85f7bc8ac1..370b2bc2fa 100644 --- a/repl/pom.xml +++ b/repl/pom.xml @@ -93,7 +93,7 @@ </dependency> <dependency> <groupId>org.mockito</groupId> - <artifactId>mockito-all</artifactId> + <artifactId>mockito-core</artifactId> <scope>test</scope> </dependency> diff --git a/unsafe/pom.xml b/unsafe/pom.xml index dd2ae6457f..33782c6c66 100644 --- a/unsafe/pom.xml +++ b/unsafe/pom.xml @@ -67,7 +67,7 @@ </dependency> <dependency> <groupId>org.mockito</groupId> - <artifactId>mockito-all</artifactId> + <artifactId>mockito-core</artifactId> <scope>test</scope> </dependency> </dependencies> diff --git a/yarn/pom.xml b/yarn/pom.xml index 644def7501..2aeed98285 100644 --- a/yarn/pom.xml +++ b/yarn/pom.xml @@ -107,7 +107,7 @@ </dependency> <dependency> <groupId>org.mockito</groupId> - <artifactId>mockito-all</artifactId> + <artifactId>mockito-core</artifactId> <scope>test</scope> </dependency> <dependency> |