aboutsummaryrefslogtreecommitdiff
path: root/pom.xml
diff options
context:
space:
mode:
authorwitgo <witgo@qq.com>2014-06-06 11:45:21 -0700
committerPatrick Wendell <pwendell@gmail.com>2014-06-06 11:45:21 -0700
commit41c4a33105c74417192925db355019ba1badeab2 (patch)
tree3ac5e1fb6c93d2b21b6651491b8107e0a17e20a1 /pom.xml
parent8d210560be8b143e48abfbaca347f383b5aa4798 (diff)
downloadspark-41c4a33105c74417192925db355019ba1badeab2.tar.gz
spark-41c4a33105c74417192925db355019ba1badeab2.tar.bz2
spark-41c4a33105c74417192925db355019ba1badeab2.zip
[SPARK-1841]: update scalatest to version 2.1.5
Author: witgo <witgo@qq.com> Closes #713 from witgo/scalatest and squashes the following commits: b627a6a [witgo] merge master 51fb3d6 [witgo] merge master 3771474 [witgo] fix RDDSuite 996d6f9 [witgo] fix TimeStampedWeakValueHashMap test 9dfa4e7 [witgo] merge bug 1479b22 [witgo] merge master 29b9194 [witgo] fix code style 022a7a2 [witgo] fix test dependency a52c0fa [witgo] fix test dependency cd8f59d [witgo] Merge branch 'master' of https://github.com/apache/spark into scalatest 046540d [witgo] fix RDDSuite.scala 2c543b9 [witgo] fix ReplSuite.scala c458928 [witgo] update scalatest to version 2.1.5
Diffstat (limited to 'pom.xml')
-rw-r--r--pom.xml15
1 files changed, 11 insertions, 4 deletions
diff --git a/pom.xml b/pom.xml
index 87c8e29ad1..891468b21b 100644
--- a/pom.xml
+++ b/pom.xml
@@ -459,25 +459,31 @@
<dependency>
<groupId>org.scalatest</groupId>
<artifactId>scalatest_${scala.binary.version}</artifactId>
- <version>1.9.1</version>
+ <version>2.1.5</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.easymock</groupId>
- <artifactId>easymock</artifactId>
+ <artifactId>easymockclassextension</artifactId>
<version>3.1</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.mockito</groupId>
<artifactId>mockito-all</artifactId>
- <version>1.8.5</version>
+ <version>1.9.0</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.scalacheck</groupId>
<artifactId>scalacheck_${scala.binary.version}</artifactId>
- <version>1.10.0</version>
+ <version>1.11.3</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <version>4.10</version>
<scope>test</scope>
</dependency>
<dependency>
@@ -779,6 +785,7 @@
<arg>-unchecked</arg>
<arg>-deprecation</arg>
<arg>-feature</arg>
+ <arg>-language:postfixOps</arg>
</args>
<jvmArgs>
<jvmArg>-Xms1024m</jvmArg>