diff options
| author | witgo <witgo@qq.com> | 2014-05-03 23:32:12 -0700 |
|---|---|---|
| committer | Patrick Wendell <pwendell@gmail.com> | 2014-05-03 23:32:12 -0700 |
| commit | fb0543224bcedb8ae3aab4a7ddcc6111a03378fe (patch) | |
| tree | 0e502222bc03740650b151ad45a8984d6f5d3b0d /pom.xml | |
| parent | 92b2902ca06eddd250bb0f50f365ed69f127a842 (diff) | |
| download | spark-fb0543224bcedb8ae3aab4a7ddcc6111a03378fe.tar.gz spark-fb0543224bcedb8ae3aab4a7ddcc6111a03378fe.tar.bz2 spark-fb0543224bcedb8ae3aab4a7ddcc6111a03378fe.zip | |
The default version of yarn is equal to the hadoop version
This is a part of [PR 590](https://github.com/apache/spark/pull/590)
Author: witgo <witgo@qq.com>
Closes #626 from witgo/yarn_version and squashes the following commits:
c390631 [witgo] restore the yarn dependency declarations
f8a4ad8 [witgo] revert remove the dependency of avro in yarn-alpha
2df6cf5 [witgo] review commit
a1d876a [witgo] review commit
20e7e3e [witgo] review commit
c76763b [witgo] The default value of yarn.version is equal to hadoop.version
Diffstat (limited to 'pom.xml')
| -rw-r--r-- | pom.xml | 15 |
1 files changed, 9 insertions, 6 deletions
@@ -16,7 +16,8 @@ ~ limitations under the License. --> -<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> +<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> <modelVersion>4.0.0</modelVersion> <parent> <groupId>org.apache</groupId> @@ -119,7 +120,7 @@ <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> + <yarn.version>${hadoop.version}</yarn.version> <hbase.version>0.94.6</hbase.version> <hive.version>0.12.0</hive.version> <parquet.version>1.3.2</parquet.version> @@ -135,7 +136,8 @@ <repositories> <repository> - <id>maven-repo</id> <!-- This should be at top, it makes maven try the central repo first and then others and hence faster dep resolution --> + <id>maven-repo</id> + <!-- This should be at top, it makes maven try the central repo first and then others and hence faster dep resolution --> <name>Maven Repository</name> <!-- HTTPS is unavailable for Maven Central --> <url>http://repo.maven.apache.org/maven2</url> @@ -847,15 +849,16 @@ <hadoop.version>0.23.7</hadoop.version> <!--<hadoop.version>2.0.5-alpha</hadoop.version> --> </properties> - <modules> - <module>yarn</module> - </modules> <dependencies> <dependency> <groupId>org.apache.avro</groupId> <artifactId>avro</artifactId> </dependency> </dependencies> + <modules> + <module>yarn</module> + </modules> + </profile> <!-- Ganglia integration is not included by default due to LGPL-licensed code --> |