This is an automated email from the ASF dual-hosted git repository.

vy pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/logging-log4j-tools.git

commit 2c6cabc6414ed93efaf4f304da1a18c856359bfb
Author: Volkan Yazıcı <[email protected]>
AuthorDate: Fri Mar 17 17:59:55 2023 +0100

    Switch from `rc.1` to `rc1` release candidate versioning scheme
---
 .github/workflows/build.yml | 2 +-
 RELEASING.adoc              | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index d223d3f..d9adc67 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -205,7 +205,7 @@ jobs:
         if: startsWith(github.ref, 'refs/heads/release/')
         run: |
           export RCN=$[ $(git tag -l "rel/$PROJECT_VERSION-rc*" | wc -l) + 1 ]
-          export TAG="rel/$PROJECT_VERSION-rc.$RCN"
+          export TAG="rel/$PROJECT_VERSION-rc$RCN"
           git config user.name github-actions
           git config user.email [email protected]
           git tag "$TAG" -m ""
diff --git a/RELEASING.adoc b/RELEASING.adoc
index 6940a91..9e0f58f 100644
--- a/RELEASING.adoc
+++ b/RELEASING.adoc
@@ -33,12 +33,12 @@ In the code examples below, assuming the version to be 
released is `7.8.0`.
 . 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-rc.1*` git tag should be created
+.. `*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-rc.1`, `rel/7.8.0-rc.2`, etc.
+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.
 ====
 
 +
@@ -58,7 +58,7 @@ The Apache Log4j Tools 7.8.0 release is now available for 
voting.
 This release contains minor enhancements and bug fixes.
 
 Source repository: https://github.com/apache/logging-log4j-tools
-Tag: rel/7.8.0-rc.1
+Tag: rel/7.8.0-rc1
 Commit: e82a44142280d013bd76ea18951fde00dcee192b
 CI run: https://github.com/apache/logging-log4j-tools/actions/runs/3882476949
 Artifacts: https://dist.apache.org/repos/dist/dev/logging/log4j/
@@ -99,7 +99,7 @@ With that, the release passes with 3 binding +1 votes from 
me, Piotr, and Matt.
 ====
 The ASF infrastructure treats ``rel/``-prefixed git tags special and ensures 
they are immutable for provenance reasons.
 ====
-. Merge `release/7.8.0` changes to `master`
+. Rebase `release/7.8.0` changes to `master`
 . 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 `master` branch
 . Delete the local and remote copies of the `release/7.8.0` branch

Reply via email to