Andy Wilkinson
563b8a8cec
Merge branch '2.3.x' into 2.4.x
...
See gh-25836
2021-03-30 20:52:15 +01:00
Andy Wilkinson
e94f8bba62
Ensure that upstream jars have been built
...
See gh-25835
2021-03-30 20:51:33 +01:00
Andy Wilkinson
df4b1ffb0d
Merge branch '2.4.x'
...
Closes gh-25837
2021-03-30 20:42:41 +01:00
Andy Wilkinson
38a4f135a9
Merge branch '2.3.x' into 2.4.x
...
Closes gh-25836
2021-03-30 20:42:29 +01:00
Andy Wilkinson
ca9a619259
Defer processing of zipTree source until execution time
...
Closes gh-25835
2021-03-30 20:41:46 +01:00
Andy Wilkinson
09173b81d6
Merge branch '2.4.x'
...
Closes gh-25833
2021-03-30 18:18:36 +01:00
Andy Wilkinson
7a846ad41f
Merge branch '2.3.x' into 2.4.x
...
Closes gh-25832
2021-03-30 18:18:10 +01:00
Andy Wilkinson
fef24a300b
Merge pull request #25621 from robert-smith-911
...
* gh-25621:
Polish "Document Failsafe configuration when not using starter parent"
Document Failsafe configuration when not using starter parent
Closes gh-25621
2021-03-30 18:17:59 +01:00
Andy Wilkinson
5a086321c6
Polish "Document Failsafe configuration when not using starter parent"
...
See gh-25621
2021-03-30 18:16:21 +01:00
robert-smith-911
0d79fd3e01
Document Failsafe configuration when not using starter parent
...
See gh-25621
2021-03-30 18:02:12 +01:00
Phillip Webb
8c31d29acf
Merge branch '2.4.x'
2021-03-30 09:29:59 -07:00
Phillip Webb
a28a3ae090
Merge branch '2.3.x' into 2.4.x
2021-03-30 09:25:46 -07:00
Phillip Webb
9c8a97809d
Consistent use of @deprecated since
...
Restore the patch version number for consistency with `@since`
tags.
See gh-25808
2021-03-30 09:20:30 -07:00
Brian Clozel
fe1011c23d
Add Netty memory leak detection config property
...
This commit adds a new `spring.netty.leak-detection` configuration
property that selects the level of memory leak detection for the Netty
engine.
This configuration is applied statically to Netty; this means all
(non-shaded) Netty usages as client or server will be impacted by this
change.
Developers might use this property during development or tests to find
causes of memory leaks when dealing with Netty buffers.
Closes gh-14338
2021-03-30 18:05:25 +02:00
Andy Wilkinson
66e857f2c5
Merge branch '2.4.x'
...
See gh-25826
2021-03-30 09:25:42 +01:00
Andy Wilkinson
d9ce30b15c
Merge branch '2.3.x' into 2.4.x
...
See gh-25825
2021-03-30 09:23:24 +01:00
Andy Wilkinson
8b6eef6f1d
Consistent use of @deprecated since
...
See gh-25808
2021-03-30 09:22:45 +01:00
Phillip Webb
4ad87a861d
Restore deprecated JobLauncherCommandLineRunner
...
Restore the deprecated `JobLauncherCommandLineRunner` class and extend
removal until 2.6. The class is still needed by spring-cloud-task.
Closes gh-25807
2021-03-29 15:56:38 -07:00
Phillip Webb
c9451b59f2
Merge branch '2.4.x'
2021-03-29 15:51:23 -07:00
Phillip Webb
a0f5169966
Polish
2021-03-29 15:51:13 -07:00
Phillip Webb
44b1751bb4
Merge branch '2.4.x'
...
Closes gh-25826
2021-03-29 15:48:20 -07:00
Phillip Webb
363f5829d1
Merge branch '2.3.x' into 2.4.x
...
Closes gh-25825
2021-03-29 15:46:50 -07:00
Phillip Webb
26dd1b9a26
Update deprecations with for removal targets
...
Update all deprecation tags to include a removal target.
Closes gh-25808
2021-03-29 15:44:58 -07:00
Andy Wilkinson
f3c9cc85cb
Polish
...
See gh-25818
2021-03-29 20:39:36 +01:00
Brian Clozel
61573fbf14
Record server metrics for cancelled connections
...
Prior to this commit, the Actuator instrumentation for WebFlux servers
would not record metrics in two cases:
* the client disconnects before the response has been sent
* a server timeout is triggered before the response is sent
This commit improves the existing instrumentation to record metrics in
these cases. Since the causes of timeouts/disconnections can vary a lot,
the chosen "outcome" tag for metrics is "UNKNOWN".
Closes gh-23606
2021-03-29 21:31:18 +02:00
Andy Wilkinson
9b65409e23
Generalize database initialization detection and include R2DBC
...
Closes gh-25818
2021-03-29 20:07:54 +01:00
Andy Wilkinson
22b02a6c6f
Merge branch '2.4.x'
...
Closes gh-25823
2021-03-29 14:39:17 +01:00
Andy Wilkinson
a025f3d252
Merge branch '2.3.x' into 2.4.x
...
Closes gh-25822
2021-03-29 14:38:38 +01:00
Andy Wilkinson
896f20e1d3
Improve diagnostics of ClassPathFileSystemWatcherTests
...
Closes gh-25821
2021-03-29 14:37:25 +01:00
Stephane Nicoll
9087c24713
Merge branch '2.4.x'
...
See gh-25820
2021-03-29 14:38:57 +02:00
Stephane Nicoll
8bb4020bd4
Polish
...
See gh-25819
2021-03-29 14:36:26 +02:00
Andy Wilkinson
676713be3f
Merge branch '2.4.x'
...
Closes gh-25820
2021-03-29 13:01:02 +01:00
Andy Wilkinson
403e747c46
Use constructor injection in SpringBootRepositoryRestConfigurer
...
Closes gh-25819
2021-03-29 13:00:02 +01:00
Andy Wilkinson
ee41dbdd8f
Merge branch 'r2dbc-init'
...
Closes gh-24741
2021-03-29 12:01:40 +01:00
Andy Wilkinson
e49a88cb9b
Auto-configure script-based R2DBC database initialization
...
See gh-24741
2021-03-29 12:01:19 +01:00
Andy Wilkinson
9cc7f0b54d
Generalize script-based DB initialization and add R2DBC initializer
...
See gh-24741
2021-03-29 11:51:02 +01:00
Andy Wilkinson
eb1200415d
Derive a ConnectionFactoryBuilder from an existing ConnectionFactory
...
Closes gh-25788
2021-03-29 09:17:05 +01:00
Stephane Nicoll
870d9b191a
Merge branch '2.4.x'
...
Closes gh-25813
2021-03-27 08:06:21 +01:00
Stephane Nicoll
d1aaee46bb
Merge branch '2.3.x' into 2.4.x
...
Closes gh-25812
2021-03-27 08:06:02 +01:00
Stephane Nicoll
c4b84ae996
Merge pull request #25810 from dreis2211
...
* pr/25810:
Fix flaky QuartzAutoConfigurationTests
Closes gh-25810
2021-03-27 08:03:46 +01:00
dreis2211
be4491959b
Fix flaky QuartzAutoConfigurationTests
...
See gh-25810
2021-03-27 08:00:52 +01:00
Scott Frederick
269fc68c1d
Merge branch '2.4.x'
...
Closes gh-25811
2021-03-26 16:43:13 -05:00
Scott Frederick
4015d70f00
Merge branch '2.3.x' into 2.4.x
...
Closes gh-25789
2021-03-26 15:16:01 -05:00
Andy Wilkinson
af30cab731
Merge pull request #25809 from dreis2211
...
* gh-25809:
Increase test coverage on Java 16
Closes gh-25809
2021-03-26 19:39:34 +00:00
dreis2211
a9a37f0dd5
Increase test coverage on Java 16
...
See gh-25809
2021-03-26 19:38:54 +00:00
Scott Frederick
3ad5f1013a
Fix Maven image building with classifiers
...
Fixes gh-25736
2021-03-26 11:36:38 -05:00
Stephane Nicoll
96be3c2cea
Merge branch '2.4.x'
2021-03-26 16:27:21 +01:00
Stephane Nicoll
72ff060287
Merge branch '2.3.x' into 2.4.x
2021-03-26 16:27:08 +01:00
Stephane Nicoll
12447b3b5b
Polish
2021-03-26 16:26:31 +01:00
Andy Wilkinson
340893747b
Merge branch '2.4.x'
...
Closes gh-25799
2021-03-25 15:50:45 +00:00