spark-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From r...@apache.org
Subject [1/2] git commit: [SPARK-959] Explicitly depend on org.eclipse.jetty.orbit jar
Date Thu, 19 Dec 2013 08:06:48 GMT
Updated Branches:
  refs/heads/master bfba5323b -> d8d3f3e60


[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.)


Project: http://git-wip-us.apache.org/repos/asf/incubator-spark/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-spark/commit/eaf6a269
Tree: http://git-wip-us.apache.org/repos/asf/incubator-spark/tree/eaf6a269
Diff: http://git-wip-us.apache.org/repos/asf/incubator-spark/diff/eaf6a269

Branch: refs/heads/master
Commit: eaf6a269b123e1eca1f1a3cb9e210a9b37ae4a27
Parents: c64a53a
Author: Aaron Davidson <aaron@databricks.com>
Authored: Sun Nov 17 22:37:46 2013 -0800
Committer: Aaron Davidson <aaron@databricks.com>
Committed: Wed Dec 18 23:37:31 2013 -0800

----------------------------------------------------------------------
 project/SparkBuild.scala | 2 ++
 1 file changed, 2 insertions(+)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-spark/blob/eaf6a269/project/SparkBuild.scala
----------------------------------------------------------------------
diff --git a/project/SparkBuild.scala b/project/SparkBuild.scala
index 29f4a4b..ab96cfa 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",


Mime
View raw message