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 /LICENSE | |
| 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.
Diffstat (limited to 'LICENSE')
| -rw-r--r-- | LICENSE | 2 |
1 files changed, 1 insertions, 1 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) |