Skip to content

Commit 2a57b40

Browse files
committed
Merge branch '5.1.x'
2 parents ffe888c + bdac937 commit 2a57b40

File tree

10 files changed

+19
-19
lines changed

10 files changed

+19
-19
lines changed

CONTRIBUTING.md

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ If you have a question, check StackOverflow using
2929
Find an existing discussion or start a new one if necessary.
3030

3131
If you suspect an issue, perform a search in the
32-
[JIRA issue tracker](https://jira.spring.io/browse/SPR), using a few different keywords.
32+
[Github issue tracker](https://github.com/spring-projects/spring-framework/issues), using a few different keywords.
3333
When you find related issues and discussions, prior or current, it helps you to learn and
3434
it helps us to make a decision.
3535

@@ -42,7 +42,7 @@ Before you create a ticket, please take the time to [research first](#discuss).
4242

4343
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.
4444

45-
When ready create a ticket in the [JIRA issue tracker](https://jira.spring.io/browse/SPR).
45+
When ready create a ticket in the [Github issue tracker](https://github.com/spring-projects/spring-framework/issues).
4646

4747
#### Ticket Lifecycle
4848

@@ -66,7 +66,7 @@ automatically when you submit a pull request.
6666

6767
1. For all but the most trivial of contributions, please [create a ticket](#create-a-ticket).
6868
The purpose of the ticket is to understand and discuss the underlying issue or feature.
69-
We use the JIRA issue tracker as the preferred place of record for conversations and
69+
We use the GitHub issue tracker as the preferred place of record for conversations and
7070
conclusions. In that sense discussions directly under a PR are more implementation detail
7171
oriented and transient in nature.
7272

@@ -75,7 +75,7 @@ oriented and transient in nature.
7575
Backports to prior versions will be considered on a case-by-case basis and reflected as
7676
the fix version in the issue tracker.
7777

78-
1. Use short branch names, preferably based on the JIRA issue (e.g. `SPR-1234`), or
78+
1. Use short branch names, preferably based on the GitHub issue (e.g. `22276`), or
7979
otherwise using succinct, lower-case, dash (-) delimited names, such as `fix-warnings`.
8080

8181
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
8484
for an overview of streamlining commit history.
8585

8686
1. Format commit messages using 55 characters for the subject line, 72 lines for the
87-
description, followed by related issues, e.g. `Issues: SPR-1234, SPR-1235`.
87+
description, followed by the issue fixed, e.g. `Fixes #22276`.
8888
See the
8989
[Commit Guidelines section of Pro Git](http://git-scm.com/book/en/Distributed-Git-Contributing-to-a-Project#Commit-Guidelines)
9090
for best practices around commit messages and use `git log` to see some examples.
9191

92-
1. List the JIRA issue number in the PR description.
92+
1. List the GitHub issue number in the PR description.
9393

9494
If accepted, your contribution may be heavily modified as needed prior to merging.
9595
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
116116

117117
The reference documentation is in the [src/docs/asciidoc](src/docs/asciidoc) directory and, in
118118
[Asciidoctor](http://asciidoctor.org/) format. For trivial changes, you may be able to browse,
119-
edit source files, and submit directly from Github.
119+
edit source files, and submit directly from GitHub.
120120

121121
When making changes locally, use `./gradlew asciidoctor` and then browse the result under
122122
`build/asciidoc/html5/index.html`.

build.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ plugins {
1919
ext {
2020
linkHomepage = "https://projects.spring.io/spring-framework"
2121
linkCi = "https://build.spring.io/browse/SPR"
22-
linkIssue = "https://jira.spring.io/browse/SPR"
22+
linkIssue = "https://github.com/spring-projects/spring-framework/issues"
2323
linkScmUrl = "https://github.com/spring-projects/spring-framework"
2424
linkScmConnection = "scm:git:git://github.com/spring-projects/spring-framework.git"
2525
linkScmDevConnection = "scm:git:ssh://[email protected]:spring-projects/spring-framework.git"

gradle/publish-maven.gradle

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -52,8 +52,8 @@ def customizePom(pom, gradleProject) {
5252
}
5353
}
5454
issueManagement {
55-
system = "Jira"
56-
url = "https://jira.springsource.org/browse/SPR"
55+
system = "GitHub"
56+
url = "https://github.com/spring-projects/spring-framework/issues"
5757
}
5858
}
5959
}

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@
2727

2828
/**
2929
* Reproduces SPR-8756, which has been marked as "won't fix" for reasons
30-
* described in the JIRA issue. Also demonstrates the suggested workaround.
30+
* described in the issue. Also demonstrates the suggested workaround.
3131
*
3232
* @author Chris Beams
3333
*/

spring-expression/readme.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
List of outstanding things to think about - turn into JIRAs once distilled to a core set of issues
1+
List of outstanding things to think about - turn into tickets once distilled to a core set of issues
22

33
High Importance
44

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,7 @@
6666
import static org.junit.Assert.*;
6767

6868
/**
69-
* Reproduction tests cornering various SpEL JIRA issues.
69+
* Reproduction tests cornering various reported SpEL issues.
7070
*
7171
* @author Andy Clement
7272
* @author Juergen Hoeller

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1132,8 +1132,8 @@ The following `DateFormatter` is an example `Formatter` implementation:
11321132
}
11331133
----
11341134

1135-
The Spring team welcomes community-driven `Formatter` contributionsSee
1136-
https://jira.spring.io/browse/SPR[jira.spring.io] to contribute.
1135+
The Spring team welcomes community-driven `Formatter` contributions. See
1136+
https://github.com/spring-projects/spring-framework/issues[GitHub Issues] to contribute.
11371137

11381138

11391139

src/docs/asciidoc/data-access.adoc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4771,7 +4771,7 @@ You can extend Spring JDBC embedded database support in two ways:
47714771
connection pool to manage embedded database connections.
47724772

47734773
We encourage you to contribute extensions to the Spring community at
4774-
https://jira.spring.io/browse/SPR[jira.spring.io].
4774+
https://github.com/spring-projects/spring-framework/issues[GitHub Issues].
47754775

47764776

47774777

src/docs/asciidoc/overview.adoc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -125,7 +125,7 @@ clean code structure with no circular dependencies between packages.
125125
For how-to questions or diagnosing or debugging issues, we suggest using StackOverflow,
126126
and we have a https://spring.io/questions[questions page] that lists the suggested tags to use.
127127
If you're fairly certain that there is a problem in the Spring Framework or would like
128-
to suggest a feature, please use the https://jira.spring.io/browse/spr[JIRA issue tracker].
128+
to suggest a feature, please use the https://github.com/spring-projects/spring-framework/issues[GitHub Issues].
129129

130130
If you have a solution in mind or a suggested fix, you can submit a pull request on
131131
https://github.com/spring-projects/spring-framework[Github]. However, please keep in mind

src/docs/dist/readme.txt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
Spring Framework version ${version}
22
=====================================================================================
33

4-
To find out what has changed since earlier releases, see the 'Change Log' section at
5-
https://jira.spring.io/browse/SPR
4+
To find out what has changed since earlier releases, see the release notes at
5+
https://github.com/spring-projects/spring-framework/releases
66

77
Please consult the documentation located within the 'docs/spring-framework-reference'
88
directory of this release and also visit the official Spring Framework home at

0 commit comments

Comments
 (0)