You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@spark.apache.org by pw...@apache.org on 2013/09/15 23:19:20 UTC
[02/10] git commit: Use different Hadoop version for YARN artifacts.
Use different Hadoop version for YARN artifacts.
This uses a seperate Hadoop version for YARN artifact. This means when people link against
spark-yarn, things will resolve correctly.
Project: http://git-wip-us.apache.org/repos/asf/incubator-spark/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-spark/commit/e9eba8c3
Tree: http://git-wip-us.apache.org/repos/asf/incubator-spark/tree/e9eba8c3
Diff: http://git-wip-us.apache.org/repos/asf/incubator-spark/diff/e9eba8c3
Branch: refs/heads/branch-0.8
Commit: e9eba8c3ce320364f20dbbb19e42df07f936214f
Parents: 45ec1cc
Author: Patrick Wendell <pw...@gmail.com>
Authored: Fri Sep 13 14:06:45 2013 -0700
Committer: Patrick Wendell <pw...@gmail.com>
Committed: Fri Sep 13 15:34:57 2013 -0700
----------------------------------------------------------------------
pom.xml | 11 ++++++-----
yarn/pom.xml | 5 +++++
2 files changed, 11 insertions(+), 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-spark/blob/e9eba8c3/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 7bacbb1..2da016a 100644
--- a/pom.xml
+++ b/pom.xml
@@ -82,6 +82,7 @@
<slf4j.version>1.7.2</slf4j.version>
<log4j.version>1.2.17</log4j.version>
<hadoop.version>1.0.4</hadoop.version>
+ <yarn.version>0.23.7</yarn.version>
<hbase.version>0.94.6</hbase.version>
<PermGen>64m</PermGen>
@@ -382,7 +383,7 @@
<dependency>
<groupId>org.apache.hadoop</groupId>
<artifactId>hadoop-yarn-api</artifactId>
- <version>${hadoop.version}</version>
+ <version>${yarn.version}</version>
<exclusions>
<exclusion>
<groupId>asm</groupId>
@@ -413,7 +414,7 @@
<dependency>
<groupId>org.apache.hadoop</groupId>
<artifactId>hadoop-yarn-common</artifactId>
- <version>${hadoop.version}</version>
+ <version>${yarn.version}</version>
<exclusions>
<exclusion>
<groupId>asm</groupId>
@@ -444,7 +445,7 @@
<dependency>
<groupId>org.apache.hadoop</groupId>
<artifactId>hadoop-yarn-client</artifactId>
- <version>${hadoop.version}</version>
+ <version>${yarn.version}</version>
<exclusions>
<exclusion>
<groupId>asm</groupId>
@@ -700,8 +701,8 @@
<properties>
<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> -->
- <hadoop.version>2.0.5-alpha</hadoop.version>
+ <hadoop.version>0.23.7</hadoop.version>
+ <!--<hadoop.version>2.0.5-alpha</hadoop.version> -->
</properties>
<modules>
http://git-wip-us.apache.org/repos/asf/incubator-spark/blob/e9eba8c3/yarn/pom.xml
----------------------------------------------------------------------
diff --git a/yarn/pom.xml b/yarn/pom.xml
index 27b2002..21b650d 100644
--- a/yarn/pom.xml
+++ b/yarn/pom.xml
@@ -49,6 +49,11 @@
<artifactId>hadoop-yarn-client</artifactId>
</dependency>
<dependency>
+ <groupId>org.apache.hadoop</groupId>
+ <artifactId>hadoop-client</artifactId>
+ <version>${yarn.version}</version>
+ </dependency>
+ <dependency>
<groupId>org.apache.avro</groupId>
<artifactId>avro</artifactId>
</dependency>