Skip to content
Snippets Groups Projects
Commit 00a9d22b authored by Cheng Lian's avatar Cheng Lian Committed by Yin Huai
Browse files

[SPARK-7845] [BUILD] Bumping default Hadoop version used in profile hadoop-1 to 1.2.1

PR #5694 reverted PR #6384 while refactoring `dev/run-tests` to `dev/run-tests.py`. Also, PR #6384 didn't bump Hadoop 1 version defined in POM.

Author: Cheng Lian <lian@databricks.com>

Closes #7062 from liancheng/spark-7845 and squashes the following commits:

c088b72 [Cheng Lian] Bumping default Hadoop version used in profile hadoop-1 to 1.2.1
parent 24fda738
No related branches found
No related tags found
No related merge requests found
......@@ -261,7 +261,7 @@ def get_hadoop_profiles(hadoop_version):
"""
sbt_maven_hadoop_profiles = {
"hadoop1.0": ["-Phadoop-1", "-Dhadoop.version=1.0.4"],
"hadoop1.0": ["-Phadoop-1", "-Dhadoop.version=1.2.1"],
"hadoop2.0": ["-Phadoop-1", "-Dhadoop.version=2.0.0-mr1-cdh4.1.1"],
"hadoop2.2": ["-Pyarn", "-Phadoop-2.2"],
"hadoop2.3": ["-Pyarn", "-Phadoop-2.3", "-Dhadoop.version=2.3.0"],
......
......@@ -1686,7 +1686,7 @@
<profile>
<id>hadoop-1</id>
<properties>
<hadoop.version>1.0.4</hadoop.version>
<hadoop.version>1.2.1</hadoop.version>
<protobuf.version>2.4.1</protobuf.version>
<hbase.version>0.98.7-hadoop1</hbase.version>
<avro.mapred.classifier>hadoop1</avro.mapred.classifier>
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment