Repository: oozie Updated Branches: refs/heads/master 1cb67fd6b -> afbc3af8f
OOZIE-3338 [build] Remove SVN references (asalamon74 via andras.piros) Project: http://git-wip-us.apache.org/repos/asf/oozie/repo Commit: http://git-wip-us.apache.org/repos/asf/oozie/commit/afbc3af8 Tree: http://git-wip-us.apache.org/repos/asf/oozie/tree/afbc3af8 Diff: http://git-wip-us.apache.org/repos/asf/oozie/diff/afbc3af8 Branch: refs/heads/master Commit: afbc3af8fdef26859f91e7fa5dc316d350c6d202 Parents: 1cb67fd Author: Andras Piros <andras.pi...@cloudera.com> Authored: Mon Nov 12 10:29:27 2018 +0100 Committer: Andras Piros <andras.pi...@cloudera.com> Committed: Mon Nov 12 10:29:27 2018 +0100 ---------------------------------------------------------------------- bin/mkdistro.sh | 50 ++++++++++++---------------- docs/src/site/markdown/ENG_MiniOozie.md | 4 +-- release-log.txt | 1 + 3 files changed, 24 insertions(+), 31 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/oozie/blob/afbc3af8/bin/mkdistro.sh ---------------------------------------------------------------------- diff --git a/bin/mkdistro.sh b/bin/mkdistro.sh index 550780c..bf5244c 100755 --- a/bin/mkdistro.sh +++ b/bin/mkdistro.sh @@ -19,58 +19,50 @@ #Utility method function setRevUrl() { - #Checking svn first - if which svn >/dev/null; then - if [ -d ".svn" ]; then - export VC_REV=`svn info | grep "Revision" | awk '{print $2}'` - export VC_URL=`svn info | grep "URL" | awk '{print $2}'` - fi - fi - - #Checking for git if SVN is not there - if [ "${VC_REV}" == "" ]; then - if which git >/dev/null; then - if [ -d ".git" ]; then - export VC_REV=`git branch -v | awk '/^\*/ {printf("%s@%s\n", $2, $3); }'` - export VC_URL=`git remote -v | grep origin | grep fetch | awk '{print $2}'` - fi - fi - fi + if command -v git >/dev/null; then + if [ -d ".git" ]; then + VC_REV=$(git branch -v | awk '/^\*/ {printf("%s@%s\n", $2, $3); }') + VC_URL=$(git remote -v | grep origin | grep fetch | awk '{print $2}') + fi + fi #If nothing found if [ "${VC_REV}" == "" ]; then - export VC_REV="unavailable" - export VC_URL="unavailable" + VC_REV="unavailable" + VC_URL="unavailable" fi + export VC_REV + export VC_URL } # resolve links - $0 may be a softlink PRG="${0}" while [ -h "${PRG}" ]; do - ls=`ls -ld "${PRG}"` - link=`expr "$ls" : '.*-> \(.*\)$'` + ls=$(ls -ld "${PRG}") + link=$(expr "$ls" : '.*-> \(.*\)$') if expr "$link" : '/.*' > /dev/null; then PRG="$link" else - PRG=`dirname "${PRG}"`/"$link" + PRG=$(dirname "${PRG}")/"$link" fi done -BASEDIR=`dirname ${PRG}` -BASEDIR=`cd ${BASEDIR}/..;pwd` +BASEDIR=$(dirname "${PRG}") +BASEDIR=$(cd "${BASEDIR}"/.. && pwd) || { echo 'ERROR, directory change failed' ; exit -1; } -cd ${BASEDIR} +cd "${BASEDIR}" || { echo 'ERROR, directory change failed' ; exit -1; } -export DATETIME=`date -u "+%Y.%m.%d-%H:%M:%SGMT"` +DATETIME=$(date -u "+%Y.%m.%d-%H:%M:%SGMT") +export DATETIME setRevUrl MVN_OPTS="-Dbuild.time=${DATETIME} -Dvc.revision=${VC_REV} -Dvc.url=${VC_URL} -DgenerateDocs" -export DATETIME2=`date -u "+%Y%m%d-%H%M%SGMT"` -mvn clean package assembly:single ${MVN_OPTS} "$@" +DATETIME2=$(date -u "+%Y%m%d-%H%M%SGMT") +export DATETIME2 -if [ "$?" -ne "0" ]; then +if ! mvn clean package assembly:single "${MVN_OPTS}" "$@"; then echo echo "ERROR, Oozie distro creation failed" echo http://git-wip-us.apache.org/repos/asf/oozie/blob/afbc3af8/docs/src/site/markdown/ENG_MiniOozie.md ---------------------------------------------------------------------- diff --git a/docs/src/site/markdown/ENG_MiniOozie.md b/docs/src/site/markdown/ENG_MiniOozie.md index e793676..5eaac03 100644 --- a/docs/src/site/markdown/ENG_MiniOozie.md +++ b/docs/src/site/markdown/ENG_MiniOozie.md @@ -17,13 +17,13 @@ The Maven command (mvn) must be in the command path. ## Installing Oozie Jars To Maven Cache -Oozie source tree is at Apache SVN or Apache GIT. MiniOozie sample project is under Oozie source tree. +Oozie source tree is at Apache GIT. The code is also mirrored at GitHub. MiniOozie sample project is under Oozie source tree. The following command downloads Oozie trunk to local: ``` -$ svn co https://svn.apache.org/repos/asf/incubator/oozie/trunk +$ git clone git://git.apache.org/oozie.git ``` OR http://git-wip-us.apache.org/repos/asf/oozie/blob/afbc3af8/release-log.txt ---------------------------------------------------------------------- diff --git a/release-log.txt b/release-log.txt index 47e6f27..7ed83bd 100644 --- a/release-log.txt +++ b/release-log.txt @@ -1,5 +1,6 @@ -- Oozie 5.2.0 release (trunk - unreleased) +OOZIE-3338 [build] Remove SVN references (asalamon74 via andras.piros) OOZIE-3378 [core] Coordinator action's status is SUBMITTED after E1003 error (asalamon74 via andras.piros) OOZIE-3373 [core] Logging of lock information is inconsistent (Prabhu Joseph via andras.piros) OOZIE-3371 TestSubWorkflowActionExecutor#testSubWorkflowRerun() is flaky (andras.piros)
