diff options
| author | Patrick Wendell <pwendell@gmail.com> | 2014-03-18 00:46:03 -0700 |
|---|---|---|
| committer | Reynold Xin <rxin@apache.org> | 2014-03-18 00:46:03 -0700 |
| commit | e7423d4040ebd1ec4105d8d4b9a4a6600b18c2ac (patch) | |
| tree | b0dc522958d9805429b6240ab8a98951e8e4f03e /project/SparkBuild.scala | |
| parent | e3681f26fae7e87321ac991f5a0fb7517415803a (diff) | |
| download | spark-e7423d4040ebd1ec4105d8d4b9a4a6600b18c2ac.tar.gz spark-e7423d4040ebd1ec4105d8d4b9a4a6600b18c2ac.tar.bz2 spark-e7423d4040ebd1ec4105d8d4b9a4a6600b18c2ac.zip | |
Revert "SPARK-1236 - Upgrade Jetty to 9.1.3.v20140225."
This reverts commit ca4bf8c572c2f70b484830f1db414b5073744ab6.
Jetty 9 requires JDK7 which is probably not a dependency we want to bump right now. Before Spark 1.0 we should consider upgrading to Jetty 8. However, in the mean time to ease some pain let's revert this. Sorry for not catching this during the initial review. cc/ @rxin
Author: Patrick Wendell <pwendell@gmail.com>
Closes #167 from pwendell/jetty-revert and squashes the following commits:
811b1c5 [Patrick Wendell] Revert "SPARK-1236 - Upgrade Jetty to 9.1.3.v20140225."
Diffstat (limited to 'project/SparkBuild.scala')
| -rw-r--r-- | project/SparkBuild.scala | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/project/SparkBuild.scala b/project/SparkBuild.scala index db24f124f3..aff191c98b 100644 --- a/project/SparkBuild.scala +++ b/project/SparkBuild.scala @@ -238,10 +238,10 @@ object SparkBuild extends Build { libraryDependencies ++= Seq( "io.netty" % "netty-all" % "4.0.17.Final", - "org.eclipse.jetty" % "jetty-server" % "9.1.3.v20140225", - "org.eclipse.jetty" % "jetty-util" % "9.1.3.v20140225", - "org.eclipse.jetty" % "jetty-plus" % "9.1.3.v20140225", - "org.eclipse.jetty" % "jetty-security" % "9.1.3.v20140225", + "org.eclipse.jetty" % "jetty-server" % "7.6.8.v20121106", + "org.eclipse.jetty" % "jetty-util" % "7.6.8.v20121106", + "org.eclipse.jetty" % "jetty-plus" % "7.6.8.v20121106", + "org.eclipse.jetty" % "jetty-security" % "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", |