diff options
author | Reynold Xin <rxin@apache.org> | 2013-12-19 00:06:43 -0800 |
---|---|---|
committer | Reynold Xin <rxin@apache.org> | 2013-12-19 00:06:43 -0800 |
commit | d8d3f3e60d919c788e63f18a70f11b96c9f6daa0 (patch) | |
tree | f7d4fac14f9e986fd114bebd44fa93cf5a0d89a0 | |
parent | bfba5323bedca3aa021e3cd9267d88379e767a92 (diff) | |
parent | eaf6a269b123e1eca1f1a3cb9e210a9b37ae4a27 (diff) | |
download | spark-d8d3f3e60d919c788e63f18a70f11b96c9f6daa0.tar.gz spark-d8d3f3e60d919c788e63f18a70f11b96c9f6daa0.tar.bz2 spark-d8d3f3e60d919c788e63f18a70f11b96c9f6daa0.zip |
Merge pull request #183 from aarondav/spark-959
[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](https://spark-project.atlassian.net/browse/SPARK-959) for more details.
Note that this may not be the best solution, as I do not understand the root cause of why this only happens for some people. However, it is reported to work.
-rw-r--r-- | project/SparkBuild.scala | 2 |
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", |