Updated Branches: refs/heads/branch-0.8 e329cf6b7 -> e270cd083
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/e270cd08 Tree: http://git-wip-us.apache.org/repos/asf/incubator-spark/tree/e270cd08 Diff: http://git-wip-us.apache.org/repos/asf/incubator-spark/diff/e270cd08 Branch: refs/heads/branch-0.8 Commit: e270cd0838c4b6c6f326cc9df41607b142c6cac1 Parents: e329cf6 Author: Patrick Wendell <pwend...@gmail.com> Authored: Fri Sep 13 14:06:45 2013 -0700 Committer: Patrick Wendell <pwend...@gmail.com> Committed: Fri Sep 13 20:07:51 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/e270cd08/pom.xml ---------------------------------------------------------------------- diff --git a/pom.xml b/pom.xml index ba3c34b..4c89df0 100644 --- a/pom.xml +++ b/pom.xml @@ -83,6 +83,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> @@ -383,7 +384,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> @@ -414,7 +415,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> @@ -445,7 +446,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> @@ -701,8 +702,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/e270cd08/yarn/pom.xml ---------------------------------------------------------------------- diff --git a/yarn/pom.xml b/yarn/pom.xml index 191b5d6..26f6faa 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>
