You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@spark.apache.org by ma...@apache.org on 2013/11/13 04:13:54 UTC
[2/3] git commit: Add mockito to the sbt build
Add mockito to the sbt build
Project: http://git-wip-us.apache.org/repos/asf/incubator-spark/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-spark/commit/17bb9a27
Tree: http://git-wip-us.apache.org/repos/asf/incubator-spark/tree/17bb9a27
Diff: http://git-wip-us.apache.org/repos/asf/incubator-spark/diff/17bb9a27
Branch: refs/heads/master
Commit: 17bb9a27b2611c9e1f3b10487570484ef3ba8017
Parents: a35472e
Author: tgravescs <tg...@yahoo.com>
Authored: Mon Nov 11 10:01:23 2013 -0600
Committer: tgravescs <tg...@yahoo.com>
Committed: Mon Nov 11 10:01:23 2013 -0600
----------------------------------------------------------------------
project/SparkBuild.scala | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-spark/blob/17bb9a27/project/SparkBuild.scala
----------------------------------------------------------------------
diff --git a/project/SparkBuild.scala b/project/SparkBuild.scala
index 45fd30a..c20848b 100644
--- a/project/SparkBuild.scala
+++ b/project/SparkBuild.scala
@@ -170,7 +170,8 @@ object SparkBuild extends Build {
"org.scalatest" %% "scalatest" % "1.9.1" % "test",
"org.scalacheck" %% "scalacheck" % "1.10.0" % "test",
"com.novocode" % "junit-interface" % "0.9" % "test",
- "org.easymock" % "easymock" % "3.1" % "test"
+ "org.easymock" % "easymock" % "3.1" % "test",
+ "org.mockito" % "mockito-all" % "1.8.5" % "test"
),
/* Workaround for issue #206 (fixed after SBT 0.11.0) */
watchTransitiveSources <<= Defaults.inDependencies[Task[Seq[File]]](watchSources.task,