aboutsummaryrefslogtreecommitdiff
path: root/project
diff options
context:
space:
mode:
authorReynold Xin <rxin@apache.org>2014-03-13 12:16:04 -0700
committerPatrick Wendell <pwendell@gmail.com>2014-03-13 12:16:04 -0700
commitca4bf8c572c2f70b484830f1db414b5073744ab6 (patch)
tree35151d6f99283b7286f574b06e4f650cf556014a /project
parent698373211ef3cdf841c82d48168cd5dbe00a57b4 (diff)
downloadspark-ca4bf8c572c2f70b484830f1db414b5073744ab6.tar.gz
spark-ca4bf8c572c2f70b484830f1db414b5073744ab6.tar.bz2
spark-ca4bf8c572c2f70b484830f1db414b5073744ab6.zip
SPARK-1236 - Upgrade Jetty to 9.1.3.v20140225.
Author: Reynold Xin <rxin@apache.org> Closes #113 from rxin/jetty9 and squashes the following commits: 867a2ce [Reynold Xin] Updated Jetty version to 9.1.3.v20140225 in Maven build file. d7c97ca [Reynold Xin] Return the correctly bound port. d14706f [Reynold Xin] Upgrade Jetty to 9.1.3.v20140225.
Diffstat (limited to 'project')
-rw-r--r--project/SparkBuild.scala8
1 files changed, 4 insertions, 4 deletions
diff --git a/project/SparkBuild.scala b/project/SparkBuild.scala
index b0c3bf29df..bfc16e814b 100644
--- a/project/SparkBuild.scala
+++ b/project/SparkBuild.scala
@@ -232,10 +232,10 @@ object SparkBuild extends Build {
libraryDependencies ++= Seq(
"io.netty" % "netty-all" % "4.0.17.Final",
- "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",
+ "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",
/** 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",