Merge branch '5.1.x'

CONTRIBUTING.md

@@ -29,7 +29,7 @@ If you have a question, check StackOverflow using
 Find an existing discussion or start a new one if necessary.
 
 If you suspect an issue, perform a search in the
-[JIRA issue tracker](https://jira.spring.io/browse/SPR), using a few different keywords.
+[Github issue tracker](https://github.com/spring-projects/spring-framework/issues), using a few different keywords.
 When you find related issues and discussions, prior or current, it helps you to learn and
 it helps us to make a decision.
 
@@ -42,7 +42,7 @@ Before you create a ticket, please take the time to [research first](#discuss).
 
 If creating a ticket after a discussion on StackOverflow, please provide a self-sufficient description in the ticket, independent of the details on StackOverview. We understand this is extra work but the issue tracker is an important place of record for design discussions and decisions that can often be referenced long after the fix version, for example to revisit decisions, to understand the origin of a feature, and so on.
 
-When ready create a ticket in the [JIRA issue tracker](https://jira.spring.io/browse/SPR).
+When ready create a ticket in the [Github issue tracker](https://github.com/spring-projects/spring-framework/issues).
 
 #### Ticket Lifecycle
 
@@ -66,7 +66,7 @@ automatically when you submit a pull request.
 
 1. For all but the most trivial of contributions, please [create a ticket](#create-a-ticket).
 The purpose of the ticket is to understand and discuss the underlying issue or feature.
-We use the JIRA issue tracker as the preferred place of record for conversations and
+We use the GitHub issue tracker as the preferred place of record for conversations and
 conclusions. In that sense discussions directly under a PR are more implementation detail
 oriented and transient in nature.
 
@@ -75,7 +75,7 @@ oriented and transient in nature.
 Backports to prior versions will be considered on a case-by-case basis and reflected as
 the fix version in the issue tracker.
 
-1. Use short branch names, preferably based on the JIRA issue (e.g. `SPR-1234`), or
+1. Use short branch names, preferably based on the GitHub issue (e.g. `22276`), or
 otherwise using succinct, lower-case, dash (-) delimited names, such as `fix-warnings`.
 
 1. Choose the granularity of your commits consciously and squash commits that represent
@@ -84,12 +84,12 @@ multiple edits or corrections of the same logical change. See
 for an overview of streamlining commit history.
 
 1. Format commit messages using 55 characters for the subject line, 72 lines for the
-description, followed by related issues, e.g. `Issues: SPR-1234, SPR-1235`.
+description, followed by the issue fixed, e.g. `Fixes #22276`.
 See the
 [Commit Guidelines section of Pro Git](http://git-scm.com/book/en/Distributed-Git-Contributing-to-a-Project#Commit-Guidelines)
 for best practices around commit messages and use `git log` to see some examples.
 
-1. List the JIRA issue number in the PR description.
+1. List the GitHub issue number in the PR description.
 
 If accepted, your contribution may be heavily modified as needed prior to merging.
 You will likely retain author attribution for your Git commits granted that the bulk of
@@ -116,7 +116,7 @@ defines the source file coding standards we use along with some IDEA editor sett
 
 The reference documentation is in the [src/docs/asciidoc](src/docs/asciidoc) directory and, in
 [Asciidoctor](http://asciidoctor.org/) format. For trivial changes, you may be able to browse,
-edit source files, and submit directly from Github.
+edit source files, and submit directly from GitHub.
 
 When making changes locally, use `./gradlew asciidoctor` and then browse the result under
 `build/asciidoc/html5/index.html`.

build.gradle

@@ -19,7 +19,7 @@ plugins {
 ext {
 	linkHomepage = "https://projects.spring.io/spring-framework"
 	linkCi = "https://build.spring.io/browse/SPR"
-	linkIssue = "https://jira.spring.io/browse/SPR"
+	linkIssue = "https://github.com/spring-projects/spring-framework/issues"
 	linkScmUrl = "https://github.com/spring-projects/spring-framework"
 	linkScmConnection = "scm:git:git://github.com/spring-projects/spring-framework.git"
 	linkScmDevConnection = "scm:git:ssh://git@github.com:spring-projects/spring-framework.git"

gradle/publish-maven.gradle

@@ -52,8 +52,8 @@ def customizePom(pom, gradleProject) {
 				}
 			}
 			issueManagement {
-				system = "Jira"
-				url = "https://jira.springsource.org/browse/SPR"
+				system = "GitHub"
+				url = "https://github.com/spring-projects/spring-framework/issues"
 			}
 		}
 	}

spring-context/src/test/java/org/springframework/context/annotation/configuration/PackagePrivateBeanMethodInheritanceTests.java

@@ -27,7 +27,7 @@ import static org.junit.Assert.*;
 
 /**
  * Reproduces SPR-8756, which has been marked as "won't fix" for reasons
- * described in the JIRA issue. Also demonstrates the suggested workaround.
+ * described in the issue. Also demonstrates the suggested workaround.
  *
  * @author Chris Beams
  */

spring-expression/readme.txt

@@ -1,4 +1,4 @@
-List of outstanding things to think about - turn into JIRAs once distilled to a core set of issues
+List of outstanding things to think about - turn into tickets once distilled to a core set of issues
 
 High Importance
 

spring-expression/src/test/java/org/springframework/expression/spel/SpelReproTests.java

@@ -66,7 +66,7 @@ import static org.hamcrest.Matchers.*;
 import static org.junit.Assert.*;
 
 /**
- * Reproduction tests cornering various SpEL JIRA issues.
+ * Reproduction tests cornering various reported SpEL issues.
  *
  * @author Andy Clement
  * @author Juergen Hoeller

src/docs/asciidoc/core/core-validation.adoc

@@ -1132,8 +1132,8 @@ The following `DateFormatter` is an example `Formatter` implementation:
 	}
 ----
 
-The Spring team welcomes community-driven `Formatter` contributionsSee
-https://jira.spring.io/browse/SPR[jira.spring.io] to contribute.
+The Spring team welcomes community-driven `Formatter` contributions. See
+https://github.com/spring-projects/spring-framework/issues[GitHub Issues] to contribute.
 
 
 

src/docs/asciidoc/data-access.adoc

@@ -4771,7 +4771,7 @@ You can extend Spring JDBC embedded database support in two ways:
   connection pool to manage embedded database connections.
 
 We encourage you to contribute extensions to the Spring community at
-https://jira.spring.io/browse/SPR[jira.spring.io].
+https://github.com/spring-projects/spring-framework/issues[GitHub Issues].
 
 
 

src/docs/asciidoc/overview.adoc

@@ -125,7 +125,7 @@ clean code structure with  no circular dependencies between packages.
 For how-to questions or diagnosing or debugging issues, we suggest using StackOverflow,
 and we have a https://spring.io/questions[questions page] that lists the suggested tags to use.
 If you're fairly certain that there is a problem in the Spring Framework or would like
-to suggest a feature, please use the https://jira.spring.io/browse/spr[JIRA issue tracker].
+to suggest a feature, please use the https://github.com/spring-projects/spring-framework/issues[GitHub Issues].
 
 If you have a solution in mind or a suggested fix, you can submit a pull request on
 https://github.com/spring-projects/spring-framework[Github]. However, please keep in mind

src/docs/dist/readme.txt

@@ -1,8 +1,8 @@
 Spring Framework version ${version}
 =====================================================================================
 
-To find out what has changed since earlier releases, see the 'Change Log' section at
-https://jira.spring.io/browse/SPR
+To find out what has changed since earlier releases, see the release notes at
+https://github.com/spring-projects/spring-framework/releases
 
 Please consult the documentation located within the 'docs/spring-framework-reference'
 directory of this release and also visit the official Spring Framework home at