diff options
author | Hossein Falaki <falaki@gmail.com> | 2014-01-07 21:28:26 -0800 |
---|---|---|
committer | Hossein Falaki <falaki@gmail.com> | 2014-01-07 21:28:26 -0800 |
commit | 46cb980a5f5ba55f341b8bcce4f0d1e5213989d3 (patch) | |
tree | ff3823085f27c0f4477d25a056d333c429c5d6c9 /docs/building-with-maven.md | |
parent | 150089dae12bbba693db4edbfcea360b443637df (diff) | |
parent | b2e690f839e7ee47f405135d35170173386c5d13 (diff) | |
download | spark-46cb980a5f5ba55f341b8bcce4f0d1e5213989d3.tar.gz spark-46cb980a5f5ba55f341b8bcce4f0d1e5213989d3.tar.bz2 spark-46cb980a5f5ba55f341b8bcce4f0d1e5213989d3.zip |
Fixed merge conflict
Diffstat (limited to 'docs/building-with-maven.md')
-rw-r--r-- | docs/building-with-maven.md | 14 |
1 files changed, 5 insertions, 9 deletions
diff --git a/docs/building-with-maven.md b/docs/building-with-maven.md index c709001632..b9ff0af76f 100644 --- a/docs/building-with-maven.md +++ b/docs/building-with-maven.md @@ -37,20 +37,16 @@ For Apache Hadoop versions 1.x, Cloudera CDH MRv1, and other Hadoop versions wit # Cloudera CDH 4.2.0 with MapReduce v1 $ mvn -Dhadoop.version=2.0.0-mr1-cdh4.2.0 -DskipTests clean package -For Apache Hadoop 2.x, 0.23.x, Cloudera CDH MRv2, and other Hadoop versions with YARN, you should enable the "hadoop2-yarn" profile and set the "yarn.version" property: +For Apache Hadoop 2.x, 0.23.x, Cloudera CDH MRv2, and other Hadoop versions with YARN, you should enable the "yarn-alpha" or "yarn" profile and set the "hadoop.version", "yarn.version" property: # Apache Hadoop 2.0.5-alpha - $ mvn -Phadoop2-yarn -Dhadoop.version=2.0.5-alpha -Dyarn.version=2.0.5-alpha -DskipTests clean package + $ mvn -Pyarn-alpha -Dhadoop.version=2.0.5-alpha -Dyarn.version=2.0.5-alpha -DskipTests clean package # Cloudera CDH 4.2.0 with MapReduce v2 - $ mvn -Phadoop2-yarn -Dhadoop.version=2.0.0-cdh4.2.0 -Dyarn.version=2.0.0-chd4.2.0 -DskipTests clean package + $ mvn -Pyarn-alpha -Dhadoop.version=2.0.0-cdh4.2.0 -Dyarn.version=2.0.0-chd4.2.0 -DskipTests clean package -Hadoop versions 2.2.x and newer can be built by setting the ```new-yarn``` and the ```yarn.version``` as follows: - - # Apache Hadoop 2.2.X and newer - $ mvn -Dyarn.version=2.2.0 -Dhadoop.version=2.2.0 -Pnew-yarn - -The build process handles Hadoop 2.2.x as a special case that uses the directory ```new-yarn```, which supports the new YARN API. Furthermore, for this version, the build depends on artifacts published by the spark-project to enable Akka 2.0.5 to work with protobuf 2.5. + # Apache Hadoop 2.2.X ( e.g. 2.2.0 as below ) and newer + $ mvn -Pyarn -Dhadoop.version=2.2.0 -Dyarn.version=2.2.0 -DskipTests clean package ## Spark Tests in Maven ## |