Skip to content

Commit b49a898

Browse files
committed
Release 0.1.0
1 parent 8803d56 commit b49a898

7 files changed

+51
-13
lines changed

CHANGELOG.adoc

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
= 0.1.0 (2023-05-05)
2+
3+
== Added
4+
5+
* 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])
6+
* 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])

RELEASING.adoc

Lines changed: 21 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -27,18 +27,29 @@ In the code examples below, assuming the version to be released is `7.8.0`.
2727
. Checkout the release branch: `git checkout -B release/7.8.0 origin/master`
2828
. Perform and commit following changes:
2929
.. Set the `revision` property to `7.8.0` in xref:pom.xml[`pom.xml`]
30-
.. Update the version and date in xref:CHANGELOG.adoc[`CHANGELOG.adoc`]
31-
. Make sure that `./mvnw clean verify` succeeds – if not, commit necessary fixes
32-
. Push the `release/7.8.0` branch
33-
. Run `./mvnw clean deploy`
34-
. Run:
30+
.. 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)
31+
.. Release and export the changelog:
32+
+
3533
[source,console]
3634
----
37-
ZIP_FILEPATH="/tmp/apache-log4j-transform-7.8.0-src.zip"
38-
git ls-files -z | xargs -0 zip -9 "$ZIP_FILEPATH" --
39-
gpg --armor --detach-sign "$ZIP_FILEPATH"
40-
sha512sum "$ZIP_FILEPATH" > "$ZIP_FILEPATH.sha512"
35+
./mvnw -N -Dlog4j.changelog.releaseVersion=0.1.0 log4j-changelog:release log4j-changelog:export
4136
----
37+
+
38+
. Make sure that `./mvnw clean verify` succeeds – if not, commit necessary fixes
39+
. Push the `release/7.8.0` branch
40+
. Make sure the associated https://github.com/apache/logging-log4j-tools/actions[GitHub Actions workflow] succeeds:
41+
.. *Signed artifacts* are uploaded to the _Staging Repositories_ in https://repository.apache.org/[repository.apache.org]
42+
.. *Signed sources and their checksum* are uploaded as GitHub Actions workflow artifacts
43+
.. `*rel/7.8.0-rc1*` git tag should be created
44+
+
45+
[IMPORTANT]
46+
====
47+
The ASF infrastructure treats ``rel/``-prefixed git tags special and ensures they are immutable for provenance reasons.
48+
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.
49+
====
50+
51+
+
52+
If not, commit necessary fixes, push, and repeat.
4253
. _Close_ the repository in https://repository.apache.org/[repository.apache.org]
4354
. 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
4455
@@ -94,7 +105,7 @@ With that, the release passes with 3 binding +1 votes from A, B and me.
94105
====
95106
The ASF infrastructure treats ``rel/``-prefixed git tags special and ensures they are immutable for provenance reasons.
96107
====
97-
. Rebase `release/7.8.0` changes to `main`
108+
. Merge `release/7.8.0` changes to `main`
98109
. Set the revision property to the next development version (e.g., `7.9.0-SNAPSHOT`) in xref:pom.xml[`pom.xml`]
99110
. Commit changes and push the `main` branch
100111
. Delete the local and remote copies of the `release/7.8.0` branch

log4j-transform-parent/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@
3030
<project.build.resourceEncoding>UTF-8</project.build.resourceEncoding>
3131
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
3232
<!-- `project.build.outputTimestamp` is required for reproducible builds: https://maven.apache.org/guides/mini/guide-reproducible-builds.html -->
33-
<project.build.outputTimestamp>1682714736</project.build.outputTimestamp>
33+
<project.build.outputTimestamp>1683307797</project.build.outputTimestamp>
3434
<!-- disable `maven-site-plugin`-->
3535
<maven.site.skip>true</maven.site.skip>
3636
<maven.site.deploy.skip>true</maven.site.deploy.skip>

pom.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -86,7 +86,7 @@
8686
</distributionManagement>
8787
<properties>
8888
<!-- project version -->
89-
<revision>0.1.0-SNAPSHOT</revision>
89+
<revision>0.1.0</revision>
9090
<!-- `minimalJavaBuildVersion` is employed by `org.apache:apache`,
9191
which is the parent of `org.apache.logging:logging-parent`, which is the parent of us.
9292
`minimalJavaBuildVersion` is used for enforcing the compiler version.
@@ -95,7 +95,7 @@
9595
<minimalJavaBuildVersion>[17,18)</minimalJavaBuildVersion>
9696
<java.version>8</java.version>
9797
<!-- `project.build.outputTimestamp` is required for reproducible builds: https://maven.apache.org/guides/mini/guide-reproducible-builds.html -->
98-
<project.build.outputTimestamp>1682714736</project.build.outputTimestamp>
98+
<project.build.outputTimestamp>1683307797</project.build.outputTimestamp>
9999
<!-- plugin versions -->
100100
<checksum-maven-plugin.version>1.11</checksum-maven-plugin.version>
101101
<flatten-maven-plugin.version>1.4.1</flatten-maven-plugin.version>

src/changelog/0.1.0/.release.xml

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,21 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<!--
3+
~ Licensed to the Apache Software Foundation (ASF) under one or more
4+
~ contributor license agreements. See the NOTICE file distributed with
5+
~ this work for additional information regarding copyright ownership.
6+
~ The ASF licenses this file to you under the Apache License, Version 2.0
7+
~ (the "License"); you may not use this file except in compliance with
8+
~ the License. You may obtain a copy of the License at
9+
~
10+
~ http://www.apache.org/licenses/LICENSE-2.0
11+
~
12+
~ Unless required by applicable law or agreed to in writing, software
13+
~ distributed under the License is distributed on an "AS IS" BASIS,
14+
~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
15+
~ See the License for the specific language governing permissions and
16+
~ limitations under the License.
17+
-->
18+
<release xmlns="http://logging.apache.org/log4j/changelog"
19+
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
20+
xsi:schemaLocation="http://logging.apache.org/log4j/changelog https://logging.apache.org/log4j/changelog-0.1.0.xsd"
21+
date="2023-05-05" version="0.1.0"/>

0 commit comments

Comments
 (0)