12783 Commits

Author SHA1 Message Date
Andy Wilkinson
66e9619d65 Merge branch '2.4.x'
Closes gh-25870
2021-04-01 19:21:31 +01:00
Andy Wilkinson
0005263f76 Merge branch '2.3.x' into 2.4.x
Closes gh-25869
2021-04-01 19:01:28 +01:00
Andy Wilkinson
1b91c1706e Ensure that Cassandra's DriverConfigLoader is only closed once
Fixes gh-25796
2021-04-01 18:57:35 +01:00
Andy Wilkinson
029f1b52b3 Merge branch '2.4.x'
Closes gh-25867
2021-04-01 16:51:42 +01:00
Andy Wilkinson
ba28f21e27 Merge branch '2.3.x' into 2.4.x
Closes gh-25866
2021-04-01 16:51:31 +01:00
Andy Wilkinson
cbf37b3a8b Use main as the branch name in info endpoint example
Closes gh-25865
2021-04-01 16:46:37 +01:00
Andy Wilkinson
cbfeb18e6a Merge branch '2.4.x'
Closes gh-25864
2021-04-01 15:36:01 +01:00
Andy Wilkinson
d82889f42e Merge branch '2.3.x' into 2.4.x
Closes gh-25863
2021-04-01 15:00:51 +01:00
Andy Wilkinson
cf0bd0f959 Polish "Fix no such bean definition with ancestor-defined Validator"
See gh-25800
2021-04-01 15:00:10 +01:00
MatejNedic
8958101510 Fix no such bean definition with ancestor-defined Validator
See gh-25800
2021-04-01 14:59:50 +01:00
Andy Wilkinson
6a7de18101 Merge branch '2.4.x'
Closes gh-25862
2021-04-01 10:25:29 +01:00
Andy Wilkinson
d1359220ed Merge branch '2.3.x' into 2.4.x
Closes gh-25861
2021-04-01 10:07:59 +01:00
Andy Wilkinson
7d632ea397 Use ApplicationContextRunner in ValidationAutoConfigurationTests
Closes gh-25859
2021-04-01 10:01:37 +01:00
Andy Wilkinson
7aabd8bf2d Ensure that class proxying is forced before AutoProxyCreator is created
Previously, using @EnableGlobalMethodSecurity would cause the
AutoProxyCreator to be created before the AOP auto-configuration had
called AopUtils.forceAutoProxyCreatorToUseClassProxying. Forcing
auto proxy creation changes the AutoProxyCreator's bean definition
so it has no effect when attempted after the creator has been created.

This commit updates the AOP auto-configuration to use a
BeanFactoryPostProcessor to force the use of class proxying. This
ensures that the changes to the auto proxy creator's bean definition
are in place before any bean creation has been performed.

Fixes gh-25413
2021-03-31 20:29:28 +01:00
Scott Frederick
5595fb2423 Polish "Extract XML examples from Maven plugin adoc files"
See gh-25534
2021-03-31 14:05:11 -05:00
robert-smith-911
4e287594bf Extract XML examples from Maven plugin adoc files
See gh-25534
2021-03-31 14:05:10 -05:00
Andy Wilkinson
03e92d794b Merge branch '2.4.x'
Closes gh-25845
2021-03-31 17:29:33 +01:00
Andy Wilkinson
0e4b66a3ea Merge branch '2.3.x' into 2.4.x
Closes gh-25844
2021-03-31 17:29:11 +01:00
Andy Wilkinson
1a84b0610e Align PushGatewayManager's exception handling with PushMeterRegistry's
Previously, would log an error for any exception and also stop
publishing for an UnknownHostException. By constrast, Micrometer's
PushMeterRegistry treats all exceptions the same, logging a warning
and continuing with subsequent push attempts.

This commit updates the push gateway manager's behaviour to match
PushMeterRegistry. UknownHostExceptions no longer receive special
treatment and push (and delete) failures are now logged as warnings
rather than errors.

Fixes gh-25804
2021-03-31 17:01:08 +01:00
Scott Frederick
97b26b4886 Merge branch '2.4.x'
Closes gh-25840
2021-03-30 21:00:38 -05:00
Scott Frederick
586ce00e06 Merge branch '2.3.x' into 2.4.x
Closes gh-25839
2021-03-30 17:39:10 -05:00
Scott Frederick
da9d8d6055 Use test harness for image building integration tests
This commit modifies the integration tests for the Maven and Gradle
image building goal and task to use a custom builder as a test harness
to verify that the plugins invoke the builder as expected.

Fixes gh-25838
2021-03-30 16:48:28 -05:00
Andy Wilkinson
6f9b1ed6a3 Merge branch '2.4.x'
See gh-25837
2021-03-30 20:52:38 +01:00
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
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