You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hudi.apache.org by vb...@apache.org on 2019/10/16 10:34:14 UTC
[incubator-hudi] branch master updated: [HUDI-121] Fix issues in
release scripts
This is an automated email from the ASF dual-hosted git repository.
vbalaji pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-hudi.git
The following commit(s) were added to refs/heads/master by this push:
new 7381b66 [HUDI-121] Fix issues in release scripts
7381b66 is described below
commit 7381b661942dad9c650e43179a478a57b530a606
Author: Balaji Varadarajan <va...@uber.com>
AuthorDate: Wed Oct 16 03:32:57 2019 -0700
[HUDI-121] Fix issues in release scripts
---
pom.xml | 1 +
scripts/release/validate_staged_release.sh | 12 ++++++------
2 files changed, 7 insertions(+), 6 deletions(-)
diff --git a/pom.xml b/pom.xml
index 5a96810..6e97333 100644
--- a/pom.xml
+++ b/pom.xml
@@ -337,6 +337,7 @@
</licenseFamilies>
<excludes>
<exclude>NOTICE</exclude>
+ <exclude>DISCLAIMER-WIP</exclude>
<exclude>**/.*</exclude>
<exclude>**/*.json</exclude>
<exclude>**/*.sqltemplate</exclude>
diff --git a/scripts/release/validate_staged_release.sh b/scripts/release/validate_staged_release.sh
index 5734b0f..31eff95 100755
--- a/scripts/release/validate_staged_release.sh
+++ b/scripts/release/validate_staged_release.sh
@@ -104,11 +104,11 @@ fi
echo -e "\t\tNo Binary Files in Source Release? - [OK]\n"
### END: Binary Files Check
-### Checking for DISCLAIMER
-echo "Checking for DISCLAIMER"
-disclaimerFile="./DISCLAIMER"
+### Checking for DISCLAIMER-WIP
+echo "Checking for DISCLAIMERi-WIP"
+disclaimerFile="./DISCLAIMER-WIP"
if [ ! -f "$disclaimerFile" ]; then
- echo "DISCLAIMER file missing"
+ echo "DISCLAIMER-WIP file missing"
exit -1
fi
echo -e "\t\tDISCLAIMER file exists ? [OK]\n"
@@ -131,10 +131,10 @@ echo -e "\t\tNotice file exists ? [OK]\n"
### Licensing Check
echo "Performing custom Licensing Check "
-numfilesWithNoLicense=`find . -iname '*' -type f | grep -v NOTICE | grep -v LICENSE | grep -v '.json' | grep -v '.data' | grep -v DISCLAIMER | grep -v KEYS | grep -v '.mailmap' | grep -v '.sqltemplate' | xargs grep -L "Licensed to the Apache Software Foundation (ASF)" | wc -l`
+numfilesWithNoLicense=`find . -iname '*' -type f | grep -v NOTICE | grep -v LICENSE | grep -v '.json' | grep -v '.data' | grep -v DISCLAIMER | grep -v KEYS | grep -v '.mailmap' | grep -v '.sqltemplate' | grep -v 'ObjectSizeCalculator.java' | grep -v 'AvroConversionHelper.scala' | xargs grep -L "Licensed to the Apache Software Foundation (ASF)" | wc -l`
if [ "$numfilesWithNoLicense" -gt "0" ]; then
echo "There were some source files that did not have Apache License"
- find . -iname '*' -type f | grep -v NOTICE | grep -v LICENSE | grep -v '.json' | grep -v '.data' | grep -v DISCLAIMER | grep -v '.sqltemplate' | grep -v KEYS | grep -v '.mailmap' | xargs grep -L "Licensed to the Apache Software Foundation (ASF)"
+ find . -iname '*' -type f | grep -v NOTICE | grep -v LICENSE | grep -v '.json' | grep -v '.data' | grep -v DISCLAIMER | grep -v '.sqltemplate' | grep -v KEYS | grep -v '.mailmap' | grep -v 'ObjectSizeCalculator.java' | grep -v 'AvroConversionHelper.scala' | xargs grep -L "Licensed to the Apache Software Foundation (ASF)"
exit -1
fi
echo -e "\t\tLicensing Check Passed [OK]\n"