Improve instructions for releasing Log4cxx (#433)

* Remove signature complexities

* The release is now signed by ASF Logging Services RM

* Simplify packaged artefact file name

Author: swebb2066

admin/release-review-instructions.md

@@ -30,10 +30,10 @@ Steps
     - Click the `>` to the left of `Run action/upload-artifact`
         - The numbered steps will display
     - Click the link next to `Artifact download URL:`
-        - The browser will download the file `Upload release files.zip` onto your system
+        - The browser will download the file `release_files.zip` onto your system
 1. Confirm the artifacts were sourced from Github using these commands
     - `mkdir /tmp/log4cxx-github`
     - `cd /tmp/log4cxx-github`
-    - `unzip "$HOME/Downloads/Upload release files.zip"`
+    - `unzip "$HOME/Downloads/release_files.zip"`
     - `diff /tmp/log4cxx{,-github}/apache-log4cxx-1.3.1.tar.gz.sha512`
     - `diff /tmp/log4cxx{,-github}/apache-log4cxx-1.3.1.zip.sha512`

admin/releasing.md

@@ -12,13 +12,14 @@ Prerequisites
 * The web-site for the new version has been published to https://logging.staged.apache.org/log4cxx (using [this procedure](staging.md) )
 * An e-mail has been sent to [email protected] announcing the intention to release
 * Your e-mail client can send mail from your `@apache.org` address. (Refer: https://eventmesh.apache.org/community/how-to-use-email/)
-* Your public key is available in [Apache Logging KEYS file](https://dist.apache.org/repos/dist/release/logging/KEYS)
 
 Steps
 -----
 
 1. Tag HEAD as the release candidate
     - `git checkout master`
+    - `git pull`
+    - `git tag v1.3.1-RC1`
     - `git push origin tag v1.3.1-RC1`
 1. Remove the old artifacts from svn
     - `svn co https://dist.apache.org/repos/dist/dev/logging -N apache-dist-logging-dev`
@@ -38,12 +39,9 @@ Steps
     - Click the `>` to the left of `Run action/upload-artifact`
         - The numbered steps will display
     - Click the link next to `Artifact download URL:`
-        - The browser will download the file `Upload release files.zip` onto your system
+        - 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.3.1` as the working directory)
-    - `unzip "$HOME/Downloads/Upload release files.zip"`
-1. Sign release artifacts (Refer: https://infra.apache.org/release-signing.html) (with `apache-dist-logging-dev/log4cxx/1.3.1` as the working directory)
-    - `gpg --armor --output apache-log4cxx-1.3.1.zip.asc --detach-sig apache-log4cxx-1.3.1.zip`
-    - `gpg --armor --output apache-log4cxx-1.3.1.tar.gz.asc --detach-sig apache-log4cxx-1.3.1.tar.gz`
+    - `unzip "$HOME/Downloads/release_files.zip"`
 1. Send the new artifacts to svn (with `apache-dist-logging-dev/log4cxx/1.3.1` as the working directory)
     - `svn add *`
     - `svn commit -m 'log4cxx 1.3.1'`
@@ -60,9 +58,6 @@ Steps
     - `git checkout v1.3.1-RC1`
     - `git tag rel/v1.3.1`
     - `git push origin tag rel/v1.3.1`
-1. Set your details in `src/site/CMakeLists.txt`
-    - Set your name in the LOG4CXX_RELEASE_MANAGER variable
-    - Set your GnuPG key in the LOG4CXX_RELEASE_MANAGER_KEY variable
 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)

admin/staging.md

@@ -45,15 +45,13 @@ 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
-    - `git rm -r 1.3.1`
     - `mv /tmp/build/src/site/html /tmp/log4cxx-site/1.3.1`
     - `git add 1.3.1`
 1. Update the symbolic links in the base of the web site working directory
     - `cd /tmp/log4cxx-site`
-    - `rm latest_stable old_stable`
-    - `ln -s 1.3.1 latest_stable`
+    - `rm old_stable`
     - `ln -s 1.2.0 old_stable`
-    - `git add latest_stable old_stable`
+    - `git add old_stable`
 1. Update `.htaccess` so the final `RewriteRule` redirects to the new version
     - `RewriteRule ^(.*)$     /log4cxx/1.3.1/$1      [R=temp,L]`
     - `git add .htaccess`

src/site/CMakeLists.txt

@@ -24,8 +24,8 @@ set(LOG4CXX_SOURCE_MIRROR_URL "https://www.apache.org/dyn/closer.cgi/logging/log
 set(APACHE_LOGGING_DISTRIBUTION_URL "https://www.apache.org/dist/logging")
 set(LOG4CXX_DOCUMENTATION_URL "https://logging.apache.org/log4cxx")
 set(LOG4CXX_DISTRIBUTION_URL "${APACHE_LOGGING_DISTRIBUTION_URL}/log4cxx/${LOG4CXX_RELEASE_VERSION}/${LOG4CXX_SOURCE_PACKAGE_FILE_NAME}")
-set(LOG4CXX_RELEASE_MANAGER "Stephen Webb")
-set(LOG4CXX_RELEASE_MANAGER_KEY "C6FC425C96722EFC4E2D02D5D4305EBC16B4A78D")
+set(LOG4CXX_RELEASE_MANAGER "ASF Logging Services RM")
+set(LOG4CXX_RELEASE_MANAGER_KEY "077E8893A6DCC33DD4A4D5B256E73BA9A0B592D0")
 
 configure_file( ${CMAKE_CURRENT_SOURCE_DIR}/doxy/Doxyfile.in
     ${CMAKE_CURRENT_BINARY_DIR}/Doxyfile )