This is an automated email from the ASF dual-hosted git repository. swebb2066 pushed a commit to branch change_version in repository https://gitbox.apache.org/repos/asf/logging-log4cxx.git
commit 34e76c9b17b533bae0f1abee39c152b1929dc5b0 Author: Stephen Webb <[email protected]> AuthorDate: Tue Jan 27 18:25:06 2026 +1100 Bump version to 1.6.2 --- admin/MailTemplate.Announce.txt | 12 ++++++------ admin/MailTemplate.Result.txt | 4 ++-- admin/MailTemplate.txt | 6 +++--- admin/release-review-instructions.md | 14 +++++++------- admin/releasing.md | 16 ++++++++-------- admin/staging.md | 16 ++++++++-------- admin/validate-release.ps1 | 2 +- admin/validate-release.sh | 2 +- src/cmake/projectVersionDetails.cmake | 2 +- src/site/CMakeLists.txt | 4 ++-- src/site/markdown/change-report-gh.md | 11 +++++++++++ 11 files changed, 50 insertions(+), 39 deletions(-) diff --git a/admin/MailTemplate.Announce.txt b/admin/MailTemplate.Announce.txt index ada18c23..971debc6 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.1 released +Subject: [ANNOUNCE] Apache log4cxx 1.6.2 released Hi, -The Apache log4cxx team is pleased to announce the 1.6.1 release. +The Apache log4cxx team is pleased to announce the 1.6.2 release. For the list of new features and issues corrected, see: -https://logging.apache.org/log4cxx/1.6.1/changelog.html#rel_1_6_1 +https://logging.apache.org/log4cxx/1.6.2/changelog.html#rel_1_6_2 For official release downloads, see: -https://logging.apache.org/log4cxx/1.6.1/download.html +https://logging.apache.org/log4cxx/1.6.2/download.html For instructions on building Log4cxx, see: -https://logging.apache.org/log4cxx/1.6.1/build.html +https://logging.apache.org/log4cxx/1.6.2/build.html All other information is available on the Log4cxx project website: -https://logging.apache.org/log4cxx/1.6.1 +https://logging.apache.org/log4cxx/1.6.2 diff --git a/admin/MailTemplate.Result.txt b/admin/MailTemplate.Result.txt index 93f6ca35..e6147f42 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.1 +Subject: [RESULT][VOTE] Release Apache Log4cxx 1.6.2 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.1. +This is a vote to release the Apache Log4cxx 1.6.2. ... \ No newline at end of file diff --git a/admin/MailTemplate.txt b/admin/MailTemplate.txt index 65a2571f..68e4b5a6 100644 --- a/admin/MailTemplate.txt +++ b/admin/MailTemplate.txt @@ -1,9 +1,9 @@ To: [email protected] -Subject: [VOTE] Release Apache Log4cxx 1.6.1 +Subject: [VOTE] Release Apache Log4cxx 1.6.2 -This is a vote to release the Apache Log4cxx 1.6.1. +This is a vote to release the Apache Log4cxx 1.6.2. -Website: https://logging.staged.apache.org/log4cxx/1.6.1/changelog.html +Website: https://logging.staged.apache.org/log4cxx/1.6.2/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 b4418ec9..0ec7d155 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.1 as an example. +The steps below use version 1.6.2 as an example. Prerequisites ---------- @@ -31,9 +31,9 @@ Steps - Windows: `validate-release.ps1` - Run the script - Linux, MacOS: - - `sh validate-release.sh 1.6.1` + - `sh validate-release.sh 1.6.2` - Windows: - - `.\validate-release.ps1 1.6.1` + - `.\validate-release.ps1 1.6.2` - 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 @@ -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.1` + - `cd /tmp/log4cxx-1.6.2` - `unzip $HOME/Downloads/release_files.zip -d github` - - `ARCHIVE=apache-log4cxx-1.6.1` + - `ARCHIVE=apache-log4cxx-1.6.2` - `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.1"` + - `Set-Location -Path "${ENV:TEMP}\log4cxx-1.6.2"` - `Expand-Archive -Path "${ENV:HOMEPATH}\Downloads\release_files.zip" -DestinationPath "github"` - - `$ARCHIVE="apache-log4cxx-1.6.1"` + - `$ARCHIVE="apache-log4cxx-1.6.2"` - `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 0c7b3acf..c88d2ce6 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.1 as the example. +using 1.6.2 as the example. Prerequisites ---------- @@ -27,9 +27,9 @@ Steps - `svn up log4cxx` - `cd log4cxx` - `svn delete *` - - `mkdir 1.6.1` - - `svn add 1.6.1` - - `cd 1.6.1` + - `mkdir 1.6.2` + - `svn add 1.6.2` + - `cd 1.6.2` 1. Download the packaged release files from Github - 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 @@ -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.1` as the working directory) +1. Unpack the release files using these commands (with `apache-dist-logging-dev/log4cxx/1.6.2` 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.1` as the working directory) +1. Send the new artifacts to svn (with `apache-dist-logging-dev/log4cxx/1.6.2` as the working directory) - `svn add *` - - `svn commit -m 'log4cxx 1.6.1'` + - `svn commit -m 'log4cxx 1.6.2'` - 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,7 +54,7 @@ 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.1" https://dist.apache.org/repos/dist/dev/logging/log4cxx/1.6.1 https://dist.apache.org/repos/dist/release/logging/log4cxx/` + - `svn move -m "Release log4cxx 1.6.2" https://dist.apache.org/repos/dist/dev/logging/log4cxx/1.6.2 https://dist.apache.org/repos/dist/release/logging/log4cxx/` 1. Tag the released version - `git checkout v1.6.1-RC1` - `git tag rel/v1.6.1` diff --git a/admin/staging.md b/admin/staging.md index 38b85ed0..f95b5000 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.1 as an example Log4cxx version. +using 1.6.2 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.1` - - `mv /tmp/build/src/site/html 1.6.1` - - `git add 1.6.1` + - `git rm -r 1.6.2` + - `mv /tmp/build/src/site/html 1.6.2` + - `git add 1.6.2` 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.1` - - `git add 1.6.1` + - `mv /tmp/build/src/site/html /tmp/log4cxx-site/1.6.2` + - `git add 1.6.2` 1. Update the symbolic links in the base of the web site working directory - `cd /tmp/log4cxx-site` - `rm 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.1/$1 [R=temp,L]` + - `RewriteRule ^(.*)$ /log4cxx/1.6.2/$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.1 documentation"` + - `git commit -m "Add the 1.6.2 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 71cdf0fd..6c2119e2 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.1" } +if (-not $VERSION) { $VERSION = "1.6.2" } $STAGE="dev" #$STAGE="release" diff --git a/admin/validate-release.sh b/admin/validate-release.sh index 33f7f459..5de41d6f 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.1 + VERSION=1.6.2 fi if [ -z "$STAGE" ] ; then diff --git a/src/cmake/projectVersionDetails.cmake b/src/cmake/projectVersionDetails.cmake index 30dbb638..f767eda0 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.1.0) +set(log4cxx_VER 1.6.2.0) diff --git a/src/site/CMakeLists.txt b/src/site/CMakeLists.txt index a2773243..f0263c80 100644 --- a/src/site/CMakeLists.txt +++ b/src/site/CMakeLists.txt @@ -21,7 +21,7 @@ find_package( Doxygen REQUIRED dot ) set(APACHE_LOGGING_DOWNLOAD_URL "https://downloads.apache.org/logging/";) set(LOG4CXX_SOURCE_PACKAGE_FILE_NAME "apache-log4cxx-${LOG4CXX_RELEASE_VERSION}") -set(LOG4CXX_SOURCE_MIRROR_URL "https://www.apache.org/dyn/closer.cgi/logging/log4cxx/${LOG4CXX_RELEASE_VERSION}";) +set(LOG4CXX_SOURCE_MIRROR_URL "https://www.apache.org/dyn/closer.lua/logging/log4cxx/${LOG4CXX_RELEASE_VERSION}";) set(LOG4CXX_SOURCE_MIRROR_FILE "${LOG4CXX_SOURCE_MIRROR_URL}/${LOG4CXX_SOURCE_PACKAGE_FILE_NAME}") set(LOG4CXX_DOCUMENTATION_URL "https://logging.apache.org/log4cxx";) set(LOG4CXX_DISTRIBUTION_URL "${APACHE_LOGGING_DOWNLOAD_URL}/log4cxx/${LOG4CXX_RELEASE_VERSION}/${LOG4CXX_SOURCE_PACKAGE_FILE_NAME}") @@ -29,7 +29,7 @@ set(LOG4CXX_RELEASE_MANAGER "ASF Logging Services RM") set(LOG4CXX_RELEASE_MANAGER_KEY "077E8893A6DCC33DD4A4D5B256E73BA9A0B592D0") set(EXPAT_DOWNLOAD_URL "https://github.com/libexpat/libexpat/releases";) -set(EXPAT_RELEASE_VERSION "2.7.1") +set(EXPAT_RELEASE_VERSION "2.7.3") set(EXPAT_SOURCE_PACKAGE_FILE_NAME "expat-${EXPAT_RELEASE_VERSION}") set(APACHE_APR_DOWNLOAD_URL "https://apr.apache.org/download.cgi";) diff --git a/src/site/markdown/change-report-gh.md b/src/site/markdown/change-report-gh.md index 1f1f060e..2dc5eea5 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.2](#rel_1_6_2) | 2026-XX-XX | Bugfix release | | [1.6.1](#rel_1_6_1) | 2026-01-09 | 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 | @@ -51,6 +52,16 @@ Change Log {#changelog} | [0.1.0](#rel_1_0) | 2003-07-08 | | | [0.0.1](#rel_0_1) | 2003-05-31 | | +## Release 1.6.2 - 2026-XX-XX {#rel_1_6_2} + +This is a minor bugfix release to fix issues found with 1.6.1. + +### Bug {#rel_1_6_2_bugs} + +* ODBCAppender prepared statement value buffers had incorrect lifetimes + \[[#581](https://github.com/apache/logging-log4cxx/pull/581)\] + + ## Release 1.6.1 - 2026-01-09 {#rel_1_6_1} This is a minor bugfix release to fix issues found with 1.6.0.
