Repository: spark Updated Branches: refs/heads/master 04fa1223e -> 3319a3e3c
SPARK-2332 [build] add exclusion for old servlet-api on hadoop-client in core Fix for class of test suite failures in jenkins Author: Peter MacKinnon <[email protected]> Closes #1271 from pdmack/master and squashes the following commits: cfe59fd [Peter MacKinnon] exclude servlet-api in hadoop-client for sbt 6f39fec [Peter MacKinnon] add exclusion for old servlet-api on hadoop-client in core Project: http://git-wip-us.apache.org/repos/asf/spark/repo Commit: http://git-wip-us.apache.org/repos/asf/spark/commit/3319a3e3 Tree: http://git-wip-us.apache.org/repos/asf/spark/tree/3319a3e3 Diff: http://git-wip-us.apache.org/repos/asf/spark/diff/3319a3e3 Branch: refs/heads/master Commit: 3319a3e3c604f187ff8176597b269af04ca5c1c5 Parents: 04fa122 Author: Peter MacKinnon <[email protected]> Authored: Tue Jul 1 00:28:38 2014 -0700 Committer: Reynold Xin <[email protected]> Committed: Tue Jul 1 00:28:38 2014 -0700 ---------------------------------------------------------------------- core/pom.xml | 6 ++++++ project/SparkBuild.scala | 2 +- 2 files changed, 7 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/spark/blob/3319a3e3/core/pom.xml ---------------------------------------------------------------------- diff --git a/core/pom.xml b/core/pom.xml index 8c23842..6abf848 100644 --- a/core/pom.xml +++ b/core/pom.xml @@ -34,6 +34,12 @@ <dependency> <groupId>org.apache.hadoop</groupId> <artifactId>hadoop-client</artifactId> + <exclusions> + <exclusion> + <groupId>javax.servlet</groupId> + <artifactId>servlet-api</artifactId> + </exclusion> + </exclusions> </dependency> <dependency> <groupId>net.java.dev.jets3t</groupId> http://git-wip-us.apache.org/repos/asf/spark/blob/3319a3e3/project/SparkBuild.scala ---------------------------------------------------------------------- diff --git a/project/SparkBuild.scala b/project/SparkBuild.scala index 55a2aa0..5997142 100644 --- a/project/SparkBuild.scala +++ b/project/SparkBuild.scala @@ -371,7 +371,7 @@ object SparkBuild extends Build { "net.java.dev.jets3t" % "jets3t" % jets3tVersion excludeAll(excludeCommonsLogging), "commons-codec" % "commons-codec" % "1.5", // Prevent jets3t from including the older version of commons-codec "org.apache.derby" % "derby" % "10.4.2.0" % "test", - "org.apache.hadoop" % hadoopClient % hadoopVersion excludeAll(excludeJBossNetty, excludeAsm, excludeCommonsLogging, excludeSLF4J, excludeOldAsm), + "org.apache.hadoop" % hadoopClient % hadoopVersion excludeAll(excludeJBossNetty, excludeAsm, excludeCommonsLogging, excludeSLF4J, excludeOldAsm, excludeServletApi), "org.apache.curator" % "curator-recipes" % "2.4.0" excludeAll(excludeJBossNetty), "com.codahale.metrics" % "metrics-core" % codahaleMetricsVersion, "com.codahale.metrics" % "metrics-jvm" % codahaleMetricsVersion,
