Skip to content

Commit

Permalink
HOTFIX: Slight tweak on previous commit.
Browse files Browse the repository at this point in the history
Meant to merge this in when committing SPARK-3787.
  • Loading branch information
pwendell committed Dec 27, 2014
1 parent de95c57 commit 82bf4be
Showing 1 changed file with 3 additions and 1 deletion.
4 changes: 3 additions & 1 deletion project/SparkBuild.scala
Original file line number Diff line number Diff line change
Expand Up @@ -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])
Expand Down

0 comments on commit 82bf4be

Please sign in to comment.