aboutsummaryrefslogtreecommitdiff
path: root/LICENSE
diff options
context:
space:
mode:
authorJosh Rosen <joshrosen@databricks.com>2015-06-29 14:07:55 -0700
committerJosh Rosen <joshrosen@databricks.com>2015-06-29 14:07:55 -0700
commit27ef85451cd237caa7016baa69957a35ab365aa8 (patch)
tree8a8fe158fa7bfcf0e03b3222f93a37ad5c2eae42 /LICENSE
parentafae9766f28d2e58297405c39862d20a04267b62 (diff)
downloadspark-27ef85451cd237caa7016baa69957a35ab365aa8.tar.gz
spark-27ef85451cd237caa7016baa69957a35ab365aa8.tar.bz2
spark-27ef85451cd237caa7016baa69957a35ab365aa8.zip
[SPARK-8709] Exclude hadoop-client's mockito-all dependency
This patch excludes `hadoop-client`'s dependency on `mockito-all`. As of #7061, Spark depends on `mockito-core` instead of `mockito-all`, so the dependency from Hadoop was leading to test compilation failures for some of the Hadoop 2 SBT builds. Author: Josh Rosen <joshrosen@databricks.com> Closes #7090 from JoshRosen/SPARK-8709 and squashes the following commits: e190122 [Josh Rosen] [SPARK-8709] Exclude hadoop-client's mockito-all dependency.
Diffstat (limited to 'LICENSE')
-rw-r--r--LICENSE2
1 files changed, 1 insertions, 1 deletions
diff --git a/LICENSE b/LICENSE
index 8672be55ec..f9e412cade 100644
--- a/LICENSE
+++ b/LICENSE
@@ -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-core:1.8.5 - http://www.mockito.org)
+ (The MIT License) Mockito (org.mockito:mockito-core:1.9.5 - http://www.mockito.org)
(MIT License) jquery (https://jquery.org/license/)
(MIT License) AnchorJS (https://github.com/bryanbraun/anchorjs)