[incubator-hudi] branch release-0.5.0 updated: [HUDI-121] Fix issues found during release candidate builds

[vb...@apache.org]

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

vbalaji pushed a commit to branch release-0.5.0
in repository https://gitbox.apache.org/repos/asf/incubator-hudi.git


The following commit(s) were added to refs/heads/release-0.5.0 by this push:
     new dfe4784  [HUDI-121] Fix issues found during release candidate builds
dfe4784 is described below

commit dfe4784b8aa95161b992efb20cf9c215f0fdbc27
Author: Balaji Varadarajan <va...@uber.com>
AuthorDate: Tue Oct 1 13:50:38 2019 -0700

    [HUDI-121] Fix issues found during release candidate builds
---
 scripts/release/cut_release_branch.sh | 36 +++++++++--------------------------
 1 file changed, 9 insertions(+), 27 deletions(-)

diff --git a/scripts/release/cut_release_branch.sh b/scripts/release/cut_release_branch.sh
index 7d506fb..8b20ace 100755
--- a/scripts/release/cut_release_branch.sh
+++ b/scripts/release/cut_release_branch.sh
@@ -38,6 +38,7 @@ if [[ $# -eq 1 && $1 = "-h" ]]; then
 	echo "There are two params required:"
 	echo "--release=\${CURRENT_RELEASE_VERSION}"
 	echo "--next_release=\${NEXT_RELEASE_VERSION}"
+	echo "--rc_num=\${RC_NUM}"
 	exit
 else
 	for param in "$@"
@@ -48,9 +49,13 @@ else
 		if [[ $param =~ --next_release\=([0-9]\.[0-9]*\.[0-9]) ]]; then
 			NEXT_VERSION_IN_BASE_BRANCH=${BASH_REMATCH[1]}
 		fi
+		if [[ $param =~ --rc_num\=([0-9]*) ]]; then
+                        RC_NUM=${BASH_REMATCH[1]}
+		fi
 	done
 fi
-if [[ -z "$RELEASE" || -z "$NEXT_VERSION_IN_BASE_BRANCH" ]]; then
+
+if [[ -z "$RELEASE" || -z "$NEXT_VERSION_IN_BASE_BRANCH" || -z "$RC_NUM" ]]; then
 	echo "This sricpt needs to be ran with params, please run with -h to get more instructions."
 	exit
 fi
@@ -68,42 +73,19 @@ echo "next_release: ${NEXT_VERSION_IN_BASE_BRANCH}"
 echo "working master branch: ${MASTER_BRANCH}"
 echo "working release branch: ${RELEASE_BRANCH}"
 echo "local repo dir: ~/${LOCAL_CLONE_DIR}/${HUDI_ROOT_DIR}"
+echo "RC_NUM: $RC_NUM
 echo "==============================================================="
 
 cd ~
 if [[ -d ${LOCAL_CLONE_DIR} ]]; then
   rm -rf ${LOCAL_CLONE_DIR}
 fi
+
 mkdir ${LOCAL_CLONE_DIR}
 cd ${LOCAL_CLONE_DIR}
 git clone ${GITHUB_REPO_URL}
 cd ${HUDI_ROOT_DIR}
 
-# Update Notice.txt
-mvn notice:generate
-
-echo "==============Update NOTICE.txt in master branch as following================"
-git diff
-echo "==============================================================="
-
-echo "Please make sure all changes above are expected. Do you confirm to commit?: [y|N]"
-read confirmation
-if [[ $confirmation != "y" ]]; then
-  echo "Exit without committing any changes on master branch."
-  clean_up
-  exit
-fi
-
-git commit -am "Updating NOTICE.txt in master" --allow-empty
-
-# Pushing NOTICE.txt changes to master
-if git push origin ${MASTER_BRANCH}; then
-  break
-else
-  clean_up
-  exit
-fi
-
 # Now, create local release branch
 git branch ${RELEASE_BRANCH}
 
@@ -139,7 +121,7 @@ fi
 
 # Checkout and update release branch - Add incubating and remove snapshot
 git checkout ${RELEASE_BRANCH}
-mvn versions:set -DnewVersion=${RELEASE}-incubating
+mvn versions:set -DnewVersion=${RELEASE}-incubating-rc${RC_NUM}
 
 echo "==================Current working branch======================="
 echo ${RELEASE_BRANCH}