diff --git a/README.adoc b/README.adoc index ab26f83..2c7b57c 100644 --- a/README.adoc +++ b/README.adoc @@ -2,4 +2,4 @@ This repository contains the code for the Spring Cloud Stream Binder implementation for AWS Kinesis. -See https://github.com/spring-cloud/spring-cloud-stream-binder-aws-kinesis/blob/master/spring-cloud-stream-binder-kinesis-docs/src/main/asciidoc/overview.adoc[AWS Kinesis Binder Reference Manual] for more information. +See https://github.com/spring-cloud/spring-cloud-stream-binder-aws-kinesis/blob/main/spring-cloud-stream-binder-kinesis-docs/src/main/asciidoc/overview.adoc[AWS Kinesis Binder Reference Manual] for more information. diff --git a/spring-cloud-stream-binder-kinesis-docs/pom.xml b/spring-cloud-stream-binder-kinesis-docs/pom.xml index 61c6025..5b807e8 100644 --- a/spring-cloud-stream-binder-kinesis-docs/pom.xml +++ b/spring-cloud-stream-binder-kinesis-docs/pom.xml @@ -298,7 +298,7 @@ - + diff --git a/spring-cloud-stream-binder-kinesis-docs/src/main/asciidoc/building.adoc b/spring-cloud-stream-binder-kinesis-docs/src/main/asciidoc/building.adoc index 128c746..e8b37bb 100644 --- a/spring-cloud-stream-binder-kinesis-docs/src/main/asciidoc/building.adoc +++ b/spring-cloud-stream-binder-kinesis-docs/src/main/asciidoc/building.adoc @@ -46,7 +46,7 @@ Open your Eclipse preferences, expand the Maven preferences, and select User Set In the User Settings field click Browse and navigate to the Spring Cloud project you imported selecting the `.settings.xml` file in that project. Click Apply and then OK to save the preference changes. -NOTE: Alternatively you can copy the repository settings from https://github.com/spring-cloud/spring-cloud-build/blob/master/.settings.xml[`.settings.xml`] into your own `~/.m2/settings.xml`. +NOTE: Alternatively you can copy the repository settings from https://github.com/spring-cloud/spring-cloud-build/blob/main/.settings.xml[`.settings.xml`] into your own `~/.m2/settings.xml`. ==== Importing into eclipse without m2eclipse If you prefer not to use m2eclipse you can generate eclipse project metadata using the following command: diff --git a/spring-cloud-stream-binder-kinesis-docs/src/main/asciidoc/contributing.adoc b/spring-cloud-stream-binder-kinesis-docs/src/main/asciidoc/contributing.adoc index bcdf6c0..66c6cf0 100644 --- a/spring-cloud-stream-binder-kinesis-docs/src/main/asciidoc/contributing.adoc +++ b/spring-cloud-stream-binder-kinesis-docs/src/main/asciidoc/contributing.adoc @@ -1,11 +1,8 @@ [[contributing]] == Contributing -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 -to contribute even something trivial please do not hesitate, but -follow the guidelines below. +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 main. +If you want to contribute even something trivial please do not hesitate, but follow the guidelines below. === Sign the Contributor License Agreement Before we accept a non-trivial patch or pull request we will need you to sign the @@ -22,8 +19,8 @@ added after the original pull request but before a merge. * Use the Spring Framework code format conventions. If you use Eclipse you can import formatter settings using the `eclipse-code-formatter.xml` file from the - https://github.com/spring-cloud/build/tree/master/eclipse-coding-conventions.xml[Spring - Cloud Build] project. If using IntelliJ, you can use the + https://github.com/spring-cloud/build/tree/main/eclipse-coding-conventions.xml[Spring Cloud Build] project. + If using IntelliJ, you can use the https://plugins.jetbrains.com/plugin/6546[Eclipse Code Formatter Plugin] to import the same file. * Make sure all new `.java` files to have a simple Javadoc class comment with at least an @@ -35,7 +32,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-stream-binder-kinesis-docs/src/main/asciidoc/index.adoc b/spring-cloud-stream-binder-kinesis-docs/src/main/asciidoc/index.adoc index df38986..c5eb762 100644 --- a/spring-cloud-stream-binder-kinesis-docs/src/main/asciidoc/index.adoc +++ b/spring-cloud-stream-binder-kinesis-docs/src/main/asciidoc/index.adoc @@ -9,7 +9,7 @@ Artem Bilan :icons: font :hide-uri-scheme: :spring-cloud-stream-binder-kinesis-repo: snapshot -:github-tag: master +:github-tag: main :spring-cloud-stream-binder-kinesis-docs-version: current :spring-cloud-stream-binder-kinesis-docs: https://docs.spring.io/spring-cloud-stream-binder-kinesis/docs/{spring-cloud-stream-binder-kinesis-docs-version}/reference :spring-cloud-stream-binder-kinesis-docs-current: https://docs.spring.io/spring-cloud-stream-binder-kinesis/docs/current-SNAPSHOT/reference/html/ @@ -17,7 +17,7 @@ Artem Bilan :github-raw: https://raw.github.com/{github-repo}/{github-tag} :github-code: https://github.com/{github-repo}/tree/{github-tag} :github-wiki: https://github.com/{github-repo}/wiki -:github-master-code: https://github.com/{github-repo}/tree/master +:github-main-code: https://github.com/{github-repo}/tree/main :sc-ext: java // ======================================================================================