This is an automated email from the ASF dual-hosted git repository. pkarwasz pushed a commit to branch release/0.1.0 in repository https://gitbox.apache.org/repos/asf/logging-log4j-transform.git
commit b49a898f74e1ceaa8cd883f211c0a9c30ef8f5c1 Author: Piotr P. Karwasz <[email protected]> AuthorDate: Mon May 1 19:29:30 2023 +0200 Release 0.1.0 --- CHANGELOG.adoc | 6 +++++ RELEASING.adoc | 31 +++++++++++++++------- log4j-transform-parent/pom.xml | 2 +- pom.xml | 4 +-- .../.release.xml} | 11 +++----- ...638_Provide_Maven_plugin_to_inline_location.xml | 0 ...LOG4J2-673_Maven_Shade_resource_transformer.xml | 0 7 files changed, 34 insertions(+), 20 deletions(-) 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 @@ <project.build.resourceEncoding>UTF-8</project.build.resourceEncoding> <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding> <!-- `project.build.outputTimestamp` is required for reproducible builds: https://maven.apache.org/guides/mini/guide-reproducible-builds.html --> - <project.build.outputTimestamp>1682714736</project.build.outputTimestamp> + <project.build.outputTimestamp>1683307797</project.build.outputTimestamp> <!-- disable `maven-site-plugin`--> <maven.site.skip>true</maven.site.skip> <maven.site.deploy.skip>true</maven.site.deploy.skip> diff --git a/pom.xml b/pom.xml index 5af0028..4b0367f 100644 --- a/pom.xml +++ b/pom.xml @@ -86,7 +86,7 @@ </distributionManagement> <properties> <!-- project version --> - <revision>0.1.0-SNAPSHOT</revision> + <revision>0.1.0</revision> <!-- `minimalJavaBuildVersion` is employed by `org.apache:apache`, which is the parent of `org.apache.logging:logging-parent`, which is the parent of us. `minimalJavaBuildVersion` is used for enforcing the compiler version. @@ -95,7 +95,7 @@ <minimalJavaBuildVersion>[17,18)</minimalJavaBuildVersion> <java.version>8</java.version> <!-- `project.build.outputTimestamp` is required for reproducible builds: https://maven.apache.org/guides/mini/guide-reproducible-builds.html --> - <project.build.outputTimestamp>1682714736</project.build.outputTimestamp> + <project.build.outputTimestamp>1683307797</project.build.outputTimestamp> <!-- plugin versions --> <checksum-maven-plugin.version>1.11</checksum-maven-plugin.version> <flatten-maven-plugin.version>1.4.1</flatten-maven-plugin.version> diff --git a/src/changelog/.0.x.x/LOG4J2-3638_Provide_Maven_plugin_to_inline_location.xml b/src/changelog/0.1.0/.release.xml similarity index 74% copy from src/changelog/.0.x.x/LOG4J2-3638_Provide_Maven_plugin_to_inline_location.xml copy to src/changelog/0.1.0/.release.xml index 34e1f8a..42b5807 100644 --- a/src/changelog/.0.x.x/LOG4J2-3638_Provide_Maven_plugin_to_inline_location.xml +++ b/src/changelog/0.1.0/.release.xml @@ -15,10 +15,7 @@ ~ See the License for the specific language governing permissions and ~ limitations under the License. --> -<entry type="added"> - <issue id="LOG4J2-3638" link="https://issues.apache.org/jira/browse/LOG4J2-3638"/> - <author id="pkarwasz"/> - <description format="asciidoc"> - Add bytecode transformation tool to provide location information without reflection. - </description> -</entry> +<release xmlns="http://logging.apache.org/log4j/changelog"; + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; + xsi:schemaLocation="http://logging.apache.org/log4j/changelog https://logging.apache.org/log4j/changelog-0.1.0.xsd"; + date="2023-05-05" version="0.1.0"/> 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
