HOTFIX: Slight tweak on previous commit. Meant to merge this in when committing SPARK-3787.
Project: http://git-wip-us.apache.org/repos/asf/spark/repo Commit: http://git-wip-us.apache.org/repos/asf/spark/commit/3c4acac4 Tree: http://git-wip-us.apache.org/repos/asf/spark/tree/3c4acac4 Diff: http://git-wip-us.apache.org/repos/asf/spark/diff/3c4acac4 Branch: refs/heads/branch-1.2 Commit: 3c4acac43f8910e9ff46392491e64803f7b1ae5f Parents: 2e0af87 Author: Patrick Wendell <[email protected]> Authored: Fri Dec 26 22:55:04 2014 -0800 Committer: Patrick Wendell <[email protected]> Committed: Fri Dec 26 22:56:10 2014 -0800 ---------------------------------------------------------------------- project/SparkBuild.scala | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/spark/blob/3c4acac4/project/SparkBuild.scala ---------------------------------------------------------------------- diff --git a/project/SparkBuild.scala b/project/SparkBuild.scala index 9d316d6..49628b1 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]) --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
