Skip to content

Commit 5bbe622

Browse files
authored
Bump version to 1.7.0 (#614)
1 parent 04fce88 commit 5bbe622

7 files changed

Lines changed: 54 additions & 31 deletions

File tree

admin/release-review-instructions.md

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ Reviewing a Log4cxx release
33

44
The review should confirm the uploaded source code is not corrupt and
55
is identical to the package generated by the Github action.
6-
The steps below use version 1.6.2 as an example.
6+
The steps below use version 1.7.0 as an example.
77

88
Prerequisites
99
----------
@@ -31,9 +31,9 @@ Steps
3131
- Windows: `validate-release.ps1`
3232
- Run the script
3333
- Linux, MacOS:
34-
- `sh validate-release.sh 1.6.2`
34+
- `sh validate-release.sh 1.7.0`
3535
- Windows:
36-
- `.\validate-release.ps1 1.6.2`
36+
- `.\validate-release.ps1 1.7.0`
3737
- For success, the final output line needs to include:
3838
- `100% tests passed, 0 tests failed out of 63`
3939
1. Download the packaged release files from Github
@@ -48,16 +48,16 @@ Steps
4848
- The browser will download the file `release_files.zip` onto your system
4949
1. Confirm the artifacts were sourced from Github using these commands
5050
- Linux, MacOS (bash):
51-
- `cd /tmp/log4cxx-1.6.2`
51+
- `cd /tmp/log4cxx-1.7.0`
5252
- `unzip $HOME/Downloads/release_files.zip -d github`
53-
- `ARCHIVE=apache-log4cxx-1.6.2`
53+
- `ARCHIVE=apache-log4cxx-1.7.0`
5454
- `for TYPE in tar.gz zip; do`
5555
- `diff {,github/}$ARCHIVE.$TYPE.sha512 && echo "$ARCHIVE.$TYPE.sha512: OK"`
5656
- `done`
5757
- Windows (powershell):
58-
- `Set-Location -Path "${ENV:TEMP}\log4cxx-1.6.2"`
58+
- `Set-Location -Path "${ENV:TEMP}\log4cxx-1.7.0"`
5959
- `Expand-Archive -Path "${ENV:HOMEPATH}\Downloads\release_files.zip" -DestinationPath "github"`
60-
- `$ARCHIVE="apache-log4cxx-1.6.2"`
60+
- `$ARCHIVE="apache-log4cxx-1.7.0"`
6161
- `foreach ($TYPE in @("tar.gz", "zip")) {`
6262
- `` if (@(Get-Content -Path "$ARCHIVE.$TYPE.sha512")[0]` ``
6363
- `-eq @(Get-Content -Path "github\$ARCHIVE.$TYPE.sha512")[0]) {`

admin/releasing.md

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ Releasing a Log4cxx version
22
===================
33

44
This document lists the steps that must be performed to release Log4cxx
5-
using 1.6.2 as the example.
5+
using 1.7.0 as the example.
66

77
Prerequisites
88
----------
@@ -27,9 +27,9 @@ Steps
2727
- `svn up log4cxx`
2828
- `cd log4cxx`
2929
- `svn delete *`
30-
- `mkdir 1.6.2`
31-
- `svn add 1.6.2`
32-
- `cd 1.6.2`
30+
- `mkdir 1.7.0`
31+
- `svn add 1.7.0`
32+
- `cd 1.7.0`
3333
1. Download the packaged release files from Github
3434
- Open https://github.com/apache/logging-log4cxx/commits/v1.6.1-RC1 in your web browser
3535
- Click the green tick mark on the top commit
@@ -40,11 +40,11 @@ Steps
4040
- The numbered steps will display
4141
- Click the link next to `Artifact download URL:`
4242
- The browser will download the file `release_files.zip` onto your system
43-
1. Unpack the release files using these commands (with `apache-dist-logging-dev/log4cxx/1.6.2` as the working directory)
43+
1. Unpack the release files using these commands (with `apache-dist-logging-dev/log4cxx/1.7.0` as the working directory)
4444
- `unzip "$HOME/Downloads/release_files.zip"`
45-
1. Send the new artifacts to svn (with `apache-dist-logging-dev/log4cxx/1.6.2` as the working directory)
45+
1. Send the new artifacts to svn (with `apache-dist-logging-dev/log4cxx/1.7.0` as the working directory)
4646
- `svn add *`
47-
- `svn commit -m 'log4cxx 1.6.2'`
47+
- `svn commit -m 'log4cxx 1.7.0'`
4848
- check https://dist.apache.org/repos/dist/dev/logging/log4cxx
4949
1. Raise a vote on the mailing list (dev@logging.apache.org)
5050
- Using [this template](MailTemplate.txt)
@@ -54,7 +54,7 @@ Steps
5454
- Using [this template](MailTemplate.Result.txt)
5555
- Enter the name of each PMC member that voted
5656
1. Get artifacts up to https://downloads.apache.org/logging/log4cxx/
57-
- `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/`
57+
- `svn move -m "Release log4cxx 1.7.0" https://dist.apache.org/repos/dist/dev/logging/log4cxx/1.7.0 https://dist.apache.org/repos/dist/release/logging/log4cxx/`
5858
1. Tag the released version
5959
- `git checkout v1.6.1-RC1`
6060
- `git tag rel/v1.6.1`

admin/staging.md

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ Updating the Log4cxx web site
22
===================
33

44
This document describes the steps used to update Log4cxx web site
5-
using 1.6.2 as an example Log4cxx version.
5+
using 1.7.0 as an example Log4cxx version.
66

77
Prerequisites
88
----------
@@ -23,9 +23,9 @@ Steps to update the Log4cxx web site
2323
- `cd /tmp/log4cxx-site`
2424
- `git checkout asf-staging`
2525
1. Use the newly generated files for the web site documentation
26-
- `git rm -r 1.6.2`
27-
- `mv /tmp/build/src/site/html 1.6.2`
28-
- `git add 1.6.2`
26+
- `git rm -r 1.7.0`
27+
- `mv /tmp/build/src/site/html 1.7.0`
28+
- `git add 1.7.0`
2929
1. Push the `asf-staging` branch to Github and wait a bit
3030
- `git commit -m "Improved the ... documentation"`
3131
- `git push origin asf-staging`
@@ -45,18 +45,18 @@ Steps to add a new version to the Log4cxx web site
4545
- `cd /tmp/log4cxx-site`
4646
- `git checkout asf-staging`
4747
1. Use the newly generated files for the web site documentation
48-
- `mv /tmp/build/src/site/html /tmp/log4cxx-site/1.6.2`
49-
- `git add 1.6.2`
48+
- `mv /tmp/build/src/site/html /tmp/log4cxx-site/1.7.0`
49+
- `git add 1.7.0`
5050
1. Update the symbolic links in the base of the web site working directory
5151
- `cd /tmp/log4cxx-site`
5252
- `rm old_stable`
5353
- `ln -s 1.6.0 old_stable`
5454
- `git add old_stable`
5555
1. Update `.htaccess` so the final `RewriteRule` redirects to the new version
56-
- `RewriteRule ^(.*)$ /log4cxx/1.6.2/$1 [R=temp,L]`
56+
- `RewriteRule ^(.*)$ /log4cxx/1.7.0/$1 [R=temp,L]`
5757
- `git add .htaccess`
5858
1. Push the `asf-staging` branch to github and wait a bit
59-
- `git commit -m "Add the 1.6.2 documentation"`
59+
- `git commit -m "Add the 1.7.0 documentation"`
6060
- `git push origin asf-staging`
6161
1. Check https://logging.staged.apache.org/log4cxx (after a minute or two)
6262
- Are you seeing the new pages?

src/cmake/projectVersionDetails.cmake

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,4 +2,4 @@
22
# setting the project version. The variable name must not
33
# clash with the log4cxx_VERSION* variables automatically
44
# defined by the project() command.
5-
set(log4cxx_VER 1.6.2.0)
5+
set(log4cxx_VER 1.7.0.0)

src/examples/cpp/MyApp-qt/CMakeLists.txt

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,6 @@ project(MyApp LANGUAGES CXX)
2020
# Find the required libraries
2121
find_package(QT NAMES Qt6 Qt5 REQUIRED COMPONENTS Core)
2222
find_package(Qt${QT_VERSION_MAJOR} REQUIRED COMPONENTS Core)
23-
find_package(log4cxx REQUIRED)
2423
find_package(log4cxx COMPONENTS qt REQUIRED)
2524
# Optionally locate fmt::fmt
2625
find_package(fmt QUIET)

src/main/include/log4cxx/varia/fallbackerrorhandler.h

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -37,6 +37,7 @@ whatever reason.
3737
logged in the new secondary appender.
3838
3939
Here is a sample configuration file that installs this error handler:
40+
\anchor fallback-ref-example
4041
\include async-fall-back-example.xml
4142
*/
4243
class LOG4CXX_EXPORT FallbackErrorHandler :

src/site/markdown/change-report-gh.md

Lines changed: 29 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ Change Log {#changelog}
2525

2626
| Version | Date | Description |
2727
| ------------------- | ---------- | -------------------- |
28-
| [1.6.2](#rel_1_6_2) | 2026-XX-XX | Bugfix release |
28+
| [1.7.0](#rel_1_7_0) | 2026-XX-XX | Maintenance release |
2929
| [1.6.1](#rel_1_6_1) | 2026-01-09 | Bugfix release |
3030
| [1.6.0](#rel_1_6_0) | 2025-12-14 | Maintenance release |
3131
| [1.5.0](#rel_1_5_0) | 2025-08-03 | Maintenance release |
@@ -52,11 +52,34 @@ Change Log {#changelog}
5252
| [0.1.0](#rel_1_0) | 2003-07-08 | |
5353
| [0.0.1](#rel_0_1) | 2003-05-31 | |
5454

55-
## Release 1.6.2 - 2026-XX-XX {#rel_1_6_2}
5655

57-
This is a minor bugfix release to fix issues found with 1.6.1.
56+
## Release 1.7.0 - 2026-XX-XX {#rel_1_7_0}
5857

59-
### Bug {#rel_1_6_2_bugs}
58+
Release 1.7.0 includes the following new features:
59+
60+
* Support for a 'fallback-ref' attribute in the 'appender-ref' element of a configuration file (see \ref fallback-ref-example)
61+
\[[#606](https://github.com/apache/logging-log4cxx/pull/606)\]
62+
63+
* Qt support can be enabled using a Log4cxx CMake find_package component (see \ref MyApp-qt/CMakeLists.txt)
64+
\[[#600](https://github.com/apache/logging-log4cxx/pull/600)\]
65+
66+
* A TelnetAppender option (NonBlocking) to close the connection when the network buffer is full
67+
\[[#591](https://github.com/apache/logging-log4cxx/pull/591)\]
68+
69+
The following issues have been addressed:
70+
71+
* XML output could contain characters not allowed by the XML 1.0 specification
72+
* [#609](https://github.com/apache/logging-log4cxx/pull/609)
73+
, [#610](https://github.com/apache/logging-log4cxx/pull/610)
74+
75+
* An XML configuration file with recursive references caused program termination
76+
\[[#605](https://github.com/apache/logging-log4cxx/pull/605)\]
77+
78+
* Possible undefined behavior during a configuration change
79+
\[[#601](https://github.com/apache/logging-log4cxx/pull/601)\]
80+
81+
* Message loss when the calculation of a logged value also logs
82+
\[[#594](https://github.com/apache/logging-log4cxx/pull/594)\]
6083

6184
* ODBCAppender prepared statement value buffers had incorrect lifetimes
6285
\[[#581](https://github.com/apache/logging-log4cxx/pull/581)\]
@@ -87,8 +110,8 @@ and the LOG4CXX_CONFIGURATION environment variable (see log4cxx::spi::Configurat
87110
* Console output (Log4cxx internal logging and BasicConfigurator) use a color per message level by default
88111
\[[#529](https://github.com/apache/logging-log4cxx/pull/529)\]
89112
* New logging macros that defer binary-to-text conversion until used in AsyncAppender's background thread
90-
* \[[#548](https://github.com/apache/logging-log4cxx/pull/548)\]
91-
, \[[#554](https://github.com/apache/logging-log4cxx/pull/554)\]
113+
* [#548](https://github.com/apache/logging-log4cxx/pull/548)
114+
, [#554](https://github.com/apache/logging-log4cxx/pull/554)
92115
* A simplified way to attach an AsyncAppender to a logger using a configuration file
93116
\[[#550](https://github.com/apache/logging-log4cxx/pull/550)\]
94117

0 commit comments

Comments
 (0)