aboutsummaryrefslogtreecommitdiff
path: root/pom.xml
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 /pom.xml
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 'pom.xml')
-rw-r--r--pom.xml8
1 files changed, 8 insertions, 0 deletions
diff --git a/pom.xml b/pom.xml
index 4c18bd5e42..94dd512cfb 100644
--- a/pom.xml
+++ b/pom.xml
@@ -748,6 +748,10 @@
<artifactId>asm</artifactId>
</exclusion>
<exclusion>
+ <groupId>org.codehaus.jackson</groupId>
+ <artifactId>jackson-mapper-asl</artifactId>
+ </exclusion>
+ <exclusion>
<groupId>org.ow2.asm</groupId>
<artifactId>asm</artifactId>
</exclusion>
@@ -760,6 +764,10 @@
<artifactId>commons-logging</artifactId>
</exclusion>
<exclusion>
+ <groupId>org.mockito</groupId>
+ <artifactId>mockito-all</artifactId>
+ </exclusion>
+ <exclusion>
<groupId>org.mortbay.jetty</groupId>
<artifactId>servlet-api-2.5</artifactId>
</exclusion>