From 2e11adea9613ed140f7a83fafe7631d1e8b6a683 Mon Sep 17 00:00:00 2001 From: GuoQiang Li Date: Sun, 3 Aug 2014 22:51:24 +0800 Subject: [PATCH 1/2] Compilation failed upon the hadoop version 2.0.0-cdh4.5.0 --- project/SparkBuild.scala | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/project/SparkBuild.scala b/project/SparkBuild.scala index ab9f8ba120e8..95642fd49881 100644 --- a/project/SparkBuild.scala +++ b/project/SparkBuild.scala @@ -72,7 +72,7 @@ object SparkBuild extends PomBuild { } Properties.envOrNone("SPARK_HADOOP_VERSION") match { case Some(v) => - if (v.matches("0.23.*")) isAlphaYarn = true + if ("^2\\.[2-9]+".r.findFirstIn(v) == None) isAlphaYarn = true println("NOTE: SPARK_HADOOP_VERSION is deprecated, please use -Dhadoop.version=" + v) System.setProperty("hadoop.version", v) case None => From 727062eee92ead57a022f5bd30d2448169b994b6 Mon Sep 17 00:00:00 2001 From: GuoQiang Li Date: Thu, 18 Sep 2014 14:01:44 +0800 Subject: [PATCH 2/2] review commits --- project/SparkBuild.scala | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/project/SparkBuild.scala b/project/SparkBuild.scala index 95642fd49881..2ae87c513667 100644 --- a/project/SparkBuild.scala +++ b/project/SparkBuild.scala @@ -72,7 +72,7 @@ object SparkBuild extends PomBuild { } Properties.envOrNone("SPARK_HADOOP_VERSION") match { case Some(v) => - if ("^2\\.[2-9]+".r.findFirstIn(v) == None) isAlphaYarn = true + if (v.matches("^0\\.23\\.[0-9]+.*") || v.matches("^2\\.[01]\\.[0-9]+.*")) isAlphaYarn = true println("NOTE: SPARK_HADOOP_VERSION is deprecated, please use -Dhadoop.version=" + v) System.setProperty("hadoop.version", v) case None =>