Repository: oozie Updated Branches: refs/heads/master 8286137b3 -> f492a43cf
OOZIE-3189 Update the release script and wiki page to use sha512 instead of md5 (rkanter via gezapeti) Project: http://git-wip-us.apache.org/repos/asf/oozie/repo Commit: http://git-wip-us.apache.org/repos/asf/oozie/commit/f492a43c Tree: http://git-wip-us.apache.org/repos/asf/oozie/tree/f492a43c Diff: http://git-wip-us.apache.org/repos/asf/oozie/diff/f492a43c Branch: refs/heads/master Commit: f492a43cfd6cdca4718d247b87ad3a266f4d55f9 Parents: 8286137 Author: Gezapeti Cseh <gezap...@apache.org> Authored: Mon Mar 19 15:24:22 2018 +0100 Committer: Gezapeti Cseh <gezap...@apache.org> Committed: Mon Mar 19 15:31:45 2018 +0100 ---------------------------------------------------------------------- bin/create-release-artifact | 42 ++++++++++++++++++++++------------------ release-log.txt | 1 + 2 files changed, 24 insertions(+), 19 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/oozie/blob/f492a43c/bin/create-release-artifact ---------------------------------------------------------------------- diff --git a/bin/create-release-artifact b/bin/create-release-artifact index 1f1bcd2..e017b3b 100755 --- a/bin/create-release-artifact +++ b/bin/create-release-artifact @@ -16,20 +16,20 @@ # limitations under the License. run() { - echo "\$ ${@}" + echo "\$ ${*}" "${@}" exitCode=$? if [[ $exitCode != 0 ]]; then echo - echo "Failed! running ${@} in `pwd`" + echo "Failed! running ${*} in $(pwd)" echo exit $exitCode fi } -branchUrl=`git ls-remote --get-url` +branchUrl=$(git ls-remote --get-url) -branchName=`git rev-parse --abbrev-ref HEAD` +branchName=$(git rev-parse --abbrev-ref HEAD) tempDir="/tmp/oozie.$$" @@ -37,13 +37,13 @@ run mkdir $tempDir run cd $tempDir -run git clone $branchUrl -b $branchName oozie-src +run git clone "$branchUrl" -b "$branchName" oozie-src run cd oozie-src rm -rf .git -releaseVersion=`mvn help:evaluate -Dexpression=project.version | grep -v INFO | grep -v WARNING` +releaseVersion=$(xmllint --xpath "//*[local-name()='project']/*[local-name()='version']/text()" pom.xml) if [ "$releaseVersion}" = "" ]; then echo "Could not determine branch version from POM" @@ -52,32 +52,36 @@ fi run cd .. -run mv oozie-src oozie-$releaseVersion +run mv oozie-src "oozie-$releaseVersion" -run tar czf oozie-${releaseVersion}.tar.gz oozie-$releaseVersion +run tar czf "oozie-${releaseVersion}.tar.gz" "oozie-$releaseVersion" -run cp oozie-$releaseVersion/release-log.txt . +run cp "oozie-$releaseVersion/release-log.txt" . -run cd oozie-$releaseVersion +run cd "oozie-$releaseVersion" run mvn apache-rat:check run cd .. -run cp oozie-${releaseVersion}/target/rat.txt rat_report +run cp "oozie-${releaseVersion}"/target/rat.txt rat_report -run rm -rf oozie-${releaseVersion} +run rm -rf "oozie-${releaseVersion}" -MD5CMD="md5sum" -which $MD5CMD -if [[ $? != 0 ]]; then - MD5CMD="md5" +# Our run function doesn't handle this one nicely because of the stdout redirect, so do the echo and exit code check here instead +echo "\$ gpg --print-md SHA512 oozie-${releaseVersion}.tar.gz > oozie-${releaseVersion}.tar.gz.sha512" +gpg --print-md SHA512 "oozie-${releaseVersion}.tar.gz" > "oozie-${releaseVersion}.tar.gz.sha512" +exitCode=$? +if [[ $exitCode != 0 ]]; then + echo + echo "Failed! running gpg --print-md SHA512 oozie-${releaseVersion}.tar.gz > oozie-${releaseVersion}.tar.gz.sha512 in $(pwd)" + echo + exit $exitCode fi -run $MD5CMD oozie-${releaseVersion}.tar.gz > oozie-${releaseVersion}.tar.gz.md5 -run gpg --armor --output oozie-${releaseVersion}.tar.gz.asc --detach-sig oozie-${releaseVersion}.tar.gz +run gpg --armor --output "oozie-${releaseVersion}.tar.gz.asc" --detach-sig "oozie-${releaseVersion}.tar.gz" -run gpg --verify oozie-${releaseVersion}.tar.gz.asc oozie-${releaseVersion}.tar.gz +run gpg --verify "oozie-${releaseVersion}.tar.gz.asc" "oozie-${releaseVersion}.tar.gz" echo echo http://git-wip-us.apache.org/repos/asf/oozie/blob/f492a43c/release-log.txt ---------------------------------------------------------------------- diff --git a/release-log.txt b/release-log.txt index 9100725..6be3de2 100644 --- a/release-log.txt +++ b/release-log.txt @@ -1,5 +1,6 @@ -- Oozie 5.0.0 release (trunk - unreleased) +OOZIE-3189 Update the release script and wiki page to use sha512 instead of md5 (rkanter via gezapeti) OOZIE-3195 Typo in WebServicesAPI.twiki: Proxy Hive Job Submission (kmarton via andras.piros) OOZIE-2814 OYA: Update example workflows to newest schemas (asasvari via gezapeti) OOZIE-2585 Remove test case TestPartitionDependencyManagerEhcache.testMemoryUsageAndSpeedOverflowToDisk and testMemoryUsageAndSpeed (pbacsko via gezapeti)