Commit Graph
852 Commits
Author SHA1 Message Date
Andy Wilkinson bb247bb42f Merge branch '3.5.x' into 4.0.x
Closes gh-50746
2026-06-10 15:53:08 +01:00
Andy Wilkinson 339ce3db43 Merge branch '3.5.x' into 4.0.x
Closes gh-50744
2026-06-10 15:46:51 +01:00
Andy Wilkinson 15406bed75 Reapply "Upgrade to Netty 4.2.15.Final"
This reverts commit 490614fe7e.

Closes gh-50692
2026-06-04 09:00:27 +01:00
Lee JiWon 9446bd7420 Fall back to default SSL provider for unmapped SNI
The RSocket WebSocket transport's HttpServerSslCustomizer kept its own
copy of the SNI provider lookup that returned null for server names
without a mapped SSL bundle. This commit adapts the copy to fall back
to the default provider, as it is done in gh-50301.

See gh-50640

Signed-off-by: Lee JiWon <dlwldnjs1009@gmail.com>
2026-05-31 16:31:58 +02:00
Stéphane Nicoll 4aac37cdf1 Merge branch '3.5.x' into 4.0.x
Closes gh-50634
2026-05-30 16:26:48 +02:00
Dmytro Nosan 7c23813752 Restore Spring Security integration with HtmlUnitDriver
Prior to this commit, securityDelegateMockMvcHtmlUnitDriverCustomizer
did not have an @Bean annotation and therefore
was not registered as a bean in SecurityMockMvcAutoConfiguration.

See gh-50602

Signed-off-by: Dmytro Nosan <dimanosan@gmail.com>
2026-05-30 15:45:22 +02:00
Stéphane Nicoll f6f1d57c6a Merge pull request #50375 from Kimgyuilli
* fix-stale-configuration-metadata-source-types:
  Fix stale type references in configuration metadata

Closes gh-50375
2026-05-30 14:45:14 +02:00
Kimgyuilli ed6c375d19 Fix stale type references in configuration metadata
See gh-50375

Signed-off-by: Kimgyuilli <rlarbdlf222@naver.com>
2026-05-30 14:42:13 +02:00
Stéphane Nicoll 23829221ef Remove sourceType from deprecated properties with error level
See gh-50375
2026-05-30 14:29:04 +02:00
Stéphane Nicoll 98084aab2b Reformat additional-spring-configuration-metadata.json files 2026-05-30 14:28:53 +02:00
Stéphane Nicoll 1a092b779f Handle Gson explicitly in CodecsAutoConfigurationTests
The change in gh-50447 added gson on the runtime classpath, which broke
a test that looks for "any" JSON support, but only filtered Jackson and
Jackson 2.

This commit adds an explicit optional dependency to gson and adapt the
test accordingly.

See gh-50447
2026-05-30 12:59:18 +02:00
Stéphane Nicoll 170c52f206 Merge branch '3.5.x' into 4.0.x
Closes gh-50611
2026-05-29 11:32:24 +02:00
Stéphane Nicoll e51e8215d7 Merge branch '3.5.x' into 4.0.x
Closes gh-50609
2026-05-29 11:13:43 +02:00
Moritz Halbritter 6a8a3ff4f0 Merge branch '3.5.x' into 4.0.x
Closes gh-50507
2026-05-27 10:22:41 +02:00
Stéphane Nicoll 8e337c5ddc Merge branch '3.5.x' into 4.0.x
Closes gh-50496
2026-05-25 17:09:13 +02:00
Andy Wilkinson add52b6ccd Merge branch '3.5.x' into 4.0.x
Closes gh-50439
2026-05-14 15:02:24 +01:00
Phillip Webb 4283e59ab4 Merge branch '3.5.x' into 4.0.x
Closes gh-50416
2026-05-12 18:10:38 -07:00
Phillip Webb fb67890c44 Merge branch '3.5.x' into 4.0.x
Closes gh-50411
2026-05-12 12:31:16 -07:00
Lee JiWon e3058d849b Fix self-referential parentId in MappingsEndpoint
The mappings endpoint reported the context's own id as `parentId`
instead of the parent context's id, preventing clients from
reconstructing the context hierarchy from the response. Align with
sibling endpoints (`BeansEndpoint`,
`ConfigurationPropertiesReportEndpoint`, `ConditionsReportEndpoint`)
which already use `parent.getId()`.

See gh-50373

Signed-off-by: Lee JiWon <dlwldnjs1009@gmail.com>
2026-05-12 12:26:19 -07:00
Brian Clozel 77faab26fc Merge branch '3.5.x' into 4.0.x
Closes gh-50393
2026-05-11 11:53:54 +02:00
Stéphane Nicoll 2c18012577 Merge branch '3.5.x' into 4.0.x
Closes gh-50286
2026-05-04 08:22:07 +02:00
Andy Wilkinson 5628644848 Merge branch '3.5.x' into 4.0.x
Closes gh-50274
2026-05-01 11:41:12 +01:00
Manu Sridharan 55a6b4525c Align @Nullable in returned Map with actual implementation
See gh-50265

Signed-off-by: Manu Sridharan <msridhar@gmail.com>

Closes gh-50265
2026-04-30 14:35:43 -07:00
Andy Wilkinson fc67e24820 Merge branch '3.5.x' into 4.0.x
Closes gh-50260
2026-04-30 13:44:06 +01:00
Andy Wilkinson a0a344f4b4 Merge branch '3.5.x' into 4.0.x
Fixes gh-50257
2026-04-30 12:35:30 +01:00
Stéphane Nicoll 4c7cedb738 Merge branch '3.5.x' into 4.0.x
Closes gh-50229
2026-04-27 11:04:35 +02:00
Stéphane Nicoll f71464b3c6 Merge branch '3.5.x' into 4.0.x
Closes gh-50227
2026-04-27 10:57:41 +02:00
Stéphane Nicoll dfabb012e8 Merge branch '3.5.x' into 4.0.x
Closes gh-50215
2026-04-25 10:37:05 +02:00
Andy Wilkinson b02f7ddea3 Fix Partitioned session cooke attribute configuration with Tomcat
Fixes gh-50201
2026-04-24 15:06:38 +01:00
Andy Wilkinson 874f6294b9 Fix default security with actuator but without health
Closes gh-50188
2026-04-23 08:57:18 +01:00
Andy Wilkinson e41b3bf731 Enable hostname verification for SSL connections to Elasticsearch
Closes gh-50187
2026-04-23 08:56:21 +01:00
Andy Wilkinson 3a9d836621 Merge branch '3.5.x' into 4.0.x
Closes gh-50180
2026-04-23 08:50:07 +01:00
Andy Wilkinson fd70564879 Merge branch '3.5.x' into 4.0.x
Closes gh-50176
2026-04-23 08:45:56 +01:00
Andy Wilkinson f8bb8162d1 Merge branch '3.5.x' into 4.0.x
Closes gh-50174
2026-04-23 08:43:58 +01:00
Andy Wilkinson ad25c28b6d Merge branch '3.5.x' into 4.0.x
Closes gh-50162
2026-04-22 20:51:26 +01:00
Stéphane Nicoll 1aaef07448 Apply API versioning path segment strategy last
This commit adapts the auto-configuration for API versioning to apply
the path segment last as this strategy is not meant to yield. It also
clarifies that configuration properties should not be used if ordering
of the strategies is important.

Closes gh-49800
2026-04-20 08:14:01 +02:00
Andy Wilkinson a96de880e0 Merge branch '3.5.x' into 4.0.x
Closes gh-50085
2026-04-16 09:07:18 +01:00
Andy Wilkinson fc426a74ad Merge branch '3.5.x' into 4.0.x
Closes gh-50077
2026-04-15 14:43:43 +01:00
Stéphane Nicoll 967b468665 Add missing modules to classic starters
Closes gh-50071
2026-04-15 08:30:11 +02:00
Venkata Naga Sai Srikanth Gollapudi 9ea60cdad3 Add spring-boot-resttestclient to spring-boot-test-classic-modules
See gh-50069

Signed-off-by: Venkata Naga Sai Srikanth Gollapudi <42247688+GollapudiSrikanth@users.noreply.github.com>
2026-04-15 08:05:36 +02:00
Stéphane Nicoll 53cbe69150 Merge branch '3.5.x' into 4.0.x
Closes gh-50039
2026-04-13 08:55:43 +02:00
Stéphane Nicoll fdc81ab029 Merge branch '3.5.x' into 4.0.x
Closes gh-50019
2026-04-10 15:31:18 +02:00
Andy Wilkinson cd88bf71f5 Merge branch '3.5.x' into 4.0.x
Closes gh-50017
2026-04-10 12:28:27 +01:00
Andy Wilkinson 64969bfea8 Ensure that mock infra is defined before Security auto-config
We need to ensure that MockMvcAutoConfiguration has defined its
DispatcherServletPath bean before the condition that checks for it in
ServletWebSecurityAutoConfiguration is evaluated.

Ideally, ServletWebSecurityAutoConfiguration in spring-boot-security
would not know about test-specific code but there's no easy way to
establish the required ordering without this link. One alternative
option is an auto-configuration class in spring-boot-security-test
that's purely for ordering purposes. This was rejected as it would
introduce new public API (as we enforce that all auto-configurations
are public).

Fixes gh-49854
2026-04-09 08:42:36 +01:00
Andy Wilkinson edcc937add Align FAIL_ON_UNKNOWN_PROPERTIES with Spring Boot 3.x
In Spring Boot 3.x, Jackson2ObjectMapperBuilder disabled
FAIL_ON_UNKNOWN_PROPERTIES. This commit aligns the behavior of
use-jackson2-defaults with this.

This commit also ensures that DEFAULT_VIEW_INCLUSION is disabled. It
was enabled by default in Jackson 2 and then disabled by
Jackson2ObjectMapperBuilder. At the time of writing, Jackson 3's
configureForJackson2() method does not enable DEFAULT_VIEW_INCLUSION.
Should that ever be corrected/changed in Jackson 3, this additional
change in this commit ensures that the Boot will continue to have the
desired default.

Fixes gh-49951
2026-04-08 08:38:32 +01:00
Stéphane Nicoll 308c4317e0 Merge branch '3.5.x' into 4.0.x 2026-04-08 07:31:30 +02:00
Stéphane Nicoll d7a475fcd9 Merge branch '3.5.x' into 4.0.x
Closes gh-49946
2026-04-07 17:33:38 +02:00
Brian Clozel 5c506b148f Merge branch '3.5.x' into 4.0.x
Closes gh-49943
2026-04-07 17:05:52 +02:00
Stéphane Nicoll d93a3f21e9 Polish 2026-04-07 14:50:30 +02:00
Brian Clozel 3aad18a774 Merge branch '3.5.x' into 4.0.x 2026-04-03 10:56:16 +02:00