You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@spark.apache.org by rx...@apache.org on 2013/12/19 09:06:48 UTC
[1/2] git commit: [SPARK-959] Explicitly depend on
org.eclipse.jetty.orbit jar
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 <aa...@databricks.com>
Authored: Sun Nov 17 22:37:46 2013 -0800
Committer: Aaron Davidson <aa...@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",
[2/2] git commit: Merge pull request #183 from aarondav/spark-959
Posted by rx...@apache.org.
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.
Project: http://git-wip-us.apache.org/repos/asf/incubator-spark/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-spark/commit/d8d3f3e6
Tree: http://git-wip-us.apache.org/repos/asf/incubator-spark/tree/d8d3f3e6
Diff: http://git-wip-us.apache.org/repos/asf/incubator-spark/diff/d8d3f3e6
Branch: refs/heads/master
Commit: d8d3f3e60d919c788e63f18a70f11b96c9f6daa0
Parents: bfba532 eaf6a26
Author: Reynold Xin <rx...@apache.org>
Authored: Thu Dec 19 00:06:43 2013 -0800
Committer: Reynold Xin <rx...@apache.org>
Committed: Thu Dec 19 00:06:43 2013 -0800
----------------------------------------------------------------------
project/SparkBuild.scala | 2 ++
1 file changed, 2 insertions(+)
----------------------------------------------------------------------