diff options
| author | Joseph E. Gonzalez <joseph.e.gonzalez@gmail.com> | 2013-10-14 22:56:42 -0700 |
|---|---|---|
| committer | Joseph E. Gonzalez <joseph.e.gonzalez@gmail.com> | 2013-10-14 22:56:42 -0700 |
| commit | ef7c369092b33a9fcf4be00d98521b92321d63c3 (patch) | |
| tree | 9fcb38b7f5fc667b5cd28939b3c26f6fa0b254bf /pom.xml | |
| parent | 67bb39c54b25e1b13edad01c25f7183e95f8a400 (diff) | |
| parent | 3b11f43e36e2aca2346db7542c52fcbbeee70da2 (diff) | |
| download | spark-ef7c369092b33a9fcf4be00d98521b92321d63c3.tar.gz spark-ef7c369092b33a9fcf4be00d98521b92321d63c3.tar.bz2 spark-ef7c369092b33a9fcf4be00d98521b92321d63c3.zip | |
merged with upstream changes
Diffstat (limited to 'pom.xml')
| -rw-r--r-- | pom.xml | 21 |
1 files changed, 16 insertions, 5 deletions
@@ -25,7 +25,7 @@ </parent> <groupId>org.apache.spark</groupId> <artifactId>spark-parent</artifactId> - <version>0.8.0-SNAPSHOT</version> + <version>0.9.0-incubating-SNAPSHOT</version> <packaging>pom</packaging> <name>Spark Project Parent POM</name> <url>http://spark.incubator.apache.org/</url> @@ -40,6 +40,7 @@ <connection>scm:git:git@github.com:apache/incubator-spark.git</connection> <developerConnection>scm:git:https://git-wip-us.apache.org/repos/asf/incubator-spark.git</developerConnection> <url>scm:git:git@github.com:apache/incubator-spark.git</url> + <tag>HEAD</tag> </scm> <developers> <developer> @@ -323,7 +324,7 @@ <dependency> <groupId>org.scalatest</groupId> - <artifactId>scalatest_${scala.version}</artifactId> + <artifactId>scalatest_2.9.3</artifactId> <version>1.9.1</version> <scope>test</scope> </dependency> @@ -335,7 +336,7 @@ </dependency> <dependency> <groupId>org.scalacheck</groupId> - <artifactId>scalacheck_${scala.version}</artifactId> + <artifactId>scalacheck_2.9.3</artifactId> <version>1.10.0</version> <scope>test</scope> </dependency> @@ -346,6 +347,17 @@ <scope>test</scope> </dependency> <dependency> + <groupId>org.apache.zookeeper</groupId> + <artifactId>zookeeper</artifactId> + <version>3.4.5</version> + <exclusions> + <exclusion> + <groupId>org.jboss.netty</groupId> + <artifactId>netty</artifactId> + </exclusion> + </exclusions> + </dependency> + <dependency> <groupId>org.apache.hadoop</groupId> <artifactId>hadoop-client</artifactId> <version>${hadoop.version}</version> @@ -558,7 +570,6 @@ <useZincServer>true</useZincServer> <args> <arg>-unchecked</arg> - <arg>-optimise</arg> <arg>-deprecation</arg> </args> <jvmArgs> @@ -605,7 +616,7 @@ <junitxml>.</junitxml> <filereports>${project.build.directory}/SparkTestSuite.txt</filereports> <argLine>-Xms64m -Xmx3g</argLine> - <stderr/> + <stderr /> </configuration> <executions> <execution> |