From a81918c5a66fc6040f9796fc1a9d4e0bfb8d0cbe Mon Sep 17 00:00:00 2001
From: Patrick Wendell <pwendell@gmail.com>
Date: Fri, 21 Nov 2014 12:10:04 -0800
Subject: [PATCH] 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 <pwendell@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
---
make-distribution.sh | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/make-distribution.sh b/make-distribution.sh
index 2267b1aa08..7c0fb8992a 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\
--
GitLab