This is an automated email from the ASF dual-hosted git repository.
swebb2066 pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/logging-log4cxx.git
The following commit(s) were added to refs/heads/master by this push:
new 01e57cd6 Bump version to 1.6.1 (#573)
01e57cd6 is described below
commit 01e57cd6d717c8760c8ea922fefc844f99e24fd2
Author: Stephen Webb <[email protected]>
AuthorDate: Fri Dec 26 17:51:30 2025 +1100
Bump version to 1.6.1 (#573)
* Add change report entries
---
admin/MailTemplate.Announce.txt | 12 ++++++------
admin/MailTemplate.Result.txt | 4 ++--
admin/MailTemplate.txt | 6 +++---
admin/release-review-instructions.md | 16 ++++++++--------
admin/releasing.md | 28 ++++++++++++++--------------
admin/staging.md | 18 +++++++++---------
admin/validate-release.ps1 | 2 +-
admin/validate-release.sh | 2 +-
src/cmake/projectVersionDetails.cmake | 2 +-
src/site/markdown/change-report-gh.md | 14 ++++++++++++++
10 files changed, 59 insertions(+), 45 deletions(-)
diff --git a/admin/MailTemplate.Announce.txt b/admin/MailTemplate.Announce.txt
index 6450f6c8..ada18c23 100644
--- a/admin/MailTemplate.Announce.txt
+++ b/admin/MailTemplate.Announce.txt
@@ -1,18 +1,18 @@
To: [email protected], [email protected]
-Subject: [ANNOUNCE] Apache log4cxx 1.6.0 released
+Subject: [ANNOUNCE] Apache log4cxx 1.6.1 released
Hi,
-The Apache log4cxx team is pleased to announce the 1.6.0 release.
+The Apache log4cxx team is pleased to announce the 1.6.1 release.
For the list of new features and issues corrected, see:
-https://logging.apache.org/log4cxx/1.6.0/changelog.html#rel_1_6_0
+https://logging.apache.org/log4cxx/1.6.1/changelog.html#rel_1_6_1
For official release downloads, see:
-https://logging.apache.org/log4cxx/1.6.0/download.html
+https://logging.apache.org/log4cxx/1.6.1/download.html
For instructions on building Log4cxx, see:
-https://logging.apache.org/log4cxx/1.6.0/build.html
+https://logging.apache.org/log4cxx/1.6.1/build.html
All other information is available on the Log4cxx project website:
-https://logging.apache.org/log4cxx/1.6.0
+https://logging.apache.org/log4cxx/1.6.1
diff --git a/admin/MailTemplate.Result.txt b/admin/MailTemplate.Result.txt
index e5586620..93f6ca35 100644
--- a/admin/MailTemplate.Result.txt
+++ b/admin/MailTemplate.Result.txt
@@ -1,5 +1,5 @@
To: [email protected]
-Subject: [RESULT][VOTE] Release Apache Log4cxx 1.6.0
+Subject: [RESULT][VOTE] Release Apache Log4cxx 1.6.1
and here is my +1.
@@ -9,6 +9,6 @@ I will continue the release process.
Stephen
---------------------------------------------------------------------------------------------------
-This is a vote to release the Apache Log4cxx 1.6.0.
+This is a vote to release the Apache Log4cxx 1.6.1.
...
\ No newline at end of file
diff --git a/admin/MailTemplate.txt b/admin/MailTemplate.txt
index 64c92b7b..65a2571f 100644
--- a/admin/MailTemplate.txt
+++ b/admin/MailTemplate.txt
@@ -1,9 +1,9 @@
To: [email protected]
-Subject: [VOTE] Release Apache Log4cxx 1.6.0
+Subject: [VOTE] Release Apache Log4cxx 1.6.1
-This is a vote to release the Apache Log4cxx 1.6.0.
+This is a vote to release the Apache Log4cxx 1.6.1.
-Website: https://logging.staged.apache.org/log4cxx/1.6.0/changelog.html
+Website: https://logging.staged.apache.org/log4cxx/1.6.1/changelog.html
GitHub: https://github.com/apache/logging-log4cxx
Commit: <todo insert>
Distribution: https://dist.apache.org/repos/dist/dev/logging/log4cxx/
diff --git a/admin/release-review-instructions.md
b/admin/release-review-instructions.md
index 4d55549d..b4418ec9 100644
--- a/admin/release-review-instructions.md
+++ b/admin/release-review-instructions.md
@@ -3,7 +3,7 @@ Reviewing a Log4cxx release
The review should confirm the uploaded source code is not corrupt and
is identical to the package generated by the Github action.
-The steps below use version 1.6.0 as an example.
+The steps below use version 1.6.1 as an example.
Prerequisites
----------
@@ -31,13 +31,13 @@ Steps
- Windows: `validate-release.ps1`
- Run the script
- Linux, MacOS:
- - `sh validate-release.sh 1.6.0`
+ - `sh validate-release.sh 1.6.1`
- Windows:
- - `.\validate-release.ps1 1.6.0`
+ - `.\validate-release.ps1 1.6.1`
- For success, the final output line needs to include:
- `100% tests passed, 0 tests failed out of 63`
1. Download the packaged release files from Github
- - Open https://github.com/apache/logging-log4cxx/commits/v1.6.0-RC1 in
your web browser
+ - Open https://github.com/apache/logging-log4cxx/commits/v1.6.1-RC1 in
your web browser
- Click the green tick mark on the top commit
- The `All checks have passed` pop-up window will display
- Click the "Details" link on the row next to `Generate release files /
Package code for release`
@@ -48,16 +48,16 @@ Steps
- The browser will download the file `release_files.zip` onto your
system
1. Confirm the artifacts were sourced from Github using these commands
- Linux, MacOS (bash):
- - `cd /tmp/log4cxx-1.6.0`
+ - `cd /tmp/log4cxx-1.6.1`
- `unzip $HOME/Downloads/release_files.zip -d github`
- - `ARCHIVE=apache-log4cxx-1.6.0`
+ - `ARCHIVE=apache-log4cxx-1.6.1`
- `for TYPE in tar.gz zip; do`
- `diff {,github/}$ARCHIVE.$TYPE.sha512 && echo "$ARCHIVE.$TYPE.sha512:
OK"`
- `done`
- Windows (powershell):
- - `Set-Location -Path "${ENV:TEMP}\log4cxx-1.6.0"`
+ - `Set-Location -Path "${ENV:TEMP}\log4cxx-1.6.1"`
- `Expand-Archive -Path "${ENV:HOMEPATH}\Downloads\release_files.zip"
-DestinationPath "github"`
- - `$ARCHIVE="apache-log4cxx-1.6.0"`
+ - `$ARCHIVE="apache-log4cxx-1.6.1"`
- `foreach ($TYPE in @("tar.gz", "zip")) {`
- `` if (@(Get-Content -Path "$ARCHIVE.$TYPE.sha512")[0]` ``
- `-eq @(Get-Content -Path "github\$ARCHIVE.$TYPE.sha512")[0]) {`
diff --git a/admin/releasing.md b/admin/releasing.md
index 8bb9471a..0c7b3acf 100644
--- a/admin/releasing.md
+++ b/admin/releasing.md
@@ -2,7 +2,7 @@ Releasing a Log4cxx version
===================
This document lists the steps that must be performed to release Log4cxx
-using 1.6.0 as the example.
+using 1.6.1 as the example.
Prerequisites
----------
@@ -19,19 +19,19 @@ Steps
1. Tag HEAD as the release candidate
- `git checkout master`
- `git pull`
- - `git tag v1.6.0-RC1`
- - `git push origin tag v1.6.0-RC1`
+ - `git tag v1.6.1-RC1`
+ - `git push origin tag v1.6.1-RC1`
1. Remove the old artifacts from svn
- `svn co https://dist.apache.org/repos/dist/dev/logging -N
apache-dist-logging-dev`
- `cd apache-dist-logging-dev`
- `svn up log4cxx`
- `cd log4cxx`
- `svn delete *`
- - `mkdir 1.6.0`
- - `svn add 1.6.0`
- - `cd 1.6.0`
+ - `mkdir 1.6.1`
+ - `svn add 1.6.1`
+ - `cd 1.6.1`
1. Download the packaged release files from Github
- - Open https://github.com/apache/logging-log4cxx/commits/v1.6.0-RC1 in
your web browser
+ - Open https://github.com/apache/logging-log4cxx/commits/v1.6.1-RC1 in
your web browser
- Click the green tick mark on the top commit
- The `All checks have passed` pop-up window will display
- Click the "Details" link on the row next to `Generate release files /
Package code for release`
@@ -40,11 +40,11 @@ Steps
- The numbered steps will display
- Click the link next to `Artifact download URL:`
- The browser will download the file `release_files.zip` onto your
system
-1. Unpack the release files using these commands (with
`apache-dist-logging-dev/log4cxx/1.6.0` as the working directory)
+1. Unpack the release files using these commands (with
`apache-dist-logging-dev/log4cxx/1.6.1` as the working directory)
- `unzip "$HOME/Downloads/release_files.zip"`
-1. Send the new artifacts to svn (with `apache-dist-logging-dev/log4cxx/1.6.0`
as the working directory)
+1. Send the new artifacts to svn (with `apache-dist-logging-dev/log4cxx/1.6.1`
as the working directory)
- `svn add *`
- - `svn commit -m 'log4cxx 1.6.0'`
+ - `svn commit -m 'log4cxx 1.6.1'`
- check https://dist.apache.org/repos/dist/dev/logging/log4cxx
1. Raise a vote on the mailing list ([email protected])
- Using [this template](MailTemplate.txt)
@@ -54,11 +54,11 @@ Steps
- Using [this template](MailTemplate.Result.txt)
- Enter the name of each PMC member that voted
1. Get artifacts up to https://downloads.apache.org/logging/log4cxx/
- - `svn move -m "Release log4cxx 1.6.0"
https://dist.apache.org/repos/dist/dev/logging/log4cxx/1.6.0
https://dist.apache.org/repos/dist/release/logging/log4cxx/`
+ - `svn move -m "Release log4cxx 1.6.1"
https://dist.apache.org/repos/dist/dev/logging/log4cxx/1.6.1
https://dist.apache.org/repos/dist/release/logging/log4cxx/`
1. Tag the released version
- - `git checkout v1.6.0-RC1`
- - `git tag rel/v1.6.0`
- - `git push origin tag rel/v1.6.0`
+ - `git checkout v1.6.1-RC1`
+ - `git tag rel/v1.6.1`
+ - `git push origin tag rel/v1.6.1`
1. Enter the release date in `src/site/markdown/change-report-gh.md`
- Commit the change
- Update the staged web site using [the update procedure](staging.md)
diff --git a/admin/staging.md b/admin/staging.md
index 7c915915..38b85ed0 100644
--- a/admin/staging.md
+++ b/admin/staging.md
@@ -2,7 +2,7 @@ Updating the Log4cxx web site
===================
This document describes the steps used to update Log4cxx web site
-using 1.6.0 as an example Log4cxx version.
+using 1.6.1 as an example Log4cxx version.
Prerequisites
----------
@@ -23,9 +23,9 @@ Steps to update the Log4cxx web site
- `cd /tmp/log4cxx-site`
- `git checkout asf-staging`
1. Use the newly generated files for the web site documentation
- - `git rm -r 1.6.0`
- - `mv /tmp/build/src/site/html 1.6.0`
- - `git add 1.6.0`
+ - `git rm -r 1.6.1`
+ - `mv /tmp/build/src/site/html 1.6.1`
+ - `git add 1.6.1`
1. Push the `asf-staging` branch to Github and wait a bit
- `git commit -m "Improved the ... documentation"`
- `git push origin asf-staging`
@@ -45,18 +45,18 @@ Steps to add a new version to the Log4cxx web site
- `cd /tmp/log4cxx-site`
- `git checkout asf-staging`
1. Use the newly generated files for the web site documentation
- - `mv /tmp/build/src/site/html /tmp/log4cxx-site/1.6.0`
- - `git add 1.6.0`
+ - `mv /tmp/build/src/site/html /tmp/log4cxx-site/1.6.1`
+ - `git add 1.6.1`
1. Update the symbolic links in the base of the web site working directory
- `cd /tmp/log4cxx-site`
- `rm old_stable`
- - `ln -s 1.5.0 old_stable`
+ - `ln -s 1.6.0 old_stable`
- `git add old_stable`
1. Update `.htaccess` so the final `RewriteRule` redirects to the new version
- - `RewriteRule ^(.*)$ /log4cxx/1.6.0/$1 [R=temp,L]`
+ - `RewriteRule ^(.*)$ /log4cxx/1.6.1/$1 [R=temp,L]`
- `git add .htaccess`
1. Push the `asf-staging` branch to github and wait a bit
- - `git commit -m "Add the 1.6.0 documentation"`
+ - `git commit -m "Add the 1.6.1 documentation"`
- `git push origin asf-staging`
1. Check https://logging.staged.apache.org/log4cxx (after a minute or two)
- Are you seeing the new pages?
diff --git a/admin/validate-release.ps1 b/admin/validate-release.ps1
index d48b324a..71cdf0fd 100644
--- a/admin/validate-release.ps1
+++ b/admin/validate-release.ps1
@@ -1,7 +1,7 @@
# Allow the version to be provided as a parameter
param ( [string]$VERSION )
-if (-not $VERSION) { $VERSION = "1.6.0" }
+if (-not $VERSION) { $VERSION = "1.6.1" }
$STAGE="dev"
#$STAGE="release"
diff --git a/admin/validate-release.sh b/admin/validate-release.sh
index 9832ee75..33f7f459 100644
--- a/admin/validate-release.sh
+++ b/admin/validate-release.sh
@@ -4,7 +4,7 @@ set -e
VERSION=$1
if [ -z "$VERSION" ] ; then
- VERSION=1.6.0
+ VERSION=1.6.1
fi
if [ -z "$STAGE" ] ; then
diff --git a/src/cmake/projectVersionDetails.cmake
b/src/cmake/projectVersionDetails.cmake
index cabd4b7a..30dbb638 100644
--- a/src/cmake/projectVersionDetails.cmake
+++ b/src/cmake/projectVersionDetails.cmake
@@ -2,4 +2,4 @@
# setting the project version. The variable name must not
# clash with the log4cxx_VERSION* variables automatically
# defined by the project() command.
-set(log4cxx_VER 1.6.0.0)
+set(log4cxx_VER 1.6.1.0)
diff --git a/src/site/markdown/change-report-gh.md
b/src/site/markdown/change-report-gh.md
index 6c2b980b..56ee9628 100644
--- a/src/site/markdown/change-report-gh.md
+++ b/src/site/markdown/change-report-gh.md
@@ -25,6 +25,7 @@ Change Log {#changelog}
| Version | Date | Description |
| ------------------- | ---------- | -------------------- |
+| [1.6.1](#rel_1_6_1) | 2026-##-## | Bugfix release |
| [1.6.0](#rel_1_6_0) | 2025-12-14 | Maintenance release |
| [1.5.0](#rel_1_5_0) | 2025-08-03 | Maintenance release |
| [1.4.0](#rel_1_4_0) | 2025-03-01 | Maintenance release |
@@ -50,6 +51,19 @@ Change Log {#changelog}
| [0.1.0](#rel_1_0) | 2003-07-08 | |
| [0.0.1](#rel_0_1) | 2003-05-31 | |
+## Release 1.6.1 - 2026-##-## {#rel_1_6_1}
+
+This is a minor bugfix release to fix issues found with 1.6.0.
+
+### Bug {#rel_1_6_1_bugs}
+
+* A Qt fatal type log message was not flushed when using buffered/async output
+ \[[#571](https://github.com/apache/logging-log4cxx/pull/571)\]
+
+* The currently executing program file path components could not be used in a
properties configuration file
+ \[[#572](https://github.com/apache/logging-log4cxx/pull/572)\]
+
+
## Release 1.6.0 - 2025-12-14 {#rel_1_6_0}
Release 1.6.0 includes the following new features:
