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 2018/08/19 12:43:48 UTC
[01/50] logging-log4cxx git commit: Delete more than one tag.
Repository: logging-log4cxx
Updated Branches:
refs/heads/master fb126e744 -> 2fe5572b5
Delete more than one tag.
Project: http://git-wip-us.apache.org/repos/asf/logging-log4cxx/repo
Commit: http://git-wip-us.apache.org/repos/asf/logging-log4cxx/commit/e0c14b79
Tree: http://git-wip-us.apache.org/repos/asf/logging-log4cxx/tree/e0c14b79
Diff: http://git-wip-us.apache.org/repos/asf/logging-log4cxx/diff/e0c14b79
Branch: refs/heads/master
Commit: e0c14b79194ada3a5210d17f14069d4056e65968
Parents: ab94e41
Author: Thorsten Schöning <ts...@am-soft.de>
Authored: Thu Aug 17 16:11:17 2017 +0200
Committer: Thorsten Schöning <ts...@am-soft.de>
Committed: Thu Aug 17 16:11:17 2017 +0200
----------------------------------------------------------------------
releasePurge.sh | 9 +++++++--
1 file changed, 7 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/logging-log4cxx/blob/e0c14b79/releasePurge.sh
----------------------------------------------------------------------
diff --git a/releasePurge.sh b/releasePurge.sh
index 70e149d..9bea16a 100755
--- a/releasePurge.sh
+++ b/releasePurge.sh
@@ -31,10 +31,15 @@ function main()
function purge_branch_and_tag()
{
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"
+
+ for tag in $(git tag -l | grep "v0.11.0-RC")
+ do
+ git tag --delete "${tag}"
+ git push --delete "origin" "${tag}"
+ done
}
function revert_pom_and_changes()
[42/50] 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/d9dba162
Tree: http://git-wip-us.apache.org/repos/asf/logging-log4cxx/tree/d9dba162
Diff: http://git-wip-us.apache.org/repos/asf/logging-log4cxx/diff/d9dba162
Branch: refs/heads/master
Commit: d9dba162fa8b00ab20c5f01968e9ff76227bc55b
Parents: 2eeafe1
Author: Thorsten Schöning <ts...@am-soft.de>
Authored: Thu Aug 17 18:32:42 2017 +0200
Committer: Thorsten Schöning <ts...@am-soft.de>
Committed: Thu Aug 17 18:32:42 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/d9dba162/src/changes/changes.xml
----------------------------------------------------------------------
diff --git a/src/changes/changes.xml b/src/changes/changes.xml
index 2be88c0..accc209 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-17"
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>
[50/50] logging-log4cxx git commit: Merge branch 'master' into
release_scripts
Posted by ts...@apache.org.
Merge branch 'master' into release_scripts
Project: http://git-wip-us.apache.org/repos/asf/logging-log4cxx/repo
Commit: http://git-wip-us.apache.org/repos/asf/logging-log4cxx/commit/2fe5572b
Tree: http://git-wip-us.apache.org/repos/asf/logging-log4cxx/tree/2fe5572b
Diff: http://git-wip-us.apache.org/repos/asf/logging-log4cxx/diff/2fe5572b
Branch: refs/heads/master
Commit: 2fe5572b53047873b3b479fa98b71b5edb56537f
Parents: 15e84ca fb126e7
Author: Thorsten Schöning <ts...@am-soft.de>
Authored: Sun Aug 19 14:42:37 2018 +0200
Committer: Thorsten Schöning <ts...@am-soft.de>
Committed: Sun Aug 19 14:42:37 2018 +0200
----------------------------------------------------------------------
src/changes/changes.xml | 2 +
src/main/cpp/appenderskeleton.cpp | 2 +-
src/main/cpp/asyncappender.cpp | 24 +--
src/main/cpp/charsetdecoder.cpp | 2 +-
src/main/cpp/class.cpp | 2 +-
src/main/cpp/defaultrepositoryselector.cpp | 8 +-
src/main/cpp/domconfigurator.cpp | 44 +++---
src/main/cpp/exception.cpp | 14 +-
src/main/cpp/file.cpp | 8 +-
src/main/cpp/fileappender.cpp | 14 +-
src/main/cpp/fileinputstream.cpp | 2 +-
src/main/cpp/gzcompressaction.cpp | 10 +-
src/main/cpp/inetaddress.cpp | 6 +-
src/main/cpp/layout.cpp | 4 +-
src/main/cpp/logger.cpp | 90 +++++------
src/main/cpp/logstream.cpp | 74 ++++-----
src/main/cpp/messagebuffer.cpp | 8 +-
src/main/cpp/obsoleterollingfileappender.cpp | 8 +-
src/main/cpp/optionconverter.cpp | 4 +-
src/main/cpp/properties.cpp | 4 +-
src/main/cpp/propertyconfigurator.cpp | 4 +-
src/main/cpp/rootlogger.cpp | 2 +-
src/main/cpp/serversocket.cpp | 26 +--
src/main/cpp/smtpappender.cpp | 70 ++++----
src/main/cpp/socket.cpp | 10 +-
src/main/cpp/syslogwriter.cpp | 2 +-
src/main/cpp/system.cpp | 2 +-
src/main/cpp/telnetappender.cpp | 12 +-
src/main/cpp/threadcxx.cpp | 24 +--
src/main/cpp/threadlocal.cpp | 6 +-
src/main/cpp/threadspecificdata.cpp | 4 +-
src/main/cpp/transcoder.cpp | 18 +--
src/main/cpp/transform.cpp | 12 +-
src/main/cpp/writer.cpp | 2 +-
src/main/cpp/writerappender.cpp | 6 +-
src/main/cpp/xmllayout.cpp | 8 +-
src/main/include/log4cxx/asyncappender.h | 24 +--
src/main/include/log4cxx/consoleappender.h | 2 +-
.../include/log4cxx/dailyrollingfileappender.h | 2 +-
src/main/include/log4cxx/db/odbcappender.h | 8 +-
src/main/include/log4cxx/defaultloggerfactory.h | 2 +-
src/main/include/log4cxx/file.h | 6 +-
src/main/include/log4cxx/filter/andfilter.h | 4 +-
.../include/log4cxx/filter/expressionfilter.h | 2 +-
.../include/log4cxx/filter/locationinfofilter.h | 2 +-
.../include/log4cxx/filter/propertyfilter.h | 2 +-
.../log4cxx/helpers/appenderattachableimpl.h | 4 +-
.../include/log4cxx/helpers/aprinitializer.h | 8 +-
.../log4cxx/helpers/bytearrayinputstream.h | 2 +-
.../include/log4cxx/helpers/charsetdecoder.h | 4 +-
src/main/include/log4cxx/helpers/condition.h | 2 +-
src/main/include/log4cxx/helpers/cyclicbuffer.h | 2 +-
src/main/include/log4cxx/helpers/exception.h | 6 +-
.../include/log4cxx/helpers/fileinputstream.h | 6 +-
.../include/log4cxx/helpers/fileoutputstream.h | 2 +-
src/main/include/log4cxx/helpers/inputstream.h | 4 +-
.../include/log4cxx/helpers/inputstreamreader.h | 2 +-
src/main/include/log4cxx/helpers/loglog.h | 4 +-
.../include/log4cxx/helpers/messagebuffer.h | 38 ++---
.../include/log4cxx/helpers/optionconverter.h | 2 +-
src/main/include/log4cxx/helpers/reader.h | 2 +-
src/main/include/log4cxx/helpers/serversocket.h | 4 +-
.../include/log4cxx/helpers/simpledateformat.h | 2 +-
src/main/include/log4cxx/helpers/socket.h | 12 +-
.../log4cxx/helpers/socketoutputstream.h | 4 +-
.../include/log4cxx/helpers/systemoutwriter.h | 4 +-
src/main/include/log4cxx/helpers/thread.h | 10 +-
src/main/include/log4cxx/helpers/threadlocal.h | 8 +-
.../log4cxx/helpers/threadspecificdata.h | 6 +-
src/main/include/log4cxx/helpers/transcoder.h | 16 +-
src/main/include/log4cxx/layout.h | 2 +-
src/main/include/log4cxx/logmanager.h | 4 +-
src/main/include/log4cxx/logstring.h | 4 +-
src/main/include/log4cxx/ndc.h | 24 +--
src/main/include/log4cxx/net/smtpappender.h | 12 +-
.../log4cxx/net/socketappenderskeleton.h | 8 +-
src/main/include/log4cxx/net/telnetappender.h | 6 +-
.../log4cxx/pattern/classnamepatternconverter.h | 4 +-
.../log4cxx/pattern/datepatternconverter.h | 4 +-
.../log4cxx/pattern/filedatepatternconverter.h | 4 +-
.../pattern/filelocationpatternconverter.h | 4 +-
.../include/log4cxx/pattern/formattinginfo.h | 4 +-
.../pattern/fulllocationpatternconverter.h | 4 +-
.../log4cxx/pattern/integerpatternconverter.h | 4 +-
.../log4cxx/pattern/levelpatternconverter.h | 4 +-
.../pattern/linelocationpatternconverter.h | 4 +-
.../pattern/lineseparatorpatternconverter.h | 4 +-
.../log4cxx/pattern/literalpatternconverter.h | 4 +-
.../log4cxx/pattern/loggerpatternconverter.h | 4 +-
.../pattern/loggingeventpatternconverter.h | 4 +-
.../log4cxx/pattern/messagepatternconverter.h | 4 +-
.../pattern/methodlocationpatternconverter.h | 4 +-
.../include/log4cxx/pattern/nameabbreviator.h | 4 +-
.../log4cxx/pattern/ndcpatternconverter.h | 4 +-
.../include/log4cxx/pattern/patternparser.h | 2 +-
.../pattern/propertiespatternconverter.h | 4 +-
.../pattern/relativetimepatternconverter.h | 4 +-
.../log4cxx/pattern/threadpatternconverter.h | 4 +-
.../throwableinformationpatternconverter.h | 4 +-
src/main/include/log4cxx/propertyconfigurator.h | 2 +-
src/main/include/log4cxx/provisionnode.h | 8 +-
.../rolling/filterbasedtriggeringpolicy.h | 4 +-
.../log4cxx/rolling/manualtriggeringpolicy.h | 2 +-
.../log4cxx/rolling/rollingfileappender.h | 8 +-
.../rolling/rollingfileappenderskeleton.h | 8 +-
.../include/log4cxx/rolling/rollingpolicybase.h | 6 +-
.../log4cxx/rolling/sizebasedtriggeringpolicy.h | 2 +-
.../include/log4cxx/rolling/triggeringpolicy.h | 4 +-
.../include/log4cxx/rolling/zipcompressaction.h | 2 +-
.../include/log4cxx/spi/appenderattachable.h | 2 +-
src/main/include/log4cxx/spi/errorhandler.h | 2 +-
src/main/include/log4cxx/spi/filter.h | 2 +-
.../log4cxx/spi/hierarchyeventlistener.h | 4 +-
src/main/include/log4cxx/spi/loggerfactory.h | 2 +-
src/main/include/log4cxx/spi/loggerrepository.h | 2 +-
src/main/include/log4cxx/stream.h | 158 +++++++++----------
.../log4cxx/varia/fallbackerrorhandler.h | 2 +-
src/main/include/log4cxx/writerappender.h | 2 +-
src/main/include/log4cxx/xml/domconfigurator.h | 8 +-
src/main/include/log4cxx/xml/xmllayout.h | 8 +-
src/site/resources/.htaccess | 33 ----
src/test/cpp/decodingtest.cpp | 151 ++++++++++++++++++
src/test/cpp/encodingtest.cpp | 71 ++++++---
src/test/resources/input/decoding/Makefile.am | 31 ++++
src/test/resources/input/decoding/UTF-16.txt | Bin 0 -> 18 bytes
src/test/resources/input/decoding/UTF-16BE.txt | Bin 0 -> 16 bytes
src/test/resources/input/decoding/UTF-16LE.txt | Bin 0 -> 16 bytes
src/test/resources/input/decoding/UTF-8.txt | 1 +
src/test/resources/input/decoding/ascii.txt | 1 +
src/test/resources/input/decoding/latin1.txt | 1 +
src/test/resources/input/xml/fallback1.xml | 14 +-
131 files changed, 812 insertions(+), 621 deletions(-)
----------------------------------------------------------------------
[05/50] logging-log4cxx git commit: No 0.11.1 yet.
Posted by ts...@apache.org.
No 0.11.1 yet.
Project: http://git-wip-us.apache.org/repos/asf/logging-log4cxx/repo
Commit: http://git-wip-us.apache.org/repos/asf/logging-log4cxx/commit/1ee2e4a8
Tree: http://git-wip-us.apache.org/repos/asf/logging-log4cxx/tree/1ee2e4a8
Diff: http://git-wip-us.apache.org/repos/asf/logging-log4cxx/diff/1ee2e4a8
Branch: refs/heads/master
Commit: 1ee2e4a82ce6b4ae935a7f78d1870b2106d1a6f4
Parents: fabf01c
Author: Thorsten Schöning <ts...@am-soft.de>
Authored: Thu Aug 17 16:32:30 2017 +0200
Committer: Thorsten Schöning <ts...@am-soft.de>
Committed: Thu Aug 17 16:32:30 2017 +0200
----------------------------------------------------------------------
src/changes/changes.xml | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/logging-log4cxx/blob/1ee2e4a8/src/changes/changes.xml
----------------------------------------------------------------------
diff --git a/src/changes/changes.xml b/src/changes/changes.xml
index accc209..f43a275 100644
--- a/src/changes/changes.xml
+++ b/src/changes/changes.xml
@@ -23,9 +23,9 @@
</properties>
<body>
- <release version="0.11.0"
- date="2017-08-17"
- 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>
@@ -102,7 +102,7 @@
<action type="update">Behavior of StringHelper::startsWith and endsWith synced</action>
<action type="update">Documented C (class) and M (method) log format keywords.</action>
<action type="add">Locationinfo for Borland C++ Builder and successors improved</action>
- </release>
+
<release version="0.10.0"
date="2008-04-03"
[23/50] logging-log4cxx git commit: Removed a mvn warning.
Posted by ts...@apache.org.
Removed a mvn warning.
Project: http://git-wip-us.apache.org/repos/asf/logging-log4cxx/repo
Commit: http://git-wip-us.apache.org/repos/asf/logging-log4cxx/commit/6eb51c78
Tree: http://git-wip-us.apache.org/repos/asf/logging-log4cxx/tree/6eb51c78
Diff: http://git-wip-us.apache.org/repos/asf/logging-log4cxx/diff/6eb51c78
Branch: refs/heads/master
Commit: 6eb51c78f0836cc9cb74bfff6d23cf2b79e8b7f2
Parents: 0fea0dc
Author: Thorsten Schöning <ts...@am-soft.de>
Authored: Thu Aug 17 17:08:44 2017 +0200
Committer: Thorsten Schöning <ts...@am-soft.de>
Committed: Thu Aug 17 17:08:44 2017 +0200
----------------------------------------------------------------------
releasePrepare.sh | 6 ++----
1 file changed, 2 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/logging-log4cxx/blob/6eb51c78/releasePrepare.sh
----------------------------------------------------------------------
diff --git a/releasePrepare.sh b/releasePrepare.sh
index 388339b..9c844db 100755
--- a/releasePrepare.sh
+++ b/releasePrepare.sh
@@ -166,9 +166,9 @@ function get_mvn_prepare_args()
{
local new_dev_ver=$(get_mvn_prepare_new_dev_ver)
local prepare_args="-Dresume=false"
-
+
# Avoid a warning about not being able to parse an empty version:
- if [ -n "${new_dev_ver}"]
+ if [ -n "${new_dev_ver}" ]
then
prepare_args="${prepare_args} -DdevelopmentVersion=${new_dev_ver}"
fi
@@ -181,8 +181,6 @@ 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
}
function exit_on_started_with_ns()
[24/50] 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/a737f90d
Tree: http://git-wip-us.apache.org/repos/asf/logging-log4cxx/tree/a737f90d
Diff: http://git-wip-us.apache.org/repos/asf/logging-log4cxx/diff/a737f90d
Branch: refs/heads/master
Commit: a737f90d87e47d3be5d530c54080e835b2d2e05d
Parents: 6eb51c7
Author: Thorsten Schöning <ts...@am-soft.de>
Authored: Thu Aug 17 17:08:56 2017 +0200
Committer: Thorsten Schöning <ts...@am-soft.de>
Committed: Thu Aug 17 17:08:56 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/a737f90d/src/changes/changes.xml
----------------------------------------------------------------------
diff --git a/src/changes/changes.xml b/src/changes/changes.xml
index 2be88c0..accc209 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-17"
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>
[31/50] 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/cb1f4082
Tree: http://git-wip-us.apache.org/repos/asf/logging-log4cxx/tree/cb1f4082
Diff: http://git-wip-us.apache.org/repos/asf/logging-log4cxx/diff/cb1f4082
Branch: refs/heads/master
Commit: cb1f40824f3ac0bd9ccdb466b5211849c7e7701f
Parents: 47edf4d
Author: Thorsten Schöning <ts...@am-soft.de>
Authored: Thu Aug 17 17:54:13 2017 +0200
Committer: Thorsten Schöning <ts...@am-soft.de>
Committed: Thu Aug 17 17:54:13 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/cb1f4082/src/changes/changes.xml
----------------------------------------------------------------------
diff --git a/src/changes/changes.xml b/src/changes/changes.xml
index 2be88c0..accc209 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-17"
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>
[38/50] logging-log4cxx git commit: Test-exit removed
Posted by ts...@apache.org.
Test-exit removed
Project: http://git-wip-us.apache.org/repos/asf/logging-log4cxx/repo
Commit: http://git-wip-us.apache.org/repos/asf/logging-log4cxx/commit/a3fc1471
Tree: http://git-wip-us.apache.org/repos/asf/logging-log4cxx/tree/a3fc1471
Diff: http://git-wip-us.apache.org/repos/asf/logging-log4cxx/diff/a3fc1471
Branch: refs/heads/master
Commit: a3fc1471e87435635174376522c531f0e28e5730
Parents: a805c9a
Author: Thorsten Schöning <ts...@am-soft.de>
Authored: Thu Aug 17 18:22:00 2017 +0200
Committer: Thorsten Schöning <ts...@am-soft.de>
Committed: Thu Aug 17 18:22:00 2017 +0200
----------------------------------------------------------------------
release_prepare.sh | 2 --
1 file changed, 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/logging-log4cxx/blob/a3fc1471/release_prepare.sh
----------------------------------------------------------------------
diff --git a/release_prepare.sh b/release_prepare.sh
index 962fbec..4e726db 100755
--- a/release_prepare.sh
+++ b/release_prepare.sh
@@ -178,8 +178,6 @@ function exec_mvn
mvn clean || exit 1
mvn release:prepare ${prepare_args} || exit 1
revert_mvn_prepare_new_dev_ver "${pom_orig_ver}" "${new_dev_ver}"
-
- exit 1
}
function exit_on_started_with_ns
[11/50] logging-log4cxx git commit: Revert "No 0.11.1 yet."
Posted by ts...@apache.org.
Revert "No 0.11.1 yet."
This reverts commit 0c6a833234141892e6cdb9dbfd36fb325570a5f8.
Project: http://git-wip-us.apache.org/repos/asf/logging-log4cxx/repo
Commit: http://git-wip-us.apache.org/repos/asf/logging-log4cxx/commit/cef8058d
Tree: http://git-wip-us.apache.org/repos/asf/logging-log4cxx/tree/cef8058d
Diff: http://git-wip-us.apache.org/repos/asf/logging-log4cxx/diff/cef8058d
Branch: refs/heads/master
Commit: cef8058dd81be050f664a3fe7248f1ba18b19438
Parents: 0c6a833
Author: Thorsten Schöning <ts...@am-soft.de>
Authored: Thu Aug 17 16:44:21 2017 +0200
Committer: Thorsten Schöning <ts...@am-soft.de>
Committed: Thu Aug 17 16:44:21 2017 +0200
----------------------------------------------------------------------
src/changes/changes.xml | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/logging-log4cxx/blob/cef8058d/src/changes/changes.xml
----------------------------------------------------------------------
diff --git a/src/changes/changes.xml b/src/changes/changes.xml
index 934185f..accc209 100644
--- a/src/changes/changes.xml
+++ b/src/changes/changes.xml
@@ -23,9 +23,9 @@
</properties>
<body>
-
-
-
+ <release version="0.11.0"
+ date="2017-08-17"
+ 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>
@@ -102,10 +102,10 @@
<action type="update">Behavior of StringHelper::startsWith and endsWith synced</action>
<action type="update">Documented C (class) and M (method) log format keywords.</action>
<action type="add">Locationinfo for Borland C++ Builder and successors improved</action>
-
+ </release>
<release version="0.10.0"
- date="XXXX-XX-XX"
+ date="2008-04-03"
description="First Apache release">
<action issue="LOGCXX-259" type="fix">Several appenders fail to compile in Visual Studio 2008</action>
<action issue="LOGCXX-258" type="fix">unable to build from make dist package due to missing doxygen file</action>
[17/50] 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/3cd05552
Tree: http://git-wip-us.apache.org/repos/asf/logging-log4cxx/tree/3cd05552
Diff: http://git-wip-us.apache.org/repos/asf/logging-log4cxx/diff/3cd05552
Branch: refs/heads/master
Commit: 3cd055527cd6a05c2188c9eb7d4fb8d5b4482764
Parents: e500c1e
Author: Thorsten Schöning <ts...@am-soft.de>
Authored: Thu Aug 17 17:00:56 2017 +0200
Committer: Thorsten Schöning <ts...@am-soft.de>
Committed: Thu Aug 17 17:00:56 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/3cd05552/src/changes/changes.xml
----------------------------------------------------------------------
diff --git a/src/changes/changes.xml b/src/changes/changes.xml
index 2be88c0..accc209 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-17"
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>
[26/50] logging-log4cxx git commit: No 0.11.1 yet.
Posted by ts...@apache.org.
No 0.11.1 yet.
Project: http://git-wip-us.apache.org/repos/asf/logging-log4cxx/repo
Commit: http://git-wip-us.apache.org/repos/asf/logging-log4cxx/commit/9d8daef3
Tree: http://git-wip-us.apache.org/repos/asf/logging-log4cxx/tree/9d8daef3
Diff: http://git-wip-us.apache.org/repos/asf/logging-log4cxx/diff/9d8daef3
Branch: refs/heads/master
Commit: 9d8daef3fb6b8e494f9181a0c985872ca708037c
Parents: c83c6e3
Author: Thorsten Schöning <ts...@am-soft.de>
Authored: Thu Aug 17 17:52:33 2017 +0200
Committer: Thorsten Schöning <ts...@am-soft.de>
Committed: Thu Aug 17 17:52:33 2017 +0200
----------------------------------------------------------------------
pom.xml | 2 +-
src/changes/changes.xml | 7 +------
2 files changed, 2 insertions(+), 7 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/logging-log4cxx/blob/9d8daef3/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 504f151..5697b54 100644
--- a/pom.xml
+++ b/pom.xml
@@ -3,7 +3,7 @@
<groupId>log4cxx</groupId>
<artifactId>apache-log4cxx</artifactId>
<packaging>pom</packaging>
- <version>0.11.1-SNAPSHOT</version>
+ <version>0.11.0-SNAPSHOT</version>
<name>Apache log4cxx</name>
<description>Logging framework for C++.</description>
<url>http://logging.apache.org/log4cxx</url>
http://git-wip-us.apache.org/repos/asf/logging-log4cxx/blob/9d8daef3/src/changes/changes.xml
----------------------------------------------------------------------
diff --git a/src/changes/changes.xml b/src/changes/changes.xml
index c30826d..2be88c0 100644
--- a/src/changes/changes.xml
+++ b/src/changes/changes.xml
@@ -23,13 +23,8 @@
</properties>
<body>
- <release version="0.11.1"
- date="XXXX-XX-XX"
- description="Maintenance release">
- </release>
-
<release version="0.11.0"
- date="2017-08-17"
+ 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>
[04/50] logging-log4cxx git commit: No 0.11.1 yet.
Posted by ts...@apache.org.
No 0.11.1 yet.
Project: http://git-wip-us.apache.org/repos/asf/logging-log4cxx/repo
Commit: http://git-wip-us.apache.org/repos/asf/logging-log4cxx/commit/fabf01c3
Tree: http://git-wip-us.apache.org/repos/asf/logging-log4cxx/tree/fabf01c3
Diff: http://git-wip-us.apache.org/repos/asf/logging-log4cxx/diff/fabf01c3
Branch: refs/heads/master
Commit: fabf01c3e20783928aaf7d4635138ea2d0194d63
Parents: c7291ba
Author: Thorsten Schöning <ts...@am-soft.de>
Authored: Thu Aug 17 16:30:58 2017 +0200
Committer: Thorsten Schöning <ts...@am-soft.de>
Committed: Thu Aug 17 16:30:58 2017 +0200
----------------------------------------------------------------------
pom.xml | 2 +-
src/changes/changes.xml | 5 -----
2 files changed, 1 insertion(+), 6 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/logging-log4cxx/blob/fabf01c3/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 504f151..5697b54 100644
--- a/pom.xml
+++ b/pom.xml
@@ -3,7 +3,7 @@
<groupId>log4cxx</groupId>
<artifactId>apache-log4cxx</artifactId>
<packaging>pom</packaging>
- <version>0.11.1-SNAPSHOT</version>
+ <version>0.11.0-SNAPSHOT</version>
<name>Apache log4cxx</name>
<description>Logging framework for C++.</description>
<url>http://logging.apache.org/log4cxx</url>
http://git-wip-us.apache.org/repos/asf/logging-log4cxx/blob/fabf01c3/src/changes/changes.xml
----------------------------------------------------------------------
diff --git a/src/changes/changes.xml b/src/changes/changes.xml
index 26c40d8..accc209 100644
--- a/src/changes/changes.xml
+++ b/src/changes/changes.xml
@@ -23,11 +23,6 @@
</properties>
<body>
- <release version="0.11.1"
- date="2017-08-17"
- description="Maintenance release">
- </release>
-
<release version="0.11.0"
date="2017-08-17"
description="Maintenance release">
[22/50] logging-log4cxx git commit: No 0.11.1 yet.
Posted by ts...@apache.org.
No 0.11.1 yet.
Project: http://git-wip-us.apache.org/repos/asf/logging-log4cxx/repo
Commit: http://git-wip-us.apache.org/repos/asf/logging-log4cxx/commit/0fea0dc2
Tree: http://git-wip-us.apache.org/repos/asf/logging-log4cxx/tree/0fea0dc2
Diff: http://git-wip-us.apache.org/repos/asf/logging-log4cxx/diff/0fea0dc2
Branch: refs/heads/master
Commit: 0fea0dc284d023a23600c54b92a0a0df0a769570
Parents: 35d31e6
Author: Thorsten Schöning <ts...@am-soft.de>
Authored: Thu Aug 17 17:08:36 2017 +0200
Committer: Thorsten Schöning <ts...@am-soft.de>
Committed: Thu Aug 17 17:08:36 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/0fea0dc2/src/changes/changes.xml
----------------------------------------------------------------------
diff --git a/src/changes/changes.xml b/src/changes/changes.xml
index accc209..2be88c0 100644
--- a/src/changes/changes.xml
+++ b/src/changes/changes.xml
@@ -24,7 +24,7 @@
<body>
<release version="0.11.0"
- date="2017-08-17"
+ 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>
[07/50] logging-log4cxx git commit: No 0.11.1 yet.
Posted by ts...@apache.org.
No 0.11.1 yet.
Project: http://git-wip-us.apache.org/repos/asf/logging-log4cxx/repo
Commit: http://git-wip-us.apache.org/repos/asf/logging-log4cxx/commit/4c3f0dde
Tree: http://git-wip-us.apache.org/repos/asf/logging-log4cxx/tree/4c3f0dde
Diff: http://git-wip-us.apache.org/repos/asf/logging-log4cxx/diff/4c3f0dde
Branch: refs/heads/master
Commit: 4c3f0dde3956bc01443f72a064a465e6ae7dd9b6
Parents: 519abb5
Author: Thorsten Schöning <ts...@am-soft.de>
Authored: Thu Aug 17 16:39:40 2017 +0200
Committer: Thorsten Schöning <ts...@am-soft.de>
Committed: Thu Aug 17 16:39:40 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/4c3f0dde/src/changes/changes.xml
----------------------------------------------------------------------
diff --git a/src/changes/changes.xml b/src/changes/changes.xml
index accc209..2be88c0 100644
--- a/src/changes/changes.xml
+++ b/src/changes/changes.xml
@@ -24,7 +24,7 @@
<body>
<release version="0.11.0"
- date="2017-08-17"
+ 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>
[27/50] logging-log4cxx git commit: Reverting the maven version in
next_stable didn't work.
Posted by ts...@apache.org.
Reverting the maven version in next_stable didn't work.
Project: http://git-wip-us.apache.org/repos/asf/logging-log4cxx/repo
Commit: http://git-wip-us.apache.org/repos/asf/logging-log4cxx/commit/bddb06ab
Tree: http://git-wip-us.apache.org/repos/asf/logging-log4cxx/tree/bddb06ab
Diff: http://git-wip-us.apache.org/repos/asf/logging-log4cxx/diff/bddb06ab
Branch: refs/heads/master
Commit: bddb06abc5de6b8b6391d15663b8d16730af41e4
Parents: 9d8daef
Author: Thorsten Schöning <ts...@am-soft.de>
Authored: Thu Aug 17 17:52:45 2017 +0200
Committer: Thorsten Schöning <ts...@am-soft.de>
Committed: Thu Aug 17 17:52:45 2017 +0200
----------------------------------------------------------------------
releasePrepare.sh | 45 ++++++++++++++++++++++-----------------------
1 file changed, 22 insertions(+), 23 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/logging-log4cxx/blob/bddb06ab/releasePrepare.sh
----------------------------------------------------------------------
diff --git a/releasePrepare.sh b/releasePrepare.sh
index 9c844db..3135fce 100755
--- a/releasePrepare.sh
+++ b/releasePrepare.sh
@@ -140,47 +140,46 @@ function get_mvn_prepare_new_dev_ver()
}
##
-# Revert new version in pom.xml assigned bei Maven if needed.
+# Revert new version in "pom.xml" assigned by Maven.
#
-# During release preparation Maven assigns some new development version to the pom.xml, which is
-# most likely correct in case of a new release cycle, but within the "next_stable" branch with
-# releases only we always want to keep the current version and only count RCs. In such a case the
-# new version to use by Maven is forced to be the current one, else Maven can decide on it's own.
-# So if a version is given, that's the forced one we write back into the pom.xml, else nothing is
-# done.
+# During release preparation Maven always assigns some new development version to the "pom.xml",
+# which is either a new calculated one or one we specified on our own already to be the same like
+# before. The first case is needed to get a new version into "release.properties", from where it
+# might be merged into a starting branch. In any case, within "next_stable" we want to keep the
+# one known version and therefore need to always revert any changes made by maven. So if a specific
+# new version is provided, always keep that, while without use the formerly available version of the
+# file. The caller most likely already has both values and additionally we are called AFTER Maven
+# already changed "pom.xml", so can't get the old value on our own easily anway.
#
-# @param[in] Specific version to used by Maven.
+# @param[in] Original version from "pom.xml".
+# @param[in] Specific version to be used by Maven.
#
-function revert_mvn_prepare_new_dev_ver_if()
+function revert_mvn_prepare_new_dev_ver()
{
- local new_dev_ver="${1}"
- if [ -z "${new_dev_ver}" ]
- then
- return 0
- fi
+ local pom_orig_ver="${1}"
+ local new_dev_ver="${2}"
+ local pom_new_ver="${new_dev_ver:-${pom_orig_ver}}"
sed -i -r "s/^(\t<version>).+(<)/\1${new_dev_ver}\2/" "pom.xml"
}
-function get_mvn_prepare_args()
+function exec_mvn()
{
- local new_dev_ver=$(get_mvn_prepare_new_dev_ver)
+ local pom_orig_ver="$(get_pom_curr_ver)"
+ local new_dev_ver="$( get_mvn_prepare_new_dev_ver)"
local prepare_args="-Dresume=false"
-
+
# 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}"
+ revert_mvn_prepare_new_dev_ver "${pom_orig_ver}" "${new_dev_ver}"
+
+ exit 1
}
function exit_on_started_with_ns()
[45/50] logging-log4cxx git commit: Spelling
Posted by ts...@apache.org.
Spelling
Project: http://git-wip-us.apache.org/repos/asf/logging-log4cxx/repo
Commit: http://git-wip-us.apache.org/repos/asf/logging-log4cxx/commit/e49bac2e
Tree: http://git-wip-us.apache.org/repos/asf/logging-log4cxx/tree/e49bac2e
Diff: http://git-wip-us.apache.org/repos/asf/logging-log4cxx/diff/e49bac2e
Branch: refs/heads/master
Commit: e49bac2e6afbcb779ef38b4a5cbc208bdf8d1685
Parents: 34e2941
Author: Thorsten Schöning <ts...@am-soft.de>
Authored: Thu Dec 21 08:34:28 2017 +0100
Committer: Thorsten Schöning <ts...@am-soft.de>
Committed: Thu Dec 21 08:34:28 2017 +0100
----------------------------------------------------------------------
release_prepare.sh | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/logging-log4cxx/blob/e49bac2e/release_prepare.sh
----------------------------------------------------------------------
diff --git a/release_prepare.sh b/release_prepare.sh
index 29fcd12..faaeded 100755
--- a/release_prepare.sh
+++ b/release_prepare.sh
@@ -221,7 +221,7 @@ function proc_new_release_cycle
<body>\n\
<release version="VER_NEEDED"\n\
date="XXXX-XX-XX"\n\
- description="Maintenance release">\n\
+ description="Maintenance release.">\n\
<\/release>\n
END
)
[39/50] 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/89b38733
Tree: http://git-wip-us.apache.org/repos/asf/logging-log4cxx/tree/89b38733
Diff: http://git-wip-us.apache.org/repos/asf/logging-log4cxx/diff/89b38733
Branch: refs/heads/master
Commit: 89b38733083db712d5e4da0dc911507a9ad7f5f0
Parents: a3fc147
Author: Thorsten Schöning <ts...@am-soft.de>
Authored: Thu Aug 17 18:22:18 2017 +0200
Committer: Thorsten Schöning <ts...@am-soft.de>
Committed: Thu Aug 17 18:22:18 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/89b38733/src/changes/changes.xml
----------------------------------------------------------------------
diff --git a/src/changes/changes.xml b/src/changes/changes.xml
index 2be88c0..accc209 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-17"
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/50] logging-log4cxx git commit: Avoid a warning about not being
able to parse an empty revision by maven.
Posted by ts...@apache.org.
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/master
Commit: 4c259f192188393fecc89ac6a7f16980516479ce
Parents: 80154a0
Author: Thorsten Schöning <ts...@am-soft.de>
Authored: Thu Aug 17 16:58:29 2017 +0200
Committer: Thorsten Schöning <ts...@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
[20/50] logging-log4cxx git commit: No 0.11.1 yet.
Posted by ts...@apache.org.
No 0.11.1 yet.
Project: http://git-wip-us.apache.org/repos/asf/logging-log4cxx/repo
Commit: http://git-wip-us.apache.org/repos/asf/logging-log4cxx/commit/b942e86d
Tree: http://git-wip-us.apache.org/repos/asf/logging-log4cxx/tree/b942e86d
Diff: http://git-wip-us.apache.org/repos/asf/logging-log4cxx/diff/b942e86d
Branch: refs/heads/master
Commit: b942e86d4e582d567ca80d38d32795fe8a2381ed
Parents: ac89048
Author: Thorsten Schöning <ts...@am-soft.de>
Authored: Thu Aug 17 17:07:48 2017 +0200
Committer: Thorsten Schöning <ts...@am-soft.de>
Committed: Thu Aug 17 17:07:48 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/b942e86d/src/changes/changes.xml
----------------------------------------------------------------------
diff --git a/src/changes/changes.xml b/src/changes/changes.xml
index accc209..2be88c0 100644
--- a/src/changes/changes.xml
+++ b/src/changes/changes.xml
@@ -24,7 +24,7 @@
<body>
<release version="0.11.0"
- date="2017-08-17"
+ 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>
[48/50] logging-log4cxx git commit: No 0.11.1 yet.
Posted by ts...@apache.org.
No 0.11.1 yet.
Project: http://git-wip-us.apache.org/repos/asf/logging-log4cxx/repo
Commit: http://git-wip-us.apache.org/repos/asf/logging-log4cxx/commit/6f69211f
Tree: http://git-wip-us.apache.org/repos/asf/logging-log4cxx/tree/6f69211f
Diff: http://git-wip-us.apache.org/repos/asf/logging-log4cxx/diff/6f69211f
Branch: refs/heads/master
Commit: 6f69211f911f182d20796a83cbf6b2426b4e0ae3
Parents: 4f8b92c
Author: Thorsten Schöning <ts...@am-soft.de>
Authored: Sat Jan 27 14:57:42 2018 +0100
Committer: Thorsten Schöning <ts...@am-soft.de>
Committed: Sat Jan 27 14:57:42 2018 +0100
----------------------------------------------------------------------
pom.xml | 2 +-
src/changes/changes.xml | 7 +------
2 files changed, 2 insertions(+), 7 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/logging-log4cxx/blob/6f69211f/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 504f151..5697b54 100644
--- a/pom.xml
+++ b/pom.xml
@@ -3,7 +3,7 @@
<groupId>log4cxx</groupId>
<artifactId>apache-log4cxx</artifactId>
<packaging>pom</packaging>
- <version>0.11.1-SNAPSHOT</version>
+ <version>0.11.0-SNAPSHOT</version>
<name>Apache log4cxx</name>
<description>Logging framework for C++.</description>
<url>http://logging.apache.org/log4cxx</url>
http://git-wip-us.apache.org/repos/asf/logging-log4cxx/blob/6f69211f/src/changes/changes.xml
----------------------------------------------------------------------
diff --git a/src/changes/changes.xml b/src/changes/changes.xml
index 249e96f..fbec857 100644
--- a/src/changes/changes.xml
+++ b/src/changes/changes.xml
@@ -23,13 +23,8 @@
</properties>
<body>
- <release version="0.11.1"
- date="XXXX-XX-XX"
- description="Maintenance release">
- </release>
-
<release version="0.11.0"
- date="2017-08-17"
+ date="XXXX-XX-XX"
description="Maintenance release">
<action issue="LOGCXX-493" type="fix">Wrong usage of milli- vs. micro- and non- vs. milliseconds in some docs.</action>
<action issue="LOGCXX-488" type="fix">Space after log level hides messages</action>
[33/50] logging-log4cxx git commit: No 0.11.1 yet.
Posted by ts...@apache.org.
No 0.11.1 yet.
Project: http://git-wip-us.apache.org/repos/asf/logging-log4cxx/repo
Commit: http://git-wip-us.apache.org/repos/asf/logging-log4cxx/commit/45195494
Tree: http://git-wip-us.apache.org/repos/asf/logging-log4cxx/tree/45195494
Diff: http://git-wip-us.apache.org/repos/asf/logging-log4cxx/diff/45195494
Branch: refs/heads/master
Commit: 45195494d57b37b75e05c954fef7739e93f98723
Parents: 00e2da8
Author: Thorsten Schöning <ts...@am-soft.de>
Authored: Thu Aug 17 18:00:46 2017 +0200
Committer: Thorsten Schöning <ts...@am-soft.de>
Committed: Thu Aug 17 18:00:46 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/45195494/src/changes/changes.xml
----------------------------------------------------------------------
diff --git a/src/changes/changes.xml b/src/changes/changes.xml
index accc209..2be88c0 100644
--- a/src/changes/changes.xml
+++ b/src/changes/changes.xml
@@ -24,7 +24,7 @@
<body>
<release version="0.11.0"
- date="2017-08-17"
+ 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>
[35/50] logging-log4cxx git commit: Renamed release script files
because snake case is used in the files itself and for some other names like
"doap_log4cxx.rdf" as well.
Posted by ts...@apache.org.
Renamed release script files because snake case is used in the files itself and for some other names like "doap_log4cxx.rdf" as well.
Project: http://git-wip-us.apache.org/repos/asf/logging-log4cxx/repo
Commit: http://git-wip-us.apache.org/repos/asf/logging-log4cxx/commit/af3d9775
Tree: http://git-wip-us.apache.org/repos/asf/logging-log4cxx/tree/af3d9775
Diff: http://git-wip-us.apache.org/repos/asf/logging-log4cxx/diff/af3d9775
Branch: refs/heads/master
Commit: af3d97752c5ddfbe55efcb18ceed7ab2fe1dc87f
Parents: 3a9fb00
Author: Thorsten Schöning <ts...@am-soft.de>
Authored: Thu Aug 17 18:09:12 2017 +0200
Committer: Thorsten Schöning <ts...@am-soft.de>
Committed: Thu Aug 17 18:09:12 2017 +0200
----------------------------------------------------------------------
releasePerform.sh | 97 --------------------
releasePrepare.sh | 238 ------------------------------------------------
releasePurge.sh | 79 ----------------
release_perform.sh | 97 ++++++++++++++++++++
release_prepare.sh | 238 ++++++++++++++++++++++++++++++++++++++++++++++++
release_purge.sh | 79 ++++++++++++++++
6 files changed, 414 insertions(+), 414 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/logging-log4cxx/blob/af3d9775/releasePerform.sh
----------------------------------------------------------------------
diff --git a/releasePerform.sh b/releasePerform.sh
deleted file mode 100755
index bbc37cb..0000000
--- a/releasePerform.sh
+++ /dev/null
@@ -1,97 +0,0 @@
-#! /bin/bash -e
-# 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.
-#
-
-##
-# Perform a release.
-#
-# Performing a release involves Maven currently to build and test things and we ran into problems
-# with the default dir structure maven assumes. This script works around those and we need to sign
-# the release archives anyway, which can be easily automated as well to not need to follow manual
-# instructions always.
-#
-# It's impoirtant to note that this script is expected to be executed in the branch "next_stable",
-# most likely prepared by the preparing counterpart.
-#
-
-function main
-{
- # log4cxx is able to build using private copies of apr and apr-util, which are expected in some
- # special relative dir structure. That doesn't work with the default working dir "perform" uses,
- # which is "target/checkout". So we either need to make apr and apr-util available in "target" or
- # change the working dir. Making available seems easy using symlinks, but "mvn clean" deletes the
- # contents(!) of the linked dirs then. And always copying things around seems a bit unnecessary as
- # well, so I'm using a relocation of the folder for now. The downside is that "mvn clean" ignores
- # that dir by default...
- WD_RELEASE="$( pwd)/../log4cxx-next_stable"
- WD_DIST_DEV="$(pwd)/../log4cxx-dist-dev"
-
- perform_release
- prepare_dist_dev
- sign_and_copy
- publish_for_vote
-}
-
-function perform_release
-{
- rm -rf "${WD_RELEASE}"
- mvn release:perform "-DworkingDirectory=${WD_RELEASE}"
-}
-
-# Prepare dist/dev to get the release candidate published for a vote.
-function prepare_dist_dev
-{
- mkdir -p "${WD_DIST_DEV}"
- pushd "${WD_DIST_DEV}" > /dev/null
- if [ ! -d ".svn" ]
- then
- svn co "https://dist.apache.org/repos/dist/dev/logging/log4cxx" .
- fi
- svn up
-}
-
-function sign_and_copy
-{
- # Might be a good idea to have another look at the GPG plugin for Maven in the future:
- #
- # http://blog.sonatype.com/2010/01/how-to-generate-pgp-signatures-with-maven/
- # http://maven.apache.org/plugins/maven-gpg-plugin/
- pushd "${WD_RELEASE}/target" > /dev/null
- for file in *.tar.gz *.zip
- do
- echo "Processing ${file}:"
-
- gpg -ab --yes "${file}" > "${file}.asc"
- md5sum "${file}" > "${file}.md5"
- sha512sum "${file}" > "${file}.sha"
-
- # No symlinks because those would be treated as is, no hardlinks because it should be safer for
- # commits.
- cp --force "${file}" "${WD_DIST_DEV}"
- cp --force "${file}.asc" "${WD_DIST_DEV}"
- cp --force "${file}.md5" "${WD_DIST_DEV}"
- cp --force "${file}.sha" "${WD_DIST_DEV}"
- done
-}
-
-function publish_for_vote
-{
- pushd "${WD_DIST_DEV}" > /dev/null
- svn add --force *.*
- svn ci -m "Publishing artifacts for new release to vote on."
-}
-
-main
http://git-wip-us.apache.org/repos/asf/logging-log4cxx/blob/af3d9775/releasePrepare.sh
----------------------------------------------------------------------
diff --git a/releasePrepare.sh b/releasePrepare.sh
deleted file mode 100755
index 962fbec..0000000
--- a/releasePrepare.sh
+++ /dev/null
@@ -1,238 +0,0 @@
-#! /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.
-# 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.
-#
-
-##
-# Prepare a release.
-#
-# We need to update dates and version numbers at various places during releases and things can go
-# wrong, so another RC might need to be released. Am not sure if/how those things are properly
-# handled using the Maven release plugin, because that moves versions of the current branch forward
-# and doesn't seem to provide a way to say that a new release is just another RC for some former
-# release. Additionally, after the current branch has been moved forward, it might have been used to
-# merge new changes already. So how to tell Maven to do another release with a former version?
-#
-# So the current approach of this script is to always create a new branch "next_stable" which acts
-# as the base for releases only. One needs to manually merge changes to the code into that branch
-# as needed for making a release work, but keep all other changes to "master" etc. outside. We try
-# to handle setting release dates, current number of release candidate etc. here automatically as
-# much as possible. Some of that info is even merged back into some source branch, e.g. "master",
-# because release dates in files like "src/changes/changes.xml" need to be updated with additional
-# candidates or later releases.
-#
-# This script can be invoked with "next_stable" being the current branch already or with some other
-# and "next_stable" is checked out automatically. If it's invoked with some other branch, release
-# dates, new development version etc. are merged to the branch the script was invoked with. Without
-# another branch those changes need to be done/merged manually to wherever they need to be in the
-# end, most likely "master". If only "master" should be supported in the future, merging back into
-# that might be hard coded, currently it isn't to support arbitrary source branches from which a
-# release gets initiated. If "next_stable" is the starting branch, it's assumed to only create
-# another release based on a former release, without merging things back to anywhere.
-#
-
-function main
-{
- #exit_on_changes
-
- branch_starting=$( git branch | grep "\*" | cut -d " " -f 2)
- branch_starting_is_ns=$(git branch | grep "\* next_stable")
-
- co_next_stable
- set_release_date_if
- update_scm_tag_name_format
-
- exec_mvn
- exit_on_started_with_ns
-
- exit_on_no_new_release_cycle
- proc_new_release_cycle
-}
-
-function exit_on_changes
-{
- if [[ -n $(git status --short) || -n $(git diff-index HEAD) ]]
- then
- echo Maven release process requires committed changes!
- exit 1
- fi
-}
-
-function co_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"
- fi
-}
-
-function set_release_date_if
-{
- local 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."
- if [ -z "${branch_starting_is_ns}" ]
- then
- local 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
-}
-
-function update_scm_tag_name_format
-{
- local scm_tag_name_format=$(grep "<tagNameFormat>" "pom.xml")
- local scm_tag_name_format_needs_one=$(echo "${scm_tag_name_format}" | grep -E -e "-RCx")
- local 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
- sed -i -r "s/(<tagNameFormat>.+?-RC)x/\11/" "pom.xml"
- fi
- if [ -n "${scm_tag_name_format_needs_inc}" ]
- then
- local inced_nr=$((${scm_tag_name_format_needs_inc} + 1))
- sed -i -r "s/(<tagNameFormat>.+?-RC)[0-9]+/\1${inced_nr}/" "pom.xml"
- fi
-
- git add "pom.xml"
- git commit -m "scm.tagNameFormat reconfigured to new RC number."
-}
-
-function get_pom_curr_ver
-{
- # \t doesn't seem to work for grep for some reason.
- echo "$(grep -E -e "^\s<version>" "pom.xml" | sed -r "s/^\t<.+>(.+)<.+>/\1/")"
-}
-
-function get_mvn_prepare_new_dev_ver
-{
- if [ -n "${branch_starting_is_ns}" ]
- then
- echo "$(get_pom_curr_ver)"
- return 0
- fi
-
- # Maven is able to calculate a useful new version itself, even it warns about not being able to
- # parse an empty version.
- echo ""
-}
-
-##
-# Revert new version in "pom.xml" assigned by Maven.
-#
-# During release preparation Maven always assigns some new development version to the "pom.xml",
-# which is either a new calculated one or one we specified on our own already to be the same like
-# before. The first case is needed to get a new version into "release.properties", from where it
-# might be merged into a starting branch. In any case, within "next_stable" we want to keep the
-# one known version and therefore need to always revert any changes made by maven. So if a specific
-# new version is provided, always keep that, while without use the formerly available version of the
-# file. The caller most likely already has both values and additionally we are called AFTER Maven
-# already changed "pom.xml", so can't get the old value on our own easily anway.
-#
-# @param[in] Original version from "pom.xml".
-# @param[in] Specific version to be used by Maven.
-#
-function revert_mvn_prepare_new_dev_ver
-{
- local pom_orig_ver="${1}"
- local new_dev_ver="${2}"
- local pom_new_ver="${new_dev_ver:-${pom_orig_ver}}"
-
- sed -i -r "s/^(\t<version>).+(<)/\1${pom_new_ver}\2/" "pom.xml"
-}
-
-function exec_mvn
-{
- local pom_orig_ver="$(get_pom_curr_ver)"
- local new_dev_ver="$( get_mvn_prepare_new_dev_ver)"
- local prepare_args="-Dresume=false"
-
- # 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
-
- mvn clean || exit 1
- mvn release:prepare ${prepare_args} || exit 1
- revert_mvn_prepare_new_dev_ver "${pom_orig_ver}" "${new_dev_ver}"
-
- exit 1
-}
-
-function exit_on_started_with_ns
-{
- if [ -n "${branch_starting_is_ns}" ]
- then
- exit 0
- fi
-}
-
-function exit_on_no_new_release_cycle
-{
- git checkout "${branch_starting}"
- local 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
-}
-
-function proc_new_release_cycle
-{
- git checkout "${branch_starting}"
-
- local commit_mvn_next_dev_iter=${1}
- local new_dev_ver=$( grep -E "^project.dev.log4cxx" "release.properties" | cut -d "=" -f 2)
- local new_dev_ver_short=$(grep -E "^project.dev.log4cxx" "release.properties" | cut -d "=" -f 2 | cut -d "-" -f 1)
- local new_release=$(cat <<-"END"
- <body>\n\
- <release version="VER_NEEDED"\n\
- date="XXXX-XX-XX"\n\
- description="Maintenance release">\n\
- <\/release>\n
-END
-)
- local 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/^(\t<version>).+(<)/\1${new_dev_ver}\2/" "pom.xml"
- sed -i -r "s/<body>/${new_release}/" "src/changes/changes.xml"
-
- git add "configure.ac"
- git add "pom.xml"
- git add "src/changes/changes.xml"
-
- if ! git diff-index --quiet HEAD
- then
- git commit -m "Prepare for next development iteration: ${new_dev_ver_short}"
- fi
-
- git checkout "next_stable"
-}
-
-main
http://git-wip-us.apache.org/repos/asf/logging-log4cxx/blob/af3d9775/releasePurge.sh
----------------------------------------------------------------------
diff --git a/releasePurge.sh b/releasePurge.sh
deleted file mode 100755
index 1abfcc8..0000000
--- a/releasePurge.sh
+++ /dev/null
@@ -1,79 +0,0 @@
-#! /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.
-# 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!
-#
-
-function main
-{
- purge_branch_and_tag
- revert_pom
- revert_changes
- commit_reverts
-}
-
-function purge_branch_and_tag
-{
- git checkout "release_scripts"
-
- git branch -D "next_stable"
- git push --delete "origin" "next_stable"
-
- for tag in $(git tag -l | grep "v0.11.0-RC")
- do
- git tag --delete "${tag}"
- git push --delete "origin" "${tag}"
- done
-}
-
-function revert_pom
-{
- sed -i -r "s/^(\t<version>).+(<)/\10.11.0-SNAPSHOT\2/" "pom.xml"
-}
-
-function revert_changes
-{
- if [ -n "$(grep "version=\"0.11.1\"" "src/changes/changes.xml")" ]
- then
- # Remove not needed "release" node.
- sed -i -r "1,/.+<release.+/ s/.+<release.+//" "src/changes/changes.xml"
- sed -i -r "1,/.+date=.+/ s/.+date=.+//" "src/changes/changes.xml"
- sed -i -r "1,/.+description=.+/ s/.+description=.+//" "src/changes/changes.xml"
- sed -i -r "1,/.+<\/release.+/ s/.+<\/release.+//" "src/changes/changes.xml"
-
- # Don't know how to remove the left newlines easier...
- local changes=$(cat "src/changes/changes.xml")
- echo "${changes/$'\n\n\n\n\n'/}" > "src/changes/changes.xml"
- fi
-
- # Last release date needs to be "unknown":
- sed -i -r "1,/.+date=.+/ s/date=\".+\"/date=\"XXXX-XX-XX\"/" "src/changes/changes.xml"
-}
-
-function commit_reverts
-{
- git add "pom.xml"
- git add "src/changes/changes.xml"
-
- git commit -m "No 0.11.1 yet."
-}
-
-main
http://git-wip-us.apache.org/repos/asf/logging-log4cxx/blob/af3d9775/release_perform.sh
----------------------------------------------------------------------
diff --git a/release_perform.sh b/release_perform.sh
new file mode 100755
index 0000000..bbc37cb
--- /dev/null
+++ b/release_perform.sh
@@ -0,0 +1,97 @@
+#! /bin/bash -e
+# 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.
+#
+
+##
+# Perform a release.
+#
+# Performing a release involves Maven currently to build and test things and we ran into problems
+# with the default dir structure maven assumes. This script works around those and we need to sign
+# the release archives anyway, which can be easily automated as well to not need to follow manual
+# instructions always.
+#
+# It's impoirtant to note that this script is expected to be executed in the branch "next_stable",
+# most likely prepared by the preparing counterpart.
+#
+
+function main
+{
+ # log4cxx is able to build using private copies of apr and apr-util, which are expected in some
+ # special relative dir structure. That doesn't work with the default working dir "perform" uses,
+ # which is "target/checkout". So we either need to make apr and apr-util available in "target" or
+ # change the working dir. Making available seems easy using symlinks, but "mvn clean" deletes the
+ # contents(!) of the linked dirs then. And always copying things around seems a bit unnecessary as
+ # well, so I'm using a relocation of the folder for now. The downside is that "mvn clean" ignores
+ # that dir by default...
+ WD_RELEASE="$( pwd)/../log4cxx-next_stable"
+ WD_DIST_DEV="$(pwd)/../log4cxx-dist-dev"
+
+ perform_release
+ prepare_dist_dev
+ sign_and_copy
+ publish_for_vote
+}
+
+function perform_release
+{
+ rm -rf "${WD_RELEASE}"
+ mvn release:perform "-DworkingDirectory=${WD_RELEASE}"
+}
+
+# Prepare dist/dev to get the release candidate published for a vote.
+function prepare_dist_dev
+{
+ mkdir -p "${WD_DIST_DEV}"
+ pushd "${WD_DIST_DEV}" > /dev/null
+ if [ ! -d ".svn" ]
+ then
+ svn co "https://dist.apache.org/repos/dist/dev/logging/log4cxx" .
+ fi
+ svn up
+}
+
+function sign_and_copy
+{
+ # Might be a good idea to have another look at the GPG plugin for Maven in the future:
+ #
+ # http://blog.sonatype.com/2010/01/how-to-generate-pgp-signatures-with-maven/
+ # http://maven.apache.org/plugins/maven-gpg-plugin/
+ pushd "${WD_RELEASE}/target" > /dev/null
+ for file in *.tar.gz *.zip
+ do
+ echo "Processing ${file}:"
+
+ gpg -ab --yes "${file}" > "${file}.asc"
+ md5sum "${file}" > "${file}.md5"
+ sha512sum "${file}" > "${file}.sha"
+
+ # No symlinks because those would be treated as is, no hardlinks because it should be safer for
+ # commits.
+ cp --force "${file}" "${WD_DIST_DEV}"
+ cp --force "${file}.asc" "${WD_DIST_DEV}"
+ cp --force "${file}.md5" "${WD_DIST_DEV}"
+ cp --force "${file}.sha" "${WD_DIST_DEV}"
+ done
+}
+
+function publish_for_vote
+{
+ pushd "${WD_DIST_DEV}" > /dev/null
+ svn add --force *.*
+ svn ci -m "Publishing artifacts for new release to vote on."
+}
+
+main
http://git-wip-us.apache.org/repos/asf/logging-log4cxx/blob/af3d9775/release_prepare.sh
----------------------------------------------------------------------
diff --git a/release_prepare.sh b/release_prepare.sh
new file mode 100755
index 0000000..962fbec
--- /dev/null
+++ b/release_prepare.sh
@@ -0,0 +1,238 @@
+#! /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.
+# 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.
+#
+
+##
+# Prepare a release.
+#
+# We need to update dates and version numbers at various places during releases and things can go
+# wrong, so another RC might need to be released. Am not sure if/how those things are properly
+# handled using the Maven release plugin, because that moves versions of the current branch forward
+# and doesn't seem to provide a way to say that a new release is just another RC for some former
+# release. Additionally, after the current branch has been moved forward, it might have been used to
+# merge new changes already. So how to tell Maven to do another release with a former version?
+#
+# So the current approach of this script is to always create a new branch "next_stable" which acts
+# as the base for releases only. One needs to manually merge changes to the code into that branch
+# as needed for making a release work, but keep all other changes to "master" etc. outside. We try
+# to handle setting release dates, current number of release candidate etc. here automatically as
+# much as possible. Some of that info is even merged back into some source branch, e.g. "master",
+# because release dates in files like "src/changes/changes.xml" need to be updated with additional
+# candidates or later releases.
+#
+# This script can be invoked with "next_stable" being the current branch already or with some other
+# and "next_stable" is checked out automatically. If it's invoked with some other branch, release
+# dates, new development version etc. are merged to the branch the script was invoked with. Without
+# another branch those changes need to be done/merged manually to wherever they need to be in the
+# end, most likely "master". If only "master" should be supported in the future, merging back into
+# that might be hard coded, currently it isn't to support arbitrary source branches from which a
+# release gets initiated. If "next_stable" is the starting branch, it's assumed to only create
+# another release based on a former release, without merging things back to anywhere.
+#
+
+function main
+{
+ #exit_on_changes
+
+ branch_starting=$( git branch | grep "\*" | cut -d " " -f 2)
+ branch_starting_is_ns=$(git branch | grep "\* next_stable")
+
+ co_next_stable
+ set_release_date_if
+ update_scm_tag_name_format
+
+ exec_mvn
+ exit_on_started_with_ns
+
+ exit_on_no_new_release_cycle
+ proc_new_release_cycle
+}
+
+function exit_on_changes
+{
+ if [[ -n $(git status --short) || -n $(git diff-index HEAD) ]]
+ then
+ echo Maven release process requires committed changes!
+ exit 1
+ fi
+}
+
+function co_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"
+ fi
+}
+
+function set_release_date_if
+{
+ local 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."
+ if [ -z "${branch_starting_is_ns}" ]
+ then
+ local 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
+}
+
+function update_scm_tag_name_format
+{
+ local scm_tag_name_format=$(grep "<tagNameFormat>" "pom.xml")
+ local scm_tag_name_format_needs_one=$(echo "${scm_tag_name_format}" | grep -E -e "-RCx")
+ local 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
+ sed -i -r "s/(<tagNameFormat>.+?-RC)x/\11/" "pom.xml"
+ fi
+ if [ -n "${scm_tag_name_format_needs_inc}" ]
+ then
+ local inced_nr=$((${scm_tag_name_format_needs_inc} + 1))
+ sed -i -r "s/(<tagNameFormat>.+?-RC)[0-9]+/\1${inced_nr}/" "pom.xml"
+ fi
+
+ git add "pom.xml"
+ git commit -m "scm.tagNameFormat reconfigured to new RC number."
+}
+
+function get_pom_curr_ver
+{
+ # \t doesn't seem to work for grep for some reason.
+ echo "$(grep -E -e "^\s<version>" "pom.xml" | sed -r "s/^\t<.+>(.+)<.+>/\1/")"
+}
+
+function get_mvn_prepare_new_dev_ver
+{
+ if [ -n "${branch_starting_is_ns}" ]
+ then
+ echo "$(get_pom_curr_ver)"
+ return 0
+ fi
+
+ # Maven is able to calculate a useful new version itself, even it warns about not being able to
+ # parse an empty version.
+ echo ""
+}
+
+##
+# Revert new version in "pom.xml" assigned by Maven.
+#
+# During release preparation Maven always assigns some new development version to the "pom.xml",
+# which is either a new calculated one or one we specified on our own already to be the same like
+# before. The first case is needed to get a new version into "release.properties", from where it
+# might be merged into a starting branch. In any case, within "next_stable" we want to keep the
+# one known version and therefore need to always revert any changes made by maven. So if a specific
+# new version is provided, always keep that, while without use the formerly available version of the
+# file. The caller most likely already has both values and additionally we are called AFTER Maven
+# already changed "pom.xml", so can't get the old value on our own easily anway.
+#
+# @param[in] Original version from "pom.xml".
+# @param[in] Specific version to be used by Maven.
+#
+function revert_mvn_prepare_new_dev_ver
+{
+ local pom_orig_ver="${1}"
+ local new_dev_ver="${2}"
+ local pom_new_ver="${new_dev_ver:-${pom_orig_ver}}"
+
+ sed -i -r "s/^(\t<version>).+(<)/\1${pom_new_ver}\2/" "pom.xml"
+}
+
+function exec_mvn
+{
+ local pom_orig_ver="$(get_pom_curr_ver)"
+ local new_dev_ver="$( get_mvn_prepare_new_dev_ver)"
+ local prepare_args="-Dresume=false"
+
+ # 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
+
+ mvn clean || exit 1
+ mvn release:prepare ${prepare_args} || exit 1
+ revert_mvn_prepare_new_dev_ver "${pom_orig_ver}" "${new_dev_ver}"
+
+ exit 1
+}
+
+function exit_on_started_with_ns
+{
+ if [ -n "${branch_starting_is_ns}" ]
+ then
+ exit 0
+ fi
+}
+
+function exit_on_no_new_release_cycle
+{
+ git checkout "${branch_starting}"
+ local 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
+}
+
+function proc_new_release_cycle
+{
+ git checkout "${branch_starting}"
+
+ local commit_mvn_next_dev_iter=${1}
+ local new_dev_ver=$( grep -E "^project.dev.log4cxx" "release.properties" | cut -d "=" -f 2)
+ local new_dev_ver_short=$(grep -E "^project.dev.log4cxx" "release.properties" | cut -d "=" -f 2 | cut -d "-" -f 1)
+ local new_release=$(cat <<-"END"
+ <body>\n\
+ <release version="VER_NEEDED"\n\
+ date="XXXX-XX-XX"\n\
+ description="Maintenance release">\n\
+ <\/release>\n
+END
+)
+ local 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/^(\t<version>).+(<)/\1${new_dev_ver}\2/" "pom.xml"
+ sed -i -r "s/<body>/${new_release}/" "src/changes/changes.xml"
+
+ git add "configure.ac"
+ git add "pom.xml"
+ git add "src/changes/changes.xml"
+
+ if ! git diff-index --quiet HEAD
+ then
+ git commit -m "Prepare for next development iteration: ${new_dev_ver_short}"
+ fi
+
+ git checkout "next_stable"
+}
+
+main
http://git-wip-us.apache.org/repos/asf/logging-log4cxx/blob/af3d9775/release_purge.sh
----------------------------------------------------------------------
diff --git a/release_purge.sh b/release_purge.sh
new file mode 100755
index 0000000..1abfcc8
--- /dev/null
+++ b/release_purge.sh
@@ -0,0 +1,79 @@
+#! /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.
+# 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!
+#
+
+function main
+{
+ purge_branch_and_tag
+ revert_pom
+ revert_changes
+ commit_reverts
+}
+
+function purge_branch_and_tag
+{
+ git checkout "release_scripts"
+
+ git branch -D "next_stable"
+ git push --delete "origin" "next_stable"
+
+ for tag in $(git tag -l | grep "v0.11.0-RC")
+ do
+ git tag --delete "${tag}"
+ git push --delete "origin" "${tag}"
+ done
+}
+
+function revert_pom
+{
+ sed -i -r "s/^(\t<version>).+(<)/\10.11.0-SNAPSHOT\2/" "pom.xml"
+}
+
+function revert_changes
+{
+ if [ -n "$(grep "version=\"0.11.1\"" "src/changes/changes.xml")" ]
+ then
+ # Remove not needed "release" node.
+ sed -i -r "1,/.+<release.+/ s/.+<release.+//" "src/changes/changes.xml"
+ sed -i -r "1,/.+date=.+/ s/.+date=.+//" "src/changes/changes.xml"
+ sed -i -r "1,/.+description=.+/ s/.+description=.+//" "src/changes/changes.xml"
+ sed -i -r "1,/.+<\/release.+/ s/.+<\/release.+//" "src/changes/changes.xml"
+
+ # Don't know how to remove the left newlines easier...
+ local changes=$(cat "src/changes/changes.xml")
+ echo "${changes/$'\n\n\n\n\n'/}" > "src/changes/changes.xml"
+ fi
+
+ # Last release date needs to be "unknown":
+ sed -i -r "1,/.+date=.+/ s/date=\".+\"/date=\"XXXX-XX-XX\"/" "src/changes/changes.xml"
+}
+
+function commit_reverts
+{
+ git add "pom.xml"
+ git add "src/changes/changes.xml"
+
+ git commit -m "No 0.11.1 yet."
+}
+
+main
[30/50] logging-log4cxx git commit: Wrong args to maven.
Posted by ts...@apache.org.
Wrong args to 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/47edf4d7
Tree: http://git-wip-us.apache.org/repos/asf/logging-log4cxx/tree/47edf4d7
Diff: http://git-wip-us.apache.org/repos/asf/logging-log4cxx/diff/47edf4d7
Branch: refs/heads/master
Commit: 47edf4d784c9d25a07dbd0e85c301f5d1357502b
Parents: 2d191ce
Author: Thorsten Schöning <ts...@am-soft.de>
Authored: Thu Aug 17 17:54:00 2017 +0200
Committer: Thorsten Schöning <ts...@am-soft.de>
Committed: Thu Aug 17 17:54:00 2017 +0200
----------------------------------------------------------------------
releasePrepare.sh | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/logging-log4cxx/blob/47edf4d7/releasePrepare.sh
----------------------------------------------------------------------
diff --git a/releasePrepare.sh b/releasePrepare.sh
index 3135fce..57625f6 100755
--- a/releasePrepare.sh
+++ b/releasePrepare.sh
@@ -175,8 +175,8 @@ function exec_mvn()
prepare_args="${prepare_args} -DdevelopmentVersion=${new_dev_ver}"
fi
- mvn clean || exit 1
- mvn release:prepare $(get_mvn_prepare_args) || exit 1
+ mvn clean || exit 1
+ mvn release:prepare ${prepare_args} || exit 1
revert_mvn_prepare_new_dev_ver "${pom_orig_ver}" "${new_dev_ver}"
exit 1
[41/50] logging-log4cxx git commit: A new version in pom.xml needs to
be committed.
Posted by ts...@apache.org.
A new version in pom.xml needs to be committed.
Project: http://git-wip-us.apache.org/repos/asf/logging-log4cxx/repo
Commit: http://git-wip-us.apache.org/repos/asf/logging-log4cxx/commit/2eeafe18
Tree: http://git-wip-us.apache.org/repos/asf/logging-log4cxx/tree/2eeafe18
Diff: http://git-wip-us.apache.org/repos/asf/logging-log4cxx/diff/2eeafe18
Branch: refs/heads/master
Commit: 2eeafe18ee5d104f94096e90ef461ebfcaaf7a02
Parents: 9592aff
Author: Thorsten Schöning <ts...@am-soft.de>
Authored: Thu Aug 17 18:32:22 2017 +0200
Committer: Thorsten Schöning <ts...@am-soft.de>
Committed: Thu Aug 17 18:32:22 2017 +0200
----------------------------------------------------------------------
release_prepare.sh | 18 ++++++++++++------
1 file changed, 12 insertions(+), 6 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/logging-log4cxx/blob/2eeafe18/release_prepare.sh
----------------------------------------------------------------------
diff --git a/release_prepare.sh b/release_prepare.sh
index 4e726db..7ec2d36 100755
--- a/release_prepare.sh
+++ b/release_prepare.sh
@@ -81,6 +81,14 @@ function co_next_stable
fi
}
+function git_commit_if
+{
+ if ! git diff-index --quiet HEAD
+ then
+ git commit -m "${1}"
+ fi
+}
+
function set_release_date_if
{
local today=$(date "+%Y-%m-%d")
@@ -161,6 +169,8 @@ function revert_mvn_prepare_new_dev_ver
local pom_new_ver="${new_dev_ver:-${pom_orig_ver}}"
sed -i -r "s/^(\t<version>).+(<)/\1${pom_new_ver}\2/" "pom.xml"
+ git add "pom.xml"
+ git_commit_if "Revert to ${pom_new_ver}."
}
function exec_mvn
@@ -225,12 +235,8 @@ END
git add "pom.xml"
git add "src/changes/changes.xml"
- if ! git diff-index --quiet HEAD
- then
- git commit -m "Prepare for next development iteration: ${new_dev_ver_short}"
- fi
-
- git checkout "next_stable"
+ git_commit_if "Prepare for next development iteration: ${new_dev_ver_short}"
+ git checkout "next_stable"
}
main
[46/50] logging-log4cxx git commit: Spelling error
Posted by ts...@apache.org.
Spelling error
Project: http://git-wip-us.apache.org/repos/asf/logging-log4cxx/repo
Commit: http://git-wip-us.apache.org/repos/asf/logging-log4cxx/commit/289575c7
Tree: http://git-wip-us.apache.org/repos/asf/logging-log4cxx/tree/289575c7
Diff: http://git-wip-us.apache.org/repos/asf/logging-log4cxx/diff/289575c7
Branch: refs/heads/master
Commit: 289575c76e3644553652c84e0c3f12e092cfdb3f
Parents: e49bac2
Author: Thorsten Schöning <ts...@am-soft.de>
Authored: Sat Jan 20 12:02:59 2018 +0100
Committer: Thorsten Schöning <ts...@am-soft.de>
Committed: Sat Jan 20 12:02:59 2018 +0100
----------------------------------------------------------------------
release_perform.sh | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/logging-log4cxx/blob/289575c7/release_perform.sh
----------------------------------------------------------------------
diff --git a/release_perform.sh b/release_perform.sh
index bbc37cb..7a3df1b 100755
--- a/release_perform.sh
+++ b/release_perform.sh
@@ -23,7 +23,7 @@
# the release archives anyway, which can be easily automated as well to not need to follow manual
# instructions always.
#
-# It's impoirtant to note that this script is expected to be executed in the branch "next_stable",
+# It's important to note that this script is expected to be executed in the branch "next_stable",
# most likely prepared by the preparing counterpart.
#
[12/50] logging-log4cxx git commit: Only remove "release" node if
somewhat necessary.
Posted by ts...@apache.org.
Only remove "release" node if somewhat necessary.
Project: http://git-wip-us.apache.org/repos/asf/logging-log4cxx/repo
Commit: http://git-wip-us.apache.org/repos/asf/logging-log4cxx/commit/80154a0f
Tree: http://git-wip-us.apache.org/repos/asf/logging-log4cxx/tree/80154a0f
Diff: http://git-wip-us.apache.org/repos/asf/logging-log4cxx/diff/80154a0f
Branch: refs/heads/master
Commit: 80154a0f5bdbd5993dc43fe1733ea36d915483a4
Parents: cef8058
Author: Thorsten Schöning <ts...@am-soft.de>
Authored: Thu Aug 17 16:51:39 2017 +0200
Committer: Thorsten Schöning <ts...@am-soft.de>
Committed: Thu Aug 17 16:51:39 2017 +0200
----------------------------------------------------------------------
releasePurge.sh | 32 ++++++++++++++++++++++----------
1 file changed, 22 insertions(+), 10 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/logging-log4cxx/blob/80154a0f/releasePurge.sh
----------------------------------------------------------------------
diff --git a/releasePurge.sh b/releasePurge.sh
index 8f17bb7..b501451 100755
--- a/releasePurge.sh
+++ b/releasePurge.sh
@@ -25,7 +25,9 @@
function main()
{
purge_branch_and_tag
- revert_pom_and_changes
+ revert_pom
+ revert_changes
+ commit_reverts
}
function purge_branch_and_tag()
@@ -42,22 +44,32 @@ function purge_branch_and_tag()
done
}
-function revert_pom_and_changes()
+function revert_pom()
{
- # Remove not needed "release" node.
sed -i -r "s/^(\t<version>).+(<)/\10.11.0-SNAPSHOT\2/" "pom.xml"
- sed -i -r "1,/.+<release.+/ s/.+<release.+//" "src/changes/changes.xml"
- sed -i -r "1,/.+date=.+/ s/.+date=.+//" "src/changes/changes.xml"
- sed -i -r "1,/.+description=.+/ s/.+description=.+//" "src/changes/changes.xml"
- sed -i -r "1,/.+<\/release.+/ s/.+<\/release.+//" "src/changes/changes.xml"
+}
+
+function revert_changes()
+{
+ if [ -n "$(grep "version=\"0.11.1\"" "src/changes/changes.xml")" ]
+ then
+ # Remove not needed "release" node.
+ sed -i -r "1,/.+<release.+/ s/.+<release.+//" "src/changes/changes.xml"
+ sed -i -r "1,/.+date=.+/ s/.+date=.+//" "src/changes/changes.xml"
+ sed -i -r "1,/.+description=.+/ s/.+description=.+//" "src/changes/changes.xml"
+ sed -i -r "1,/.+<\/release.+/ s/.+<\/release.+//" "src/changes/changes.xml"
- # Don't know how to remove the left newlines easier...
- local changes=$(cat "src/changes/changes.xml")
- echo "${changes/$'\n\n\n\n\n'/}" > "src/changes/changes.xml"
+ # Don't know how to remove the left newlines easier...
+ local changes=$(cat "src/changes/changes.xml")
+ echo "${changes/$'\n\n\n\n\n'/}" > "src/changes/changes.xml"
+ fi
# Last release date needs to be "unknown":
sed -i -r "1,/.+date=.+/ s/date=\".+\"/date=\"XXXX-XX-XX\"/" "src/changes/changes.xml"
+}
+function commit_reverts()
+{
git add "pom.xml"
git add "src/changes/changes.xml"
[10/50] logging-log4cxx git commit: No 0.11.1 yet.
Posted by ts...@apache.org.
No 0.11.1 yet.
Project: http://git-wip-us.apache.org/repos/asf/logging-log4cxx/repo
Commit: http://git-wip-us.apache.org/repos/asf/logging-log4cxx/commit/0c6a8332
Tree: http://git-wip-us.apache.org/repos/asf/logging-log4cxx/tree/0c6a8332
Diff: http://git-wip-us.apache.org/repos/asf/logging-log4cxx/diff/0c6a8332
Branch: refs/heads/master
Commit: 0c6a833234141892e6cdb9dbfd36fb325570a5f8
Parents: df6c225
Author: Thorsten Schöning <ts...@am-soft.de>
Authored: Thu Aug 17 16:43:34 2017 +0200
Committer: Thorsten Schöning <ts...@am-soft.de>
Committed: Thu Aug 17 16:43:34 2017 +0200
----------------------------------------------------------------------
src/changes/changes.xml | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/logging-log4cxx/blob/0c6a8332/src/changes/changes.xml
----------------------------------------------------------------------
diff --git a/src/changes/changes.xml b/src/changes/changes.xml
index accc209..934185f 100644
--- a/src/changes/changes.xml
+++ b/src/changes/changes.xml
@@ -23,9 +23,9 @@
</properties>
<body>
- <release version="0.11.0"
- date="2017-08-17"
- 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>
@@ -102,10 +102,10 @@
<action type="update">Behavior of StringHelper::startsWith and endsWith synced</action>
<action type="update">Documented C (class) and M (method) log format keywords.</action>
<action type="add">Locationinfo for Borland C++ Builder and successors improved</action>
- </release>
+
<release version="0.10.0"
- date="2008-04-03"
+ date="XXXX-XX-XX"
description="First Apache release">
<action issue="LOGCXX-259" type="fix">Several appenders fail to compile in Visual Studio 2008</action>
<action issue="LOGCXX-258" type="fix">unable to build from make dist package due to missing doxygen file</action>
[25/50] 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/c83c6e36
Tree: http://git-wip-us.apache.org/repos/asf/logging-log4cxx/tree/c83c6e36
Diff: http://git-wip-us.apache.org/repos/asf/logging-log4cxx/diff/c83c6e36
Branch: refs/heads/master
Commit: c83c6e36271797984a2cd43954a69f2ffe111eab
Parents: a737f90
Author: Thorsten Schöning <ts...@am-soft.de>
Authored: Thu Aug 17 17:11:34 2017 +0200
Committer: Thorsten Schöning <ts...@am-soft.de>
Committed: Thu Aug 17 17:11:34 2017 +0200
----------------------------------------------------------------------
pom.xml | 2 +-
src/changes/changes.xml | 5 +++++
2 files changed, 6 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/logging-log4cxx/blob/c83c6e36/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 5697b54..504f151 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.1-SNAPSHOT</version>
<name>Apache log4cxx</name>
<description>Logging framework for C++.</description>
<url>http://logging.apache.org/log4cxx</url>
http://git-wip-us.apache.org/repos/asf/logging-log4cxx/blob/c83c6e36/src/changes/changes.xml
----------------------------------------------------------------------
diff --git a/src/changes/changes.xml b/src/changes/changes.xml
index accc209..c30826d 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-17"
description="Maintenance release">
[15/50] logging-log4cxx git commit: Wrong function name.
Posted by ts...@apache.org.
Wrong function name.
Project: http://git-wip-us.apache.org/repos/asf/logging-log4cxx/repo
Commit: http://git-wip-us.apache.org/repos/asf/logging-log4cxx/commit/9e50ab99
Tree: http://git-wip-us.apache.org/repos/asf/logging-log4cxx/tree/9e50ab99
Diff: http://git-wip-us.apache.org/repos/asf/logging-log4cxx/diff/9e50ab99
Branch: refs/heads/master
Commit: 9e50ab995050913f256bf718b8e688aebacad93d
Parents: d3c8666
Author: Thorsten Schöning <ts...@am-soft.de>
Authored: Thu Aug 17 16:59:56 2017 +0200
Committer: Thorsten Schöning <ts...@am-soft.de>
Committed: Thu Aug 17 16:59:56 2017 +0200
----------------------------------------------------------------------
releasePrepare.sh | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/logging-log4cxx/blob/9e50ab99/releasePrepare.sh
----------------------------------------------------------------------
diff --git a/releasePrepare.sh b/releasePrepare.sh
index 8c96a49..388339b 100755
--- a/releasePrepare.sh
+++ b/releasePrepare.sh
@@ -54,7 +54,7 @@ function main()
set_release_date_if
update_scm_tag_name_format
- exec_maven
+ exec_mvn
exit_on_started_with_ns
exit_on_no_new_release_cycle
[16/50] logging-log4cxx git commit: No 0.11.1 yet.
Posted by ts...@apache.org.
No 0.11.1 yet.
Project: http://git-wip-us.apache.org/repos/asf/logging-log4cxx/repo
Commit: http://git-wip-us.apache.org/repos/asf/logging-log4cxx/commit/e500c1eb
Tree: http://git-wip-us.apache.org/repos/asf/logging-log4cxx/tree/e500c1eb
Diff: http://git-wip-us.apache.org/repos/asf/logging-log4cxx/diff/e500c1eb
Branch: refs/heads/master
Commit: e500c1ebaa8df5bb1fce10a630d1d80b21282125
Parents: 9e50ab9
Author: Thorsten Schöning <ts...@am-soft.de>
Authored: Thu Aug 17 17:00:33 2017 +0200
Committer: Thorsten Schöning <ts...@am-soft.de>
Committed: Thu Aug 17 17:00:33 2017 +0200
----------------------------------------------------------------------
pom.xml | 2 +-
src/changes/changes.xml | 7 +------
2 files changed, 2 insertions(+), 7 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/logging-log4cxx/blob/e500c1eb/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 504f151..5697b54 100644
--- a/pom.xml
+++ b/pom.xml
@@ -3,7 +3,7 @@
<groupId>log4cxx</groupId>
<artifactId>apache-log4cxx</artifactId>
<packaging>pom</packaging>
- <version>0.11.1-SNAPSHOT</version>
+ <version>0.11.0-SNAPSHOT</version>
<name>Apache log4cxx</name>
<description>Logging framework for C++.</description>
<url>http://logging.apache.org/log4cxx</url>
http://git-wip-us.apache.org/repos/asf/logging-log4cxx/blob/e500c1eb/src/changes/changes.xml
----------------------------------------------------------------------
diff --git a/src/changes/changes.xml b/src/changes/changes.xml
index c30826d..2be88c0 100644
--- a/src/changes/changes.xml
+++ b/src/changes/changes.xml
@@ -23,13 +23,8 @@
</properties>
<body>
- <release version="0.11.1"
- date="XXXX-XX-XX"
- description="Maintenance release">
- </release>
-
<release version="0.11.0"
- date="2017-08-17"
+ 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>
[19/50] 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/ac890489
Tree: http://git-wip-us.apache.org/repos/asf/logging-log4cxx/tree/ac890489
Diff: http://git-wip-us.apache.org/repos/asf/logging-log4cxx/diff/ac890489
Branch: refs/heads/master
Commit: ac89048963206620d02a644d27f104f486285115
Parents: 0e7ac78
Author: Thorsten Schöning <ts...@am-soft.de>
Authored: Thu Aug 17 17:03:41 2017 +0200
Committer: Thorsten Schöning <ts...@am-soft.de>
Committed: Thu Aug 17 17:03:41 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/ac890489/src/changes/changes.xml
----------------------------------------------------------------------
diff --git a/src/changes/changes.xml b/src/changes/changes.xml
index 2be88c0..accc209 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-17"
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>
[18/50] logging-log4cxx git commit: No 0.11.1 yet.
Posted by ts...@apache.org.
No 0.11.1 yet.
Project: http://git-wip-us.apache.org/repos/asf/logging-log4cxx/repo
Commit: http://git-wip-us.apache.org/repos/asf/logging-log4cxx/commit/0e7ac78f
Tree: http://git-wip-us.apache.org/repos/asf/logging-log4cxx/tree/0e7ac78f
Diff: http://git-wip-us.apache.org/repos/asf/logging-log4cxx/diff/0e7ac78f
Branch: refs/heads/master
Commit: 0e7ac78f2a6474701e79b1fd5ed24a177f20774b
Parents: 3cd0555
Author: Thorsten Schöning <ts...@am-soft.de>
Authored: Thu Aug 17 17:02:57 2017 +0200
Committer: Thorsten Schöning <ts...@am-soft.de>
Committed: Thu Aug 17 17:02:57 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/0e7ac78f/src/changes/changes.xml
----------------------------------------------------------------------
diff --git a/src/changes/changes.xml b/src/changes/changes.xml
index accc209..2be88c0 100644
--- a/src/changes/changes.xml
+++ b/src/changes/changes.xml
@@ -24,7 +24,7 @@
<body>
<release version="0.11.0"
- date="2017-08-17"
+ 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>
[36/50] 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/8c0a9fda
Tree: http://git-wip-us.apache.org/repos/asf/logging-log4cxx/tree/8c0a9fda
Diff: http://git-wip-us.apache.org/repos/asf/logging-log4cxx/diff/8c0a9fda
Branch: refs/heads/master
Commit: 8c0a9fda9436f667dbe267c3bf8757cc8e947f1a
Parents: af3d977
Author: Thorsten Schöning <ts...@am-soft.de>
Authored: Thu Aug 17 18:13:35 2017 +0200
Committer: Thorsten Schöning <ts...@am-soft.de>
Committed: Thu Aug 17 18:13:35 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/8c0a9fda/src/changes/changes.xml
----------------------------------------------------------------------
diff --git a/src/changes/changes.xml b/src/changes/changes.xml
index 2be88c0..accc209 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-17"
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/50] 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/833e82d5
Tree: http://git-wip-us.apache.org/repos/asf/logging-log4cxx/tree/833e82d5
Diff: http://git-wip-us.apache.org/repos/asf/logging-log4cxx/diff/833e82d5
Branch: refs/heads/master
Commit: 833e82d55d6e9b9aa22acc4f999ec4b163c2b286
Parents: bddb06a
Author: Thorsten Schöning <ts...@am-soft.de>
Authored: Thu Aug 17 17:53:03 2017 +0200
Committer: Thorsten Schöning <ts...@am-soft.de>
Committed: Thu Aug 17 17:53:03 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/833e82d5/src/changes/changes.xml
----------------------------------------------------------------------
diff --git a/src/changes/changes.xml b/src/changes/changes.xml
index 2be88c0..accc209 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-17"
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>
[44/50] logging-log4cxx git commit: Spelling error.
Posted by ts...@apache.org.
Spelling error.
Project: http://git-wip-us.apache.org/repos/asf/logging-log4cxx/repo
Commit: http://git-wip-us.apache.org/repos/asf/logging-log4cxx/commit/34e29410
Tree: http://git-wip-us.apache.org/repos/asf/logging-log4cxx/tree/34e29410
Diff: http://git-wip-us.apache.org/repos/asf/logging-log4cxx/diff/34e29410
Branch: refs/heads/master
Commit: 34e29410ed9decb8865f2851bf3a215d15e16b20
Parents: 56f36b4
Author: Thorsten Schöning <ts...@am-soft.de>
Authored: Tue Dec 19 18:56:59 2017 +0100
Committer: Thorsten Schöning <ts...@am-soft.de>
Committed: Tue Dec 19 18:56:59 2017 +0100
----------------------------------------------------------------------
release_prepare.sh | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/logging-log4cxx/blob/34e29410/release_prepare.sh
----------------------------------------------------------------------
diff --git a/release_prepare.sh b/release_prepare.sh
index 7ec2d36..29fcd12 100755
--- a/release_prepare.sh
+++ b/release_prepare.sh
@@ -142,7 +142,7 @@ function get_mvn_prepare_new_dev_ver
return 0
fi
- # Maven is able to calculate a useful new version itself, even it warns about not being able to
+ # Maven is able to calculate a useful new version itself, even if it warns about not being able to
# parse an empty version.
echo ""
}
[29/50] logging-log4cxx git commit: No 0.11.1 yet.
Posted by ts...@apache.org.
No 0.11.1 yet.
Project: http://git-wip-us.apache.org/repos/asf/logging-log4cxx/repo
Commit: http://git-wip-us.apache.org/repos/asf/logging-log4cxx/commit/2d191ceb
Tree: http://git-wip-us.apache.org/repos/asf/logging-log4cxx/tree/2d191ceb
Diff: http://git-wip-us.apache.org/repos/asf/logging-log4cxx/diff/2d191ceb
Branch: refs/heads/master
Commit: 2d191ceb5260762c6c78f7936d3434dd34bc8edc
Parents: 833e82d
Author: Thorsten Schöning <ts...@am-soft.de>
Authored: Thu Aug 17 17:53:53 2017 +0200
Committer: Thorsten Schöning <ts...@am-soft.de>
Committed: Thu Aug 17 17:53:53 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/2d191ceb/src/changes/changes.xml
----------------------------------------------------------------------
diff --git a/src/changes/changes.xml b/src/changes/changes.xml
index accc209..2be88c0 100644
--- a/src/changes/changes.xml
+++ b/src/changes/changes.xml
@@ -24,7 +24,7 @@
<body>
<release version="0.11.0"
- date="2017-08-17"
+ 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>
[02/50] logging-log4cxx git commit: Codestyle
Posted by ts...@apache.org.
Codestyle
Project: http://git-wip-us.apache.org/repos/asf/logging-log4cxx/repo
Commit: http://git-wip-us.apache.org/repos/asf/logging-log4cxx/commit/85583f52
Tree: http://git-wip-us.apache.org/repos/asf/logging-log4cxx/tree/85583f52
Diff: http://git-wip-us.apache.org/repos/asf/logging-log4cxx/diff/85583f52
Branch: refs/heads/master
Commit: 85583f525c50c77c9af7891fcd58e36a9bcd2042
Parents: e0c14b7
Author: Thorsten Schöning <ts...@am-soft.de>
Authored: Thu Aug 17 16:11:59 2017 +0200
Committer: Thorsten Schöning <ts...@am-soft.de>
Committed: Thu Aug 17 16:11:59 2017 +0200
----------------------------------------------------------------------
releasePurge.sh | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/logging-log4cxx/blob/85583f52/releasePurge.sh
----------------------------------------------------------------------
diff --git a/releasePurge.sh b/releasePurge.sh
index 9bea16a..d692e93 100755
--- a/releasePurge.sh
+++ b/releasePurge.sh
@@ -37,7 +37,7 @@ function purge_branch_and_tag()
for tag in $(git tag -l | grep "v0.11.0-RC")
do
- git tag --delete "${tag}"
+ git tag --delete "${tag}"
git push --delete "origin" "${tag}"
done
}
[08/50] logging-log4cxx git commit: Remove "-e" because a missing
branch shouldn't stop the other executions and remove the last release date.
Posted by ts...@apache.org.
Remove "-e" because a missing branch shouldn't stop the other executions and remove the last release 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/41c0a994
Tree: http://git-wip-us.apache.org/repos/asf/logging-log4cxx/tree/41c0a994
Diff: http://git-wip-us.apache.org/repos/asf/logging-log4cxx/diff/41c0a994
Branch: refs/heads/master
Commit: 41c0a994fb53ea58829a3585dfadb0c65244bb7a
Parents: 4c3f0dd
Author: Thorsten Schöning <ts...@am-soft.de>
Authored: Thu Aug 17 16:40:27 2017 +0200
Committer: Thorsten Schöning <ts...@am-soft.de>
Committed: Thu Aug 17 16:40:27 2017 +0200
----------------------------------------------------------------------
releasePurge.sh | 8 ++++++--
1 file changed, 6 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/logging-log4cxx/blob/41c0a994/releasePurge.sh
----------------------------------------------------------------------
diff --git a/releasePurge.sh b/releasePurge.sh
index d692e93..8f17bb7 100755
--- a/releasePurge.sh
+++ b/releasePurge.sh
@@ -1,4 +1,4 @@
-#! /bin/bash -e
+#! /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.
@@ -44,16 +44,20 @@ function purge_branch_and_tag()
function revert_pom_and_changes()
{
+ # Remove not needed "release" node.
sed -i -r "s/^(\t<version>).+(<)/\10.11.0-SNAPSHOT\2/" "pom.xml"
sed -i -r "1,/.+<release.+/ s/.+<release.+//" "src/changes/changes.xml"
sed -i -r "1,/.+date=.+/ s/.+date=.+//" "src/changes/changes.xml"
sed -i -r "1,/.+description=.+/ s/.+description=.+//" "src/changes/changes.xml"
sed -i -r "1,/.+<\/release.+/ s/.+<\/release.+//" "src/changes/changes.xml"
- # Don't know ho to remove the created newlines in changes easier...
+ # Don't know how to remove the left newlines easier...
local changes=$(cat "src/changes/changes.xml")
echo "${changes/$'\n\n\n\n\n'/}" > "src/changes/changes.xml"
+ # Last release date needs to be "unknown":
+ sed -i -r "1,/.+date=.+/ s/date=\".+\"/date=\"XXXX-XX-XX\"/" "src/changes/changes.xml"
+
git add "pom.xml"
git add "src/changes/changes.xml"
[47/50] logging-log4cxx git commit: Merge branch 'master' into
release_scripts
Posted by ts...@apache.org.
Merge branch 'master' into release_scripts
Project: http://git-wip-us.apache.org/repos/asf/logging-log4cxx/repo
Commit: http://git-wip-us.apache.org/repos/asf/logging-log4cxx/commit/4f8b92ca
Tree: http://git-wip-us.apache.org/repos/asf/logging-log4cxx/tree/4f8b92ca
Diff: http://git-wip-us.apache.org/repos/asf/logging-log4cxx/diff/4f8b92ca
Branch: refs/heads/master
Commit: 4f8b92ca554907f508dbc3aee02795a32701c0f0
Parents: 289575c 327c950
Author: Thorsten Schöning <ts...@am-soft.de>
Authored: Sat Jan 27 13:01:13 2018 +0100
Committer: Thorsten Schöning <ts...@am-soft.de>
Committed: Sat Jan 27 13:01:13 2018 +0100
----------------------------------------------------------------------
src/changes/changes.xml | 1 +
.../log4cxx/helpers/relativetimedateformat.h | 2 +-
src/main/include/log4cxx/spi/loggingevent.h | 19 ++++++++--------
src/site/apt/building/ant.apt | 12 +++++-----
src/site/apt/building/autotools.apt | 2 +-
src/site/apt/building/maven.apt | 6 ++---
src/site/apt/building/vstudio.apt | 2 +-
src/site/apt/building/xcode.apt | 2 +-
src/site/apt/community/issue-tracking.apt | 6 ++---
src/site/apt/download.apt.vm | 16 ++++++-------
src/site/apt/index.apt | 8 +++----
src/site/resources/.htaccess | 24 ++++++++++----------
src/site/site.vm | 8 +++----
src/site/site.xml | 14 ++++++------
14 files changed, 62 insertions(+), 60 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/logging-log4cxx/blob/4f8b92ca/src/changes/changes.xml
----------------------------------------------------------------------
diff --cc src/changes/changes.xml
index c30826d,fbec857..249e96f
--- a/src/changes/changes.xml
+++ b/src/changes/changes.xml
@@@ -23,14 -23,10 +23,15 @@@
</properties>
<body>
- <release version="0.11.0"
+ <release version="0.11.1"
date="XXXX-XX-XX"
description="Maintenance release">
+ </release>
+
+ <release version="0.11.0"
+ date="2017-08-17"
+ description="Maintenance release">
+ <action issue="LOGCXX-493" type="fix">Wrong usage of milli- vs. micro- and non- vs. milliseconds in some docs.</action>
<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>
[21/50] 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/35d31e6d
Tree: http://git-wip-us.apache.org/repos/asf/logging-log4cxx/tree/35d31e6d
Diff: http://git-wip-us.apache.org/repos/asf/logging-log4cxx/diff/35d31e6d
Branch: refs/heads/master
Commit: 35d31e6d2b300bc0d30ef399f95f2862d56a6015
Parents: b942e86
Author: Thorsten Schöning <ts...@am-soft.de>
Authored: Thu Aug 17 17:07:50 2017 +0200
Committer: Thorsten Schöning <ts...@am-soft.de>
Committed: Thu Aug 17 17:07:50 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/35d31e6d/src/changes/changes.xml
----------------------------------------------------------------------
diff --git a/src/changes/changes.xml b/src/changes/changes.xml
index 2be88c0..accc209 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-17"
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>
[14/50] 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/d3c86667
Tree: http://git-wip-us.apache.org/repos/asf/logging-log4cxx/tree/d3c86667
Diff: http://git-wip-us.apache.org/repos/asf/logging-log4cxx/diff/d3c86667
Branch: refs/heads/master
Commit: d3c86667852d0aabb5689daf47f5e4c41cd9f381
Parents: 4c259f1
Author: Thorsten Schöning <ts...@am-soft.de>
Authored: Thu Aug 17 16:58:54 2017 +0200
Committer: Thorsten Schöning <ts...@am-soft.de>
Committed: Thu Aug 17 16:58:54 2017 +0200
----------------------------------------------------------------------
pom.xml | 2 +-
src/changes/changes.xml | 5 +++++
2 files changed, 6 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/logging-log4cxx/blob/d3c86667/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 5697b54..504f151 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.1-SNAPSHOT</version>
<name>Apache log4cxx</name>
<description>Logging framework for C++.</description>
<url>http://logging.apache.org/log4cxx</url>
http://git-wip-us.apache.org/repos/asf/logging-log4cxx/blob/d3c86667/src/changes/changes.xml
----------------------------------------------------------------------
diff --git a/src/changes/changes.xml b/src/changes/changes.xml
index accc209..c30826d 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-17"
description="Maintenance release">
[43/50] 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/56f36b48
Tree: http://git-wip-us.apache.org/repos/asf/logging-log4cxx/tree/56f36b48
Diff: http://git-wip-us.apache.org/repos/asf/logging-log4cxx/diff/56f36b48
Branch: refs/heads/master
Commit: 56f36b4872c46a559fd9b80f712ffc5f88f3ef83
Parents: d9dba16
Author: Thorsten Schöning <ts...@am-soft.de>
Authored: Thu Aug 17 18:35:20 2017 +0200
Committer: Thorsten Schöning <ts...@am-soft.de>
Committed: Thu Aug 17 18:35:20 2017 +0200
----------------------------------------------------------------------
pom.xml | 2 +-
src/changes/changes.xml | 5 +++++
2 files changed, 6 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/logging-log4cxx/blob/56f36b48/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 5697b54..504f151 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.1-SNAPSHOT</version>
<name>Apache log4cxx</name>
<description>Logging framework for C++.</description>
<url>http://logging.apache.org/log4cxx</url>
http://git-wip-us.apache.org/repos/asf/logging-log4cxx/blob/56f36b48/src/changes/changes.xml
----------------------------------------------------------------------
diff --git a/src/changes/changes.xml b/src/changes/changes.xml
index accc209..c30826d 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-17"
description="Maintenance release">
[34/50] logging-log4cxx git commit: Wrong function definitions,
even though it worked.
Posted by ts...@apache.org.
Wrong function definitions, even though it worked.
Project: http://git-wip-us.apache.org/repos/asf/logging-log4cxx/repo
Commit: http://git-wip-us.apache.org/repos/asf/logging-log4cxx/commit/3a9fb005
Tree: http://git-wip-us.apache.org/repos/asf/logging-log4cxx/tree/3a9fb005
Diff: http://git-wip-us.apache.org/repos/asf/logging-log4cxx/diff/3a9fb005
Branch: refs/heads/master
Commit: 3a9fb005f573487a15b082b7d12c460d6a6658eb
Parents: 4519549
Author: Thorsten Schöning <ts...@am-soft.de>
Authored: Thu Aug 17 18:03:23 2017 +0200
Committer: Thorsten Schöning <ts...@am-soft.de>
Committed: Thu Aug 17 18:03:23 2017 +0200
----------------------------------------------------------------------
releasePerform.sh | 12 ++++++------
releasePrepare.sh | 28 ++++++++++++++--------------
releasePurge.sh | 16 ++++++++--------
3 files changed, 28 insertions(+), 28 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/logging-log4cxx/blob/3a9fb005/releasePerform.sh
----------------------------------------------------------------------
diff --git a/releasePerform.sh b/releasePerform.sh
index 635c605..bbc37cb 100755
--- a/releasePerform.sh
+++ b/releasePerform.sh
@@ -20,14 +20,14 @@
#
# Performing a release involves Maven currently to build and test things and we ran into problems
# with the default dir structure maven assumes. This script works around those and we need to sign
-# the release archives anyway, which can be easily automated as well to not need to follow manual
+# the release archives anyway, which can be easily automated as well to not need to follow manual
# instructions always.
#
# It's impoirtant to note that this script is expected to be executed in the branch "next_stable",
# most likely prepared by the preparing counterpart.
#
-function main()
+function main
{
# log4cxx is able to build using private copies of apr and apr-util, which are expected in some
# special relative dir structure. That doesn't work with the default working dir "perform" uses,
@@ -45,14 +45,14 @@ function main()
publish_for_vote
}
-function perform_release()
+function perform_release
{
rm -rf "${WD_RELEASE}"
mvn release:perform "-DworkingDirectory=${WD_RELEASE}"
}
# Prepare dist/dev to get the release candidate published for a vote.
-function prepare_dist_dev()
+function prepare_dist_dev
{
mkdir -p "${WD_DIST_DEV}"
pushd "${WD_DIST_DEV}" > /dev/null
@@ -63,7 +63,7 @@ function prepare_dist_dev()
svn up
}
-function sign_and_copy()
+function sign_and_copy
{
# Might be a good idea to have another look at the GPG plugin for Maven in the future:
#
@@ -87,7 +87,7 @@ function sign_and_copy()
done
}
-function publish_for_vote()
+function publish_for_vote
{
pushd "${WD_DIST_DEV}" > /dev/null
svn add --force *.*
http://git-wip-us.apache.org/repos/asf/logging-log4cxx/blob/3a9fb005/releasePrepare.sh
----------------------------------------------------------------------
diff --git a/releasePrepare.sh b/releasePrepare.sh
index 0bbafe6..962fbec 100755
--- a/releasePrepare.sh
+++ b/releasePrepare.sh
@@ -18,7 +18,7 @@
##
# Prepare a release.
#
-# We need to update dates and version numbers at various places during releases and things can go
+# We need to update dates and version numbers at various places during releases and things can go
# wrong, so another RC might need to be released. Am not sure if/how those things are properly
# handled using the Maven release plugin, because that moves versions of the current branch forward
# and doesn't seem to provide a way to say that a new release is just another RC for some former
@@ -28,7 +28,7 @@
# So the current approach of this script is to always create a new branch "next_stable" which acts
# as the base for releases only. One needs to manually merge changes to the code into that branch
# as needed for making a release work, but keep all other changes to "master" etc. outside. We try
-# to handle setting release dates, current number of release candidate etc. here automatically as
+# to handle setting release dates, current number of release candidate etc. here automatically as
# much as possible. Some of that info is even merged back into some source branch, e.g. "master",
# because release dates in files like "src/changes/changes.xml" need to be updated with additional
# candidates or later releases.
@@ -43,7 +43,7 @@
# another release based on a former release, without merging things back to anywhere.
#
-function main()
+function main
{
#exit_on_changes
@@ -61,7 +61,7 @@ function main()
proc_new_release_cycle
}
-function exit_on_changes()
+function exit_on_changes
{
if [[ -n $(git status --short) || -n $(git diff-index HEAD) ]]
then
@@ -70,7 +70,7 @@ function exit_on_changes()
fi
}
-function co_next_stable()
+function co_next_stable
{
if [ -z "${branch_starting_is_ns}" ]
then
@@ -81,7 +81,7 @@ function co_next_stable()
fi
}
-function set_release_date_if()
+function set_release_date_if
{
local today=$(date "+%Y-%m-%d")
sed -i -r "1,/date=\".+?\"/ s/date=\".+?\"/date=\"${today}\"/" "src/changes/changes.xml"
@@ -100,7 +100,7 @@ function set_release_date_if()
fi
}
-function update_scm_tag_name_format()
+function update_scm_tag_name_format
{
local scm_tag_name_format=$(grep "<tagNameFormat>" "pom.xml")
local scm_tag_name_format_needs_one=$(echo "${scm_tag_name_format}" | grep -E -e "-RCx")
@@ -120,13 +120,13 @@ function update_scm_tag_name_format()
git commit -m "scm.tagNameFormat reconfigured to new RC number."
}
-function get_pom_curr_ver()
+function get_pom_curr_ver
{
# \t doesn't seem to work for grep for some reason.
echo "$(grep -E -e "^\s<version>" "pom.xml" | sed -r "s/^\t<.+>(.+)<.+>/\1/")"
}
-function get_mvn_prepare_new_dev_ver()
+function get_mvn_prepare_new_dev_ver
{
if [ -n "${branch_starting_is_ns}" ]
then
@@ -154,7 +154,7 @@ function get_mvn_prepare_new_dev_ver()
# @param[in] Original version from "pom.xml".
# @param[in] Specific version to be used by Maven.
#
-function revert_mvn_prepare_new_dev_ver()
+function revert_mvn_prepare_new_dev_ver
{
local pom_orig_ver="${1}"
local new_dev_ver="${2}"
@@ -163,7 +163,7 @@ function revert_mvn_prepare_new_dev_ver()
sed -i -r "s/^(\t<version>).+(<)/\1${pom_new_ver}\2/" "pom.xml"
}
-function exec_mvn()
+function exec_mvn
{
local pom_orig_ver="$(get_pom_curr_ver)"
local new_dev_ver="$( get_mvn_prepare_new_dev_ver)"
@@ -182,7 +182,7 @@ function exec_mvn()
exit 1
}
-function exit_on_started_with_ns()
+function exit_on_started_with_ns
{
if [ -n "${branch_starting_is_ns}" ]
then
@@ -190,7 +190,7 @@ function exit_on_started_with_ns()
fi
}
-function exit_on_no_new_release_cycle()
+function exit_on_no_new_release_cycle
{
git checkout "${branch_starting}"
local new_release_cycle=$(grep 'date="XXXX-XX-XX"' "src/changes/changes.xml")
@@ -202,7 +202,7 @@ function exit_on_no_new_release_cycle()
fi
}
-function proc_new_release_cycle()
+function proc_new_release_cycle
{
git checkout "${branch_starting}"
http://git-wip-us.apache.org/repos/asf/logging-log4cxx/blob/3a9fb005/releasePurge.sh
----------------------------------------------------------------------
diff --git a/releasePurge.sh b/releasePurge.sh
index b501451..1abfcc8 100755
--- a/releasePurge.sh
+++ b/releasePurge.sh
@@ -22,7 +22,7 @@
# branches and tags created during tests of the release process. Be very careful with execution!
#
-function main()
+function main
{
purge_branch_and_tag
revert_pom
@@ -30,26 +30,26 @@ function main()
commit_reverts
}
-function purge_branch_and_tag()
+function purge_branch_and_tag
{
git checkout "release_scripts"
git branch -D "next_stable"
- git push --delete "origin" "next_stable"
+ git push --delete "origin" "next_stable"
for tag in $(git tag -l | grep "v0.11.0-RC")
- do
+ do
git tag --delete "${tag}"
git push --delete "origin" "${tag}"
done
}
-function revert_pom()
+function revert_pom
{
sed -i -r "s/^(\t<version>).+(<)/\10.11.0-SNAPSHOT\2/" "pom.xml"
}
-function revert_changes()
+function revert_changes
{
if [ -n "$(grep "version=\"0.11.1\"" "src/changes/changes.xml")" ]
then
@@ -58,7 +58,7 @@ function revert_changes()
sed -i -r "1,/.+date=.+/ s/.+date=.+//" "src/changes/changes.xml"
sed -i -r "1,/.+description=.+/ s/.+description=.+//" "src/changes/changes.xml"
sed -i -r "1,/.+<\/release.+/ s/.+<\/release.+//" "src/changes/changes.xml"
-
+
# Don't know how to remove the left newlines easier...
local changes=$(cat "src/changes/changes.xml")
echo "${changes/$'\n\n\n\n\n'/}" > "src/changes/changes.xml"
@@ -68,7 +68,7 @@ function revert_changes()
sed -i -r "1,/.+date=.+/ s/date=\".+\"/date=\"XXXX-XX-XX\"/" "src/changes/changes.xml"
}
-function commit_reverts()
+function commit_reverts
{
git add "pom.xml"
git add "src/changes/changes.xml"
[06/50] logging-log4cxx git commit: Revert "No 0.11.1 yet."
Posted by ts...@apache.org.
Revert "No 0.11.1 yet."
This reverts commit 1ee2e4a82ce6b4ae935a7f78d1870b2106d1a6f4.
Project: http://git-wip-us.apache.org/repos/asf/logging-log4cxx/repo
Commit: http://git-wip-us.apache.org/repos/asf/logging-log4cxx/commit/519abb54
Tree: http://git-wip-us.apache.org/repos/asf/logging-log4cxx/tree/519abb54
Diff: http://git-wip-us.apache.org/repos/asf/logging-log4cxx/diff/519abb54
Branch: refs/heads/master
Commit: 519abb549a71d4a63b3f8742864ab5f510afed58
Parents: 1ee2e4a
Author: Thorsten Schöning <ts...@am-soft.de>
Authored: Thu Aug 17 16:33:08 2017 +0200
Committer: Thorsten Schöning <ts...@am-soft.de>
Committed: Thu Aug 17 16:33:08 2017 +0200
----------------------------------------------------------------------
src/changes/changes.xml | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/logging-log4cxx/blob/519abb54/src/changes/changes.xml
----------------------------------------------------------------------
diff --git a/src/changes/changes.xml b/src/changes/changes.xml
index f43a275..accc209 100644
--- a/src/changes/changes.xml
+++ b/src/changes/changes.xml
@@ -23,9 +23,9 @@
</properties>
<body>
-
-
-
+ <release version="0.11.0"
+ date="2017-08-17"
+ 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>
@@ -102,7 +102,7 @@
<action type="update">Behavior of StringHelper::startsWith and endsWith synced</action>
<action type="update">Documented C (class) and M (method) log format keywords.</action>
<action type="add">Locationinfo for Borland C++ Builder and successors improved</action>
-
+ </release>
<release version="0.10.0"
date="2008-04-03"
[49/50] logging-log4cxx git commit: No 0.11.0 yet.
Posted by ts...@apache.org.
No 0.11.0 yet.
Project: http://git-wip-us.apache.org/repos/asf/logging-log4cxx/repo
Commit: http://git-wip-us.apache.org/repos/asf/logging-log4cxx/commit/15e84cae
Tree: http://git-wip-us.apache.org/repos/asf/logging-log4cxx/tree/15e84cae
Diff: http://git-wip-us.apache.org/repos/asf/logging-log4cxx/diff/15e84cae
Branch: refs/heads/master
Commit: 15e84cae12b8c97117bc356cfd246284d807e8ca
Parents: 6f69211
Author: Thorsten Schöning <ts...@am-soft.de>
Authored: Tue Jan 30 18:26:52 2018 +0100
Committer: Thorsten Schöning <ts...@am-soft.de>
Committed: Tue Jan 30 18:26:52 2018 +0100
----------------------------------------------------------------------
configure.ac | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/logging-log4cxx/blob/15e84cae/configure.ac
----------------------------------------------------------------------
diff --git a/configure.ac b/configure.ac
index 94f6caf..6ec857e 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], [0.11.0])
AC_CONFIG_MACRO_DIR([src/m4])
AC_CONFIG_SRCDIR(src/main/cpp/logger.cpp)
[32/50] logging-log4cxx git commit: Wrong variable...
Posted by ts...@apache.org.
Wrong variable...
Project: http://git-wip-us.apache.org/repos/asf/logging-log4cxx/repo
Commit: http://git-wip-us.apache.org/repos/asf/logging-log4cxx/commit/00e2da8c
Tree: http://git-wip-us.apache.org/repos/asf/logging-log4cxx/tree/00e2da8c
Diff: http://git-wip-us.apache.org/repos/asf/logging-log4cxx/diff/00e2da8c
Branch: refs/heads/master
Commit: 00e2da8c03d3abf68358bea04bd932f04b1df295
Parents: cb1f408
Author: Thorsten Schöning <ts...@am-soft.de>
Authored: Thu Aug 17 17:58:47 2017 +0200
Committer: Thorsten Schöning <ts...@am-soft.de>
Committed: Thu Aug 17 18:00:37 2017 +0200
----------------------------------------------------------------------
releasePrepare.sh | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/logging-log4cxx/blob/00e2da8c/releasePrepare.sh
----------------------------------------------------------------------
diff --git a/releasePrepare.sh b/releasePrepare.sh
index 57625f6..0bbafe6 100755
--- a/releasePrepare.sh
+++ b/releasePrepare.sh
@@ -160,7 +160,7 @@ function revert_mvn_prepare_new_dev_ver()
local new_dev_ver="${2}"
local pom_new_ver="${new_dev_ver:-${pom_orig_ver}}"
- sed -i -r "s/^(\t<version>).+(<)/\1${new_dev_ver}\2/" "pom.xml"
+ sed -i -r "s/^(\t<version>).+(<)/\1${pom_new_ver}\2/" "pom.xml"
}
function exec_mvn()
[37/50] logging-log4cxx git commit: No 0.11.1 yet.
Posted by ts...@apache.org.
No 0.11.1 yet.
Project: http://git-wip-us.apache.org/repos/asf/logging-log4cxx/repo
Commit: http://git-wip-us.apache.org/repos/asf/logging-log4cxx/commit/a805c9ae
Tree: http://git-wip-us.apache.org/repos/asf/logging-log4cxx/tree/a805c9ae
Diff: http://git-wip-us.apache.org/repos/asf/logging-log4cxx/diff/a805c9ae
Branch: refs/heads/master
Commit: a805c9aeabfd437491253960271f7f0f588c7c44
Parents: 8c0a9fd
Author: Thorsten Schöning <ts...@am-soft.de>
Authored: Thu Aug 17 18:21:26 2017 +0200
Committer: Thorsten Schöning <ts...@am-soft.de>
Committed: Thu Aug 17 18:21:26 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/a805c9ae/src/changes/changes.xml
----------------------------------------------------------------------
diff --git a/src/changes/changes.xml b/src/changes/changes.xml
index accc209..2be88c0 100644
--- a/src/changes/changes.xml
+++ b/src/changes/changes.xml
@@ -24,7 +24,7 @@
<body>
<release version="0.11.0"
- date="2017-08-17"
+ 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>
[03/50] 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/c7291baf
Tree: http://git-wip-us.apache.org/repos/asf/logging-log4cxx/tree/c7291baf
Diff: http://git-wip-us.apache.org/repos/asf/logging-log4cxx/diff/c7291baf
Branch: refs/heads/master
Commit: c7291baf0015c27cc1e49e092906dcea09d9c621
Parents: 85583f5
Author: Thorsten Schöning <ts...@am-soft.de>
Authored: Thu Aug 17 16:27:50 2017 +0200
Committer: Thorsten Schöning <ts...@am-soft.de>
Committed: Thu Aug 17 16:27:50 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/c7291baf/src/changes/changes.xml
----------------------------------------------------------------------
diff --git a/src/changes/changes.xml b/src/changes/changes.xml
index c30826d..26c40d8 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-17"
description="Maintenance release">
</release>
[09/50] 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/df6c2253
Tree: http://git-wip-us.apache.org/repos/asf/logging-log4cxx/tree/df6c2253
Diff: http://git-wip-us.apache.org/repos/asf/logging-log4cxx/diff/df6c2253
Branch: refs/heads/master
Commit: df6c22531b70a5b569bc05c86c440d60bbae67fb
Parents: 41c0a99
Author: Thorsten Schöning <ts...@am-soft.de>
Authored: Thu Aug 17 16:42:39 2017 +0200
Committer: Thorsten Schöning <ts...@am-soft.de>
Committed: Thu Aug 17 16:42:39 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/df6c2253/src/changes/changes.xml
----------------------------------------------------------------------
diff --git a/src/changes/changes.xml b/src/changes/changes.xml
index 2be88c0..accc209 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-17"
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>
[40/50] logging-log4cxx git commit: No 0.11.1 yet.
Posted by ts...@apache.org.
No 0.11.1 yet.
Project: http://git-wip-us.apache.org/repos/asf/logging-log4cxx/repo
Commit: http://git-wip-us.apache.org/repos/asf/logging-log4cxx/commit/9592afff
Tree: http://git-wip-us.apache.org/repos/asf/logging-log4cxx/tree/9592afff
Diff: http://git-wip-us.apache.org/repos/asf/logging-log4cxx/diff/9592afff
Branch: refs/heads/master
Commit: 9592afff86fbf873e97e2599484f238e110ab60b
Parents: 89b3873
Author: Thorsten Schöning <ts...@am-soft.de>
Authored: Thu Aug 17 18:27:09 2017 +0200
Committer: Thorsten Schöning <ts...@am-soft.de>
Committed: Thu Aug 17 18:27:09 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/9592afff/src/changes/changes.xml
----------------------------------------------------------------------
diff --git a/src/changes/changes.xml b/src/changes/changes.xml
index accc209..2be88c0 100644
--- a/src/changes/changes.xml
+++ b/src/changes/changes.xml
@@ -24,7 +24,7 @@
<body>
<release version="0.11.0"
- date="2017-08-17"
+ 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>