Fix pom.xml for maven build
Project: http://git-wip-us.apache.org/repos/asf/incubator-spark/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-spark/commit/4738818d Tree: http://git-wip-us.apache.org/repos/asf/incubator-spark/tree/4738818d Diff: http://git-wip-us.apache.org/repos/asf/incubator-spark/diff/4738818d Branch: refs/heads/master Commit: 4738818dd6efc644a093e983ac4a5a300da14f09 Parents: 1b6e450 Author: Raymond Liu <[email protected]> Authored: Mon Dec 2 13:08:36 2013 +0800 Committer: Raymond Liu <[email protected]> Committed: Tue Dec 3 16:36:05 2013 +0800 ---------------------------------------------------------------------- core/pom.xml | 10 +++------ pom.xml | 61 ++++++++++++++++++++++++++++++++++++++++++-------- streaming/pom.xml | 9 +------- 3 files changed, 56 insertions(+), 24 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-spark/blob/4738818d/core/pom.xml ---------------------------------------------------------------------- diff --git a/core/pom.xml b/core/pom.xml index 6af229c..38f4be1 100644 --- a/core/pom.xml +++ b/core/pom.xml @@ -95,15 +95,15 @@ <version>0.3.1</version> </dependency> <dependency> - <groupId>com.typesafe.akka</groupId> + <groupId>${akka.group}</groupId> <artifactId>akka-actor</artifactId> </dependency> <dependency> - <groupId>com.typesafe.akka</groupId> + <groupId>${akka.group}</groupId> <artifactId>akka-remote</artifactId> </dependency> <dependency> - <groupId>com.typesafe.akka</groupId> + <groupId>${akka.group}</groupId> <artifactId>akka-slf4j</artifactId> </dependency> <dependency> @@ -127,10 +127,6 @@ <artifactId>colt</artifactId> </dependency> <dependency> - <groupId>com.github.scala-incubator.io</groupId> - <artifactId>scala-io-file_2.9.2</artifactId> - </dependency> - <dependency> <groupId>org.apache.mesos</groupId> <artifactId>mesos</artifactId> </dependency> http://git-wip-us.apache.org/repos/asf/incubator-spark/blob/4738818d/pom.xml ---------------------------------------------------------------------- diff --git a/pom.xml b/pom.xml index 42c1e00..9348c77 100644 --- a/pom.xml +++ b/pom.xml @@ -102,7 +102,9 @@ <java.version>1.5</java.version> <scala.version>2.9.3</scala.version> <mesos.version>0.13.0</mesos.version> + <akka.group>com.typesafe.akka</akka.group> <akka.version>2.0.5</akka.version> + <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> @@ -245,7 +247,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> @@ -258,7 +260,7 @@ <version>0.3.1</version> </dependency> <dependency> - <groupId>com.typesafe.akka</groupId> + <groupId>${akka.group}</groupId> <artifactId>akka-actor</artifactId> <version>${akka.version}</version> <exclusions> @@ -269,7 +271,7 @@ </exclusions> </dependency> <dependency> - <groupId>com.typesafe.akka</groupId> + <groupId>${akka.group}</groupId> <artifactId>akka-remote</artifactId> <version>${akka.version}</version> <exclusions> @@ -280,7 +282,7 @@ </exclusions> </dependency> <dependency> - <groupId>com.typesafe.akka</groupId> + <groupId>${akka.group}</groupId> <artifactId>akka-slf4j</artifactId> <version>${akka.version}</version> <exclusions> @@ -291,6 +293,17 @@ </exclusions> </dependency> <dependency> + <groupId>${akka.group}</groupId> + <artifactId>akka-zeromq</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> @@ -301,11 +314,6 @@ <version>1.2.0</version> </dependency> <dependency> - <groupId>com.github.scala-incubator.io</groupId> - <artifactId>scala-io-file_2.9.2</artifactId> - <version>0.4.1</version> - </dependency> - <dependency> <groupId>org.apache.mesos</groupId> <artifactId>mesos</artifactId> <version>${mesos.version}</version> @@ -770,6 +778,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> http://git-wip-us.apache.org/repos/asf/incubator-spark/blob/4738818d/streaming/pom.xml ---------------------------------------------------------------------- diff --git a/streaming/pom.xml b/streaming/pom.xml index 7a9ae6a..4089293 100644 --- a/streaming/pom.xml +++ b/streaming/pom.xml @@ -110,15 +110,8 @@ <artifactId>scala-library</artifactId> </dependency> <dependency> - <groupId>com.typesafe.akka</groupId> + <groupId>${akka.group}</groupId> <artifactId>akka-zeromq</artifactId> - <version>2.0.3</version> - <exclusions> - <exclusion> - <groupId>org.jboss.netty</groupId> - <artifactId>netty</artifactId> - </exclusion> - </exclusions> </dependency> <dependency> <groupId>org.scalatest</groupId>
