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:55:04 -0800 |
| commit | 82bf4bee15bb449a418290c0c07652e9a8ec8fdd (patch) | |
| tree | 03baf4a2280a1cf6bf7c9961c05de078e15ae291 /project | |
| parent | de95c57ac6fcb2a62cf5083feb3cc79ab18a836f (diff) | |
| download | spark-82bf4bee15bb449a418290c0c07652e9a8ec8fdd.tar.gz spark-82bf4bee15bb449a418290c0c07652e9a8ec8fdd.tar.bz2 spark-82bf4bee15bb449a418290c0c07652e9a8ec8fdd.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 4d103f9dc0..c512b62f61 100644 --- a/project/SparkBuild.scala +++ b/project/SparkBuild.scala @@ -114,10 +114,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]) |