From a1ed76ad25257f3f6829562fe15adfa49ed1c59c Mon Sep 17 00:00:00 2001 From: Andy Wilkinson Date: Wed, 28 Apr 2021 20:57:06 +0100 Subject: [PATCH] Rename default branch to main --- CONTRIBUTING.md | 4 ++-- docs/build.gradle | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 5440d212..5d3062a9 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -31,8 +31,8 @@ None of these is essential for a pull request, but they will all help than cosmetic changes). - Add some Javadocs - Add unit tests that covers and new or modified functionality -- Whenever possible, please rebase your branch against the current master (or other - target branch in the main project). +- Whenever possible, please rebase your branch against the current main (or other + target branch in the project). * When writing a commit message please follow [these conventions][3]. Also, if you are fixing an existing issue please add `Fixes gh-nnn` at the end of the commit message (where nnn is the issue number). diff --git a/docs/build.gradle b/docs/build.gradle index 528f2f8b..52d22a88 100644 --- a/docs/build.gradle +++ b/docs/build.gradle @@ -26,6 +26,6 @@ asciidoctor { include 'index.adoc' } attributes 'revnumber': project.version, - 'branch-or-tag': project.version.endsWith('SNAPSHOT') ? 'master': "v${project.version}" + 'branch-or-tag': project.version.endsWith('SNAPSHOT') ? 'main': "v${project.version}" inputs.files(sourceSets.test.java) }