Avoid a warning about not being able to parse an empty revision by maven.
Project: http://git-wip-us.apache.org/repos/asf/logging-log4cxx/repo Commit: http://git-wip-us.apache.org/repos/asf/logging-log4cxx/commit/4c259f19 Tree: http://git-wip-us.apache.org/repos/asf/logging-log4cxx/tree/4c259f19 Diff: http://git-wip-us.apache.org/repos/asf/logging-log4cxx/diff/4c259f19 Branch: refs/heads/release_scripts Commit: 4c259f192188393fecc89ac6a7f16980516479ce Parents: 80154a0 Author: Thorsten Schöning <tschoen...@am-soft.de> Authored: Thu Aug 17 16:58:29 2017 +0200 Committer: Thorsten Schöning <tschoen...@am-soft.de> Committed: Thu Aug 17 16:58:29 2017 +0200 ---------------------------------------------------------------------- releasePrepare.sh | 22 +++++++++++++++++----- 1 file changed, 17 insertions(+), 5 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/logging-log4cxx/blob/4c259f19/releasePrepare.sh ---------------------------------------------------------------------- diff --git a/releasePrepare.sh b/releasePrepare.sh index 0a06db3..8c96a49 100755 --- a/releasePrepare.sh +++ b/releasePrepare.sh @@ -134,7 +134,8 @@ function get_mvn_prepare_new_dev_ver() return 0 fi - # Maven is able to calculate a useful new version itself: + # Maven is able to calculate a useful new version itself, even it warns about not being able to + # parse an empty version. echo "" } @@ -161,13 +162,24 @@ function revert_mvn_prepare_new_dev_ver_if() sed -i -r "s/^(\t<version>).+(<)/\1${new_dev_ver}\2/" "pom.xml" } -function exec_maven() +function get_mvn_prepare_args() { local new_dev_ver=$(get_mvn_prepare_new_dev_ver) - local prepare_args="-Dresume=false -DdevelopmentVersion=${new_dev_ver}" + local prepare_args="-Dresume=false" - mvn clean || exit 1 - mvn release:prepare ${prepare_args} || exit 1 + # Avoid a warning about not being able to parse an empty version: + if [ -n "${new_dev_ver}"] + then + prepare_args="${prepare_args} -DdevelopmentVersion=${new_dev_ver}" + fi + + echo "${prepare_args}" +} + +function exec_mvn() +{ + mvn clean || exit 1 + mvn release:prepare $(get_mvn_prepare_args) || exit 1 revert_mvn_prepare_new_dev_ver_if "${new_dev_ver}" exit 1