diff options
| author | Patrick Wendell <pwendell@gmail.com> | 2014-12-26 22:55:04 -0800 |
|---|---|---|
| committer | Patrick Wendell <pwendell@gmail.com> | 2014-12-26 22:56:10 -0800 |
| commit | 3c4acac43f8910e9ff46392491e64803f7b1ae5f (patch) | |
| tree | 8b7933ef335a32576bca00f0e7790624093dd1d2 /project | |
| parent | 2e0af87277093907207d0dd0896930f21a763f41 (diff) | |
| download | spark-3c4acac43f8910e9ff46392491e64803f7b1ae5f.tar.gz spark-3c4acac43f8910e9ff46392491e64803f7b1ae5f.tar.bz2 spark-3c4acac43f8910e9ff46392491e64803f7b1ae5f.zip | |
HOTFIX: Slight tweak on previous commit.
Meant to merge this in when committing SPARK-3787.
Diffstat (limited to 'project')
| -rw-r--r-- | project/SparkBuild.scala | 4 |
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]) |