aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSean Owen <sowen@cloudera.com>2015-05-03 21:22:31 +0100
committerSean Owen <sowen@cloudera.com>2015-05-03 21:22:31 +0100
commit9e25b09f8809378777ae8bbe75dca12d2c45ff4c (patch)
tree694f0117283d24c76df50c283620d7b23149a756
parentdaa70bf135f23381f5f410aa95a1c0e5a2888568 (diff)
downloadspark-9e25b09f8809378777ae8bbe75dca12d2c45ff4c.tar.gz
spark-9e25b09f8809378777ae8bbe75dca12d2c45ff4c.tar.bz2
spark-9e25b09f8809378777ae8bbe75dca12d2c45ff4c.zip
[SPARK-7302] [DOCS] SPARK building documentation still mentions building for yarn 0.23
Remove references to Hadoop 0.23 CC tgravescs Is this what you had in mind? basically all refs to 0.23? We don't support YARN 0.23, but also don't support Hadoop 0.23 anymore AFAICT. There are no builds or releases for it. In fact, on a related note, refs to CDH3 (Hadoop 0.20.2) should be removed as this certainly isn't supported either. Author: Sean Owen <sowen@cloudera.com> Closes #5863 from srowen/SPARK-7302 and squashes the following commits: 42f5d1e [Sean Owen] Remove CDH3 (Hadoop 0.20.2) refs too dad02e3 [Sean Owen] Remove references to Hadoop 0.23
-rw-r--r--docs/building-spark.md4
-rw-r--r--docs/hadoop-third-party-distributions.md3
-rwxr-xr-xmake-distribution.sh2
-rw-r--r--pom.xml14
4 files changed, 1 insertions, 22 deletions
diff --git a/docs/building-spark.md b/docs/building-spark.md
index ea79c5bc27..287fcd3c40 100644
--- a/docs/building-spark.md
+++ b/docs/building-spark.md
@@ -66,7 +66,6 @@ Because HDFS is not protocol-compatible across versions, if you want to read fro
<tr><th>Hadoop version</th><th>Profile required</th></tr>
</thead>
<tbody>
- <tr><td>0.23.x</td><td>hadoop-0.23</td></tr>
<tr><td>1.x to 2.1.x</td><td>(none)</td></tr>
<tr><td>2.2.x</td><td>hadoop-2.2</td></tr>
<tr><td>2.3.x</td><td>hadoop-2.3</td></tr>
@@ -82,9 +81,6 @@ mvn -Dhadoop.version=1.2.1 -DskipTests clean package
# Cloudera CDH 4.2.0 with MapReduce v1
mvn -Dhadoop.version=2.0.0-mr1-cdh4.2.0 -DskipTests clean package
-
-# Apache Hadoop 0.23.x
-mvn -Phadoop-0.23 -Dhadoop.version=0.23.7 -DskipTests clean package
{% endhighlight %}
You can enable the "yarn" profile and optionally set the "yarn.version" property if it is different from "hadoop.version". Spark only supports YARN versions 2.2.0 and later.
diff --git a/docs/hadoop-third-party-distributions.md b/docs/hadoop-third-party-distributions.md
index 87dcc58feb..96bd69ca3b 100644
--- a/docs/hadoop-third-party-distributions.md
+++ b/docs/hadoop-third-party-distributions.md
@@ -29,9 +29,6 @@ the _exact_ Hadoop version you are running to avoid any compatibility errors.
<tr><th>Release</th><th>Version code</th></tr>
<tr><td>CDH 4.X.X (YARN mode)</td><td>2.0.0-cdh4.X.X</td></tr>
<tr><td>CDH 4.X.X</td><td>2.0.0-mr1-cdh4.X.X</td></tr>
- <tr><td>CDH 3u6</td><td>0.20.2-cdh3u6</td></tr>
- <tr><td>CDH 3u5</td><td>0.20.2-cdh3u5</td></tr>
- <tr><td>CDH 3u4</td><td>0.20.2-cdh3u4</td></tr>
</table>
</td>
<td>
diff --git a/make-distribution.sh b/make-distribution.sh
index 92177e19fe..1bfa9acb1f 100755
--- a/make-distribution.sh
+++ b/make-distribution.sh
@@ -58,7 +58,7 @@ while (( "$#" )); do
--hadoop)
echo "Error: '--hadoop' is no longer supported:"
echo "Error: use Maven profiles and options -Dhadoop.version and -Dyarn.version instead."
- echo "Error: Related profiles include hadoop-0.23, hdaoop-2.2, hadoop-2.3 and hadoop-2.4."
+ echo "Error: Related profiles include hadoop-2.2, hadoop-2.3 and hadoop-2.4."
exit_with_usage
;;
--with-yarn)
diff --git a/pom.xml b/pom.xml
index 4313f94003..de18741fea 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1615,20 +1615,6 @@
-->
<profile>
- <id>hadoop-0.23</id>
- <!-- SPARK-1121: Adds an explicit dependency on Avro to work around a Hadoop 0.23.X issue -->
- <dependencies>
- <dependency>
- <groupId>org.apache.avro</groupId>
- <artifactId>avro</artifactId>
- </dependency>
- </dependencies>
- <properties>
- <hadoop.version>0.23.10</hadoop.version>
- </properties>
- </profile>
-
- <profile>
<id>hadoop-2.2</id>
<properties>
<hadoop.version>2.2.0</hadoop.version>