diff options
| author | Reynold Xin <rxin@cs.berkeley.edu> | 2013-03-18 18:30:14 +0800 |
|---|---|---|
| committer | Reynold Xin <rxin@cs.berkeley.edu> | 2013-03-18 18:30:14 +0800 |
| commit | ba9d00c44a42fea41e136384d884242cce93056e (patch) | |
| tree | fc725976a8ade33b55c7c991a2691683fa2023cc /pom.xml | |
| parent | 19d3b059e3622e5e20b56b4bf1e46cea22b6bee7 (diff) | |
| parent | c1e9cdc49f89222b366a14a20ffd937ca0fb9adc (diff) | |
| download | spark-ba9d00c44a42fea41e136384d884242cce93056e.tar.gz spark-ba9d00c44a42fea41e136384d884242cce93056e.tar.bz2 spark-ba9d00c44a42fea41e136384d884242cce93056e.zip | |
Merge branch 'master' into graph
Conflicts:
run2.cmd
Diffstat (limited to 'pom.xml')
| -rw-r--r-- | pom.xml | 21 |
1 files changed, 14 insertions, 7 deletions
@@ -2,8 +2,8 @@ <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> <modelVersion>4.0.0</modelVersion> <groupId>org.spark-project</groupId> - <artifactId>parent</artifactId> - <version>0.7.0-SNAPSHOT</version> + <artifactId>spark-parent</artifactId> + <version>0.7.1-SNAPSHOT</version> <packaging>pom</packaging> <name>Spark Project Parent POM</name> <url>http://spark-project.org/</url> @@ -59,6 +59,7 @@ <spray.json.version>1.1.1</spray.json.version> <slf4j.version>1.6.1</slf4j.version> <cdh.version>4.1.2</cdh.version> + <log4j.version>1.2.17</log4j.version> </properties> <repositories> @@ -85,9 +86,9 @@ </snapshots> </repository> <repository> - <id>typesafe-repo</id> - <name>Typesafe Repository</name> - <url>http://repo.typesafe.com/typesafe/releases/</url> + <id>akka-repo</id> + <name>Akka Repository</name> + <url>http://repo.akka.io/releases/</url> <releases> <enabled>true</enabled> </releases> @@ -199,7 +200,7 @@ <dependency> <groupId>de.javakaffee</groupId> <artifactId>kryo-serializers</artifactId> - <version>0.20</version> + <version>0.22</version> </dependency> <dependency> <groupId>com.typesafe.akka</groupId> @@ -269,6 +270,12 @@ </dependency> <dependency> + <groupId>log4j</groupId> + <artifactId>log4j</artifactId> + <version>${log4j.version}</version> + </dependency> + + <dependency> <groupId>org.scalatest</groupId> <artifactId>scalatest_${scala.version}</artifactId> <version>1.8</version> @@ -515,7 +522,7 @@ <dependency> <groupId>org.apache.hadoop</groupId> <artifactId>hadoop-core</artifactId> - <version>1.0.3</version> + <version>1.0.4</version> </dependency> </dependencies> </dependencyManagement> |