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/11/21 21:10:08 UTC
spark git commit: SPARK-4532: Fix bug in detection of Hive in Spark
1.2
Repository: spark
Updated Branches:
refs/heads/master 65b987c3e -> a81918c5a
SPARK-4532: Fix bug in detection of Hive in Spark 1.2
Because the Hive profile is no longer defined in the root pom,
we need to check specifically in the sql/hive pom when we
perform the check in make-distribtion.sh.
Author: Patrick Wendell <pw...@gmail.com>
Closes #3398 from pwendell/make-distribution and squashes the following commits:
8a58279 [Patrick Wendell] Fix bug in detection of Hive in Spark 1.2
Project: http://git-wip-us.apache.org/repos/asf/spark/repo
Commit: http://git-wip-us.apache.org/repos/asf/spark/commit/a81918c5
Tree: http://git-wip-us.apache.org/repos/asf/spark/tree/a81918c5
Diff: http://git-wip-us.apache.org/repos/asf/spark/diff/a81918c5
Branch: refs/heads/master
Commit: a81918c5a66fc6040f9796fc1a9d4e0bfb8d0cbe
Parents: 65b987c
Author: Patrick Wendell <pw...@gmail.com>
Authored: Fri Nov 21 12:10:04 2014 -0800
Committer: Patrick Wendell <pw...@gmail.com>
Committed: Fri Nov 21 12:10:04 2014 -0800
----------------------------------------------------------------------
make-distribution.sh | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/spark/blob/a81918c5/make-distribution.sh
----------------------------------------------------------------------
diff --git a/make-distribution.sh b/make-distribution.sh
index 2267b1a..7c0fb89 100755
--- a/make-distribution.sh
+++ b/make-distribution.sh
@@ -119,7 +119,7 @@ VERSION=$(mvn help:evaluate -Dexpression=project.version 2>/dev/null | grep -v "
SPARK_HADOOP_VERSION=$(mvn help:evaluate -Dexpression=hadoop.version $@ 2>/dev/null\
| grep -v "INFO"\
| tail -n 1)
-SPARK_HIVE=$(mvn help:evaluate -Dexpression=project.activeProfiles $@ 2>/dev/null\
+SPARK_HIVE=$(mvn help:evaluate -Dexpression=project.activeProfiles -pl sql/hive $@ 2>/dev/null\
| grep -v "INFO"\
| fgrep --count "<id>hive</id>";\
# Reset exit status to 0, otherwise the script stops here if the last grep finds nothing\
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@spark.apache.org
For additional commands, e-mail: commits-help@spark.apache.org