From 0e5dd1863f695227168715b5a9e078e313090eaa Mon Sep 17 00:00:00 2001 From: Eleftheria Stein Date: Wed, 28 Apr 2021 17:19:52 +0200 Subject: [PATCH] Rename master branch to main Closes gh-1846 --- .github/workflows/continuous-integration-workflow.yml | 2 +- CONTRIBUTING.adoc | 2 +- README.adoc | 8 ++++---- spring-session-docs/spring-session-docs.gradle | 2 +- .../src/main/resources/templates/layout.html | 2 +- .../src/main/resources/templates/layout.html | 2 +- .../src/main/resources/templates/layout.html | 2 +- .../src/main/resources/templates/layout.html | 2 +- .../src/main/resources/templates/layout.html | 2 +- .../src/main/resources/templates/layout.html | 2 +- 10 files changed, 13 insertions(+), 13 deletions(-) diff --git a/.github/workflows/continuous-integration-workflow.yml b/.github/workflows/continuous-integration-workflow.yml index 246c9c16..8c381cc2 100644 --- a/.github/workflows/continuous-integration-workflow.yml +++ b/.github/workflows/continuous-integration-workflow.yml @@ -3,7 +3,7 @@ name: CI on: push: branches: - - master + - main schedule: - cron: '0 10 * * *' # Once per day at 10am UTC workflow_dispatch: # Manual trigger diff --git a/CONTRIBUTING.adoc b/CONTRIBUTING.adoc index 56084028..5f25c999 100644 --- a/CONTRIBUTING.adoc +++ b/CONTRIBUTING.adoc @@ -6,7 +6,7 @@ something, or simply want to hack on the code this document should help you get == Code of Conduct -Please see our https://github.com/spring-projects/.github/blob/master/CODE_OF_CONDUCT.md[code of conduct]. +Please see our https://github.com/spring-projects/.github/blob/main/CODE_OF_CONDUCT.md[code of conduct]. == Reporting Security Vulnerabilities diff --git a/README.adoc b/README.adoc index f1e01146..c089747c 100644 --- a/README.adoc +++ b/README.adoc @@ -2,7 +2,7 @@ image:https://badges.gitter.im/spring-projects/spring-session.svg[link="https://gitter.im/spring-projects/spring-session?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge"] -image:https://github.com/spring-projects/spring-session/workflows/CI/badge.svg?branch=master["Build Status", link="https://github.com/spring-projects/spring-session/actions?query=workflow%3ACI"] +image:https://github.com/spring-projects/spring-session/workflows/CI/badge.svg?branch=main["Build Status", link="https://github.com/spring-projects/spring-session/actions?query=workflow%3ACI"] Spring Session provides an API and implementations for managing a user's session information, while also making it trivial to support clustered sessions without being tied to an application container specific solution. It also provides transparent integration with: @@ -29,12 +29,12 @@ We recommend you visit the https://docs.spring.io/spring-session/docs/current/re == Samples -Spring Session samples are available in the https://github.com/spring-projects/spring-session/tree/master/spring-session-samples[spring-session-samples] directory. +Spring Session samples are available in the https://github.com/spring-projects/spring-session/tree/main/spring-session-samples[spring-session-samples] directory. == Contributing -Please see our https://github.com/spring-projects/spring-session/blob/master/CONTRIBUTING.adoc[Contributing guidelines] +Please see our https://github.com/spring-projects/spring-session/blob/main/CONTRIBUTING.adoc[Contributing guidelines] for information on how to report issues, enhancements or security vulnerabilities. == Building from Source @@ -67,7 +67,7 @@ For more in depth information, visit the https://docs.spring.io/spring-session/d == Code of Conduct -Please see our https://github.com/spring-projects/.github/blob/master/CODE_OF_CONDUCT.md[code of conduct]. +Please see our https://github.com/spring-projects/.github/blob/main/CODE_OF_CONDUCT.md[code of conduct]. == License diff --git a/spring-session-docs/spring-session-docs.gradle b/spring-session-docs/spring-session-docs.gradle index 2917aef0..355ed426 100644 --- a/spring-session-docs/spring-session-docs.gradle +++ b/spring-session-docs/spring-session-docs.gradle @@ -41,7 +41,7 @@ asciidoctor { } asciidoctorj { - def ghTag = snapshotBuild ? 'master' : project.version + def ghTag = snapshotBuild ? 'main' : project.version def ghUrl = "https://github.com/spring-projects/spring-session/tree/$ghTag" attributes 'docs-itest-dir': "$rootProject.projectDir.path/spring-session-docs/src/integration-test/java/", diff --git a/spring-session-samples/spring-session-sample-boot-hazelcast/src/main/resources/templates/layout.html b/spring-session-samples/spring-session-sample-boot-hazelcast/src/main/resources/templates/layout.html index a5732ba8..50be94b5 100644 --- a/spring-session-samples/spring-session-sample-boot-hazelcast/src/main/resources/templates/layout.html +++ b/spring-session-samples/spring-session-sample-boot-hazelcast/src/main/resources/templates/layout.html @@ -115,7 +115,7 @@ diff --git a/spring-session-samples/spring-session-sample-boot-hazelcast4/src/main/resources/templates/layout.html b/spring-session-samples/spring-session-sample-boot-hazelcast4/src/main/resources/templates/layout.html index a5732ba8..50be94b5 100644 --- a/spring-session-samples/spring-session-sample-boot-hazelcast4/src/main/resources/templates/layout.html +++ b/spring-session-samples/spring-session-sample-boot-hazelcast4/src/main/resources/templates/layout.html @@ -115,7 +115,7 @@ diff --git a/spring-session-samples/spring-session-sample-boot-jdbc/src/main/resources/templates/layout.html b/spring-session-samples/spring-session-sample-boot-jdbc/src/main/resources/templates/layout.html index a5732ba8..50be94b5 100644 --- a/spring-session-samples/spring-session-sample-boot-jdbc/src/main/resources/templates/layout.html +++ b/spring-session-samples/spring-session-sample-boot-jdbc/src/main/resources/templates/layout.html @@ -115,7 +115,7 @@ diff --git a/spring-session-samples/spring-session-sample-boot-redis-simple/src/main/resources/templates/layout.html b/spring-session-samples/spring-session-sample-boot-redis-simple/src/main/resources/templates/layout.html index 74b9be55..31051267 100644 --- a/spring-session-samples/spring-session-sample-boot-redis-simple/src/main/resources/templates/layout.html +++ b/spring-session-samples/spring-session-sample-boot-redis-simple/src/main/resources/templates/layout.html @@ -121,7 +121,7 @@ diff --git a/spring-session-samples/spring-session-sample-boot-redis/src/main/resources/templates/layout.html b/spring-session-samples/spring-session-sample-boot-redis/src/main/resources/templates/layout.html index a5732ba8..50be94b5 100644 --- a/spring-session-samples/spring-session-sample-boot-redis/src/main/resources/templates/layout.html +++ b/spring-session-samples/spring-session-sample-boot-redis/src/main/resources/templates/layout.html @@ -115,7 +115,7 @@ diff --git a/spring-session-samples/spring-session-sample-boot-websocket/src/main/resources/templates/layout.html b/spring-session-samples/spring-session-sample-boot-websocket/src/main/resources/templates/layout.html index 50e29100..3874bdf2 100644 --- a/spring-session-samples/spring-session-sample-boot-websocket/src/main/resources/templates/layout.html +++ b/spring-session-samples/spring-session-sample-boot-websocket/src/main/resources/templates/layout.html @@ -117,7 +117,7 @@