spark git commit: [SPARK-24685][BUILD][FOLLOWUP] Fix the nonexist profile name in release script
Repository: spark Updated Branches: refs/heads/master 538e04787 -> b66e14dc9 [SPARK-24685][BUILD][FOLLOWUP] Fix the nonexist profile name in release script ## What changes were proposed in this pull request? `without-hadoop` profile doesn't exist in Maven, instead the name should be `hadoop-provided`, this is a regression introduced by SPARK-24685. So here fix it. ## How was this patch tested? Local test. Closes #22434 from jerryshao/SPARK-24685-followup. Authored-by: jerryshao Signed-off-by: Wenchen Fan Project: http://git-wip-us.apache.org/repos/asf/spark/repo Commit: http://git-wip-us.apache.org/repos/asf/spark/commit/b66e14dc Tree: http://git-wip-us.apache.org/repos/asf/spark/tree/b66e14dc Diff: http://git-wip-us.apache.org/repos/asf/spark/diff/b66e14dc Branch: refs/heads/master Commit: b66e14dc96011a83f5ea0df8708ecb02a154ed1d Parents: 538e047 Author: jerryshao Authored: Mon Sep 17 15:21:18 2018 +0800 Committer: Wenchen Fan Committed: Mon Sep 17 15:21:18 2018 +0800 -- dev/create-release/release-build.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -- http://git-wip-us.apache.org/repos/asf/spark/blob/b66e14dc/dev/create-release/release-build.sh -- diff --git a/dev/create-release/release-build.sh b/dev/create-release/release-build.sh index 73610a3..ca066be 100755 --- a/dev/create-release/release-build.sh +++ b/dev/create-release/release-build.sh @@ -271,7 +271,7 @@ if [[ "$1" == "package" ]]; then BINARY_PKGS_ARGS["hadoop2.7"]="-Phadoop-2.7 $HIVE_PROFILES" if ! is_dry_run; then BINARY_PKGS_ARGS["hadoop2.6"]="-Phadoop-2.6 $HIVE_PROFILES" -BINARY_PKGS_ARGS["without-hadoop"]="-Pwithout-hadoop" +BINARY_PKGS_ARGS["without-hadoop"]="-Phadoop-provided" if [[ $SPARK_VERSION < "2.2." ]]; then BINARY_PKGS_ARGS["hadoop2.4"]="-Phadoop-2.4 $HIVE_PROFILES" BINARY_PKGS_ARGS["hadoop2.3"]="-Phadoop-2.3 $HIVE_PROFILES" - To unsubscribe, e-mail: commits-unsubscr...@spark.apache.org For additional commands, e-mail: commits-h...@spark.apache.org
spark git commit: [SPARK-24685][BUILD][FOLLOWUP] Fix the nonexist profile name in release script
Repository: spark Updated Branches: refs/heads/branch-2.4 fb1539ad8 -> e368efcf5 [SPARK-24685][BUILD][FOLLOWUP] Fix the nonexist profile name in release script ## What changes were proposed in this pull request? `without-hadoop` profile doesn't exist in Maven, instead the name should be `hadoop-provided`, this is a regression introduced by SPARK-24685. So here fix it. ## How was this patch tested? Local test. Closes #22434 from jerryshao/SPARK-24685-followup. Authored-by: jerryshao Signed-off-by: Wenchen Fan (cherry picked from commit b66e14dc96011a83f5ea0df8708ecb02a154ed1d) Signed-off-by: Wenchen Fan Project: http://git-wip-us.apache.org/repos/asf/spark/repo Commit: http://git-wip-us.apache.org/repos/asf/spark/commit/e368efcf Tree: http://git-wip-us.apache.org/repos/asf/spark/tree/e368efcf Diff: http://git-wip-us.apache.org/repos/asf/spark/diff/e368efcf Branch: refs/heads/branch-2.4 Commit: e368efcf54b478848f6d625d6cbce63f0d1ce5b9 Parents: fb1539a Author: jerryshao Authored: Mon Sep 17 15:21:18 2018 +0800 Committer: Wenchen Fan Committed: Mon Sep 17 15:21:41 2018 +0800 -- dev/create-release/release-build.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -- http://git-wip-us.apache.org/repos/asf/spark/blob/e368efcf/dev/create-release/release-build.sh -- diff --git a/dev/create-release/release-build.sh b/dev/create-release/release-build.sh index 73610a3..ca066be 100755 --- a/dev/create-release/release-build.sh +++ b/dev/create-release/release-build.sh @@ -271,7 +271,7 @@ if [[ "$1" == "package" ]]; then BINARY_PKGS_ARGS["hadoop2.7"]="-Phadoop-2.7 $HIVE_PROFILES" if ! is_dry_run; then BINARY_PKGS_ARGS["hadoop2.6"]="-Phadoop-2.6 $HIVE_PROFILES" -BINARY_PKGS_ARGS["without-hadoop"]="-Pwithout-hadoop" +BINARY_PKGS_ARGS["without-hadoop"]="-Phadoop-provided" if [[ $SPARK_VERSION < "2.2." ]]; then BINARY_PKGS_ARGS["hadoop2.4"]="-Phadoop-2.4 $HIVE_PROFILES" BINARY_PKGS_ARGS["hadoop2.3"]="-Phadoop-2.3 $HIVE_PROFILES" - To unsubscribe, e-mail: commits-unsubscr...@spark.apache.org For additional commands, e-mail: commits-h...@spark.apache.org
