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 14:16:49 UTC
[01/29] logging-log4cxx git commit: Prepare for next development
iteration:
Repository: logging-log4cxx
Updated Branches:
refs/heads/next_stable [created] cd67a89a3
Prepare for next development iteration:
Project: http://git-wip-us.apache.org/repos/asf/logging-log4cxx/repo
Commit: http://git-wip-us.apache.org/repos/asf/logging-log4cxx/commit/24db4642
Tree: http://git-wip-us.apache.org/repos/asf/logging-log4cxx/tree/24db4642
Diff: http://git-wip-us.apache.org/repos/asf/logging-log4cxx/diff/24db4642
Branch: refs/heads/next_stable
Commit: 24db4642a7e997c266f28c4ccb8335430048e8a6
Parents: 2fca5d8
Author: Thorsten Schöning <ts...@am-soft.de>
Authored: Tue Aug 15 15:32:29 2017 +0200
Committer: Thorsten Schöning <ts...@am-soft.de>
Committed: Tue Aug 15 15:32:29 2017 +0200
----------------------------------------------------------------------
configure.ac | 2 +-
src/changes/changes.xml | 7 ++++++-
2 files changed, 7 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/logging-log4cxx/blob/24db4642/configure.ac
----------------------------------------------------------------------
diff --git a/configure.ac b/configure.ac
index 94f6caf..e4d8a0c 100644
--- a/configure.ac
+++ b/configure.ac
@@ -13,7 +13,7 @@
# See the License for the specific language governing permissions and
# limitations under the License.
-AC_INIT([log4cxx], [0.11.1])
+AC_INIT([log4cxx], [])
AC_CONFIG_MACRO_DIR([src/m4])
AC_CONFIG_SRCDIR(src/main/cpp/logger.cpp)
http://git-wip-us.apache.org/repos/asf/logging-log4cxx/blob/24db4642/src/changes/changes.xml
----------------------------------------------------------------------
diff --git a/src/changes/changes.xml b/src/changes/changes.xml
index 2be88c0..385ade1 100644
--- a/src/changes/changes.xml
+++ b/src/changes/changes.xml
@@ -23,9 +23,14 @@
</properties>
<body>
- <release version="0.11.0"
+ <release version=""
date="XXXX-XX-XX"
description="Maintenance release">
+ </release>
+
+ <release version="0.11.0"
+ date="2017-08-15"
+ description="Maintenance release">
<action issue="LOGCXX-488" type="fix">Space after log level hides messages</action>
<action issue="LOGCXX-484" type="fix">Spelling error s/excute/execute</action>
<action issue="LOGCXX-482" type="fix">Build failure with GCC-6</action>
[14/29] logging-log4cxx git commit: Remote delete in one command to
only need to authenticate once.
Posted by ts...@apache.org.
Remote delete in one command to only need to authenticate once.
Project: http://git-wip-us.apache.org/repos/asf/logging-log4cxx/repo
Commit: http://git-wip-us.apache.org/repos/asf/logging-log4cxx/commit/dd9296bf
Tree: http://git-wip-us.apache.org/repos/asf/logging-log4cxx/tree/dd9296bf
Diff: http://git-wip-us.apache.org/repos/asf/logging-log4cxx/diff/dd9296bf
Branch: refs/heads/next_stable
Commit: dd9296bf8a6fca21a5efc361c253432e51ef86f4
Parents: 6374ce0
Author: Thorsten Schöning <ts...@am-soft.de>
Authored: Wed Aug 16 10:36:49 2017 +0200
Committer: Thorsten Schöning <ts...@am-soft.de>
Committed: Wed Aug 16 10:36:49 2017 +0200
----------------------------------------------------------------------
releasePurge.sh | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/logging-log4cxx/blob/dd9296bf/releasePurge.sh
----------------------------------------------------------------------
diff --git a/releasePurge.sh b/releasePurge.sh
index e274268..0535e55 100755
--- a/releasePurge.sh
+++ b/releasePurge.sh
@@ -24,5 +24,4 @@
git checkout "release_scripts"
git branch -D "next_stable"
git tag --delete "v0.11.0-RC1"
-git push --delete "origin" "next_stable"
-git push --delete "origin" "v0.11.0-RC1"
+git push --delete "origin" "next_stable" "v0.11.0-RC1"
[09/29] logging-log4cxx git commit: Maven fails on uncomitted changes,
so exit early to not create branches unnecessary.,
Posted by ts...@apache.org.
Maven fails on uncomitted changes, so exit early to not create branches unnecessary.,
Project: http://git-wip-us.apache.org/repos/asf/logging-log4cxx/repo
Commit: http://git-wip-us.apache.org/repos/asf/logging-log4cxx/commit/53d7fdec
Tree: http://git-wip-us.apache.org/repos/asf/logging-log4cxx/tree/53d7fdec
Diff: http://git-wip-us.apache.org/repos/asf/logging-log4cxx/diff/53d7fdec
Branch: refs/heads/next_stable
Commit: 53d7fdec3fd8ac07a6e635548ac8658715b3af40
Parents: d26e229
Author: Thorsten Schöning <ts...@am-soft.de>
Authored: Wed Aug 16 10:05:33 2017 +0200
Committer: Thorsten Schöning <ts...@am-soft.de>
Committed: Wed Aug 16 10:05:33 2017 +0200
----------------------------------------------------------------------
releasePrepare.sh | 17 ++++++++++++-----
1 file changed, 12 insertions(+), 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/logging-log4cxx/blob/53d7fdec/releasePrepare.sh
----------------------------------------------------------------------
diff --git a/releasePrepare.sh b/releasePrepare.sh
index cd02a34..0657465 100755
--- a/releasePrepare.sh
+++ b/releasePrepare.sh
@@ -1,4 +1,4 @@
-#! /bin/sh
+#! /bin/bash
# Licensed to the Apache Software Foundation (ASF) under one or more
# contributor license agreements. See the NOTICE file distributed with
# this work for additional information regarding copyright ownership.
@@ -22,8 +22,15 @@
# and quite a lot of the needed changes are possible in this script, so that is
# preferred over manually following some docs in the wiki.
#
-branch_starting=$( git branch | grep "\*" | cut -d " " -f 2)
-branch_starting_is_ns=$(git branch | grep "\* next_stable")
+
+if [[ -n $(git status) || $(git diff-index HEAD) ]]
+then
+ echo Maven release process requires committed changes!
+ exit 1
+fi
+
+branch_starting=$( git branch | grep "\*" | cut -d " " -f 2)
+branch_starting_is_ns=$( git branch | grep "\* next_stable")
if [ -z "${branch_starting_is_ns}" ]
then
@@ -43,8 +50,8 @@ then
git checkout "next_stable"
fi
-mvn clean || exit 1
-mvn release:prepare -Dresume=false || exit 1
+#mvn clean || exit 1
+#mvn release:prepare -Dresume=false || exit 1
if [ -z "${branch_starting_is_ns}" ]
then
[10/29] logging-log4cxx git commit: Fixed errors.
Posted by ts...@apache.org.
Fixed errors.
Project: http://git-wip-us.apache.org/repos/asf/logging-log4cxx/repo
Commit: http://git-wip-us.apache.org/repos/asf/logging-log4cxx/commit/d4b82961
Tree: http://git-wip-us.apache.org/repos/asf/logging-log4cxx/tree/d4b82961
Diff: http://git-wip-us.apache.org/repos/asf/logging-log4cxx/diff/d4b82961
Branch: refs/heads/next_stable
Commit: d4b82961b253186145a79b70b274ba8449897858
Parents: 53d7fde
Author: Thorsten Schöning <ts...@am-soft.de>
Authored: Wed Aug 16 10:18:25 2017 +0200
Committer: Thorsten Schöning <ts...@am-soft.de>
Committed: Wed Aug 16 10:18:25 2017 +0200
----------------------------------------------------------------------
releasePrepare.sh | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/logging-log4cxx/blob/d4b82961/releasePrepare.sh
----------------------------------------------------------------------
diff --git a/releasePrepare.sh b/releasePrepare.sh
index 0657465..80f5104 100755
--- a/releasePrepare.sh
+++ b/releasePrepare.sh
@@ -23,7 +23,7 @@
# preferred over manually following some docs in the wiki.
#
-if [[ -n $(git status) || $(git diff-index HEAD) ]]
+if [[ -n $(git status --short) || -n $(git diff-index HEAD) ]]
then
echo Maven release process requires committed changes!
exit 1
[12/29] logging-log4cxx git commit: Prepare for next development
iteration: 0.11.1
Posted by ts...@apache.org.
Prepare for next development iteration: 0.11.1
Project: http://git-wip-us.apache.org/repos/asf/logging-log4cxx/repo
Commit: http://git-wip-us.apache.org/repos/asf/logging-log4cxx/commit/6aeb38c7
Tree: http://git-wip-us.apache.org/repos/asf/logging-log4cxx/tree/6aeb38c7
Diff: http://git-wip-us.apache.org/repos/asf/logging-log4cxx/diff/6aeb38c7
Branch: refs/heads/next_stable
Commit: 6aeb38c7dbf0182d10d88f83a736a0963d0fcef9
Parents: 900e469
Author: Thorsten Schöning <ts...@am-soft.de>
Authored: Wed Aug 16 10:26:00 2017 +0200
Committer: Thorsten Schöning <ts...@am-soft.de>
Committed: Wed Aug 16 10:26:00 2017 +0200
----------------------------------------------------------------------
configure.ac | 2 +-
src/changes/changes.xml | 5 +++++
2 files changed, 6 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/logging-log4cxx/blob/6aeb38c7/configure.ac
----------------------------------------------------------------------
diff --git a/configure.ac b/configure.ac
index e4d8a0c..94f6caf 100644
--- a/configure.ac
+++ b/configure.ac
@@ -13,7 +13,7 @@
# See the License for the specific language governing permissions and
# limitations under the License.
-AC_INIT([log4cxx], [])
+AC_INIT([log4cxx], [0.11.1])
AC_CONFIG_MACRO_DIR([src/m4])
AC_CONFIG_SRCDIR(src/main/cpp/logger.cpp)
http://git-wip-us.apache.org/repos/asf/logging-log4cxx/blob/6aeb38c7/src/changes/changes.xml
----------------------------------------------------------------------
diff --git a/src/changes/changes.xml b/src/changes/changes.xml
index bdf1b7b..9aa187a 100644
--- a/src/changes/changes.xml
+++ b/src/changes/changes.xml
@@ -23,6 +23,11 @@
</properties>
<body>
+ <release version="0.11.1"
+ date="XXXX-XX-XX"
+ description="Maintenance release">
+ </release>
+
<release version="0.11.0"
date="2017-08-16"
description="Maintenance release">
[06/29] logging-log4cxx git commit: Set release date to today.
Posted by ts...@apache.org.
Set release date to today.
Project: http://git-wip-us.apache.org/repos/asf/logging-log4cxx/repo
Commit: http://git-wip-us.apache.org/repos/asf/logging-log4cxx/commit/74095fa8
Tree: http://git-wip-us.apache.org/repos/asf/logging-log4cxx/tree/74095fa8
Diff: http://git-wip-us.apache.org/repos/asf/logging-log4cxx/diff/74095fa8
Branch: refs/heads/next_stable
Commit: 74095fa84054166dd60b45a30ecf419a42b2b47a
Parents: 46da9d1
Author: Thorsten Schöning <ts...@am-soft.de>
Authored: Tue Aug 15 17:33:32 2017 +0200
Committer: Thorsten Schöning <ts...@am-soft.de>
Committed: Tue Aug 15 17:33:32 2017 +0200
----------------------------------------------------------------------
src/changes/changes.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/logging-log4cxx/blob/74095fa8/src/changes/changes.xml
----------------------------------------------------------------------
diff --git a/src/changes/changes.xml b/src/changes/changes.xml
index 2be88c0..4be7e1c 100644
--- a/src/changes/changes.xml
+++ b/src/changes/changes.xml
@@ -24,7 +24,7 @@
<body>
<release version="0.11.0"
- date="XXXX-XX-XX"
+ date="2017-08-15"
description="Maintenance release">
<action issue="LOGCXX-488" type="fix">Space after log level hides messages</action>
<action issue="LOGCXX-484" type="fix">Spelling error s/excute/execute</action>
[13/29] logging-log4cxx git commit: Error exiting in case already on
next_stable.
Posted by ts...@apache.org.
Error exiting in case already on next_stable.
Project: http://git-wip-us.apache.org/repos/asf/logging-log4cxx/repo
Commit: http://git-wip-us.apache.org/repos/asf/logging-log4cxx/commit/6374ce0b
Tree: http://git-wip-us.apache.org/repos/asf/logging-log4cxx/tree/6374ce0b
Diff: http://git-wip-us.apache.org/repos/asf/logging-log4cxx/diff/6374ce0b
Branch: refs/heads/next_stable
Commit: 6374ce0b365881573169cf1463ff217bb12c9bf1
Parents: 6aeb38c
Author: Thorsten Schöning <ts...@am-soft.de>
Authored: Wed Aug 16 10:34:13 2017 +0200
Committer: Thorsten Schöning <ts...@am-soft.de>
Committed: Wed Aug 16 10:34:13 2017 +0200
----------------------------------------------------------------------
releasePrepare.sh | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/logging-log4cxx/blob/6374ce0b/releasePrepare.sh
----------------------------------------------------------------------
diff --git a/releasePrepare.sh b/releasePrepare.sh
index ea9f789..bdd2a89 100755
--- a/releasePrepare.sh
+++ b/releasePrepare.sh
@@ -53,7 +53,7 @@ fi
#mvn clean || exit 1
#mvn release:prepare -Dresume=false || exit 1
-if [ -z "${branch_starting_is_ns}" ]
+if [ -n "${branch_starting_is_ns}" ]
then
git checkout "${branch_starting}"
new_release_cycle=$(grep 'date="XXXX-XX-XX"' "src/changes/changes.xml")
[11/29] logging-log4cxx git commit: Commit new versions of
development iteration.
Posted by ts...@apache.org.
Commit new versions of development iteration.
Project: http://git-wip-us.apache.org/repos/asf/logging-log4cxx/repo
Commit: http://git-wip-us.apache.org/repos/asf/logging-log4cxx/commit/900e469c
Tree: http://git-wip-us.apache.org/repos/asf/logging-log4cxx/tree/900e469c
Diff: http://git-wip-us.apache.org/repos/asf/logging-log4cxx/diff/900e469c
Branch: refs/heads/next_stable
Commit: 900e469c910adcad822b0a6c8ba192618e50220d
Parents: d4b8296
Author: Thorsten Schöning <ts...@am-soft.de>
Authored: Wed Aug 16 10:25:36 2017 +0200
Committer: Thorsten Schöning <ts...@am-soft.de>
Committed: Wed Aug 16 10:25:36 2017 +0200
----------------------------------------------------------------------
releasePrepare.sh | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/logging-log4cxx/blob/900e469c/releasePrepare.sh
----------------------------------------------------------------------
diff --git a/releasePrepare.sh b/releasePrepare.sh
index 80f5104..ea9f789 100755
--- a/releasePrepare.sh
+++ b/releasePrepare.sh
@@ -81,7 +81,7 @@ sed -i -r "s/<body>/${new_release}/" "src/changes/changes.xml"
git add "configure.ac"
git add "src/changes/changes.xml"
-if git diff-index --quiet HEAD
+if ! git diff-index --quiet HEAD
then
git commit -m "Prepare for next development iteration: ${new_dev_ver_short}"
fi
[15/29] logging-log4cxx git commit: Set release date to today.
Posted by ts...@apache.org.
Set release date to today.
Project: http://git-wip-us.apache.org/repos/asf/logging-log4cxx/repo
Commit: http://git-wip-us.apache.org/repos/asf/logging-log4cxx/commit/0fd27be9
Tree: http://git-wip-us.apache.org/repos/asf/logging-log4cxx/tree/0fd27be9
Diff: http://git-wip-us.apache.org/repos/asf/logging-log4cxx/diff/0fd27be9
Branch: refs/heads/next_stable
Commit: 0fd27be9fa30e72106ae313d08642466e61c94c0
Parents: dd9296b
Author: Thorsten Schöning <ts...@am-soft.de>
Authored: Wed Aug 16 10:37:33 2017 +0200
Committer: Thorsten Schöning <ts...@am-soft.de>
Committed: Wed Aug 16 10:37:33 2017 +0200
----------------------------------------------------------------------
src/changes/changes.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/logging-log4cxx/blob/0fd27be9/src/changes/changes.xml
----------------------------------------------------------------------
diff --git a/src/changes/changes.xml b/src/changes/changes.xml
index 9aa187a..f2235f4 100644
--- a/src/changes/changes.xml
+++ b/src/changes/changes.xml
@@ -24,7 +24,7 @@
<body>
<release version="0.11.1"
- date="XXXX-XX-XX"
+ date="2017-08-16"
description="Maintenance release">
</release>
[17/29] logging-log4cxx git commit: Prepare for next development
iteration: 0.11.1
Posted by ts...@apache.org.
Prepare for next development iteration: 0.11.1
Project: http://git-wip-us.apache.org/repos/asf/logging-log4cxx/repo
Commit: http://git-wip-us.apache.org/repos/asf/logging-log4cxx/commit/20905318
Tree: http://git-wip-us.apache.org/repos/asf/logging-log4cxx/tree/20905318
Diff: http://git-wip-us.apache.org/repos/asf/logging-log4cxx/diff/20905318
Branch: refs/heads/next_stable
Commit: 20905318006844aeba742aed5374d8a8b4fd0dac
Parents: 9693b9e
Author: Thorsten Schöning <ts...@am-soft.de>
Authored: Wed Aug 16 10:59:44 2017 +0200
Committer: Thorsten Schöning <ts...@am-soft.de>
Committed: Wed Aug 16 10:59:44 2017 +0200
----------------------------------------------------------------------
src/changes/changes.xml | 5 +++++
1 file changed, 5 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/logging-log4cxx/blob/20905318/src/changes/changes.xml
----------------------------------------------------------------------
diff --git a/src/changes/changes.xml b/src/changes/changes.xml
index f2235f4..680a56b 100644
--- a/src/changes/changes.xml
+++ b/src/changes/changes.xml
@@ -24,6 +24,11 @@
<body>
<release version="0.11.1"
+ date="XXXX-XX-XX"
+ description="Maintenance release">
+ </release>
+
+ <release version="0.11.1"
date="2017-08-16"
description="Maintenance release">
</release>
[04/29] logging-log4cxx git commit: Changed ther script to create a
new branch next_stable for releases,
because releases might contain errors which need to be fixed fast,
while development in master might already have continued etc. How maven
release pl
Posted by ts...@apache.org.
Changed ther script to create a new branch next_stable for releases, because releases might contain errors which need to be fixed fast, while development in master might already have continued etc. How maven release plugin handles RCs, new versions in the developoment iteration etc. seems a bit strange to me.
Project: http://git-wip-us.apache.org/repos/asf/logging-log4cxx/repo
Commit: http://git-wip-us.apache.org/repos/asf/logging-log4cxx/commit/991982f9
Tree: http://git-wip-us.apache.org/repos/asf/logging-log4cxx/tree/991982f9
Diff: http://git-wip-us.apache.org/repos/asf/logging-log4cxx/diff/991982f9
Branch: refs/heads/next_stable
Commit: 991982f917de3f16cf09b5d06445e65d540ec85c
Parents: 2fdf67e
Author: Thorsten Schöning <ts...@am-soft.de>
Authored: Tue Aug 15 16:43:21 2017 +0200
Committer: Thorsten Schöning <ts...@am-soft.de>
Committed: Tue Aug 15 16:43:21 2017 +0200
----------------------------------------------------------------------
releasePrepare.sh | 54 +++++++++++++++++++++++++++++++++++++++-----------
1 file changed, 42 insertions(+), 12 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/logging-log4cxx/blob/991982f9/releasePrepare.sh
----------------------------------------------------------------------
diff --git a/releasePrepare.sh b/releasePrepare.sh
index 74554b4..2e34839 100755
--- a/releasePrepare.sh
+++ b/releasePrepare.sh
@@ -1,4 +1,4 @@
-#! /bin/bash -e
+#! /bin/sh
# Licensed to the Apache Software Foundation (ASF) under one or more
# contributor license agreements. See the NOTICE file distributed with
# this work for additional information regarding copyright ownership.
@@ -22,18 +22,44 @@
# and quite a lot of the needed changes are possible in this script, so that is
# preferred over manually following some docs in the wiki.
#
+branch_starting=$( git branch | grep "\*" | cut -d " " -f 2)
+branch_starting_is_ns=$(git branch | grep "\* next_stable")
-TODAY=$(date "+%Y-%m-%d")
-sed -i -r "s/date=\"XXXX-XX-XX\"/date=\"${TODAY}\"/" "src/changes/changes.xml"
+if [ -z "${branch_starting_is_ns}" ]
+then
+ git checkout "next_stable" || git checkout -b "next_stable"
+ git merge "${branch_starting}"
+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"
-git diff-index --quiet HEAD || git commit -m "Set release date to today."
+if git diff-index --quiet HEAD
+then
+ git commit -m "Set release date to today."
+ commit_changes=$(git log --max-count=1 | grep "commit" | cut -d " " -f 2)
+ git checkout "${branch_starting}"
+ git merge "${commit_changes}"
+ git checkout "next_stable"
+fi
+
+mvn clean || exit 1
+mvn release:prepare -Dresume=false || exit 1
-mvn clean
-mvn release:prepare -Dresume=false
+if [ -z "${branch_starting_is_ns}" ]
+then
+ 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"
+ exit 0
+ fi
+fi
# Propagate new version into some additional files:
-NEW_DEV_VER_SHORT=$(grep -E "^project.dev.log4cxx" "release.properties" | cut -d = -f 2 | cut -d - -f 1)
-NEW_RELEASE=$(cat <<-"END"
+new_dev_ver_short=$(grep -E "^project.dev.log4cxx" "release.properties" | cut -d "=" -f 2 | cut -d - -f 1)
+new_release=$(cat <<-"END"
<body>\n\
<release version="VER_NEEDED"\n\
date="XXXX-XX-XX"\n\
@@ -41,11 +67,15 @@ NEW_RELEASE=$(cat <<-"END"
<\/release>\n
END
)
-NEW_RELEASE="${NEW_RELEASE/VER_NEEDED/${NEW_DEV_VER_SHORT}}"
+new_release="${new_release/VER_NEEDED/${new_dev_ver_short}}"
-sed -i -r "s/AC_INIT\(\[log4cxx\], \[.+?\]\)/AC_INIT([log4cxx], [${NEW_DEV_VER_SHORT}])/" "configure.ac"
-sed -i -r "s/<body>/${NEW_RELEASE}/" "src/changes/changes.xml"
+sed -i -r "s/AC_INIT\(\[log4cxx\], \[.+?\]\)/AC_INIT([log4cxx], [${new_dev_ver_short}])/" "configure.ac"
+sed -i -r "s/<body>/${new_release}/" "src/changes/changes.xml"
git add "configure.ac"
git add "src/changes/changes.xml"
-git diff-index --quiet HEAD || git commit -m "Prepare for next development iteration: ${NEW_DEV_VER_SHORT}"
+if git diff-index --quiet HEAD
+then
+ git commit -m "Prepare for next development iteration: ${new_dev_ver_short}"
+fi
+git checkout "next_stable"
[20/29] logging-log4cxx git commit: Set release date to today.
Posted by ts...@apache.org.
Set release date to today.
Project: http://git-wip-us.apache.org/repos/asf/logging-log4cxx/repo
Commit: http://git-wip-us.apache.org/repos/asf/logging-log4cxx/commit/4684243a
Tree: http://git-wip-us.apache.org/repos/asf/logging-log4cxx/tree/4684243a
Diff: http://git-wip-us.apache.org/repos/asf/logging-log4cxx/diff/4684243a
Branch: refs/heads/next_stable
Commit: 4684243a9fb75ef4df5bc7ac1d2eb9369b3b69b5
Parents: a7412af
Author: Thorsten Schöning <ts...@am-soft.de>
Authored: Wed Aug 16 11:10:07 2017 +0200
Committer: Thorsten Schöning <ts...@am-soft.de>
Committed: Wed Aug 16 11:10:07 2017 +0200
----------------------------------------------------------------------
src/changes/changes.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/logging-log4cxx/blob/4684243a/src/changes/changes.xml
----------------------------------------------------------------------
diff --git a/src/changes/changes.xml b/src/changes/changes.xml
index 9aa187a..f2235f4 100644
--- a/src/changes/changes.xml
+++ b/src/changes/changes.xml
@@ -24,7 +24,7 @@
<body>
<release version="0.11.1"
- date="XXXX-XX-XX"
+ date="2017-08-16"
description="Maintenance release">
</release>
[07/29] logging-log4cxx git commit: New Script to purge releases
during development.
Posted by ts...@apache.org.
New Script to purge releases during development.
Project: http://git-wip-us.apache.org/repos/asf/logging-log4cxx/repo
Commit: http://git-wip-us.apache.org/repos/asf/logging-log4cxx/commit/b6d4188e
Tree: http://git-wip-us.apache.org/repos/asf/logging-log4cxx/tree/b6d4188e
Diff: http://git-wip-us.apache.org/repos/asf/logging-log4cxx/diff/b6d4188e
Branch: refs/heads/next_stable
Commit: b6d4188ea243b3c15f9bee3d7a82003b797be141
Parents: 74095fa
Author: Thorsten Schöning <ts...@am-soft.de>
Authored: Wed Aug 16 09:50:24 2017 +0200
Committer: Thorsten Schöning <ts...@am-soft.de>
Committed: Wed Aug 16 09:50:24 2017 +0200
----------------------------------------------------------------------
releasePurge.sh | 28 ++++++++++++++++++++++++++++
1 file changed, 28 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/logging-log4cxx/blob/b6d4188e/releasePurge.sh
----------------------------------------------------------------------
diff --git a/releasePurge.sh b/releasePurge.sh
new file mode 100755
index 0000000..e274268
--- /dev/null
+++ b/releasePurge.sh
@@ -0,0 +1,28 @@
+#! /bin/sh
+# Licensed to the Apache Software Foundation (ASF) under one or more
+# contributor license agreements. See the NOTICE file distributed with
+# this work for additional information regarding copyright ownership.
+# The ASF licenses this file to You under the Apache License, Version 2.0
+# (the "License"); you may not use this file except in compliance with
+# the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+
+##
+# Purge (some) releases during development of release scripts.
+#
+# This script is mainly used during development of the release scripts itself and simply deletes
+# branches and tags created during tests of the release process. Be very careful with execution!
+#
+git checkout "release_scripts"
+git branch -D "next_stable"
+git tag --delete "v0.11.0-RC1"
+git push --delete "origin" "next_stable"
+git push --delete "origin" "v0.11.0-RC1"
[08/29] logging-log4cxx git commit: Set release date to today.
Posted by ts...@apache.org.
Set release date to today.
Project: http://git-wip-us.apache.org/repos/asf/logging-log4cxx/repo
Commit: http://git-wip-us.apache.org/repos/asf/logging-log4cxx/commit/d26e2293
Tree: http://git-wip-us.apache.org/repos/asf/logging-log4cxx/tree/d26e2293
Diff: http://git-wip-us.apache.org/repos/asf/logging-log4cxx/diff/d26e2293
Branch: refs/heads/next_stable
Commit: d26e22937da9fb76de1b3c73989d621b5169db60
Parents: b6d4188
Author: Thorsten Schöning <ts...@am-soft.de>
Authored: Wed Aug 16 10:00:14 2017 +0200
Committer: Thorsten Schöning <ts...@am-soft.de>
Committed: Wed Aug 16 10:00:14 2017 +0200
----------------------------------------------------------------------
src/changes/changes.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/logging-log4cxx/blob/d26e2293/src/changes/changes.xml
----------------------------------------------------------------------
diff --git a/src/changes/changes.xml b/src/changes/changes.xml
index 4be7e1c..bdf1b7b 100644
--- a/src/changes/changes.xml
+++ b/src/changes/changes.xml
@@ -24,7 +24,7 @@
<body>
<release version="0.11.0"
- date="2017-08-15"
+ date="2017-08-16"
description="Maintenance release">
<action issue="LOGCXX-488" type="fix">Space after log level hides messages</action>
<action issue="LOGCXX-484" type="fix">Spelling error s/excute/execute</action>
[03/29] logging-log4cxx git commit: Reverted changes.
Posted by ts...@apache.org.
Reverted changes.
Project: http://git-wip-us.apache.org/repos/asf/logging-log4cxx/repo
Commit: http://git-wip-us.apache.org/repos/asf/logging-log4cxx/commit/2fdf67e4
Tree: http://git-wip-us.apache.org/repos/asf/logging-log4cxx/tree/2fdf67e4
Diff: http://git-wip-us.apache.org/repos/asf/logging-log4cxx/diff/2fdf67e4
Branch: refs/heads/next_stable
Commit: 2fdf67e4ef51faf4179bc6c6c39cea82b7ee6c46
Parents: 398f925
Author: Thorsten Schöning <ts...@am-soft.de>
Authored: Tue Aug 15 16:31:38 2017 +0200
Committer: Thorsten Schöning <ts...@am-soft.de>
Committed: Tue Aug 15 16:31:38 2017 +0200
----------------------------------------------------------------------
src/changes/changes.xml | 27 +--------------------------
1 file changed, 1 insertion(+), 26 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/logging-log4cxx/blob/2fdf67e4/src/changes/changes.xml
----------------------------------------------------------------------
diff --git a/src/changes/changes.xml b/src/changes/changes.xml
index 59f4383..2be88c0 100644
--- a/src/changes/changes.xml
+++ b/src/changes/changes.xml
@@ -23,33 +23,8 @@
</properties>
<body>
- <release version=""
- date="2017-08-15"
- description="Maintenance release">
- </release>
-
- <release version=""
- date="2017-08-15"
- description="Maintenance release">
- </release>
-
- <release version=""
- date="2017-08-15"
- description="Maintenance release">
- </release>
-
- <release version=""
- date="2017-08-15"
- description="Maintenance release">
- </release>
-
- <release version=""
- date="2017-08-15"
- description="Maintenance release">
- </release>
-
<release version="0.11.0"
- date="2017-08-15"
+ date="XXXX-XX-XX"
description="Maintenance release">
<action issue="LOGCXX-488" type="fix">Space after log level hides messages</action>
<action issue="LOGCXX-484" type="fix">Spelling error s/excute/execute</action>
[28/29] logging-log4cxx git commit: Merge mvn release cycle changes
into starting branch if needed.
Posted by ts...@apache.org.
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}"
[05/29] logging-log4cxx git commit: Corrected check for changes in
changes.xnml.
Posted by ts...@apache.org.
Corrected check for changes in changes.xnml.
Project: http://git-wip-us.apache.org/repos/asf/logging-log4cxx/repo
Commit: http://git-wip-us.apache.org/repos/asf/logging-log4cxx/commit/46da9d1a
Tree: http://git-wip-us.apache.org/repos/asf/logging-log4cxx/tree/46da9d1a
Diff: http://git-wip-us.apache.org/repos/asf/logging-log4cxx/diff/46da9d1a
Branch: refs/heads/next_stable
Commit: 46da9d1a6b4e7e5e28201a60323ec07ca141bf3b
Parents: 991982f
Author: Thorsten Schöning <ts...@am-soft.de>
Authored: Tue Aug 15 17:33:12 2017 +0200
Committer: Thorsten Schöning <ts...@am-soft.de>
Committed: Tue Aug 15 17:33:12 2017 +0200
----------------------------------------------------------------------
releasePrepare.sh | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/logging-log4cxx/blob/46da9d1a/releasePrepare.sh
----------------------------------------------------------------------
diff --git a/releasePrepare.sh b/releasePrepare.sh
index 2e34839..cd02a34 100755
--- a/releasePrepare.sh
+++ b/releasePrepare.sh
@@ -34,7 +34,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
+if ! git diff-index --quiet HEAD
then
git commit -m "Set release date to today."
commit_changes=$(git log --max-count=1 | grep "commit" | cut -d " " -f 2)
[26/29] logging-log4cxx git commit: Test with Maven again.
Posted by ts...@apache.org.
Test with Maven again.
Project: http://git-wip-us.apache.org/repos/asf/logging-log4cxx/repo
Commit: http://git-wip-us.apache.org/repos/asf/logging-log4cxx/commit/54744b5f
Tree: http://git-wip-us.apache.org/repos/asf/logging-log4cxx/tree/54744b5f
Diff: http://git-wip-us.apache.org/repos/asf/logging-log4cxx/diff/54744b5f
Branch: refs/heads/next_stable
Commit: 54744b5f80babd805125734086b2135dc72c9b86
Parents: 3b42516
Author: Thorsten Schöning <ts...@am-soft.de>
Authored: Wed Aug 16 11:26:00 2017 +0200
Committer: Thorsten Schöning <ts...@am-soft.de>
Committed: Wed Aug 16 11:26:00 2017 +0200
----------------------------------------------------------------------
releasePrepare.sh | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/logging-log4cxx/blob/54744b5f/releasePrepare.sh
----------------------------------------------------------------------
diff --git a/releasePrepare.sh b/releasePrepare.sh
index 679a6a6..dba37e5 100755
--- a/releasePrepare.sh
+++ b/releasePrepare.sh
@@ -55,14 +55,16 @@ then
fi
fi
-#mvn clean || exit 1
-#mvn release:prepare -Dresume=false || exit 1
+mvn clean || exit 1
+mvn release:prepare -Dresume=false || exit 1
if [ -n "${branch_starting_is_ns}" ]
then
exit 0
fi
+exit 0
+
git checkout "${branch_starting}"
new_release_cycle=$(grep 'date="XXXX-XX-XX"' "src/changes/changes.xml")
if [ -n "${new_release_cycle}" ]
[18/29] logging-log4cxx git commit: Removed 0.11.1
Posted by ts...@apache.org.
Removed 0.11.1
Project: http://git-wip-us.apache.org/repos/asf/logging-log4cxx/repo
Commit: http://git-wip-us.apache.org/repos/asf/logging-log4cxx/commit/dda5846b
Tree: http://git-wip-us.apache.org/repos/asf/logging-log4cxx/tree/dda5846b
Diff: http://git-wip-us.apache.org/repos/asf/logging-log4cxx/diff/dda5846b
Branch: refs/heads/next_stable
Commit: dda5846bccb4190c80d067f2f9e555655fc97a8d
Parents: 2090531
Author: Thorsten Schöning <ts...@am-soft.de>
Authored: Wed Aug 16 11:08:32 2017 +0200
Committer: Thorsten Schöning <ts...@am-soft.de>
Committed: Wed Aug 16 11:08:32 2017 +0200
----------------------------------------------------------------------
src/changes/changes.xml | 10 ----------
1 file changed, 10 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/logging-log4cxx/blob/dda5846b/src/changes/changes.xml
----------------------------------------------------------------------
diff --git a/src/changes/changes.xml b/src/changes/changes.xml
index 680a56b..bdf1b7b 100644
--- a/src/changes/changes.xml
+++ b/src/changes/changes.xml
@@ -23,16 +23,6 @@
</properties>
<body>
- <release version="0.11.1"
- date="XXXX-XX-XX"
- description="Maintenance release">
- </release>
-
- <release version="0.11.1"
- date="2017-08-16"
- description="Maintenance release">
- </release>
-
<release version="0.11.0"
date="2017-08-16"
description="Maintenance release">
[25/29] logging-log4cxx git commit: Prepare for next development
iteration: 0.11.1
Posted by ts...@apache.org.
Prepare for next development iteration: 0.11.1
Project: http://git-wip-us.apache.org/repos/asf/logging-log4cxx/repo
Commit: http://git-wip-us.apache.org/repos/asf/logging-log4cxx/commit/3b425164
Tree: http://git-wip-us.apache.org/repos/asf/logging-log4cxx/tree/3b425164
Diff: http://git-wip-us.apache.org/repos/asf/logging-log4cxx/diff/3b425164
Branch: refs/heads/next_stable
Commit: 3b425164c48c5fb36189ff284888c66af4aec99f
Parents: 42c8652
Author: Thorsten Schöning <ts...@am-soft.de>
Authored: Wed Aug 16 11:21:32 2017 +0200
Committer: Thorsten Schöning <ts...@am-soft.de>
Committed: Wed Aug 16 11:21:32 2017 +0200
----------------------------------------------------------------------
src/changes/changes.xml | 5 +++++
1 file changed, 5 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/logging-log4cxx/blob/3b425164/src/changes/changes.xml
----------------------------------------------------------------------
diff --git a/src/changes/changes.xml b/src/changes/changes.xml
index bdf1b7b..9aa187a 100644
--- a/src/changes/changes.xml
+++ b/src/changes/changes.xml
@@ -23,6 +23,11 @@
</properties>
<body>
+ <release version="0.11.1"
+ date="XXXX-XX-XX"
+ description="Maintenance release">
+ </release>
+
<release version="0.11.0"
date="2017-08-16"
description="Maintenance release">
[23/29] logging-log4cxx git commit: Removed 0.11.1
Posted by ts...@apache.org.
Removed 0.11.1
Project: http://git-wip-us.apache.org/repos/asf/logging-log4cxx/repo
Commit: http://git-wip-us.apache.org/repos/asf/logging-log4cxx/commit/2a48d9d6
Tree: http://git-wip-us.apache.org/repos/asf/logging-log4cxx/tree/2a48d9d6
Diff: http://git-wip-us.apache.org/repos/asf/logging-log4cxx/diff/2a48d9d6
Branch: refs/heads/next_stable
Commit: 2a48d9d65796efe364b001ff37ae1e7917141546
Parents: 3ad1468
Author: Thorsten Schöning <ts...@am-soft.de>
Authored: Wed Aug 16 11:19:55 2017 +0200
Committer: Thorsten Schöning <ts...@am-soft.de>
Committed: Wed Aug 16 11:19:55 2017 +0200
----------------------------------------------------------------------
src/changes/changes.xml | 12 +-----------
1 file changed, 1 insertion(+), 11 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/logging-log4cxx/blob/2a48d9d6/src/changes/changes.xml
----------------------------------------------------------------------
diff --git a/src/changes/changes.xml b/src/changes/changes.xml
index 680a56b..2be88c0 100644
--- a/src/changes/changes.xml
+++ b/src/changes/changes.xml
@@ -23,18 +23,8 @@
</properties>
<body>
- <release version="0.11.1"
- date="XXXX-XX-XX"
- description="Maintenance release">
- </release>
-
- <release version="0.11.1"
- date="2017-08-16"
- description="Maintenance release">
- </release>
-
<release version="0.11.0"
- date="2017-08-16"
+ date="XXXX-XX-XX"
description="Maintenance release">
<action issue="LOGCXX-488" type="fix">Space after log level hides messages</action>
<action issue="LOGCXX-484" type="fix">Spelling error s/excute/execute</action>
[29/29] logging-log4cxx git commit: [maven-release-plugin] prepare
release v0.11.0-RCx
Posted by ts...@apache.org.
[maven-release-plugin] prepare release v0.11.0-RCx
Project: http://git-wip-us.apache.org/repos/asf/logging-log4cxx/repo
Commit: http://git-wip-us.apache.org/repos/asf/logging-log4cxx/commit/cd67a89a
Tree: http://git-wip-us.apache.org/repos/asf/logging-log4cxx/tree/cd67a89a
Diff: http://git-wip-us.apache.org/repos/asf/logging-log4cxx/diff/cd67a89a
Branch: refs/heads/next_stable
Commit: cd67a89a34d1676a65dc7d2223db1582d6758ff3
Parents: 4a95f24
Author: Thorsten Schöning <ts...@am-soft.de>
Authored: Wed Aug 16 16:13:39 2017 +0200
Committer: Thorsten Schöning <ts...@am-soft.de>
Committed: Wed Aug 16 16:13:39 2017 +0200
----------------------------------------------------------------------
pom.xml | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/logging-log4cxx/blob/cd67a89a/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 5697b54..2e88cb3 100644
--- a/pom.xml
+++ b/pom.xml
@@ -3,7 +3,7 @@
<groupId>log4cxx</groupId>
<artifactId>apache-log4cxx</artifactId>
<packaging>pom</packaging>
- <version>0.11.0-SNAPSHOT</version>
+ <version>0.11.0</version>
<name>Apache log4cxx</name>
<description>Logging framework for C++.</description>
<url>http://logging.apache.org/log4cxx</url>
@@ -65,7 +65,7 @@
<connection>scm:git:http://git-wip-us.apache.org/repos/asf/logging-log4cxx.git</connection>
<developerConnection>scm:git:https://git-wip-us.apache.org/repos/asf/logging-log4cxx.git</developerConnection>
<url>https://git-wip-us.apache.org/repos/asf?p=logging-log4cxx.git</url>
- <tag>v0.11.0-RC1</tag>
+ <tag>v0.11.0-RCx</tag>
</scm>
<properties>
[02/29] logging-log4cxx git commit: Some changes...
Posted by ts...@apache.org.
Some changes...
Project: http://git-wip-us.apache.org/repos/asf/logging-log4cxx/repo
Commit: http://git-wip-us.apache.org/repos/asf/logging-log4cxx/commit/398f9253
Tree: http://git-wip-us.apache.org/repos/asf/logging-log4cxx/tree/398f9253
Diff: http://git-wip-us.apache.org/repos/asf/logging-log4cxx/diff/398f9253
Branch: refs/heads/next_stable
Commit: 398f9253be875d90e1eb4a0941b3b492b3e93d5e
Parents: 24db464
Author: Thorsten Schöning <ts...@am-soft.de>
Authored: Tue Aug 15 16:30:28 2017 +0200
Committer: Thorsten Schöning <ts...@am-soft.de>
Committed: Tue Aug 15 16:30:28 2017 +0200
----------------------------------------------------------------------
src/changes/changes.xml | 22 +++++++++++++++++++++-
1 file changed, 21 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/logging-log4cxx/blob/398f9253/src/changes/changes.xml
----------------------------------------------------------------------
diff --git a/src/changes/changes.xml b/src/changes/changes.xml
index 385ade1..59f4383 100644
--- a/src/changes/changes.xml
+++ b/src/changes/changes.xml
@@ -24,7 +24,27 @@
<body>
<release version=""
- date="XXXX-XX-XX"
+ date="2017-08-15"
+ description="Maintenance release">
+ </release>
+
+ <release version=""
+ date="2017-08-15"
+ description="Maintenance release">
+ </release>
+
+ <release version=""
+ date="2017-08-15"
+ description="Maintenance release">
+ </release>
+
+ <release version=""
+ date="2017-08-15"
+ description="Maintenance release">
+ </release>
+
+ <release version=""
+ date="2017-08-15"
description="Maintenance release">
</release>
[21/29] logging-log4cxx git commit: Prepare for next development
iteration: 0.11.1
Posted by ts...@apache.org.
Prepare for next development iteration: 0.11.1
Project: http://git-wip-us.apache.org/repos/asf/logging-log4cxx/repo
Commit: http://git-wip-us.apache.org/repos/asf/logging-log4cxx/commit/23b42602
Tree: http://git-wip-us.apache.org/repos/asf/logging-log4cxx/tree/23b42602
Diff: http://git-wip-us.apache.org/repos/asf/logging-log4cxx/diff/23b42602
Branch: refs/heads/next_stable
Commit: 23b42602c1eadd0a0020e2212f0e7b5d9d0098db
Parents: 4684243
Author: Thorsten Schöning <ts...@am-soft.de>
Authored: Wed Aug 16 11:10:07 2017 +0200
Committer: Thorsten Schöning <ts...@am-soft.de>
Committed: Wed Aug 16 11:10:07 2017 +0200
----------------------------------------------------------------------
src/changes/changes.xml | 5 +++++
1 file changed, 5 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/logging-log4cxx/blob/23b42602/src/changes/changes.xml
----------------------------------------------------------------------
diff --git a/src/changes/changes.xml b/src/changes/changes.xml
index f2235f4..680a56b 100644
--- a/src/changes/changes.xml
+++ b/src/changes/changes.xml
@@ -24,6 +24,11 @@
<body>
<release version="0.11.1"
+ date="XXXX-XX-XX"
+ description="Maintenance release">
+ </release>
+
+ <release version="0.11.1"
date="2017-08-16"
description="Maintenance release">
</release>
[19/29] logging-log4cxx git commit: Prepare for next development
iteration: 0.11.1
Posted by ts...@apache.org.
Prepare for next development iteration: 0.11.1
Project: http://git-wip-us.apache.org/repos/asf/logging-log4cxx/repo
Commit: http://git-wip-us.apache.org/repos/asf/logging-log4cxx/commit/a7412af7
Tree: http://git-wip-us.apache.org/repos/asf/logging-log4cxx/tree/a7412af7
Diff: http://git-wip-us.apache.org/repos/asf/logging-log4cxx/diff/a7412af7
Branch: refs/heads/next_stable
Commit: a7412af7568b1dfafa6f696ce47af263f88e7c25
Parents: dda5846
Author: Thorsten Schöning <ts...@am-soft.de>
Authored: Wed Aug 16 11:09:41 2017 +0200
Committer: Thorsten Schöning <ts...@am-soft.de>
Committed: Wed Aug 16 11:09:41 2017 +0200
----------------------------------------------------------------------
src/changes/changes.xml | 5 +++++
1 file changed, 5 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/logging-log4cxx/blob/a7412af7/src/changes/changes.xml
----------------------------------------------------------------------
diff --git a/src/changes/changes.xml b/src/changes/changes.xml
index bdf1b7b..9aa187a 100644
--- a/src/changes/changes.xml
+++ b/src/changes/changes.xml
@@ -23,6 +23,11 @@
</properties>
<body>
+ <release version="0.11.1"
+ date="XXXX-XX-XX"
+ description="Maintenance release">
+ </release>
+
<release version="0.11.0"
date="2017-08-16"
description="Maintenance release">
[22/29] logging-log4cxx git commit: Don't merge a non-next_stable
starting branch,
because we don't want changes belonging to the next dev iteration and such.
Those would confuse our next_stable-related logic and lead again to changes
in non-next-stable
Posted by ts...@apache.org.
Don't merge a non-next_stable starting branch, because we don't want changes belonging to the next dev iteration and such. Those would confuse our next_stable-related logic and lead again to changes in non-next-stable merged back to next-stable etc.
Project: http://git-wip-us.apache.org/repos/asf/logging-log4cxx/repo
Commit: http://git-wip-us.apache.org/repos/asf/logging-log4cxx/commit/3ad1468d
Tree: http://git-wip-us.apache.org/repos/asf/logging-log4cxx/tree/3ad1468d
Diff: http://git-wip-us.apache.org/repos/asf/logging-log4cxx/diff/3ad1468d
Branch: refs/heads/next_stable
Commit: 3ad1468df00a1f0d0bc4b819acb5ba7f4b88a38c
Parents: 23b4260
Author: Thorsten Schöning <ts...@am-soft.de>
Authored: Wed Aug 16 11:18:20 2017 +0200
Committer: Thorsten Schöning <ts...@am-soft.de>
Committed: Wed Aug 16 11:18:20 2017 +0200
----------------------------------------------------------------------
releasePrepare.sh | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/logging-log4cxx/blob/3ad1468d/releasePrepare.sh
----------------------------------------------------------------------
diff --git a/releasePrepare.sh b/releasePrepare.sh
index c2ad1f8..679a6a6 100755
--- a/releasePrepare.sh
+++ b/releasePrepare.sh
@@ -34,8 +34,10 @@ branch_starting_is_ns=$(git branch | grep "\* next_stable")
if [ -z "${branch_starting_is_ns}" ]
then
+ # If we didn't start with "next_stable", don't merge the starting branch, because it contains
+ # changes regarding new development iteration etc. we don't want to have. People need to merge
+ # relevant changes manually.
git checkout "next_stable" || git checkout -b "next_stable"
- git merge "${branch_starting}"
fi
today=$(date "+%Y-%m-%d")
[24/29] logging-log4cxx git commit: Set release date to today.
Posted by ts...@apache.org.
Set release date to today.
Project: http://git-wip-us.apache.org/repos/asf/logging-log4cxx/repo
Commit: http://git-wip-us.apache.org/repos/asf/logging-log4cxx/commit/42c8652d
Tree: http://git-wip-us.apache.org/repos/asf/logging-log4cxx/tree/42c8652d
Diff: http://git-wip-us.apache.org/repos/asf/logging-log4cxx/diff/42c8652d
Branch: refs/heads/next_stable
Commit: 42c8652d2611ae6b450aca9418c170ac863df0c0
Parents: 2a48d9d
Author: Thorsten Schöning <ts...@am-soft.de>
Authored: Wed Aug 16 11:21:32 2017 +0200
Committer: Thorsten Schöning <ts...@am-soft.de>
Committed: Wed Aug 16 11:21:32 2017 +0200
----------------------------------------------------------------------
src/changes/changes.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/logging-log4cxx/blob/42c8652d/src/changes/changes.xml
----------------------------------------------------------------------
diff --git a/src/changes/changes.xml b/src/changes/changes.xml
index 2be88c0..bdf1b7b 100644
--- a/src/changes/changes.xml
+++ b/src/changes/changes.xml
@@ -24,7 +24,7 @@
<body>
<release version="0.11.0"
- date="XXXX-XX-XX"
+ date="2017-08-16"
description="Maintenance release">
<action issue="LOGCXX-488" type="fix">Space after log level hides messages</action>
<action issue="LOGCXX-484" type="fix">Spelling error s/excute/execute</action>
[16/29] logging-log4cxx git commit: If on next_stable,
we don't need to change any files anymore after calls to Maven,
else we do. Additionally,
the commit for the current date only needs to get merged if we did not start
in next_stable, else we don't kn
Posted by ts...@apache.org.
If on next_stable, we don't need to change any files anymore after calls to Maven, else we do. Additionally, the commit for the current date only needs to get merged if we did not start in next_stable, else we don't know where to merge the new date.
Project: http://git-wip-us.apache.org/repos/asf/logging-log4cxx/repo
Commit: http://git-wip-us.apache.org/repos/asf/logging-log4cxx/commit/9693b9e0
Tree: http://git-wip-us.apache.org/repos/asf/logging-log4cxx/tree/9693b9e0
Diff: http://git-wip-us.apache.org/repos/asf/logging-log4cxx/diff/9693b9e0
Branch: refs/heads/next_stable
Commit: 9693b9e0feadac8c04398266af9dd0dcc47b28d4
Parents: 0fd27be
Author: Thorsten Schöning <ts...@am-soft.de>
Authored: Wed Aug 16 10:57:51 2017 +0200
Committer: Thorsten Schöning <ts...@am-soft.de>
Committed: Wed Aug 16 10:57:51 2017 +0200
----------------------------------------------------------------------
releasePrepare.sh | 31 ++++++++++++++++++-------------
1 file changed, 18 insertions(+), 13 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/logging-log4cxx/blob/9693b9e0/releasePrepare.sh
----------------------------------------------------------------------
diff --git a/releasePrepare.sh b/releasePrepare.sh
index bdd2a89..c2ad1f8 100755
--- a/releasePrepare.sh
+++ b/releasePrepare.sh
@@ -29,8 +29,8 @@ then
exit 1
fi
-branch_starting=$( git branch | grep "\*" | cut -d " " -f 2)
-branch_starting_is_ns=$( git branch | grep "\* next_stable")
+branch_starting=$( git branch | grep "\*" | cut -d " " -f 2)
+branch_starting_is_ns=$(git branch | grep "\* next_stable")
if [ -z "${branch_starting_is_ns}" ]
then
@@ -44,10 +44,13 @@ git add "src/changes/changes.xml"
if ! git diff-index --quiet HEAD
then
git commit -m "Set release date to today."
- commit_changes=$(git log --max-count=1 | grep "commit" | cut -d " " -f 2)
- git checkout "${branch_starting}"
- git merge "${commit_changes}"
- git checkout "next_stable"
+ if [ -z "${branch_starting_is_ns}" ]
+ then
+ commit_changes=$(git log --max-count=1 | grep "commit" | cut -d " " -f 2)
+ git checkout "${branch_starting}"
+ git merge "${commit_changes}"
+ git checkout "next_stable"
+ fi
fi
#mvn clean || exit 1
@@ -55,13 +58,15 @@ fi
if [ -n "${branch_starting_is_ns}" ]
then
- 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"
- exit 0
- fi
+ exit 0
+fi
+
+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"
+ exit 0
fi
# Propagate new version into some additional files:
[27/29] logging-log4cxx git commit: Set release date to today.
Posted by ts...@apache.org.
Set release date to today.
Project: http://git-wip-us.apache.org/repos/asf/logging-log4cxx/repo
Commit: http://git-wip-us.apache.org/repos/asf/logging-log4cxx/commit/6e11978e
Tree: http://git-wip-us.apache.org/repos/asf/logging-log4cxx/tree/6e11978e
Diff: http://git-wip-us.apache.org/repos/asf/logging-log4cxx/diff/6e11978e
Branch: refs/heads/next_stable
Commit: 6e11978ed75f1e4e1a97aa6481d66bf24bbf1ea3
Parents: 54744b5
Author: Thorsten Schöning <ts...@am-soft.de>
Authored: Wed Aug 16 11:26:14 2017 +0200
Committer: Thorsten Schöning <ts...@am-soft.de>
Committed: Wed Aug 16 11:26:14 2017 +0200
----------------------------------------------------------------------
src/changes/changes.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/logging-log4cxx/blob/6e11978e/src/changes/changes.xml
----------------------------------------------------------------------
diff --git a/src/changes/changes.xml b/src/changes/changes.xml
index 9aa187a..f2235f4 100644
--- a/src/changes/changes.xml
+++ b/src/changes/changes.xml
@@ -24,7 +24,7 @@
<body>
<release version="0.11.1"
- date="XXXX-XX-XX"
+ date="2017-08-16"
description="Maintenance release">
</release>