Repository: spark Updated Branches: refs/heads/branch-1.2 6f70e0295 -> 6a01689a9
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 <[email protected]> Closes #3398 from pwendell/make-distribution and squashes the following commits: 8a58279 [Patrick Wendell] Fix bug in detection of Hive in Spark 1.2 (cherry picked from commit a81918c5a66fc6040f9796fc1a9d4e0bfb8d0cbe) Signed-off-by: Patrick Wendell <[email protected]> Project: http://git-wip-us.apache.org/repos/asf/spark/repo Commit: http://git-wip-us.apache.org/repos/asf/spark/commit/6a01689a Tree: http://git-wip-us.apache.org/repos/asf/spark/tree/6a01689a Diff: http://git-wip-us.apache.org/repos/asf/spark/diff/6a01689a Branch: refs/heads/branch-1.2 Commit: 6a01689a913a1a223fad66848c4fc17ab2931f22 Parents: 6f70e02 Author: Patrick Wendell <[email protected]> Authored: Fri Nov 21 12:10:04 2014 -0800 Committer: Patrick Wendell <[email protected]> Committed: Fri Nov 21 12:10:39 2014 -0800 ---------------------------------------------------------------------- make-distribution.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/spark/blob/6a01689a/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: [email protected] For additional commands, e-mail: [email protected]
