Skip to content

Commit 199f40b

Browse files
committed
- Erased unnecessary CDH5-specific note in docs/building-spark.md
- Remove example of instance -Phadoop-2.2 -Dhadoop.version=2.2.0 in docs/building-spark.md - Enabled hadoop-2.2 profile when the Hadoop version is 2.2.0, which is now the default .Added comment in the yarn/pom.xml to specify that.
1 parent 88a8b88 commit 199f40b

File tree

2 files changed

+10
-6
lines changed

2 files changed

+10
-6
lines changed

docs/building-spark.md

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -83,10 +83,6 @@ mvn -Dhadoop.version=1.2.1 -DskipTests clean package
8383
# Cloudera CDH 4.2.0 with MapReduce v1
8484
mvn -Dhadoop.version=2.0.0-mr1-cdh4.2.0 -DskipTests clean package
8585

86-
#Cloudera CDH 5.3.3 without MapReduce
87-
88-
mvn -Dhadoop.version=2.5.0-cdh5.3.3 -DskipTests clean package
89-
9086
# Apache Hadoop 0.23.x
9187
mvn -Phadoop-0.23 -Dhadoop.version=0.23.7 -DskipTests clean package
9288
{% endhighlight %}
@@ -96,8 +92,6 @@ You can enable the "yarn" profile and optionally set the "yarn.version" property
9692
Examples:
9793

9894
{% highlight bash %}
99-
# Apache Hadoop 2.2.X
100-
mvn -Pyarn -Phadoop-2.2 -Dhadoop.version=2.2.0 -DskipTests clean package
10195

10296
# Apache Hadoop 2.3.X
10397
mvn -Pyarn -Phadoop-2.3 -Dhadoop.version=2.3.0 -DskipTests clean package

yarn/pom.xml

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -109,6 +109,16 @@
109109
<properties>
110110
<jersey.version>1.9</jersey.version>
111111
</properties>
112+
<!-- Enable hadoop-2.2 profile when the Hadoop version is 2.2.0, which is now
113+
the default. Those building against 2.2.x or some distro-specific variation of
114+
that string would still have to manually enable -Phadoop-2.2.
115+
-->
116+
<activation>
117+
<property>
118+
<name>hadoop.version</name>
119+
<value>2.2.0<value>
120+
</property>
121+
</activation>
112122
<dependencies>
113123
<dependency>
114124
<groupId>org.mortbay.jetty</groupId>

0 commit comments

Comments
 (0)