Skip to content
Snippets Groups Projects
Commit 46b87b8a authored by Harvey Feng's avatar Harvey Feng
Browse files

Merge pull request #2 from colorant/yarn-client-2.2

Fix pom.xml for maven build
parents 1b6e4507 4738818d
No related branches found
No related tags found
No related merge requests found
...@@ -95,15 +95,15 @@ ...@@ -95,15 +95,15 @@
<version>0.3.1</version> <version>0.3.1</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>com.typesafe.akka</groupId> <groupId>${akka.group}</groupId>
<artifactId>akka-actor</artifactId> <artifactId>akka-actor</artifactId>
</dependency> </dependency>
<dependency> <dependency>
<groupId>com.typesafe.akka</groupId> <groupId>${akka.group}</groupId>
<artifactId>akka-remote</artifactId> <artifactId>akka-remote</artifactId>
</dependency> </dependency>
<dependency> <dependency>
<groupId>com.typesafe.akka</groupId> <groupId>${akka.group}</groupId>
<artifactId>akka-slf4j</artifactId> <artifactId>akka-slf4j</artifactId>
</dependency> </dependency>
<dependency> <dependency>
...@@ -126,10 +126,6 @@ ...@@ -126,10 +126,6 @@
<groupId>colt</groupId> <groupId>colt</groupId>
<artifactId>colt</artifactId> <artifactId>colt</artifactId>
</dependency> </dependency>
<dependency>
<groupId>com.github.scala-incubator.io</groupId>
<artifactId>scala-io-file_2.9.2</artifactId>
</dependency>
<dependency> <dependency>
<groupId>org.apache.mesos</groupId> <groupId>org.apache.mesos</groupId>
<artifactId>mesos</artifactId> <artifactId>mesos</artifactId>
......
...@@ -102,7 +102,9 @@ ...@@ -102,7 +102,9 @@
<java.version>1.5</java.version> <java.version>1.5</java.version>
<scala.version>2.9.3</scala.version> <scala.version>2.9.3</scala.version>
<mesos.version>0.13.0</mesos.version> <mesos.version>0.13.0</mesos.version>
<akka.group>com.typesafe.akka</akka.group>
<akka.version>2.0.5</akka.version> <akka.version>2.0.5</akka.version>
<protobuf.version>2.4.1</protobuf.version>
<slf4j.version>1.7.2</slf4j.version> <slf4j.version>1.7.2</slf4j.version>
<log4j.version>1.2.17</log4j.version> <log4j.version>1.2.17</log4j.version>
<hadoop.version>1.0.4</hadoop.version> <hadoop.version>1.0.4</hadoop.version>
...@@ -245,7 +247,7 @@ ...@@ -245,7 +247,7 @@
<dependency> <dependency>
<groupId>com.google.protobuf</groupId> <groupId>com.google.protobuf</groupId>
<artifactId>protobuf-java</artifactId> <artifactId>protobuf-java</artifactId>
<version>2.4.1</version> <version>${protobuf.version}</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>com.twitter</groupId> <groupId>com.twitter</groupId>
...@@ -258,7 +260,7 @@ ...@@ -258,7 +260,7 @@
<version>0.3.1</version> <version>0.3.1</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>com.typesafe.akka</groupId> <groupId>${akka.group}</groupId>
<artifactId>akka-actor</artifactId> <artifactId>akka-actor</artifactId>
<version>${akka.version}</version> <version>${akka.version}</version>
<exclusions> <exclusions>
...@@ -269,7 +271,7 @@ ...@@ -269,7 +271,7 @@
</exclusions> </exclusions>
</dependency> </dependency>
<dependency> <dependency>
<groupId>com.typesafe.akka</groupId> <groupId>${akka.group}</groupId>
<artifactId>akka-remote</artifactId> <artifactId>akka-remote</artifactId>
<version>${akka.version}</version> <version>${akka.version}</version>
<exclusions> <exclusions>
...@@ -280,7 +282,7 @@ ...@@ -280,7 +282,7 @@
</exclusions> </exclusions>
</dependency> </dependency>
<dependency> <dependency>
<groupId>com.typesafe.akka</groupId> <groupId>${akka.group}</groupId>
<artifactId>akka-slf4j</artifactId> <artifactId>akka-slf4j</artifactId>
<version>${akka.version}</version> <version>${akka.version}</version>
<exclusions> <exclusions>
...@@ -290,6 +292,17 @@ ...@@ -290,6 +292,17 @@
</exclusion> </exclusion>
</exclusions> </exclusions>
</dependency> </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> <dependency>
<groupId>it.unimi.dsi</groupId> <groupId>it.unimi.dsi</groupId>
<artifactId>fastutil</artifactId> <artifactId>fastutil</artifactId>
...@@ -300,11 +313,6 @@ ...@@ -300,11 +313,6 @@
<artifactId>colt</artifactId> <artifactId>colt</artifactId>
<version>1.2.0</version> <version>1.2.0</version>
</dependency> </dependency>
<dependency>
<groupId>com.github.scala-incubator.io</groupId>
<artifactId>scala-io-file_2.9.2</artifactId>
<version>0.4.1</version>
</dependency>
<dependency> <dependency>
<groupId>org.apache.mesos</groupId> <groupId>org.apache.mesos</groupId>
<artifactId>mesos</artifactId> <artifactId>mesos</artifactId>
...@@ -770,6 +778,41 @@ ...@@ -770,6 +778,41 @@
</dependencies> </dependencies>
</dependencyManagement> </dependencyManagement>
</profile> </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> <profile>
<id>repl-bin</id> <id>repl-bin</id>
<activation> <activation>
......
...@@ -110,15 +110,8 @@ ...@@ -110,15 +110,8 @@
<artifactId>scala-library</artifactId> <artifactId>scala-library</artifactId>
</dependency> </dependency>
<dependency> <dependency>
<groupId>com.typesafe.akka</groupId> <groupId>${akka.group}</groupId>
<artifactId>akka-zeromq</artifactId> <artifactId>akka-zeromq</artifactId>
<version>2.0.3</version>
<exclusions>
<exclusion>
<groupId>org.jboss.netty</groupId>
<artifactId>netty</artifactId>
</exclusion>
</exclusions>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.scalatest</groupId> <groupId>org.scalatest</groupId>
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment