Commit Graph
796 Commits
Author SHA1 Message Date
Stéphane Nicoll 51ffdc6cd3 Merge branch '3.5.x' into 4.0.x
Closes gh-49782
2026-03-25 14:26:27 +01:00
Andy Wilkinson 96eea1812d Fix WebSocketMessagingAutoConfiguration without a JsonMapper bean
Previously, if Jackson was on the classpath but no JsonMapper bean
was present, the app would fail to start. This commit updates
the auto-configuration so that the parts that require a JsonMapper
bean back of when no such bean is present.

The sample problem also exists with Jackson 2 and an ObjectMapper
bean. This commit also corrects that.

Fixes gh-49749
2026-03-25 11:55:39 +00:00
Andy Wilkinson 9851e67079 Merge branch '3.5.x' into 4.0.x
Closes gh-49753
2026-03-25 11:24:09 +00:00
Stéphane Nicoll 6b53de850d Merge branch '3.5.x' into 4.0.x
Closes gh-49747
2026-03-25 07:34:12 +01:00
Yanming Zhou 664467563b Remove empty package "org.springframework.boot.actuate.data"
See gh-49741

Signed-off-by: Yanming Zhou <zhouyanming@gmail.com>
2026-03-24 19:02:20 -07:00
Phillip Webb e8ec285fd5 Merge branch '3.5.x' into 4.0.x
Closes gh-49736
2026-03-24 17:39:33 -07:00
Stéphane Nicoll a96bfd6a0b Merge branch '3.5.x' into 4.0.x
Closes gh-49727
2026-03-24 10:29:30 +01:00
Andy Wilkinson f988fe93e0 Merge branch '3.5.x' into 4.0.x 2026-03-23 14:50:29 +00:00
Brian Clozel 86274962f4 Merge branch '3.5.x' into 4.0.x
Closes gh-49706
2026-03-23 11:18:25 +01:00
Daeho Kwon 0b45618cb5 Add @ConditionalOnWebApplication to NettyReactiveWebServerAutoConfiguration
See gh-49695

Signed-off-by: Daeho Kwon <trewq231@naver.com>
2026-03-21 14:26:23 -07:00
Stéphane Nicoll 25b6de94d5 Fix formatting 2026-03-20 10:29:31 +01:00
Stéphane Nicoll d8ea797aab Merge branch '3.5.x' into 4.0.x
Closes gh-49672
2026-03-20 10:08:40 +01:00
Brian Clozel 26edf79084 Merge branch '3.5.x' into 4.0.x 2026-03-19 09:40:05 +01:00
Brian Clozel a6d8c48e13 Merge branch '3.5.x' into 4.0.x
Closes gh-49649
2026-03-18 17:38:12 +01:00
Brian Clozel 1ead08b9d8 Merge branch '3.5.x' into 4.0.x
Closes gh-49646
2026-03-18 16:45:57 +01:00
Andy Wilkinson 797253a447 Merge branch '3.5.x' into 4.0.x
Closes gh-49617
2026-03-16 18:00:39 +00:00
Andy Wilkinson 76290f7871 Remove unused org.springframework.boot.docker-test plugin
Closes gh-49598
2026-03-13 16:38:01 +00:00
Brian Clozel ed8cba80b6 Merge branch '3.5.x' into 4.0.x
Closes gh-49593
2026-03-13 16:48:49 +01:00
Andy Wilkinson f0aff3aa3c Polish "Add failure analysis for missing auto-configured MailSender"
See gh-49582

Signed-off-by: Andy Wilkinson <andy.wilkinson@broadcom.com>
2026-03-13 12:24:25 +00:00
MJY ffb36cb5ed Add failure analysis for missing auto-configured MailSender
Signed-off-by: MJY <jmoon0227@gmail.com>

See gh-49582
2026-03-13 12:02:08 +00:00
Moritz Halbritter 2b6559ccd6 Deprecate ZipkinWithOpenTelemetryTracingAutoConfiguration
See gh-49453
2026-03-11 10:30:34 +01:00
Andy Wilkinson 3977d878d9 Merge branch '3.5.x' into 4.0.x
Closes gh-49522
2026-03-09 11:23:20 +00:00
Brian Clozel e487a6b499 Improve EndpointRequest matcher documentation
Prior to this commit, `EndpointRequest` exposed factory methods for
creating security matchers in the context of Actuator endpoints. This is
using the popular pattern matching approach for security matchers.
Such matchers are not as focused as method-level security and will match
the endpoint path itself (`"actuator/endpoint"`) as well as everything
beneath it (`"actuator/endpoint/**"`).

This commit improves the Javadoc and reference documentation to make
this behavior more explicit.

Closes gh-49520
2026-03-09 11:25:39 +01:00
Andy Wilkinson f80e7fe67e Merge branch '3.5.x' into 4.0.x
See gh-49385
2026-03-06 18:08:55 +00:00
Stéphane Nicoll 09ed319596 Merge branch '3.5.x' into 4.0.x 2026-03-05 09:23:11 +01:00
Stéphane Nicoll d15805f8f6 Merge branch '3.5.x' into 4.0.x
Closes gh-49387
2026-03-03 14:12:13 +01:00
Stéphane Nicoll 63c7099e84 Merge branch '3.5.x' into 4.0.x
Closes gh-49385
2026-03-03 13:38:43 +01:00
Andy Wilkinson 42466e4776 Allow Customizer<HttpSecurity> beans to refine auth server config
Fixes gh-49367
2026-03-03 09:01:17 +00:00
Andy Wilkinson 23903925c5 Merge branch '3.5.x' into 4.0.x
Closes gh-49344
2026-02-27 12:13:03 +00:00
Andy Wilkinson 7f7532a0b9 Remove duplicate spring-web dependency
Closes gh-49338
2026-02-27 09:34:34 +00:00
Andy Wilkinson 6c8cd183bd Merge branch '3.5.x' into 4.0.x
Closes gh-49327
2026-02-26 09:38:10 +00:00
Andy Wilkinson 20ff2b7ff1 Register reflection hints for HTTP service client property binding
Fixes gh-49274
2026-02-25 15:12:55 +00:00
Andy Wilkinson 75ccf2cdba Merge branch '3.5.x' into 4.0.x
Closes gh-49314
2026-02-24 16:26:50 +00:00
Andy Wilkinson e808d7a7de Align server.tomcat.max-part-count default with Tomcat's default
Fixes gh-49311
2026-02-24 15:32:50 +00:00
Brian Clozel dd51ece7ac Merge branch '3.5.x' into 4.0.x
Closes gh-49302
2026-02-23 18:34:48 +01:00
Phillip Webb 1d054e8a12 Ensure HttpMessageConverters are configured before RestClients
Update `RestClientAutoConfiguration` to ensure that it applies after
`HttpMessageConvertersAutoConfiguration`.

Prior to this commit, the `HttpMessageConvertersRestClientCustomizer`
bean might not get created due to the `@ConditionalOnBean` guard not
finding any `ClientHttpMessageConvertersCustomizer` beans.

Since the issue is surprising hard to replicate in a unit test, a new
smoke test has been added to ensure the problem doesn't return.

Fixes gh-49223
2026-02-17 22:26:02 -08:00
Phillip Webb 362b3e3f20 Polish 2026-02-17 20:55:20 -08:00
Moritz Halbritter cdf8d2e9c8 Back off on Propagator in Brave and Otel auto-configurations
This also fixes the bug that both auto-configurations couldn't be used
together.

Closes gh-49183
2026-02-13 13:48:38 +01:00
Andy Wilkinson 9c6d1d2944 Make additional health paths back off without health module
Fixes gh-49196
2026-02-12 10:31:00 +00:00
Phillip Webb e276b28311 Polish 2026-02-06 19:04:57 -08:00
Andy Wilkinson dfd4b85289 Upgrade to Tomcat 11.0.18
Tomcat 9.0.115, 10.1.52, and 11.0.18 include a breaking change [1] to
how ciphers are configured when using HTTPS. Previously, a single
setting was used but this has now been split in two; the existing
ciphers setting for TLSv1.2 ciphers and a new ciperSuites setting for
TLSv1.3. As part of this split, the behavior of the ciphers setting
has been changed such that any TLSv1.3 ciphers are ignored and a
warning is logged.

This change in Tomcat is problematic without also making some changes
in Boot. If we had done nothing, a user that had configured only
TLSv1.3 cipers would have them all ignored, leaving their SSL
connection unexpectedly using all of the default ciphers which may be
less secure.

This commit adapts to the breaking change in Tomcat by taking the
user's list of ciphers and splitting into into TLSv1.2 and TLSv1.3
ciphers before passing them into Tomcat's two settings (ciphers and
cipherSuites respectively). This is done defensively for backwards
compatibility. If the methods to identify and configure the TLSv1.3
ciphers are not present, we assume that we're running with an earlier
version of Tomcat and fall back to passing them all into the ciphers
setting as we did previously.

Closes gh-49108

[1] https://github.com/apache/tomcat/commit/9abf6bddb2e84ecf1668780bb3150b799f832ccf
2026-02-05 15:14:09 +00:00
Andy Wilkinson 4bbb0f731c Upgrade to Jetty 12.1.6
Closes gh-49102
2026-02-05 15:14:08 +00:00
Andy Wilkinson 0401000ae2 Merge branch '3.5.x' into 4.0.x
Closes gh-49034
2026-02-02 10:45:15 +00:00
Stéphane Nicoll 3bbf3c79ef Merge branch '3.5.x' into 4.0.x
Closes gh-49026
2026-01-30 19:14:51 +01:00
Brian Clozel 53c1f424ce Fix Jackson3 class reference in condition
Prior to this commit, the `XmlMapper` auto-configuration for Jackson2
would refer to Jackson3's `XmlMapper` instead of Jackson2. This would
not only make the condition invalid, but it could also lead to
`NoClassDefFoundError` at runtime if the application mixed Jackson 2 and
3 on the classpath.

Fixes gh-49015
2026-01-29 09:45:00 +01:00
Andy Wilkinson 5826200520 Delay removal of Jackson 2 support until 4.3.0 at the earliest
Closes gh-49010
2026-01-28 13:52:00 +00:00
Andy Wilkinson cbfbe59581 Upgrade to Nullability Plugin 0.0.11
In addition to the upgrade, this commit also fixes some contract
violations in non-public APIs that are now detected as the new
version of the plugin enables contract checking by default.

Closes gh-49000
2026-01-28 10:46:42 +00:00
Moritz Halbritter b38338fe32 Merge branch '3.5.x' into 4.0.x
Closes gh-48989
2026-01-27 13:41:04 +01:00
Andy Wilkinson 78fbd12510 Merge branch '3.5.x' into 4.0.x
Closes gh-48987
2026-01-27 11:08:52 +00:00
Yanming Zhou 5733ee723e Remove unnecessary @ConfigurationPropertiesSource
Remove @ConfigurationPropertiesSource from classes that reside in
the same module as all referencing @ConfigurationProperties classes.

Signed-off-by: Yanming Zhou <zhouyanming@gmail.com>

See gh-48934
2026-01-23 10:33:35 +00:00