aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAaron Davidson <aaron@databricks.com>2013-11-17 22:37:46 -0800
committerAaron Davidson <aaron@databricks.com>2013-12-18 23:37:31 -0800
commiteaf6a269b123e1eca1f1a3cb9e210a9b37ae4a27 (patch)
treed5b91025b2799273d861cacb80432e3b0f2b33a8
parentc64a53a48b894c3b5f4631eb0549c3292cd3d167 (diff)
downloadspark-eaf6a269b123e1eca1f1a3cb9e210a9b37ae4a27.tar.gz
spark-eaf6a269b123e1eca1f1a3cb9e210a9b37ae4a27.tar.bz2
spark-eaf6a269b123e1eca1f1a3cb9e210a9b37ae4a27.zip
[SPARK-959] Explicitly depend on org.eclipse.jetty.orbit jar
Without this, in some cases, Ivy attempts to download the wrong file and fails, stopping the whole build. See bug for more details. (This is probably also the beginning of the slow death of our recently prettified dependencies. Form follow function.)
-rw-r--r--project/SparkBuild.scala2
1 files changed, 2 insertions, 0 deletions
diff --git a/project/SparkBuild.scala b/project/SparkBuild.scala
index 29f4a4b9ff..ab96cfa18b 100644
--- a/project/SparkBuild.scala
+++ b/project/SparkBuild.scala
@@ -177,6 +177,8 @@ object SparkBuild extends Build {
libraryDependencies ++= Seq(
"io.netty" % "netty-all" % "4.0.0.CR1",
"org.eclipse.jetty" % "jetty-server" % "7.6.8.v20121106",
+ /** Workaround for SPARK-959. Dependency used by org.eclipse.jetty. Fixed in ivy 2.3.0. */
+ "org.eclipse.jetty.orbit" % "javax.servlet" % "2.5.0.v201103041518" artifacts Artifact("javax.servlet", "jar", "jar"),
"org.scalatest" %% "scalatest" % "1.9.1" % "test",
"org.scalacheck" %% "scalacheck" % "1.10.0" % "test",
"com.novocode" % "junit-interface" % "0.9" % "test",