aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--project/SparkBuild.scala4
1 files changed, 3 insertions, 1 deletions
diff --git a/project/SparkBuild.scala b/project/SparkBuild.scala
index 9d316d691e..49628b1f51 100644
--- a/project/SparkBuild.scala
+++ b/project/SparkBuild.scala
@@ -120,10 +120,12 @@ object SparkBuild extends PomBuild {
override val userPropertiesMap = System.getProperties.toMap
+ // Handle case where hadoop.version is set via profile.
+ // Needed only because we read back this property in sbt
+ // when we create the assembly jar.
val pom = loadEffectivePom(new File("pom.xml"),
profiles = profiles,
userProps = userPropertiesMap)
-
if (System.getProperty("hadoop.version") == null) {
System.setProperty("hadoop.version",
pom.getProperties.get("hadoop.version").asInstanceOf[String])