aboutsummaryrefslogtreecommitdiff
path: root/pom.xml
diff options
context:
space:
mode:
authorRaymond Liu <raymond.liu@intel.com>2013-11-14 12:44:19 +0800
committerRaymond Liu <raymond.liu@intel.com>2013-11-14 12:44:19 +0800
commita60620b76a98e236f1e4ffda7a2f289e7917b957 (patch)
treef66630007c201074af74ba13dca24ab9894ae543 /pom.xml
parent0f2e3c6e31d56c627ff81cdc93289a7c7cb2ec16 (diff)
parent2054c61a18c277c00661b89bbae365470c297031 (diff)
downloadspark-a60620b76a98e236f1e4ffda7a2f289e7917b957.tar.gz
spark-a60620b76a98e236f1e4ffda7a2f289e7917b957.tar.bz2
spark-a60620b76a98e236f1e4ffda7a2f289e7917b957.zip
Merge branch 'master' into scala-2.10
Diffstat (limited to 'pom.xml')
-rw-r--r--pom.xml6
1 files changed, 6 insertions, 0 deletions
diff --git a/pom.xml b/pom.xml
index 72b9549cfa..4be9d3a3d2 100644
--- a/pom.xml
+++ b/pom.xml
@@ -391,6 +391,12 @@
<version>3.1</version>
<scope>test</scope>
</dependency>
+ <dependency>
+ <groupId>org.mockito</groupId>
+ <artifactId>mockito-all</artifactId>
+ <version>1.8.5</version>
+ <scope>test</scope>
+ </dependency>
<dependency>
<groupId>org.scalacheck</groupId>
<artifactId>scalacheck_${scala-short.version}</artifactId>