From 49505a0b0bc0292725fb84fc6af3f3370d6ea692 Mon Sep 17 00:00:00 2001
From: root <root@ip-10-191-125-131.ec2.internal>
Date: Mon, 17 Oct 2011 18:06:41 +0000
Subject: [PATCH] Switched Jetty to version 7.5 because 8.0 was causing a
conflict with the log4j and Jetty libraries in Hadoop.
---
project/SparkBuild.scala | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/project/SparkBuild.scala b/project/SparkBuild.scala
index 33568befc0..c3e057969b 100644
--- a/project/SparkBuild.scala
+++ b/project/SparkBuild.scala
@@ -25,7 +25,7 @@ object SparkBuild extends Build {
testListeners <<= target.map(t => Seq(new eu.henkelmann.sbt.JUnitXmlTestsListener(t.getAbsolutePath))),
publishTo <<= baseDirectory { base => Some(Resolver.file("Local", base / "target" / "maven" asFile)(Patterns(true, Resolver.mavenStyleBasePattern))) },
libraryDependencies ++= Seq(
- "org.eclipse.jetty" % "jetty-server" % "8.0.1.v20110908",
+ "org.eclipse.jetty" % "jetty-server" % "7.5.3.v20111011",
"org.scalatest" %% "scalatest" % "1.6.1" % "test",
"org.scala-tools.testing" %% "scalacheck" % "1.9" % "test"
),
--
GitLab