Commit Graph

31232 Commits

Author SHA1 Message Date
Stephane Nicoll
46baf462ac Start building against Spring Data 2021.0.0-M5 snapshots
See gh-25548
2021-03-11 14:36:57 +01:00
Andy Wilkinson
c19e5c9212 Merge branch '2.4.x'
Closes gh-25604
2021-03-11 11:13:13 +00:00
Andy Wilkinson
c43ae0b2d3 Merge branch '2.3.x' into 2.4.x
Closes gh-25603
2021-03-11 11:12:54 +00:00
Andy Wilkinson
df97627b21 Merge pull request #25480 from maruoovv
* gh-25480:
  Correct javadoc for ON_PARAM

Closes gh-25480
2021-03-11 11:12:42 +00:00
maruoovv
b401be1589 Correct javadoc for ON_PARAM
See gh-25480
2021-03-11 11:12:04 +00:00
Andy Wilkinson
bad6400455 Merge pull request #25571 from Jurrie
* gh-25571:
  Support Maven's reproducible build feature for war repackaging

Closes gh-25571
2021-03-11 11:09:16 +00:00
Jurrie Overgoor
3c0e236562 Support Maven's reproducible build feature for war repackaging
See gh-25571
2021-03-11 11:08:10 +00:00
Andy Wilkinson
9180220cf4 Merge branch '2.4.x'
Closes gh-25594
2021-03-11 09:50:30 +00:00
Andy Wilkinson
718e08cfb4 Merge branch '2.3.x' into 2.4.x
Closes gh-25592
2021-03-11 09:50:08 +00:00
Andy Wilkinson
3f241b6b73 Upgrade CI images to ubuntu:focal-20210217
Closes gh-25593
2021-03-11 09:49:12 +00:00
Andy Wilkinson
a98a204b35 Merge branch '2.4.x'
Closes gh-25595
2021-03-11 09:47:13 +00:00
Andy Wilkinson
ddf072e24b Upgrade Java 16 CI image to 2021-03-09-12-41
Closes gh-25591
2021-03-11 09:46:35 +00:00
Andy Wilkinson
eba7951503 Merge branch '2.4.x'
Closes gh-25601
2021-03-11 09:40:51 +00:00
Andy Wilkinson
979890189a Merge branch '2.3.x' into 2.4.x
Closes gh-25600
2021-03-11 09:40:00 +00:00
Andy Wilkinson
911cb21a3e Merge pull request #25597 from bal360
* gh-25597:
  Fix typos in README

Closes gh-25597
2021-03-11 09:39:28 +00:00
Blake A. Long
6da00dfed8 Fix typos in README
See gh-25597
2021-03-11 09:38:54 +00:00
Andy Wilkinson
e2860fee03 Merge branch '2.4.x'
Closes gh-25599
2021-03-11 09:36:00 +00:00
Andy Wilkinson
f3b8c2d477 Merge pull request #25596 from izeye
* gh-25596:
  Add Javadoc since tag to Bootstrapper.initialize()

Closes gh-25596
2021-03-11 09:35:25 +00:00
Johnny Lim
90666faf6d Add Javadoc since tag to Bootstrapper.initialize()
See gh-25596
2021-03-11 09:34:57 +00:00
Andy Wilkinson
d283e5957c Merge branch '2.4.x'
Closes gh-25588
2021-03-10 17:31:17 +00:00
Andy Wilkinson
f5118a0e70 Merge branch '2.3.x' into 2.4.x
Closes gh-25587
2021-03-10 17:30:33 +00:00
Andy Wilkinson
94e17d23ef Create issue for each forward merge found in commit message
Closes gh-25586
2021-03-10 17:30:15 +00:00
Andy Wilkinson
29ba18afec Merge branch '2.4.x'
Closes gh-25584
Fixes gh-25367 in 2.5.x
2021-03-10 17:13:07 +00:00
Andy Wilkinson
952ac7b8d2 Don't use RestartClassLoader when proxying classes it did not load
Fixes gh-19010
Fixes gh-25367
2021-03-10 17:12:38 +00:00
Andy Wilkinson
4b0600b558 Merge branch '2.4.x'
Closes gh-25576
2021-03-10 14:36:57 +00:00
Andy Wilkinson
3cc36d518d Merge branch '2.3.x' into 2.4.x
Closes gh-25575
2021-03-10 14:36:34 +00:00
Stephane Nicoll
2c8e78b082 Merge branch '2.4.x'
Closes gh-25574
2021-03-10 15:15:42 +01:00
Stephane Nicoll
6840440220 Merge branch '2.3.x' into 2.4.x
Closes gh-25573
2021-03-10 15:15:21 +01:00
Andy Wilkinson
4d3d56abfe Try to stabilize SampleSessionWebFluxApplicationTests
userDefinedMappingsSecureByDefault in
SampleSessionWebFluxApplicationTests may fail with an NPE if the
session times out before the initial response is sent due to the absence
of a SESSION cookie in the response. The test uses a short session
timeout (2 seconds) and we've seen the problem occur on CI when,
presumably, a noisy neighbour has caused some CPU starvation.

This commit increases the timeout to 5 seconds to reduce the chance of
a short period of CPU starvation causing the test to fail.

Closes gh-25572
2021-03-10 14:06:40 +00:00
Stephane Nicoll
f38e863fbc Properly subscribe to CloseableConnectionFactory#close
Closes gh-25565
2021-03-10 15:03:27 +01:00
Stephane Nicoll
858c3ec2a7 Merge branch '2.4.x'
Closes gh-25570
2021-03-10 13:25:14 +01:00
Stephane Nicoll
d5b1fd5b31 Merge branch '2.3.x' into 2.4.x
Closes gh-25569
2021-03-10 13:24:32 +01:00
Stephane Nicoll
c8101f8c9b Remove host name in R2DBC's embedded H2 url
Closes gh-25560
2021-03-10 13:24:08 +01:00
Andy Wilkinson
5863edfdda Simplify code that makes hal the default json media type
See gh-25546
2021-03-10 12:14:54 +00:00
Stephane Nicoll
5c34db96bd Start building against Spring HATEOAS 1.3.0-RC1 snapshots
See gh-25546
2021-03-10 08:45:34 +01:00
Stephane Nicoll
728b81acbb Start building against Spring Framework 5.3.5 snapshots
See gh-25542
2021-03-10 08:45:01 +01:00
Stephane Nicoll
86959032de Start building against Reactor 2020.0.5 snapshots
See gh-25540
2021-03-10 08:44:27 +01:00
Stephane Nicoll
2116c345d6 Merge branch '2.4.x' 2021-03-10 08:43:59 +01:00
Stephane Nicoll
cad9fa2fc0 Start building against Spring Data 2020.0.6 snapshots
See gh-25547
2021-03-10 08:07:44 +01:00
Stephane Nicoll
924bb53c69 Start building against Spring HATEOAS 1.2.5 snapshots
See gh-25545
2021-03-10 08:07:17 +01:00
Stephane Nicoll
d2733b26b6 Start building against Spring Framework 5.3.5 snapshots
See gh-25541
2021-03-10 08:06:44 +01:00
Stephane Nicoll
0985845c3b Start building against Reactor 2020.0.5 snapshots
See gh-25539
2021-03-10 08:06:06 +01:00
Phillip Webb
05cf7fbb04 Use new backend features for extracted samples
Update extracted samples to make use of code folding and chomping.

See gh-6313
2021-03-09 11:55:23 -08:00
Andy Wilkinson
1f3acd45ae Merge pull request #25562 from dreis2211
* gh-25562:
  Deprecate FlywayMigrationScriptMissingFailureAnalyzer

Closes gh-25562
2021-03-09 18:02:51 +00:00
dreis2211
cf8a3b3018 Deprecate FlywayMigrationScriptMissingFailureAnalyzer
See gh-25562
2021-03-09 18:02:32 +00:00
Phillip Webb
3b095972cc Migrate to spring-asciidoctor-backends
Migrate to the renamed spring-asciidoctor-backends project.

See gh-25553
2021-03-09 09:55:52 -08:00
Andy Wilkinson
4d97ed19e8 Deprecate support for checking Flyway locations
Closes gh-25488
2021-03-09 15:50:17 +00:00
Andy Wilkinson
ed72bca6c8 Provide more pluggable way to indicate DataSource init dependencies
Closes gh-17619
Closes gh-25559
2021-03-09 13:55:48 +00:00
Andy Wilkinson
99b7d29c2c Merge branch '2.4.x' 2021-03-09 11:12:07 +00:00
Andy Wilkinson
9be36f3a72 Merge branch '2.3.x' into 2.4.x 2021-03-09 11:11:46 +00:00