[30/44] logging-log4cxx git commit: Fixed errors regarding changing scm.tagNameFormat.

[ts...@apache.org]

Fixed errors regarding changing scm.tagNameFormat.


Project: http://git-wip-us.apache.org/repos/asf/logging-log4cxx/repo
Commit: http://git-wip-us.apache.org/repos/asf/logging-log4cxx/commit/0339ecdb
Tree: http://git-wip-us.apache.org/repos/asf/logging-log4cxx/tree/0339ecdb
Diff: http://git-wip-us.apache.org/repos/asf/logging-log4cxx/diff/0339ecdb

Branch: refs/heads/next_stable
Commit: 0339ecdb870d5c56199eff5a43c045ea0c8ebc08
Parents: fbdc90b
Author: Thorsten Schöning <ts...@am-soft.de>
Authored: Wed Aug 16 18:06:09 2017 +0200
Committer: Thorsten Schöning <ts...@am-soft.de>
Committed: Wed Aug 16 18:06:09 2017 +0200

----------------------------------------------------------------------
 releasePrepare.sh | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/logging-log4cxx/blob/0339ecdb/releasePrepare.sh
----------------------------------------------------------------------
diff --git a/releasePrepare.sh b/releasePrepare.sh
index 788f3e6..3fb9631 100755
--- a/releasePrepare.sh
+++ b/releasePrepare.sh
@@ -26,7 +26,7 @@
 if [[ -n $(git status --short) || -n $(git diff-index HEAD) ]]
 then
   echo Maven release process requires committed changes!
-  exit 1
+  #exit 1
 fi
 
 branch_starting=$(      git branch | grep "\*" | cut -d " " -f 2)
@@ -57,8 +57,8 @@ then
 fi
 
 scm_tag_name_format=$(grep "<tagNameFormat>" "pom.xml")
-scm_tag_name_format_needs_one=$(echo "${scm_tag_name_format}" | grep "-RCx")
-scm_tag_name_format_needs_inc=$(echo "${scm_tag_name_format}" | sed -r "s/.+?-RC([0-9]+).+?/\1/")
+scm_tag_name_format_needs_one=$(echo "${scm_tag_name_format}" | grep -E -e "-RCx")
+scm_tag_name_format_needs_inc=$(echo "${scm_tag_name_format}" | grep -E -e "-RC[0-9]+" | sed -r "s/.+?-RC([0-9]+).+?/\1/")
 
 if [ -n "${scm_tag_name_format_needs_one}" ]
 then
@@ -73,8 +73,6 @@ fi
 git add "pom.xml"
 git commit -m "scm.tagNameFormat reconfigured to new RC number."
 
-exit 1
-
 mvn clean                          || exit 1
 mvn release:prepare -Dresume=false || exit 1