diff options
| author | Reynold Xin <rxin@apache.org> | 2014-01-13 16:21:26 -0800 |
|---|---|---|
| committer | Reynold Xin <rxin@apache.org> | 2014-01-13 16:21:26 -0800 |
| commit | e2d25d2dfeb1d43d1e36f169250d8efef4ac232a (patch) | |
| tree | d911a37f5aacc89bc3a1c76d41842e1c156aec6a /pom.xml | |
| parent | 8038da232870fe016e73122a2ef110ac8e56ca1e (diff) | |
| parent | b93f9d42f21f03163734ef97b2871db945e166da (diff) | |
| download | spark-e2d25d2dfeb1d43d1e36f169250d8efef4ac232a.tar.gz spark-e2d25d2dfeb1d43d1e36f169250d8efef4ac232a.tar.bz2 spark-e2d25d2dfeb1d43d1e36f169250d8efef4ac232a.zip | |
Merge branch 'master' into graphx
Diffstat (limited to 'pom.xml')
| -rw-r--r-- | pom.xml | 17 |
1 files changed, 17 insertions, 0 deletions
@@ -259,6 +259,17 @@ </exclusions> </dependency> <dependency> + <groupId>${akka.group}</groupId> + <artifactId>akka-testkit_${scala.binary.version}</artifactId> + <version>${akka.version}</version> + <exclusions> + <exclusion> + <groupId>org.jboss.netty</groupId> + <artifactId>netty</artifactId> + </exclusion> + </exclusions> + </dependency> + <dependency> <groupId>it.unimi.dsi</groupId> <artifactId>fastutil</artifactId> <version>6.4.4</version> @@ -347,6 +358,12 @@ <scope>test</scope> </dependency> <dependency> + <groupId>org.mockito</groupId> + <artifactId>mockito-all</artifactId> + <scope>test</scope> + <version>1.8.5</version> + </dependency> + <dependency> <groupId>commons-io</groupId> <artifactId>commons-io</artifactId> <version>2.4</version> |