From b49a898f74e1ceaa8cd883f211c0a9c30ef8f5c1 Mon Sep 17 00:00:00 2001 From: "Piotr P. Karwasz" Date: Mon, 1 May 2023 19:29:30 +0200 Subject: [PATCH] Release 0.1.0 --- CHANGELOG.adoc | 6 ++++ RELEASING.adoc | 31 +++++++++++++------ log4j-transform-parent/pom.xml | 2 +- pom.xml | 4 +-- src/changelog/0.1.0/.release.xml | 21 +++++++++++++ ...rovide_Maven_plugin_to_inline_location.xml | 0 ...2-673_Maven_Shade_resource_transformer.xml | 0 7 files changed, 51 insertions(+), 13 deletions(-) create mode 100644 CHANGELOG.adoc create mode 100644 src/changelog/0.1.0/.release.xml rename src/changelog/{.0.x.x => 0.1.0}/LOG4J2-3638_Provide_Maven_plugin_to_inline_location.xml (100%) rename src/changelog/{.0.x.x => 0.1.0}/LOG4J2-673_Maven_Shade_resource_transformer.xml (100%) diff --git a/CHANGELOG.adoc b/CHANGELOG.adoc new file mode 100644 index 0000000..91dde4e --- /dev/null +++ b/CHANGELOG.adoc @@ -0,0 +1,6 @@ += 0.1.0 (2023-05-05) + +== Added + +* https://issues.apache.org/jira/browse/LOG4J2-3638[LOG4J2-3638]: Add bytecode transformation tool to provide location information without reflection. (https://github.com/ppkarwasz[pkarwasz]) +* https://issues.apache.org/jira/browse/LOG4J2-673[LOG4J2-673]: Add resource transformer for the Maven Shade Plugin to merge `Log4j2Plugins.dat` plugin caches. Thanks to https://github.com/edwgiz[Eduard Gizatullin]. (https://github.com/ppkarwasz[pkarwasz]) diff --git a/RELEASING.adoc b/RELEASING.adoc index 19d78d3..6de2578 100644 --- a/RELEASING.adoc +++ b/RELEASING.adoc @@ -27,18 +27,29 @@ In the code examples below, assuming the version to be released is `7.8.0`. . Checkout the release branch: `git checkout -B release/7.8.0 origin/master` . Perform and commit following changes: .. Set the `revision` property to `7.8.0` in xref:pom.xml[`pom.xml`] -.. Update the version and date in xref:CHANGELOG.adoc[`CHANGELOG.adoc`] -. Make sure that `./mvnw clean verify` succeeds – if not, commit necessary fixes -. Push the `release/7.8.0` branch -. Run `./mvnw clean deploy` -. Run: +.. Set the `project.build.outputTimestamp` in xref:pom.xml[`pom.xml`] and xref:log4j-transform-parent/pom.xml[`log4j-transform-parent/pom.xml`] to the expected release date (72 hours from now) +.. Release and export the changelog: ++ [source,console] ---- -ZIP_FILEPATH="/tmp/apache-log4j-transform-7.8.0-src.zip" -git ls-files -z | xargs -0 zip -9 "$ZIP_FILEPATH" -- -gpg --armor --detach-sign "$ZIP_FILEPATH" -sha512sum "$ZIP_FILEPATH" > "$ZIP_FILEPATH.sha512" +./mvnw -N -Dlog4j.changelog.releaseVersion=0.1.0 log4j-changelog:release log4j-changelog:export ---- ++ +. Make sure that `./mvnw clean verify` succeeds – if not, commit necessary fixes +. Push the `release/7.8.0` branch +. Make sure the associated https://github.com/apache/logging-log4j-tools/actions[GitHub Actions workflow] succeeds: +.. *Signed artifacts* are uploaded to the _Staging Repositories_ in https://repository.apache.org/[repository.apache.org] +.. *Signed sources and their checksum* are uploaded as GitHub Actions workflow artifacts +.. `*rel/7.8.0-rc1*` git tag should be created ++ +[IMPORTANT] +==== +The ASF infrastructure treats ``rel/``-prefixed git tags special and ensures they are immutable for provenance reasons. +To make the above operation idempotent and allow retries, the release candidate enumeration used in the tag will be incremented automatically; `rel/7.8.0-rc1`, `rel/7.8.0-rc2`, etc. +==== + ++ +If not, commit necessary fixes, push, and repeat. . _Close_ the repository in https://repository.apache.org/[repository.apache.org] . Commit _the signed sources and their checksum_ (e.g., `apache-log4j-transform-7.8.0-src.{zip,.zip.asc,.zip.sha512}`) to https://dist.apache.org/repos/dist/dev/logging/log4j[dist.apache.org/repos/dist/**dev**/logging/log4j] Subversion repository and delete any artifacts from old releases @@ -94,7 +105,7 @@ With that, the release passes with 3 binding +1 votes from A, B and me. ==== The ASF infrastructure treats ``rel/``-prefixed git tags special and ensures they are immutable for provenance reasons. ==== -. Rebase `release/7.8.0` changes to `main` +. Merge `release/7.8.0` changes to `main` . Set the revision property to the next development version (e.g., `7.9.0-SNAPSHOT`) in xref:pom.xml[`pom.xml`] . Commit changes and push the `main` branch . Delete the local and remote copies of the `release/7.8.0` branch diff --git a/log4j-transform-parent/pom.xml b/log4j-transform-parent/pom.xml index 268debc..1e8d40c 100644 --- a/log4j-transform-parent/pom.xml +++ b/log4j-transform-parent/pom.xml @@ -30,7 +30,7 @@ UTF-8 UTF-8 - 1682714736 + 1683307797 true true diff --git a/pom.xml b/pom.xml index 5af0028..4b0367f 100644 --- a/pom.xml +++ b/pom.xml @@ -86,7 +86,7 @@ - 0.1.0-SNAPSHOT + 0.1.0 - 1682714736 + 1683307797 1.11 1.4.1 diff --git a/src/changelog/0.1.0/.release.xml b/src/changelog/0.1.0/.release.xml new file mode 100644 index 0000000..42b5807 --- /dev/null +++ b/src/changelog/0.1.0/.release.xml @@ -0,0 +1,21 @@ + + + diff --git a/src/changelog/.0.x.x/LOG4J2-3638_Provide_Maven_plugin_to_inline_location.xml b/src/changelog/0.1.0/LOG4J2-3638_Provide_Maven_plugin_to_inline_location.xml similarity index 100% rename from src/changelog/.0.x.x/LOG4J2-3638_Provide_Maven_plugin_to_inline_location.xml rename to src/changelog/0.1.0/LOG4J2-3638_Provide_Maven_plugin_to_inline_location.xml diff --git a/src/changelog/.0.x.x/LOG4J2-673_Maven_Shade_resource_transformer.xml b/src/changelog/0.1.0/LOG4J2-673_Maven_Shade_resource_transformer.xml similarity index 100% rename from src/changelog/.0.x.x/LOG4J2-673_Maven_Shade_resource_transformer.xml rename to src/changelog/0.1.0/LOG4J2-673_Maven_Shade_resource_transformer.xml