From ce98d0f25bd7112fa510bf091e6516ec8c704edb Mon Sep 17 00:00:00 2001
From: Takuya UESHIN <ueshin@happy-camper.st>
Date: Tue, 18 Nov 2014 00:24:21 +0900
Subject: [PATCH 1/3] Set non-empty value to system property "scala-2.11" if
 the property exists instead of adding profile.

---
 project/SparkBuild.scala | 10 +++-------
 1 file changed, 3 insertions(+), 7 deletions(-)

diff --git a/project/SparkBuild.scala b/project/SparkBuild.scala
index 1697b6d4f2d43..b1eb29c955902 100644
--- a/project/SparkBuild.scala
+++ b/project/SparkBuild.scala
@@ -101,14 +101,10 @@ object SparkBuild extends PomBuild {
       v.split("(\\s+|,)").filterNot(_.isEmpty).map(_.trim.replaceAll("-P", "")).toSeq
     }
 
-    if (profiles.exists(_.contains("scala-"))) {
-      profiles
-    } else if (System.getProperty("scala-2.11") != null) {
-      profiles ++ Seq("scala-2.11")
-    } else {
-      println("Enabled default scala profile")
-      profiles ++ Seq("scala-2.10")
+    if (System.getProperty("scala-2.11") != null && System.getProperty("scala-2.11") == "") {
+      System.setProperty("scala-2.11", "true")
     }
+    profiles
   }
 
   Properties.envOrNone("SBT_MAVEN_PROPERTIES") match {

From 4eef52b685911a370b318a0571f7b97e90d3cef1 Mon Sep 17 00:00:00 2001
From: Takuya UESHIN <ueshin@happy-camper.st>
Date: Wed, 19 Nov 2014 05:34:39 +0900
Subject: [PATCH 2/3] Remove unneeded condition.

---
 project/SparkBuild.scala | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/project/SparkBuild.scala b/project/SparkBuild.scala
index b1eb29c955902..4d79d95f0e7a2 100644
--- a/project/SparkBuild.scala
+++ b/project/SparkBuild.scala
@@ -101,7 +101,7 @@ object SparkBuild extends PomBuild {
       v.split("(\\s+|,)").filterNot(_.isEmpty).map(_.trim.replaceAll("-P", "")).toSeq
     }
 
-    if (System.getProperty("scala-2.11") != null && System.getProperty("scala-2.11") == "") {
+    if (System.getProperty("scala-2.11") == "") {
       System.setProperty("scala-2.11", "true")
     }
     profiles

From 14d86e817d3829f5b3384f2a3f3c7ca70f4e5375 Mon Sep 17 00:00:00 2001
From: Takuya UESHIN <ueshin@happy-camper.st>
Date: Wed, 19 Nov 2014 16:53:54 +0900
Subject: [PATCH 3/3] Add a comment.

---
 project/SparkBuild.scala | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/project/SparkBuild.scala b/project/SparkBuild.scala
index 4d79d95f0e7a2..5a043da140083 100644
--- a/project/SparkBuild.scala
+++ b/project/SparkBuild.scala
@@ -102,6 +102,9 @@ object SparkBuild extends PomBuild {
     }
 
     if (System.getProperty("scala-2.11") == "") {
+      // To activate scala-2.11 profile, replace empty property value to non-empty value
+      // in the same way as Maven which handles -Dname as -Dname=true before executes build process.
+      // see: https://github.com/apache/maven/blob/maven-3.0.4/maven-embedder/src/main/java/org/apache/maven/cli/MavenCli.java#L1082
       System.setProperty("scala-2.11", "true")
     }
     profiles