From feee68c28b53b58ce9fd2a5386984a69a6e3edd7 Mon Sep 17 00:00:00 2001
From: rco <rco@ableton.com>
Date: Wed, 13 Dec 2023 12:21:11 +0000
Subject: [PATCH 1/2] Change default branch from master to main

---
 .jenkins.yml    | 6 +++---
 CONTRIBUTING.md | 4 ++--
 Jenkinsfile     | 2 +-
 README.md       | 4 ++--
 4 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/.jenkins.yml b/.jenkins.yml
index 0bca8c33..0f7cb8ae 100644
--- a/.jenkins.yml
+++ b/.jenkins.yml
@@ -1,11 +1,11 @@
 pull_requests:
-  - master
+  - main
 
 pushes:
-  - master
+  - main
 
 notifications:
   - name: Build failures on the main branch
-    branch: master
+    branch: main
     slack:
       - GJUMRCZKQ
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index bd773953..2eee8d7a 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -8,7 +8,7 @@ the following criteria:
  - The code is well-formatted.
    * Please see the linting checks in the `test` section of the
      [Jenkinsfile][jenkinsfile]).
- 
+
 
 [cla]: http://ableton.github.io/cla/
-[jenkinsfile]: https://github.com/AbletonDevTools/groovylint/blob/master/Jenkinsfile
+[jenkinsfile]: https://github.com/AbletonDevTools/groovylint/blob/main/Jenkinsfile
diff --git a/Jenkinsfile b/Jenkinsfile
index 5b97ecff..4f09579c 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -12,7 +12,7 @@ library "groovylint@${params.JENKINS_COMMIT}"
 
 
 devToolsProject.run(
-  defaultBranch: 'master',
+  defaultBranch: 'main',
   setup: { data ->
     data['venv'] = pyenv.createVirtualEnv(readFile('.python-version'))
     data.venv.run('pip install -r requirements-dev.txt')
diff --git a/README.md b/README.md
index 9b719838..4c08e31e 100644
--- a/README.md
+++ b/README.md
@@ -126,10 +126,10 @@ corresponding Docker image for that release.
 
 In order to ensure that the library is using a compatible version of the Docker image, a
 file named `VERSION` exists in the top-level directory of this project. To make a release,
-this file should be updated accordingly and the commit merged to the `master` branch.
+this file should be updated accordingly and the commit merged to the `main` branch.
 Please also update the groovylint version in `pom.xml`.
 
-Once on `master`, a new Docker image will be published by Ableton's CI service, which will
+Once on `main`, a new Docker image will be published by Ableton's CI service, which will
 also push a corresponding git tag to the origin and update the respective `major.minor`
 branch.
 

From d6dd050b157ce00801804968f5f9355b87574791 Mon Sep 17 00:00:00 2001
From: rco <rco@ableton.com>
Date: Wed, 13 Dec 2023 16:53:17 +0000
Subject: [PATCH 2/2] Rename master to controller in README

---
 README.md | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/README.md b/README.md
index 4c08e31e..011f2c54 100644
--- a/README.md
+++ b/README.md
@@ -99,8 +99,8 @@ $ /path/to/run_codenarc.py --resources /path/to/groovylint/resources \
 
 To assist in linting on Jenkins, `groovylint` provides a pipeline library and global
 singleton. To use `groovylint` in this manner, you'll need to add it to your [Jenkins
-master configuration][jenkins-lib-config]. Any `Jenkinsfile` which is using this library
-should also use the version tag, like so:
+controller configuration][jenkins-lib-config]. Any `Jenkinsfile` which is using this
+library should also use the version tag, like so:
 
 ```groovy
 // Example Jenkinsfile using a scripted pipeline