From f803f8546a4c045cb83cf980b17f676cf065b1c1 Mon Sep 17 00:00:00 2001 From: Roy Clarkson Date: Fri, 2 Apr 2021 09:58:05 -0400 Subject: [PATCH] Rename 'master' branch to 'main' --- .github/workflows/gradle-java11.yml | 4 ++-- .github/workflows/gradle-java15.yml | 4 ++-- CONTRIBUTING.adoc | 4 ++-- spring-cloud-open-service-broker-docs/build.gradle | 2 +- 4 files changed, 7 insertions(+), 7 deletions(-) diff --git a/.github/workflows/gradle-java11.yml b/.github/workflows/gradle-java11.yml index 3e7a8fde..8d8b7d8b 100644 --- a/.github/workflows/gradle-java11.yml +++ b/.github/workflows/gradle-java11.yml @@ -6,11 +6,11 @@ name: Java 11 on: push: branches: - - master + - main - 3.* pull_request: branches: - - master + - main - 3.* jobs: diff --git a/.github/workflows/gradle-java15.yml b/.github/workflows/gradle-java15.yml index 735ba7d6..12a634b9 100644 --- a/.github/workflows/gradle-java15.yml +++ b/.github/workflows/gradle-java15.yml @@ -6,11 +6,11 @@ name: Java 15 on: push: branches: - - master + - main - 3.* pull_request: branches: - - master + - main - 3.* jobs: diff --git a/CONTRIBUTING.adoc b/CONTRIBUTING.adoc index 32f7d0e3..7225e42d 100644 --- a/CONTRIBUTING.adoc +++ b/CONTRIBUTING.adoc @@ -2,7 +2,7 @@ Spring Cloud is released under the non-restrictive Apache 2.0 license, and follows a very standard Github development process, using Github -tracker for issues and merging pull requests into master. If you want +tracker for issues and merging pull requests into main. If you want to contribute even something trivial please do not hesitate, but follow the guidelines below. @@ -39,7 +39,7 @@ added after the original pull request but before a merge. than cosmetic changes). * Add some Javadocs and, if you change the namespace, some XSD doc elements. * A few unit tests would help a lot as well -- someone has to do it. -* If no-one else is using your branch, please rebase it against the current master (or +* If no-one else is using your branch, please rebase it against the current main (or other target branch in the main project). * When writing a commit message please follow https://tbaggery.com/2008/04/19/a-note-about-git-commit-messages.html[these conventions], if you are fixing an existing issue please add `Fixes gh-XXXX` at the end of the commit diff --git a/spring-cloud-open-service-broker-docs/build.gradle b/spring-cloud-open-service-broker-docs/build.gradle index 06daf864..f044d8a5 100644 --- a/spring-cloud-open-service-broker-docs/build.gradle +++ b/spring-cloud-open-service-broker-docs/build.gradle @@ -90,7 +90,7 @@ asciidoctor { options doctype: 'book', eruby: 'erubis' attributes 'revnumber': project.version, 'spring-version': project.version, - 'branch-or-tag': project.version.endsWith('SNAPSHOT') ? 'master' : "v${project.version}", + 'branch-or-tag': project.version.endsWith('SNAPSHOT') ? 'main' : "v${project.version}", 'icons': 'font', 'idprefix': '', 'idseparator': '-',