Skip to content
Snippets Groups Projects
Commit 82bf4bee authored by Patrick Wendell's avatar Patrick Wendell
Browse files

HOTFIX: Slight tweak on previous commit.

Meant to merge this in when committing SPARK-3787.
parent de95c57a
No related branches found
No related tags found
No related merge requests found
...@@ -114,10 +114,12 @@ object SparkBuild extends PomBuild { ...@@ -114,10 +114,12 @@ object SparkBuild extends PomBuild {
override val userPropertiesMap = System.getProperties.toMap 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"), val pom = loadEffectivePom(new File("pom.xml"),
profiles = profiles, profiles = profiles,
userProps = userPropertiesMap) userProps = userPropertiesMap)
if (System.getProperty("hadoop.version") == null) { if (System.getProperty("hadoop.version") == null) {
System.setProperty("hadoop.version", System.setProperty("hadoop.version",
pom.getProperties.get("hadoop.version").asInstanceOf[String]) pom.getProperties.get("hadoop.version").asInstanceOf[String])
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment