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 f4930652 Add missing file to release image (#617)
f4930652 is described below
commit f4930652aa9536d16134450b98c4be177d573615
Author: Stephen Webb <[email protected]>
AuthorDate: Wed Apr 1 12:42:01 2026 +1100
Add missing file to release image (#617)
* Check the archive is complete in CI
* Update release review instructions
---
.github/workflows/package_code.yml | 18 +++++++++++++++++-
admin/MailTemplate.Announce.txt | 12 ++++++------
admin/MailTemplate.Result.txt | 4 ++--
admin/MailTemplate.txt | 10 +++++-----
admin/release-review-instructions.md | 2 +-
admin/releasing.md | 12 ++++++------
admin/validate-release.ps1 | 2 +-
admin/validate-release.sh | 2 +-
8 files changed, 39 insertions(+), 23 deletions(-)
diff --git a/.github/workflows/package_code.yml
b/.github/workflows/package_code.yml
index 947f2c0d..5b173018 100644
--- a/.github/workflows/package_code.yml
+++ b/.github/workflows/package_code.yml
@@ -59,7 +59,7 @@ jobs:
cd clean-checkout
rm -r src/main/abi-symbols
VERSION=`grep 'set(log4cxx_VER '
src/cmake/projectVersionDetails.cmake|sed -Ee 's/.*log4cxx_VER
([0-9]*)\.([0-9]*)\.([0-9]*).*/\1.\2.\3/'`
- tar -zcf "../apache-log4cxx-$VERSION.tar.gz"
"--transform=s,^,apache-log4cxx-$VERSION/," LICENSE NOTICE README.md
CMakeLists.txt src liblog4cxx.pc.in liblog4cxx-qt.pc.in
+ tar -zcf "../apache-log4cxx-$VERSION.tar.gz"
"--transform=s,^,apache-log4cxx-$VERSION/," LICENSE NOTICE README.md
CMakeLists.txt Config.cmake.in src liblog4cxx.pc.in liblog4cxx-qt.pc.in
cd ..
sha512sum "apache-log4cxx-$VERSION.tar.gz" >
"apache-log4cxx-$VERSION.tar.gz.sha512"
sha256sum "apache-log4cxx-$VERSION.tar.gz" >
"apache-log4cxx-$VERSION.tar.gz.sha256"
@@ -70,6 +70,22 @@ jobs:
sha256sum "apache-log4cxx-$VERSION.zip" >
"apache-log4cxx-$VERSION.zip.sha256"
gpg --armor --detach-sign --yes --pinentry-mode error
"apache-log4cxx-$VERSION.zip"
+ - name: 'Configure Dependencies'
+ run: |
+ sudo apt-get update
+ sudo apt-get install -y libapr1-dev libaprutil1-dev
+
+ - name: 'test archive'
+ run: |
+ VERSION=`ls apache-log4cxx-*.tar.gz | sed -Ee
's/.*apache-log4cxx-([0-9]*)\.([0-9]*)\.([0-9]*).*/\1.\2.\3/'`
+ echo "Extracting files from apache-log4cxx-$VERSION.tar.gz..."
+ tar xf apache-log4cxx-$VERSION.tar.gz || exit
+
+ cmake -S apache-log4cxx-$VERSION -B test-archive || exit
+ cmake --build test-archive || exit
+ cd test-archive
+ ctest
+
- uses: actions/upload-artifact@v4
if: always()
with:
diff --git a/admin/MailTemplate.Announce.txt b/admin/MailTemplate.Announce.txt
index 971debc6..37da0c2c 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.2 released
+Subject: [ANNOUNCE] Apache log4cxx 1.7.0 released
Hi,
-The Apache log4cxx team is pleased to announce the 1.6.2 release.
+The Apache log4cxx team is pleased to announce the 1.7.0 release.
For the list of new features and issues corrected, see:
-https://logging.apache.org/log4cxx/1.6.2/changelog.html#rel_1_6_2
+https://logging.apache.org/log4cxx/changelog.html#rel_1_7_0
For official release downloads, see:
-https://logging.apache.org/log4cxx/1.6.2/download.html
+https://logging.apache.org/log4cxx/download.html
For instructions on building Log4cxx, see:
-https://logging.apache.org/log4cxx/1.6.2/build.html
+https://logging.apache.org/log4cxx/build.html
All other information is available on the Log4cxx project website:
-https://logging.apache.org/log4cxx/1.6.2
+https://logging.apache.org/log4cxx
diff --git a/admin/MailTemplate.Result.txt b/admin/MailTemplate.Result.txt
index e6147f42..50799a4b 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.2
+Subject: [RESULT][VOTE] Release Apache Log4cxx 1.7.0
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.2.
+This is a vote to release the Apache Log4cxx 1.7.0.
...
\ No newline at end of file
diff --git a/admin/MailTemplate.txt b/admin/MailTemplate.txt
index 68e4b5a6..74de42f7 100644
--- a/admin/MailTemplate.txt
+++ b/admin/MailTemplate.txt
@@ -1,9 +1,9 @@
To: [email protected]
-Subject: [VOTE] Release Apache Log4cxx 1.6.2
+Subject: [VOTE] Release Apache Log4cxx 1.7.0
-This is a vote to release the Apache Log4cxx 1.6.2.
+This is a vote to release the Apache Log4cxx 1.7.0.
-Website: https://logging.staged.apache.org/log4cxx/1.6.2/changelog.html
+Website: https://logging.staged.apache.org/log4cxx/changelog.html#rel_1_7_0
GitHub: https://github.com/apache/logging-log4cxx
Commit: <todo insert>
Distribution: https://dist.apache.org/repos/dist/dev/logging/log4cxx/
@@ -15,6 +15,6 @@ Please download, test, and cast your votes on this mailing
list.
[ ] +1, release the artifacts
[ ] -1, don't release, because ...
-This vote is open for 72 hours and will pass unless getting a net negative
vote count.
-All votes are welcome and we encourage everyone to test the release, but only
the
+This vote is open for 72 hours and will pass unless it gets a net negative
vote count.
+All votes are welcome, and we encourage everyone to test the release, but only
the
Logging Services PMC votes are officially counted.
diff --git a/admin/release-review-instructions.md
b/admin/release-review-instructions.md
index 2754f5ec..51b5408e 100644
--- a/admin/release-review-instructions.md
+++ b/admin/release-review-instructions.md
@@ -37,7 +37,7 @@ Steps
- 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.1-RC1 in
your web browser
+ - Open https://github.com/apache/logging-log4cxx/commits/v1.7.0-RC2 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`
diff --git a/admin/releasing.md b/admin/releasing.md
index a9c3aab3..f6f3ee46 100644
--- a/admin/releasing.md
+++ b/admin/releasing.md
@@ -19,8 +19,8 @@ Steps
1. Tag HEAD as the release candidate
- `git checkout master`
- `git pull`
- - `git tag v1.6.1-RC1`
- - `git push origin tag v1.6.1-RC1`
+ - `git tag v1.7.0-RC2`
+ - `git push origin tag v1.7.0-RC2`
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`
@@ -31,7 +31,7 @@ Steps
- `svn add 1.7.0`
- `cd 1.7.0`
1. Download the packaged release files from Github
- - Open https://github.com/apache/logging-log4cxx/commits/v1.6.1-RC1 in
your web browser
+ - Open https://github.com/apache/logging-log4cxx/commits/v1.7.0-RC2 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`
@@ -56,9 +56,9 @@ Steps
1. Get artifacts up to https://downloads.apache.org/logging/log4cxx/
- `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/`
1. Tag the released version
- - `git checkout v1.6.1-RC1`
- - `git tag rel/v1.6.1`
- - `git push origin tag rel/v1.6.1`
+ - `git checkout v1.7.0-RC2`
+ - `git tag rel/v1.7.0`
+ - `git push origin tag rel/v1.7.0`
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/validate-release.ps1 b/admin/validate-release.ps1
index 6c2119e2..d76889e2 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.2" }
+if (-not $VERSION) { $VERSION = "1.7.0" }
$STAGE="dev"
#$STAGE="release"
diff --git a/admin/validate-release.sh b/admin/validate-release.sh
index 5de41d6f..591f3e0b 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.2
+ VERSION=1.7.0
fi
if [ -z "$STAGE" ] ; then
