diff --git a/CODE_OF_CONDUCT.adoc b/CODE_OF_CONDUCT.adoc index f013d6f3..17783c7c 100644 --- a/CODE_OF_CONDUCT.adoc +++ b/CODE_OF_CONDUCT.adoc @@ -40,5 +40,5 @@ appropriate to the circumstances. Maintainers are obligated to maintain confiden with regard to the reporter of an incident. This Code of Conduct is adapted from the -http://contributor-covenant.org[Contributor Covenant], version 1.3.0, available at -http://contributor-covenant.org/version/1/3/0/[contributor-covenant.org/version/1/3/0/] +https://contributor-covenant.org[Contributor Covenant], version 1.3.0, available at +https://contributor-covenant.org/version/1/3/0/[contributor-covenant.org/version/1/3/0/] diff --git a/CONTRIBUTING.adoc b/CONTRIBUTING.adoc index e10c4881..d6b658c4 100644 --- a/CONTRIBUTING.adoc +++ b/CONTRIBUTING.adoc @@ -35,7 +35,7 @@ Signing the CLA does not grant anyone commit rights to the main repository, but 1. Go to https://github.com/spring-projects/spring-kafka[https://github.com/spring-projects/spring-kafka] 2. Hit the "fork" button and choose your own GitHub account as the target -3. For more detail see http://help.github.com/fork-a-repo/[Fork A Repo]. +3. For more detail see https://help.github.com/fork-a-repo/[Fork A Repo]. == Setup your Local Development Environment @@ -56,7 +56,7 @@ _you should see branches on origin as well as upstream, including 'master' and ' - For example, to create and switch to a new branch for issue GH-123: `git checkout -b GH-123` * You might be working on several different topic branches at any given time, but when at a stopping point for one of those branches, commit (a local operation). * Please follow the "Commit Guidelines" described in -http://git-scm.com/book/en/Distributed-Git-Contributing-to-a-Project[this chapter of Pro Git]. +https://git-scm.com/book/en/Distributed-Git-Contributing-to-a-Project[this chapter of Pro Git]. * Then to begin working on another issue (say GH-101): `git checkout GH-101`. The _-b_ flag is not needed if that branch already exists in your local repository. * When ready to resolve an issue or to collaborate with others, you can push your branch to origin (your fork), @@ -74,7 +74,7 @@ add a comment about something that should be modified, or he might reject the pu **This is the responsibility of any contributor.** If your pull request cannot be applied cleanly, the project lead will most likely add a comment requesting that you make it merge-able. -For a full explanation, see http://git-scm.com/book/en/Git-Branching-Rebasing[the Pro Git section on rebasing]. +For a full explanation, see https://git-scm.com/book/en/Git-Branching-Rebasing[the Pro Git section on rebasing]. As stated there: _"> Often, you’ll do this to make sure your commits apply cleanly on a remote branch — perhaps in a project to which you’re trying to contribute but that you don’t maintain."_ @@ -91,11 +91,11 @@ and merging that into the branch you are in currently) - Then: `git pull upstream master` - Switch back to the topic branch: `git checkout GH-123` (no -b needed since the branch already exists) - Rebase the topic branch to minimize the distance between it and your recently synched master branch: `git rebase master` -(Again, for more detail see http://git-scm.com/book/en/Git-Branching-Rebasing[the Pro Git section on rebasing]). +(Again, for more detail see https://git-scm.com/book/en/Git-Branching-Rebasing[the Pro Git section on rebasing]). * **Note** You cannot rebase if you have already pushed your branch to your remote because you'd be rewriting history (see **'The Perils of Rebasing'** in the article). If you rebase by mistake, you can undo it as discussed -http://stackoverflow.com/questions/134882/undoing-a-git-rebase[in this StackOverflow discussion]. +https://stackoverflow.com/questions/134882/undoing-a-git-rebase[in this StackOverflow discussion]. Once you have published your branch, you need to merge in the master rather than rebasing. * Now, if you issue a pull request, it is much more likely to be merged without conflicts. Most likely, any pull request that would produce conflicts will be deferred until the issuer of that pull request makes diff --git a/README.md b/README.md index f7218d38..5b387574 100644 --- a/README.md +++ b/README.md @@ -53,16 +53,16 @@ To generate IDEA metadata (.iml and .ipr files), do the following: # Resources For more information, please visit the Spring Kafka website at: -[Reference Manual](http://docs.spring.io/spring-kafka/docs/1.0.0.BUILD-SNAPSHOT/reference/html/) +[Reference Manual](https://docs.spring.io/spring-kafka/docs/1.0.0.BUILD-SNAPSHOT/reference/html/) # Contributing to Spring Kafka Here are some ways for you to get involved in the community: -* Get involved with the Spring community on the Spring Community Forums. Please help out on the [StackOverflow](http://stackoverflow.com/questions/tagged/spring-kafka) by responding to questions and joining the debate. +* Get involved with the Spring community on the Spring Community Forums. Please help out on the [StackOverflow](https://stackoverflow.com/questions/tagged/spring-kafka) by responding to questions and joining the debate. * Create [GitHub issues](https://github.com/spring-projects/spring-kafka/issues) for bugs and new features and comment and vote on the ones that you are interested in. -* Github is for social coding: if you want to write code, we encourage contributions through pull requests from [forks of this repository](http://help.github.com/forking/). If you want to contribute code this way, please reference a JIRA ticket as well covering the specific issue you are addressing. -* Watch for upcoming articles on Spring by [subscribing](http://www.springsource.org/node/feed) to springframework.org +* Github is for social coding: if you want to write code, we encourage contributions through pull requests from [forks of this repository](https://help.github.com/forking/). If you want to contribute code this way, please reference a JIRA ticket as well covering the specific issue you are addressing. +* Watch for upcoming articles on Spring by [subscribing](https://www.springsource.org/node/feed) to springframework.org Before we accept a non-trivial patch or pull request we will need you to sign the [contributor's agreement](https://support.springsource.com/spring_committer_signup). Signing the contributor's agreement does not grant anyone commit rights to the main repository, but it does mean that we can accept your contributions, and you will get an author credit if we do. diff --git a/src/api/overview.html b/src/api/overview.html index 219c6838..4095328c 100644 --- a/src/api/overview.html +++ b/src/api/overview.html @@ -5,7 +5,7 @@ This document is the API specification for Spring for Apache Kafka project

For further API reference and developer documentation, see the - Spring + Spring Kafka reference documentation. That documentation contains more detailed, developer-targeted descriptions, with conceptual overviews, definitions of terms, @@ -14,8 +14,8 @@ This document is the API specification for Spring for Apache Kafka project

If you are interested in commercial training, consultancy, and - support for Spring Kafka, please visit - http://www.springsource.com + support for Spring Kafka, please visit + https://www.springsource.com

diff --git a/src/dist/notice.txt b/src/dist/notice.txt index 222e00be..26059f27 100644 --- a/src/dist/notice.txt +++ b/src/dist/notice.txt @@ -4,13 +4,13 @@ ======================================================================== This product includes software developed by - the Apache Software Foundation (http://www.apache.org). + the Apache Software Foundation (https://www.apache.org). The end-user documentation included with a redistribution, if any, must include the following acknowledgement: "This product includes software developed by the Spring Framework - Project (http://www.springframework.org)." + Project (https://www.springframework.org)." Alternatively, this acknowledgement may appear in the software itself, if and wherever such third-party acknowledgements normally appear. diff --git a/src/reference/asciidoc/kafka.adoc b/src/reference/asciidoc/kafka.adoc index ec9f4e2c..24c5db4e 100644 --- a/src/reference/asciidoc/kafka.adoc +++ b/src/reference/asciidoc/kafka.adoc @@ -339,9 +339,9 @@ public void listen(@Payload String foo, In certain scenarios, such as rebalancing, a message may be redelivered that has already been processed. The framework cannot know whether such a message has been processed or not, that is an application-level function. -This is known as the http://www.enterpriseintegrationpatterns.com/patterns/messaging/IdempotentReceiver.html[Idempotent +This is known as the https://www.enterpriseintegrationpatterns.com/patterns/messaging/IdempotentReceiver.html[Idempotent Receiver] pattern and Spring Integration provides an -http://docs.spring.io/spring-integration/reference/html/messaging-endpoints-chapter.html#idempotent-receiver[implementation thereof]. +https://docs.spring.io/spring-integration/reference/html/messaging-endpoints-chapter.html#idempotent-receiver[implementation thereof]. The Spring for Apache Kafka project also provides some assistance by means of the `FilteringMessageListenerAdapter` class, which can wrap your `MessageListener`. diff --git a/src/reference/asciidoc/si-kafka.adoc b/src/reference/asciidoc/si-kafka.adoc index 6c2162f8..95f3ab49 100644 --- a/src/reference/asciidoc/si-kafka.adoc +++ b/src/reference/asciidoc/si-kafka.adoc @@ -5,7 +5,7 @@ This documentation pertains to versions 2.0.0 and above; for documentation for earlier releases, see the https://github.com/spring-projects/spring-integration-kafka/blob/1.3.x/README.md[1.3.x README]. -Spring Integration Kafka is now based on the http://projects.spring.io/spring-kafka/[Spring for Apache Kafka project]. +Spring Integration Kafka is now based on the https://projects.spring.io/spring-kafka/[Spring for Apache Kafka project]. It provides the following components: - Outbound Channel Adapter diff --git a/src/reference/asciidoc/stylesheets/golo.css b/src/reference/asciidoc/stylesheets/golo.css index d50ec1b8..1781d6b5 100644 --- a/src/reference/asciidoc/stylesheets/golo.css +++ b/src/reference/asciidoc/stylesheets/golo.css @@ -1,8 +1,8 @@ -@import url(http://fonts.googleapis.com/css?family=Varela+Round|Open+Sans:400italic,700italic,400,700); +@import url(https://fonts.googleapis.com/css?family=Varela+Round|Open+Sans:400italic,700italic,400,700); /*! normalize.css v2.1.2 | MIT License | git.io/normalize */ /* ========================================================================== HTML5 display definitions ========================================================================== */ /** Correct `block` display not defined in IE 8/9. */ -@import url(http://cdnjs.cloudflare.com/ajax/libs/font-awesome/3.2.1/css/font-awesome.css); +@import url(https://cdnjs.cloudflare.com/ajax/libs/font-awesome/3.2.1/css/font-awesome.css); article, aside, details, figcaption, figure, footer, header, hgroup, main, nav, section, summary { display: block; } /** Correct `inline-block` display not defined in IE 8/9. */