You signed in with another tab or window. Reload to refresh your session.You signed out in another tab or window. Reload to refresh your session.You switched accounts on another tab or window. Reload to refresh your session.Dismiss alert
* Do not fix urls for the `http://apache.org/xml/features` when we
configure XML components
* Do not fix urls for localhost and fake links in tests
* Fix all the dead links in docs
Copy file name to clipboardExpand all lines: CONTRIBUTING.adoc
+4-4
Original file line number
Diff line number
Diff line change
@@ -33,7 +33,7 @@ Signing the CLA does not grant anyone commit rights to the main repository, but
33
33
34
34
1. Go to https://github.com/spring-projects/spring-integration[https://github.com/spring-projects/spring-integration]
35
35
2. Hit the "fork" button and choose your own github account as the target
36
-
3. For more detail see http://help.github.com/fork-a-repo/[Fork A Repo].
36
+
3. For more detail see https://help.github.com/fork-a-repo/[Fork A Repo].
37
37
38
38
== Setup your Local Development Environment
39
39
@@ -53,7 +53,7 @@ _you should see branches on origin as well as upstream, including 'master'_
53
53
* _Always_ work on topic branches (Typically use the GitHub issue ID as the branch name).
54
54
- For example, to create and switch to a new branch for issue 123: `git checkout -b GH-123`
55
55
* 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).
56
-
* Please follow the "Commit Guidelines" described in http://git-scm.com/book/en/Distributed-Git-Contributing-to-a-Project[this chapter of Pro Git].
56
+
* Please follow the "Commit Guidelines" described in https://git-scm.com/book/en/Distributed-Git-Contributing-to-a-Project[this chapter of Pro Git].
57
57
* Then to begin working on another issue (say 101): `git checkout GH-101`.
58
58
The _-b_ flag is not needed if that branch already exists in your local repository.
59
59
* When ready to resolve an issue or to collaborate with others, you can push your branch to origin (your fork), e.g.: `git push origin GH-123`
@@ -65,7 +65,7 @@ Alternatively, they can use `git fetch --all` to sync their local state with all
65
65
* A prerequisite for any pull request is that it will be cleanly merge-able with the upstream master's current state.
66
66
**This is the responsibility of any contributor.**
67
67
If your pull request cannot be applied cleanly, the project lead will most likely add a comment requesting that you make it merge-able.
68
-
For a full explanation, see http://git-scm.com/book/en/Git-Branching-Rebasing[the Pro Git section on rebasing].
68
+
For a full explanation, see https://git-scm.com/book/en/Git-Branching-Rebasing[the Pro Git section on rebasing].
69
69
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."_
70
70
71
71
== Keeping your Local Code in Sync
@@ -80,7 +80,7 @@ As stated there: _"> Often, you’ll do this to make sure your commits apply cle
80
80
- Then: `git pull upstream master`
81
81
- Switch back to the topic branch: `git checkout GH-123` (no -b needed since the branch already exists)
82
82
- Rebase the topic branch to minimize the distance between it and your recently synced master branch: `git rebase master`
83
-
(Again, for more detail see http://git-scm.com/book/en/Git-Branching-Rebasing[the Pro Git section on rebasing]).
83
+
(Again, for more detail see https://git-scm.com/book/en/Git-Branching-Rebasing[the Pro Git section on rebasing]).
84
84
* **Note** While it is generally recommended to __not__ re-write history by using `push --force`, and we do not do this on `master` (and release) branches in the main repo, we require topic branches for pull requests to be rebased before merging, in order to maintain a clean timeline and avoid "merge" commits.
85
85
* If, while rebasing for the merge, we find significant conflicts, we may ask you to rebase and `push --force` to your topic branch after resolving the conflicts.
86
86
* Assuming your pull request is merged into the 'upstream' master, you will end up pulling that change into your own master eventually and, at that time, you may decide to delete the topic branch from your local repository and your fork (origin) if you pushed it there.
Copy file name to clipboardExpand all lines: README.md
+2-2
Original file line number
Diff line number
Diff line change
@@ -1,4 +1,4 @@
1
-
Spring Integration [<imgsrc="https://build.spring.io/plugins/servlet/buildStatusImage/INT-MASTER">](https://build.spring.io/browse/INT-MASTER)[](https://gitter.im/spring-projects/spring-integration?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge)
1
+
Spring Integration [<imgsrc="https://build.spring.io/plugins/servlet/wittified/build-status/INT-MASTER">](https://build.spring.io/browse/INT-MASTER)[](https://gitter.im/spring-projects/spring-integration?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge)
2
2
==================
3
3
4
4
# Checking out and Building
@@ -53,4 +53,4 @@ To generate IDEA metadata (.iml and .ipr files), do the following:
53
53
# Resources
54
54
55
55
For more information, please visit the Spring Integration website at:
Copy file name to clipboardExpand all lines: spring-integration-amqp/src/main/resources/org/springframework/integration/amqp/config/spring-integration-amqp-5.2.xsd
Copy file name to clipboardExpand all lines: spring-integration-core/src/main/java/org/springframework/integration/handler/advice/IdempotentReceiverInterceptor.java
+3-2
Original file line number
Diff line number
Diff line change
@@ -1,5 +1,5 @@
1
1
/*
2
-
* Copyright 2014-2018 the original author or authors.
2
+
* Copyright 2014-2019 the original author or authors.
3
3
*
4
4
* Licensed under the Apache License, Version 2.0 (the "License");
5
5
* you may not use this file except in compliance with the License.
@@ -28,7 +28,7 @@
28
28
29
29
/**
30
30
* The {@link org.aopalliance.intercept.MethodInterceptor} implementation for the
Copy file name to clipboardExpand all lines: spring-integration-core/src/main/java/org/springframework/integration/scattergather/ScatterGatherHandler.java
+1-1
Original file line number
Diff line number
Diff line change
@@ -44,7 +44,7 @@
44
44
45
45
/**
46
46
* The {@link MessageHandler} implementation for the
Copy file name to clipboardExpand all lines: spring-integration-core/src/test/java/org/springframework/integration/config/xml/chain-elements-config.properties
Copy file name to clipboardExpand all lines: spring-integration-core/src/test/java/org/springframework/integration/config/xml/idempotent-receiver-configs.properties
0 commit comments