diff options
| author | Patrick Wendell <pwendell@gmail.com> | 2014-11-21 12:10:04 -0800 |
|---|---|---|
| committer | Patrick Wendell <pwendell@gmail.com> | 2014-11-21 12:10:04 -0800 |
| commit | a81918c5a66fc6040f9796fc1a9d4e0bfb8d0cbe (patch) | |
| tree | 03c7f5d5bd04e7de846639f3513e95bc796e8b2d /make-distribution.sh | |
| parent | 65b987c3ed79b8362dda53b70434652d2d4840da (diff) | |
| download | spark-a81918c5a66fc6040f9796fc1a9d4e0bfb8d0cbe.tar.gz spark-a81918c5a66fc6040f9796fc1a9d4e0bfb8d0cbe.tar.bz2 spark-a81918c5a66fc6040f9796fc1a9d4e0bfb8d0cbe.zip | |
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
Diffstat (limited to 'make-distribution.sh')
| -rwxr-xr-x | make-distribution.sh | 2 |
1 files changed, 1 insertions, 1 deletions
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\ |