[logging-log4j-tools] 03/05: Rename `master` to `main`

[vy...@apache.org]

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

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

commit 5bc00c04f89267e9b687978384a4aaca7f07cc05
Author: Volkan Yazıcı <vo...@yazi.ci>
AuthorDate: Tue Jul 25 12:46:53 2023 +0200

    Rename `master` to `main`
---
 .asf.yaml                   |  2 +-
 .github/workflows/build.yml | 12 ++++++------
 RELEASING.adoc              |  6 +++---
 log4j-changelog/README.adoc |  2 +-
 4 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/.asf.yaml b/.asf.yaml
index 2f53f34..c210768 100644
--- a/.asf.yaml
+++ b/.asf.yaml
@@ -31,7 +31,7 @@ github:
 
   # Prevent force pushes to primary branches
   protected_branches:
-    master:
+    main:
       required_signatures: true
   # Attempt to make the auto-generated github emails more easily readable in email clients.
   custom_subjects:
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 089a21e..866b47e 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -113,7 +113,7 @@ jobs:
 
     runs-on: ubuntu-latest
     needs: merge
-    if: github.repository == 'apache/logging-log4j-tools' && (github.ref == 'refs/heads/master' || startsWith(github.ref, 'refs/heads/release/'))
+    if: github.repository == 'apache/logging-log4j-tools' && (github.ref == 'refs/heads/main' || startsWith(github.ref, 'refs/heads/release/'))
 
     steps:
 
@@ -128,7 +128,7 @@ jobs:
           java-package: jdk
           architecture: x64
           cache: maven
-          server-id: ${{ github.ref == 'refs/heads/master' && 'apache.snapshots.https' || 'apache.releases.https' }}
+          server-id: ${{ github.ref == 'refs/heads/main' && 'apache.snapshots.https' || 'apache.releases.https' }}
           server-username: NEXUS_USERNAME
           server-password: NEXUS_PASSWORD
           # We won't use `maven-gpg-plugin`, but this is convenient to import the GPG secret key
@@ -144,7 +144,7 @@ jobs:
           echo "PROJECT_VERSION=$PROJECT_VERSION" >> $GITHUB_ENV
 
       - name: Check version (SNAPSHOT)
-        if: github.ref == 'refs/heads/master'
+        if: github.ref == 'refs/heads/main'
         run: |
           [[ "$PROJECT_VERSION" =~ ^[0-9]+\.[0-9]+\.[0-9]+-SNAPSHOT$ ]] || {
             echo "was expecting a snapshot version, found: \"$PROJECT_VERSION\"" 1>&2
@@ -171,12 +171,12 @@ jobs:
             -P deploy
         env:
           # `NEXUS_USERNAME` and `NEXUS_PASSWORD` are used in `~/.m2/settings.xml` created by `setup-java` action
-          NEXUS_USERNAME: ${{ github.ref == 'refs/heads/master' && secrets.NEXUS_USER || secrets.LOGGING_STAGE_DEPLOYER_USER }}
-          NEXUS_PASSWORD: ${{ github.ref == 'refs/heads/master' && secrets.NEXUS_PW || secrets.LOGGING_STAGE_DEPLOYER_PW }}
+          NEXUS_USERNAME: ${{ github.ref == 'refs/heads/main' && secrets.NEXUS_USER || secrets.LOGGING_STAGE_DEPLOYER_USER }}
+          NEXUS_PASSWORD: ${{ github.ref == 'refs/heads/main' && secrets.NEXUS_PW || secrets.LOGGING_STAGE_DEPLOYER_PW }}
           # `SIGN_KEY` is used by `sign-maven-plugin`
           SIGN_KEY: ${{ secrets.GPG_SECRET_KEY }}
 
-      - name: Create distribution artifacts (RELEASE)
+      - name: Create the distribution (RELEASE)
         if: startsWith(github.ref, 'refs/heads/release/')
         run: |
           ./mvnw \
diff --git a/RELEASING.adoc b/RELEASING.adoc
index db75804..c20c02c 100644
--- a/RELEASING.adoc
+++ b/RELEASING.adoc
@@ -24,7 +24,7 @@ In the code examples below, assuming the version to be released is `7.8.0`.
 
 == Stage the release
 
-. Checkout the release branch: `git checkout -B release/7.8.0 origin/master`
+. Checkout the release branch: `git checkout -B release/7.8.0 origin/main`
 . Perform and commit following changes:
 .. Set the `revision` property to `7.8.0` in xref:pom.xml[`pom.xml`]
 .. For release notes
@@ -82,9 +82,9 @@ git push origin rel/7.8.0
 ====
 The ASF infrastructure treats ``rel/``-prefixed git tags special and ensures they are immutable for provenance reasons.
 ====
-. Merge `release/7.8.0` to `master`
+. Merge `release/7.8.0` 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 `master` branch
+. Commit changes and push the `main` branch
 . Delete the local and remote copies of the `release/7.8.0` branch
 
 === In the ASF infrastructure
diff --git a/log4j-changelog/README.adoc b/log4j-changelog/README.adoc
index 5f99243..e02ae27 100644
--- a/log4j-changelog/README.adoc
+++ b/log4j-changelog/README.adoc
@@ -30,7 +30,7 @@ A changelog is a log of all notable changes made to a project.
 Existing changelog practices (e.g., https://keepachangelog.com[Keep a changelog], https://maven.apache.org/plugins/maven-changes-plugin/[maven-changes-plugin]) store changelog entries in the same file.
 This creates merge conflicts between different branches.
 Imagine multiple people working on multiple branches each containing a change to `CHANGELOG.md`.
-Whoever succeeds in merging their branch to `master` first will cause a merge-conflict for the others, even though their work might be totally unrelated from each other.
+Whoever succeeds in merging their branch to `main` first will cause a merge-conflict for the others, even though their work might be totally unrelated from each other.
 
 This project embraces a model where changelog entries are kept in separate files and hence are not prone to merge conflicts.
 Similar to `maven-changes-plugin`, changelog sources and their exports (e.g., AsciiDoc-formatted) are split by design.