diff options
| author | Patrick Wendell <pwendell@gmail.com> | 2013-12-15 20:30:21 -0800 |
|---|---|---|
| committer | Patrick Wendell <pwendell@gmail.com> | 2013-12-16 21:53:51 -0800 |
| commit | c6f95e603e2c58b2fab6255c824a839807f03026 (patch) | |
| tree | 7b11d9a3374b1b86dbf318832ef11b6bfe875e44 /pom.xml | |
| parent | 964a3b6971716823f473f672611951d1e489a552 (diff) | |
| download | spark-c6f95e603e2c58b2fab6255c824a839807f03026.tar.gz spark-c6f95e603e2c58b2fab6255c824a839807f03026.tar.bz2 spark-c6f95e603e2c58b2fab6255c824a839807f03026.zip | |
Attempt with extra repositories
Diffstat (limited to 'pom.xml')
| -rw-r--r-- | pom.xml | 76 |
1 files changed, 43 insertions, 33 deletions
@@ -104,12 +104,11 @@ <scala.version>2.10.3</scala.version> <scala.binary.version>2.10</scala.binary.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> + <akka.version>2.2.3-shaded-protobuf</akka.version> <slf4j.version>1.7.2</slf4j.version> <log4j.version>1.2.17</log4j.version> <hadoop.version>1.0.4</hadoop.version> + <protobuf.version>2.4.1</protobuf.version> <yarn.version>0.23.7</yarn.version> <hbase.version>0.94.6</hbase.version> @@ -200,6 +199,11 @@ <artifactId>asm</artifactId> <version>4.0</version> </dependency> + <!-- In theory we need not directly depend on protobuf since Spark does not directly + use it. However, when building with Hadoop/YARN 2.2 Maven doesn't correctly bump + the protobuf version up from the one Mesos gives. For now we include this variable + to explicitly bump the version when building with YARN. It would be nice to figure + out why Maven can't resolve this correctly (like SBT does). --> <dependency> <groupId>com.google.protobuf</groupId> <artifactId>protobuf-java</artifactId> @@ -216,6 +220,7 @@ <version>0.3.1</version> </dependency> <dependency> +<<<<<<< HEAD <groupId>${akka.group}</groupId> <artifactId>akka-actor_${scala.binary.version}</artifactId> <version>${akka.version}</version> @@ -249,8 +254,13 @@ </exclusions> </dependency> <dependency> +<<<<<<< HEAD <groupId>${akka.group}</groupId> <artifactId>akka-zeromq_${scala.binary.version}</artifactId> +======= + <groupId>org.spark-project.akka</groupId> + <artifactId>akka-zeromq_2.10</artifactId> +>>>>>>> Attempt with extra repositories <version>${akka.version}</version> <exclusions> <exclusion> @@ -461,6 +471,7 @@ </exclusion> </exclusions> </dependency> + <dependency> <groupId>org.apache.hadoop</groupId> <artifactId>hadoop-yarn-client</artifactId> @@ -716,6 +727,7 @@ <hadoop.major.version>2</hadoop.major.version> <!-- 0.23.* is same as 2.0.* - except hardened to run production jobs --> <hadoop.version>0.23.7</hadoop.version> + <protobuf.version>2.5.0</protobuf.version> <!--<hadoop.version>2.0.5-alpha</hadoop.version> --> </properties> @@ -743,39 +755,37 @@ </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> --> + <profile> + <id>new-yarn</id> + <properties> + <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> --> + <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> --> + <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> --> + <dependencyManagement> + <dependencies> + </dependencies> + </dependencyManagement> + </profile> <profile> <id>repl-bin</id> |