Change branch master to main (#220)

pmd · Sep 19, 2024 · e093f22 · e093f22
1 parent 64f5c3b
commit e093f22
Show file tree

Hide file tree

Showing 6 changed files with 18 additions and 11 deletions.
diff --git a/.ci/inc/fetch_ci_scripts.bash b/.ci/inc/fetch_ci_scripts.bash
@@ -4,7 +4,7 @@ function fetch_ci_scripts() {
     local inc_dir
     local inc_url
     inc_dir="$(dirname "$0")/inc"
-    inc_url="${PMD_CI_SCRIPTS_URL:-https://raw.githubusercontent.com/pmd/build-tools/master/scripts}/inc"
+    inc_url="${PMD_CI_SCRIPTS_URL:-https://raw.githubusercontent.com/pmd/build-tools/main/scripts}/inc"
 
     mkdir -p "${inc_dir}"
 

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -4,7 +4,6 @@ on:
   push:
     branches:
       - main
-      - master
     tags:
       - '**'
   pull_request:

diff --git a/README.md b/README.md
@@ -1,9 +1,9 @@
 # PMD Eclipse Plugin
 
-[![Build Status](https://github.com/pmd/pmd-eclipse-plugin/workflows/build/badge.svg?branch=master)](https://github.com/pmd/pmd-eclipse-plugin/actions/?query=workflow%3Abuild+branch%3Amaster)
+[![Build Status](https://github.com/pmd/pmd-eclipse-plugin/workflows/build/badge.svg?branch=main)](https://github.com/pmd/pmd-eclipse-plugin/actions/?query=workflow%3Abuild+branch%3Amaster)
 [![Eclipse Marketplace](https://img.shields.io/eclipse-marketplace/v/pmd-eclipse-plugin.svg)](https://marketplace.eclipse.org/content/pmd-eclipse-plugin)
 
-Release Notes: <https://github.com/pmd/pmd-eclipse-plugin/blob/master/ReleaseNotes.md>
+Release Notes: <https://github.com/pmd/pmd-eclipse-plugin/blob/main/ReleaseNotes.md>
 
 Eclipse Update Site:
 

diff --git a/ReleaseNotes.md b/ReleaseNotes.md
@@ -13,6 +13,14 @@ This is a minor release.
 
 ### New and noteworthy
 
+#### New Git default branch - "main"
+
+We are joining the Git community and updating "master" to "main". Using the term "master" for the main
+development branch can be offensive to some people. Existing versions of Git have been always capable of
+working with any branch name and since 2.28.0 (July 2020) the default initial branch is configurable
+(`init.defaultBranch`). Since October 2020, the default branch for new repositories on GitHub
+is "main". Finally, PMD will also use this new name for the main branch in all our own repositories.
+
 ### Fixed Issues
 
 ### API Changes

diff --git a/do-release.sh b/do-release.sh
@@ -108,11 +108,11 @@ ${RELEASE_NOTES_BODY}
 EOF
 
 echo
-echo "Updating version in master to next"
+echo "Updating version in main to next"
 ./mvnw org.eclipse.tycho:tycho-versions-plugin:set-version -DnewVersion="${DEVELOPMENT_VERSION}-SNAPSHOT"
 git commit -a -m "Prepare next pmd-eclipse-plugin development version ${DEVELOPMENT_VERSION}-SNAPSHOT"
-echo "Pushing master"
-git push origin master
+echo "Pushing main"
+git push origin main
 
 echo
 echo Checkout the release branch and build the plugin
@@ -142,7 +142,7 @@ read -r
 echo
 echo "Publishing now..."
 git restore net.sourceforge.pmd.eclipse.p2updatesite/category.xml
-git checkout master
+git checkout main
 git branch -D "pmd-eclipse-plugin-rb-${RELEASE_VERSION}"
 git push origin tag "${RELEASE_VERSION}.${BUILDQUALIFIER}"
 echo
@@ -198,7 +198,7 @@ echo
 echo "Please verify and commit and push..."
 echo "cd ${PMD_GITHUB_IO_DIR}"
 echo "git commit -m \"PMD For Eclipse ${RELEASE_VERSION}.${BUILDQUALIFIER} Released\""
-echo "git push origin master"
+echo "git push origin main"
 echo
 echo
 echo Done.
diff --git a/pmd-eclipse-plugin.setup b/pmd-eclipse-plugin.setup
@@ -139,8 +139,8 @@
         rootFolder="${git.clone.location}"/>
     <description></description>
   </setupTask>
-  <stream name="master"
-      label="master"/>
+  <stream name="main"
+      label="main"/>
   <logicalProjectContainer
       xsi:type="setup:ProjectCatalog"
       href="index:/org.eclipse.setup#//@projectCatalogs[name='com.github']"/>
-Original file line number
+Diff line change
@@ Expand Up / @@ -4,7 +4,6 @@ on: @@
       push:
         branches:
           - main
-          - master
         tags:
           - '**'
       pull_request:
@@ Expand Down @@