diff options
| author | Prashant Sharma <prashant.s@imaginea.com> | 2013-12-11 10:21:53 +0530 |
|---|---|---|
| committer | Prashant Sharma <prashant.s@imaginea.com> | 2013-12-11 10:21:53 +0530 |
| commit | 603af51bb5257744ce0db28e7f10db6a2ba899ec (patch) | |
| tree | 31ad611d8d56147ec90108d2b3a92d38eae4d150 /pom.xml | |
| parent | 17db6a9041d5e83d7b6fe47f9c36758d0613fcd6 (diff) | |
| parent | d2efe13574090e93c600adeacc7f6356bc196e6c (diff) | |
| download | spark-603af51bb5257744ce0db28e7f10db6a2ba899ec.tar.gz spark-603af51bb5257744ce0db28e7f10db6a2ba899ec.tar.bz2 spark-603af51bb5257744ce0db28e7f10db6a2ba899ec.zip | |
Merge branch 'master' into akka-bug-fix
Conflicts:
core/pom.xml
core/src/main/scala/org/apache/spark/scheduler/DAGScheduler.scala
pom.xml
project/SparkBuild.scala
streaming/pom.xml
yarn/src/main/scala/org/apache/spark/deploy/yarn/YarnAllocationHandler.scala
Diffstat (limited to 'pom.xml')
| -rw-r--r-- | pom.xml | 61 |
1 files changed, 52 insertions, 9 deletions
@@ -104,6 +104,8 @@ <scala.version>2.10.3</scala.version> <mesos.version>0.13.0</mesos.version> <akka.version>2.2.3</akka.version> + <akka.group>com.typesafe.akka</akka.group> + <protobuf.version>2.4.1</protobuf.version> <slf4j.version>1.7.2</slf4j.version> <log4j.version>1.2.17</log4j.version> <hadoop.version>1.0.4</hadoop.version> @@ -200,7 +202,7 @@ <dependency> <groupId>com.google.protobuf</groupId> <artifactId>protobuf-java</artifactId> - <version>2.4.1</version> + <version>${protobuf.version}</version> </dependency> <dependency> <groupId>com.twitter</groupId> @@ -213,7 +215,7 @@ <version>0.3.1</version> </dependency> <dependency> - <groupId>com.typesafe.akka</groupId> + <groupId>${akka.group}</groupId> <artifactId>akka-actor_2.10</artifactId> <version>${akka.version}</version> <exclusions> @@ -224,7 +226,7 @@ </exclusions> </dependency> <dependency> - <groupId>com.typesafe.akka</groupId> + <groupId>${akka.group}</groupId> <artifactId>akka-remote_2.10</artifactId> <version>${akka.version}</version> <exclusions> @@ -235,7 +237,7 @@ </exclusions> </dependency> <dependency> - <groupId>com.typesafe.akka</groupId> + <groupId>${akka.group}</groupId> <artifactId>akka-slf4j_2.10</artifactId> <version>${akka.version}</version> <exclusions> @@ -246,6 +248,17 @@ </exclusions> </dependency> <dependency> + <groupId>${akka.group}</groupId> + <artifactId>akka-zeromq_2.10</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> @@ -256,11 +269,6 @@ <version>1.2.0</version> </dependency> <dependency> - <groupId>com.github.scala-incubator.io</groupId> - <artifactId>scala-io-file_2.10</artifactId> - <version>0.4.1</version> - </dependency> - <dependency> <groupId>org.apache.mesos</groupId> <artifactId>mesos</artifactId> <version>${mesos.version}</version> @@ -729,6 +737,41 @@ </dependencies> </dependencyManagement> </profile> + + <profile> + <id>new-yarn</id> + <properties> + <akka.group>org.spark-project</akka.group> + <akka.version>2.0.5-protobuf-2.5-java-1.5</akka.version> + <hadoop.major.version>2</hadoop.major.version> + <hadoop.version>2.2.0</hadoop.version> + <protobuf.version>2.5.0</protobuf.version> + </properties> + + <modules> + <module>new-yarn</module> + </modules> + + <repositories> + <repository> + <id>maven-root</id> + <name>Maven root repository</name> + <url>http://repo1.maven.org/maven2/</url> + <releases> + <enabled>true</enabled> + </releases> + <snapshots> + <enabled>false</enabled> + </snapshots> + </repository> + </repositories> + + <dependencyManagement> + <dependencies> + </dependencies> + </dependencyManagement> + </profile> + <profile> <id>repl-bin</id> <activation> |