Commit Graph

33790 Commits

Author SHA1 Message Date
Phillip Webb
8db82f02fc Merge branch '2.5.x'
Closes gh-27831
2021-08-27 22:49:39 -07:00
Phillip Webb
15d0078eca Merge branch '2.4.x' into 2.5.x
Closes gh-27830
2021-08-27 22:40:56 -07:00
Phillip Webb
b1b3bdc9b1 Polish 2021-08-27 22:35:18 -07:00
Phillip Webb
87dbda2339 Ensure TypeConverterConverter is thread safe
Update `TypeConverterConverter` do that a new `SimpleTypeConverter` is
obtained for each `convert` operation. Prior to this commit the same
`SimpleTypeConverter` could be accessed concurrently from multiple
threads which is not allowed.

Fixes gh-27829
2021-08-27 22:08:40 -07:00
Stephane Nicoll
2095991ff0 Merge branch '2.5.x'
Closes gh-27818
2021-08-25 18:21:48 +02:00
Stephane Nicoll
90da6778a1 Merge branch '2.4.x' into 2.5.x
Closes gh-27817
2021-08-25 18:21:38 +02:00
Stephane Nicoll
69be1c872e Rename Spring Buildmaster account to Spring Builds
Closes gh-27816
2021-08-25 18:20:13 +02:00
Stephane Nicoll
dff7af3ea8 Merge branch '2.5.x' 2021-08-25 08:47:29 +02:00
Stephane Nicoll
4420afe217 Merge branch '2.4.x' into 2.5.x 2021-08-25 08:47:20 +02:00
Stephane Nicoll
8b5d7b0bc0 Polish 2021-08-25 08:47:09 +02:00
Stephane Nicoll
fd36941ad3 Merge pull request #27808 from weixsun
* pr/27808:
  Polish SessionAutoConfiguration#addCandidateIfAvailable

Closes gh-27808
2021-08-24 07:29:14 +02:00
weixsun
149ed09230 Polish SessionAutoConfiguration#addCandidateIfAvailable
See gh-27808
2021-08-24 07:24:23 +02:00
Andy Wilkinson
a7de44a718 Merge pull request #27737 from Buzzardo
* gh-27737:
  Polish "Only link to other formats from each format of the ref docs"
  Only link to other formats from each format of the ref docs

Closes gh-27737
2021-08-23 17:36:40 +01:00
Andy Wilkinson
e299175eef Polish "Only link to other formats from each format of the ref docs"
See gh-27737
2021-08-23 17:36:11 +01:00
Jay Bryant
edab97a3e4 Only link to other formats from each format of the ref docs
See gh-27737
2021-08-23 17:35:40 +01:00
Jay Bryant
47bbae8356 Polish the multi-page documentation's index
See gh-27805
2021-08-23 15:55:47 +01:00
Andy Wilkinson
07d9a614e0 Merge branch '2.5.x'
Closes gh-27804
2021-08-23 15:45:51 +01:00
Andy Wilkinson
b508d77a4e Merge branch '2.4.x' into 2.5.x
Closes gh-27803
2021-08-23 15:45:33 +01:00
Andy Wilkinson
a8652a89b2 Merge pull request #27755 from brneto
* gh-27755:
  Polish "Document how to parameterize REST Docs' output dir with WebTestClient"
  Document how to parameterize REST Docs' output dir with WebTestClient

Closes gh-27755
2021-08-23 15:37:11 +01:00
Andy Wilkinson
990b766847 Polish "Document how to parameterize REST Docs' output dir with WebTestClient"
See gh-27755
2021-08-23 15:36:16 +01:00
Berchris Requiao
c83f6ebaa2 Document how to parameterize REST Docs' output dir with WebTestClient
See gh-27755
2021-08-23 15:30:21 +01:00
Andy Wilkinson
c5272a4122 Merge branch '2.5.x'
Closes gh-27800
2021-08-23 14:28:53 +01:00
Andy Wilkinson
ca655b639f Merge pull request #27698 from thegeekyasian
* gh-27698:
  Polish "Avoid NPE when routing DataSource has target with null key"
  Avoid NPE when routing DataSource has target with null key

Closes gh-27698
2021-08-23 14:28:39 +01:00
Andy Wilkinson
24c88ab80b Polish "Avoid NPE when routing DataSource has target with null key"
See gh-27698
2021-08-23 13:53:34 +01:00
Safeer A
efdc19647c Avoid NPE when routing DataSource has target with null key
See gh-27698
2021-08-23 13:40:33 +01:00
Andy Wilkinson
909838c93a Merge pull request #27781 from izeye
* gh-27781:
  Fix typo in action for bean currently in creation failure analysis

Closes gh-27781
2021-08-23 13:38:00 +01:00
izeye
e147cae84c Fix typo in action for bean currently in creation failure analysis
See gh-27781
2021-08-23 13:36:59 +01:00
Andy Wilkinson
575d83737a Merge branch '2.5.x'
Closes gh-27799
2021-08-23 13:27:22 +01:00
Andy Wilkinson
e409489859 Merge branch '2.4.x' into 2.5.x
Closes gh-27798
2021-08-23 13:26:37 +01:00
Andy Wilkinson
f8ef90813f Allow @MockBean to be used with Framework's @Repeat
Fixes gh-27693
2021-08-23 12:38:15 +01:00
Scott Frederick
f386ebe61d Remove tests that rely on an unpredictable order of repackaged libs
See gh-27436
2021-08-20 14:09:23 -05:00
Scott Frederick
40a9c4d90f Sort repackaged libraries in a reproducible Maven build
When a Maven build is configured to ensure reproducibility, any
libraries added to `BOOT-INF/lib` in a jar archive or to `WEB-INF/lib`
in a war archive by the Spring Boot plugin repackaging should be
sorted by name to ensure a stable and predictable order.

Fixes gh-27436
2021-08-20 13:00:39 -05:00
Andy Wilkinson
813fc9ea92 Merge branch '2.5.x'
Closes gh-27792
2021-08-20 15:23:31 +01:00
Andy Wilkinson
56438cf274 Merge branch '2.4.x' into 2.5.x
Closes gh-27791
2021-08-20 15:23:16 +01:00
Andy Wilkinson
02a988e055 Make secrets available to publish_gradle_plugin
Fixes gh-27774
2021-08-20 15:20:35 +01:00
Andy Wilkinson
4009d1023e Merge branch '2.5.x'
Closes gh-27790
2021-08-20 15:18:35 +01:00
Andy Wilkinson
e0e6e45523 Merge branch '2.4.x' into 2.5.x
Closes gh-27789
2021-08-20 15:18:20 +01:00
Andy Wilkinson
29c187fda9 Upgrade to Gradle 6.9.1
Closes gh-27788
2021-08-20 15:17:59 +01:00
Andy Wilkinson
69d4e273d3 Merge branch '2.5.x'
Closes gh-27787
2021-08-20 13:56:09 +01:00
Andy Wilkinson
3566e5881b Merge branch '2.4.x' into 2.5.x
Closes gh-27786
2021-08-20 13:54:02 +01:00
Andy Wilkinson
9f402f0428 Use snapshot rather than libs-snapshot when generating effective bom
Closes gh-27785
2021-08-20 13:53:34 +01:00
Stephane Nicoll
2f9dea2f1f Merge branch '2.5.x'
Closes gh-27777
2021-08-19 15:05:23 +02:00
Stephane Nicoll
2d8d0b06e5 Merge branch '2.4.x' into 2.5.x
Closes gh-27776
2021-08-19 15:04:42 +02:00
Stephane Nicoll
0a79cf76a3 Update email address used for submitting the Homebrew update
Closes gh-27775
2021-08-19 15:03:12 +02:00
Spring Buildmaster
15d98a6ccf Next development version (v2.5.5-SNAPSHOT) 2021-08-19 12:17:26 +00:00
Andy Wilkinson
aa216dd3d1 Merge branch '2.5.x'
Closes gh-27773
2021-08-19 12:12:26 +01:00
Andy Wilkinson
a5bd4e963f Merge branch '2.4.x' into 2.5.x
Closes gh-27772
2021-08-19 12:12:02 +01:00
Andy Wilkinson
6be27e2212 Download artifacts for the publish_gradle_plugin task
Closes gh-27759
2021-08-19 12:11:15 +01:00
Stephane Nicoll
bd054d7940 Merge branch '2.5.x'
Closes gh-27771
2021-08-19 12:58:43 +02:00
Stephane Nicoll
29ccbddaf4 Merge branch '2.4.x' into 2.5.x
Closes gh-27770
2021-08-19 12:58:16 +02:00