aboutsummaryrefslogtreecommitdiff
path: root/project/SparkBuild.scala
diff options
context:
space:
mode:
authorReynold Xin <rxin@cs.berkeley.edu>2013-02-19 12:44:05 -0800
committerReynold Xin <rxin@cs.berkeley.edu>2013-02-19 12:44:05 -0800
commit19d3b059e3622e5e20b56b4bf1e46cea22b6bee7 (patch)
tree6174901ed0f65ba052e88c48193d69f24c9fe65a /project/SparkBuild.scala
parent81c4d19c612208b932f8579427cb895385336c6e (diff)
parent03d847999e8c54684128573b94973544026081b2 (diff)
downloadspark-19d3b059e3622e5e20b56b4bf1e46cea22b6bee7.tar.gz
spark-19d3b059e3622e5e20b56b4bf1e46cea22b6bee7.tar.bz2
spark-19d3b059e3622e5e20b56b4bf1e46cea22b6bee7.zip
Merge branch 'master' into graph
Diffstat (limited to 'project/SparkBuild.scala')
-rw-r--r--project/SparkBuild.scala3
1 files changed, 2 insertions, 1 deletions
diff --git a/project/SparkBuild.scala b/project/SparkBuild.scala
index 3e383b1300..d0206a23c9 100644
--- a/project/SparkBuild.scala
+++ b/project/SparkBuild.scala
@@ -94,7 +94,8 @@ object SparkBuild extends Build {
"org.eclipse.jetty" % "jetty-server" % "7.5.3.v20111011",
"org.scalatest" %% "scalatest" % "1.8" % "test",
"org.scalacheck" %% "scalacheck" % "1.9" % "test",
- "com.novocode" % "junit-interface" % "0.8" % "test"
+ "com.novocode" % "junit-interface" % "0.8" % "test",
+ "org.easymock" % "easymock" % "3.1" % "test"
),
parallelExecution := false,
/* Workaround for issue #206 (fixed after SBT 0.11.0) */