You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@spark.apache.org by pw...@apache.org on 2014/12/27 07:55:43 UTC
spark git commit: HOTFIX: Slight tweak on previous commit.
Repository: spark
Updated Branches:
refs/heads/master de95c57ac -> 82bf4bee1
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/82bf4bee
Tree: http://git-wip-us.apache.org/repos/asf/spark/tree/82bf4bee
Diff: http://git-wip-us.apache.org/repos/asf/spark/diff/82bf4bee
Branch: refs/heads/master
Commit: 82bf4bee15bb449a418290c0c07652e9a8ec8fdd
Parents: de95c57
Author: Patrick Wendell <pw...@gmail.com>
Authored: Fri Dec 26 22:55:04 2014 -0800
Committer: Patrick Wendell <pw...@gmail.com>
Committed: Fri Dec 26 22:55:04 2014 -0800
----------------------------------------------------------------------
project/SparkBuild.scala | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/spark/blob/82bf4bee/project/SparkBuild.scala
----------------------------------------------------------------------
diff --git a/project/SparkBuild.scala b/project/SparkBuild.scala
index 4d103f9..c512b62 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])
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@spark.apache.org
For additional commands, e-mail: commits-help@spark.apache.org