From 63cc455d9c273af0dda8a07f2293d350da36c851 Mon Sep 17 00:00:00 2001
From: Balaji Varadarajan <varadarb@uber.com>
Date: Fri, 13 Sep 2019 13:58:29 -0700
Subject: [PATCH] [HUDI-121] ASF Release : Ensure NOTICE.txt is generated as
 part of cutting release branch

---
 RELEASE_NOTES.md                      |  2 +-
 release/scripts/cut_release_branch.sh | 27 ++++++++++++++++++++++++++-
 2 files changed, 27 insertions(+), 2 deletions(-)

diff --git a/RELEASE_NOTES.md b/RELEASE_NOTES.md
index 25bdd0c7b..45cf4dbb4 100644
--- a/RELEASE_NOTES.md
+++ b/RELEASE_NOTES.md
@@ -8,10 +8,10 @@ Release 0.5.0-incubating
  * Bug fixes in query side integration, hive-sync, deltaStreamer, compaction, rollbacks, restore
 
 ### Full PR List
+  * **Balaji Varadarajan** [HUDI-249] Update Release-notes. Add sign-artifacts to POM and release related scripts. Add missing license headers and update NOTICE.txt files
   * **Vinoth Chandar** [HUDI-244] : Hive sync should escape partition field name - now supports field names beginning with '_' for e.g
   * **Balaji Varadarajan** [HUDI-250] Ensure Hudi CLI wrapper works with non snapshot jars too
   * **Nishith Agarwal** [HUDI-235] Fix scheduled compaction rollback in restore command
-  * **Balaji Varadarajan** [HUDI-249] Update Release-notes. Add sign-artifacts to POM and release related scripts. Add missing license headers
   * **yanghua** [HUDI-217] Provide a unified resource management class to standardize the resource allocation and release for hudi client test cases
   * **Bhavani Sudha Saktheeswaran** [HUDI-164] Fixes incorrect averageBytesPerRecord
   * **Balaji Varadarajan** [HUDI-243] Rename HoodieInputFormat and HoodieRealtimeInputFormat to HoodieParquetInputFormat and HoodieParquetRealtimeInputFormat
diff --git a/release/scripts/cut_release_branch.sh b/release/scripts/cut_release_branch.sh
index 48d62f73a..7d506fb56 100755
--- a/release/scripts/cut_release_branch.sh
+++ b/release/scripts/cut_release_branch.sh
@@ -79,7 +79,32 @@ cd ${LOCAL_CLONE_DIR}
 git clone ${GITHUB_REPO_URL}
 cd ${HUDI_ROOT_DIR}
 
-# Create local release branch
+# 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}
 
 git checkout ${MASTER_BRANCH}