You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@logging.apache.org by ts...@apache.org on 2017/08/16 16:52:28 UTC
[28/34] logging-log4cxx git commit: Merge mvn release cycle changes
into starting branch if needed.
Merge mvn release cycle changes into starting branch if needed.
Project: http://git-wip-us.apache.org/repos/asf/logging-log4cxx/repo
Commit: http://git-wip-us.apache.org/repos/asf/logging-log4cxx/commit/4a95f243
Tree: http://git-wip-us.apache.org/repos/asf/logging-log4cxx/tree/4a95f243
Diff: http://git-wip-us.apache.org/repos/asf/logging-log4cxx/diff/4a95f243
Branch: refs/heads/next_stable
Commit: 4a95f243bf1fad0b1b842af9de71f1778907a5e5
Parents: 6e11978
Author: Thorsten Schöning <ts...@am-soft.de>
Authored: Wed Aug 16 11:38:02 2017 +0200
Committer: Thorsten Schöning <ts...@am-soft.de>
Committed: Wed Aug 16 11:38:02 2017 +0200
----------------------------------------------------------------------
releasePrepare.sh | 7 +++++--
1 file changed, 5 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/logging-log4cxx/blob/4a95f243/releasePrepare.sh
----------------------------------------------------------------------
diff --git a/releasePrepare.sh b/releasePrepare.sh
index dba37e5..9b13aeb 100755
--- a/releasePrepare.sh
+++ b/releasePrepare.sh
@@ -43,6 +43,7 @@ fi
today=$(date "+%Y-%m-%d")
sed -i -r "1,/date=\".+?\"/ s/date=\".+?\"/date=\"${today}\"/" "src/changes/changes.xml"
git add "src/changes/changes.xml"
+
if ! git diff-index --quiet HEAD
then
git commit -m "Set release date to today."
@@ -63,10 +64,10 @@ then
exit 0
fi
-exit 0
-
+commit_mvn_next_dev_iter=$(git log --max-count=1 | grep "commit" | cut -d " " -f 2)
git checkout "${branch_starting}"
new_release_cycle=$(grep 'date="XXXX-XX-XX"' "src/changes/changes.xml")
+
if [ -n "${new_release_cycle}" ]
then
git checkout "next_stable"
@@ -90,6 +91,8 @@ sed -i -r "s/<body>/${new_release}/" "src/changes/changes.xml"
git add "configure.ac"
git add "src/changes/changes.xml"
+git merge "${commit_mvn_next_dev_iter}"
+
if ! git diff-index --quiet HEAD
then
git commit -m "Prepare for next development iteration: ${new_dev_ver_short}"