You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@flink.apache.org by th...@apache.org on 2018/12/13 19:59:15 UTC

[flink] branch master updated: [FLINK-11145] Fix Hadoop version handling in binary release script

This is an automated email from the ASF dual-hosted git repository.

thw pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/flink.git


The following commit(s) were added to refs/heads/master by this push:
     new 951ae9a  [FLINK-11145] Fix Hadoop version handling in binary release script
951ae9a is described below

commit 951ae9a813cbf8a2db95519853f940277e4ea088
Author: Thomas Weise <th...@apache.org>
AuthorDate: Tue Dec 11 07:21:14 2018 -0800

    [FLINK-11145] Fix Hadoop version handling in binary release script
---
 tools/releasing/create_binary_release.sh | 28 ++++++++++++++--------------
 1 file changed, 14 insertions(+), 14 deletions(-)

diff --git a/tools/releasing/create_binary_release.sh b/tools/releasing/create_binary_release.sh
index f4d7c57..444e01b 100755
--- a/tools/releasing/create_binary_release.sh
+++ b/tools/releasing/create_binary_release.sh
@@ -20,8 +20,8 @@
 ##
 ## Variables with defaults (if not overwritten by environment)
 ##
-SCALA_VERSION=none
-HADOOP_VERSION=none
+SCALA_VERSION=${SCALA_VERSION:-none}
+HADOOP_VERSION=${HADOOP_VERSION:-none}
 SKIP_GPG=${SKIP_GPG:-false}
 MVN=${MVN:-mvn}
 
@@ -95,27 +95,27 @@ make_binary_release() {
   cd ${FLINK_DIR}
 }
 
+HADOOP_CLASSIFIERS=("24" "26" "27" "28")
+HADOOP_VERSIONS=("2.4.1" "2.6.5" "2.7.5" "2.8.3")
+
 if [ "$SCALA_VERSION" == "none" ] && [ "$HADOOP_VERSION" == "none" ]; then
   make_binary_release "" "-DwithoutHadoop" "2.12"
-  make_binary_release "hadoop24" "-Dhadoop.version=2.4.1" "2.12"
-  make_binary_release "hadoop26" "-Dhadoop.version=2.6.5" "2.12"
-  make_binary_release "hadoop27" "-Dhadoop.version=2.7.5" "2.12"
-  make_binary_release "hadoop28" "-Dhadoop.version=2.8.3" "2.12"
+  for i in "${!HADOOP_CLASSIFIERS[@]}"; do
+    make_binary_release "hadoop${HADOOP_CLASSIFIERS[$i]}" "-Dhadoop.version=${HADOOP_VERSIONS[$i]}" "2.12"
+  done
   make_binary_release "" "-DwithoutHadoop" "2.11"
-  make_binary_release "hadoop24" "-Dhadoop.version=2.4.1" "2.11"
-  make_binary_release "hadoop26" "-Dhadoop.version=2.6.5" "2.11"
-  make_binary_release "hadoop27" "-Dhadoop.version=2.7.5" "2.11"
-  make_binary_release "hadoop28" "-Dhadoop.version=2.8.3" "2.11"
+  for i in "${!HADOOP_CLASSIFIERS[@]}"; do
+    make_binary_release "hadoop${HADOOP_CLASSIFIERS[$i]}" "-Dhadoop.version=${HADOOP_VERSIONS[$i]}" "2.11"
+  done
 elif [ "$SCALA_VERSION" == none ] && [ "$HADOOP_VERSION" != "none" ]
 then
   make_binary_release "hadoop2" "-Dhadoop.version=$HADOOP_VERSION" "2.11"
 elif [ "$SCALA_VERSION" != none ] && [ "$HADOOP_VERSION" == "none" ]
 then
   make_binary_release "" "-DwithoutHadoop" "$SCALA_VERSION"
-  make_binary_release "hadoop24" "-Dhadoop.version=2.4.1" "$SCALA_VERSION"
-  make_binary_release "hadoop26" "-Dhadoop.version=2.6.5" "$SCALA_VERSION"
-  make_binary_release "hadoop27" "-Dhadoop.version=2.7.3" "$SCALA_VERSION"
-  make_binary_release "hadoop28" "-Dhadoop.version=2.8.0" "$SCALA_VERSION"
+  for i in "${!HADOOP_CLASSIFIERS[@]}"; do
+    make_binary_release "hadoop${HADOOP_CLASSIFIERS[$i]}" "-Dhadoop.version=${HADOOP_VERSIONS[$i]}" "$SCALA_VERSION"
+  done
 else
   make_binary_release "hadoop2x" "-Dhadoop.version=$HADOOP_VERSION" "$SCALA_VERSION"
 fi