diff options
| author | Josh Rosen <joshrosen@databricks.com> | 2015-06-29 14:07:55 -0700 |
|---|---|---|
| committer | Josh Rosen <joshrosen@databricks.com> | 2015-06-29 14:07:55 -0700 |
| commit | 27ef85451cd237caa7016baa69957a35ab365aa8 (patch) | |
| tree | 8a8fe158fa7bfcf0e03b3222f93a37ad5c2eae42 /core | |
| parent | afae9766f28d2e58297405c39862d20a04267b62 (diff) | |
| download | spark-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 'core')
| -rw-r--r-- | core/pom.xml | 10 |
1 files changed, 0 insertions, 10 deletions
diff --git a/core/pom.xml b/core/pom.xml index 565437c486..aee0d92620 100644 --- a/core/pom.xml +++ b/core/pom.xml @@ -69,16 +69,6 @@ <dependency> <groupId>org.apache.hadoop</groupId> <artifactId>hadoop-client</artifactId> - <exclusions> - <exclusion> - <groupId>javax.servlet</groupId> - <artifactId>servlet-api</artifactId> - </exclusion> - <exclusion> - <groupId>org.codehaus.jackson</groupId> - <artifactId>jackson-mapper-asl</artifactId> - </exclusion> - </exclusions> </dependency> <dependency> <groupId>org.apache.spark</groupId> |