Rename 'master' branch to 'main'

This commit is contained in:
Roy Clarkson
2021-04-02 09:58:05 -04:00
parent e0a7ce8e9c
commit f803f8546a
4 changed files with 7 additions and 7 deletions

View File

@@ -6,11 +6,11 @@ name: Java 11
on:
push:
branches:
- master
- main
- 3.*
pull_request:
branches:
- master
- main
- 3.*
jobs:

View File

@@ -6,11 +6,11 @@ name: Java 15
on:
push:
branches:
- master
- main
- 3.*
pull_request:
branches:
- master
- main
- 3.*
jobs:

View File

@@ -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

View File

@@ -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': '-',