Commit Graph

33280 Commits

Author SHA1 Message Date
Stephane Nicoll 4d019c02ac Upgrade Ubuntu version in CI images
Closes gh-27850
2021-09-06 08:01:38 +02:00
Stephane Nicoll aaff78fb6c Merge branch '2.4.x' into 2.5.x 2021-09-06 08:00:46 +02:00
Stephane Nicoll 4ca39534bc Upgrade Ubuntu version in CI images
Closes gh-27848
2021-09-06 08:00:29 +02:00
Stephane Nicoll 7cc8668540 Merge branch '2.4.x' into 2.5.x
Closes gh-27876
2021-09-05 17:29:01 +02:00
Stephane Nicoll 58e9992db9 Merge pull request #27812 from quaff
* pr/27812:
  Fix inconsistent devtools doc

Closes gh-27812
2021-09-05 17:28:19 +02:00
Yanming Zhou 6bf92f06e9 Fix inconsistent devtools doc
See gh-27812
2021-09-05 17:28:02 +02:00
Stephane Nicoll 3dab5ff2c0 Merge branch '2.4.x' into 2.5.x
Closes gh-27873
2021-09-05 17:02:17 +02:00
Stephane Nicoll 319f75e90c Merge pull request #27856 from hpoettker
* pr/27856:
  Fix typo in javadoc

Closes gh-27856
2021-09-05 17:02:09 +02:00
Henning Pöttker 831e28b001 Fix typo in javadoc
See gh-27856
2021-09-05 17:01:31 +02:00
Phillip Webb 1215bbc10b Merge branch '2.4.x' into 2.5.x
Closes gh-27859
2021-09-02 11:16:42 -07:00
Phillip Webb 61764389c2 Merge branch '2.3.x' into 2.4.x
Closes gh-27858
2021-09-02 11:15:32 -07:00
Phillip Webb 44eb8c39d2 Align ApplicationTemp with Files.createTempDirectory
Update `ApplicationTemp` to align the way that it creates temp folders
with the way that `Files.createTempDirectory` works.

Closes gh-27857
2021-09-02 11:13:26 -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 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 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 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
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 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 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
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 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 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 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 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 29ccbddaf4 Merge branch '2.4.x' into 2.5.x
Closes gh-27770
2021-08-19 12:58:16 +02:00
Stephane Nicoll f2b7092073 Use token for GitHub authentication consistently
Closes gh-24458
2021-08-19 12:56:51 +02:00
Spring Buildmaster e28115e7a2 Next development version (v2.4.11-SNAPSHOT) 2021-08-19 10:06:15 +00:00
Andy Wilkinson 2c18f26b4c Merge branch '2.4.x' into 2.5.x
Closes gh-27765
2021-08-19 10:31:19 +01:00
Andy Wilkinson ea95c99b77 Update email address used for release commit
Closes gh-27764
2021-08-19 10:30:41 +01:00
Andy Wilkinson 6d8ba3e8b1 Merge branch '2.4.x' into 2.5.x
Closes gh-27757
2021-08-18 17:56:32 +01:00
Andy Wilkinson ea9f8516ce Merge pull request #27736 from izeye
* gh-27736:
  Polish "Polish access modifiers for test classes"
  Polish access modifiers for test classes

Closes gh-27736
2021-08-18 17:52:59 +01:00
Andy Wilkinson ffbd28b60a Polish "Polish access modifiers for test classes"
See gh-27736
2021-08-18 17:52:42 +01:00
izeye 8a425dedfd Polish access modifiers for test classes
See gh-27736
2021-08-18 17:38:40 +01:00
Stephane Nicoll e1cacc7cf5 Merge branch '2.4.x' into 2.5.x 2021-08-18 16:12:30 +02:00
Stephane Nicoll 0d44503980 Upgrade to Spring Session 2021.0.2
Closes gh-27605
2021-08-18 16:11:05 +02:00
Stephane Nicoll 2baee89971 Upgrade to Spring Session 2020.0.6
Closes gh-27599
2021-08-18 16:10:15 +02:00