spring/spring-boot
1
0
Fork 0
mirror of https://github.com/spring-projects/spring-boot.git synced 2026-09-25 19:09:03 +00:00
Code Issues Projects Releases Wiki Activity
61,398 Commits 28 Branches 395 Tags
ebdfa4189bce58715f06e16c31ea73db683f77e0
Commit Graph
1131 Commits
Author SHA1 Message Date
Stéphane Nicoll 451c873a8a Merge branch '4.0.x' 
Closes gh-50645
 2026-05-31 16:34:25 +02: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 894c2bf2cb Merge branch '4.0.x' 
Closes gh-50635
 2026-05-30 16:27:04 +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
Stéphane Nicoll 7fe52b8ea0 Merge branch '4.0.x' 
Closes gh-50633
 2026-05-30 15:48:35 +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 85e1ef83d0 Merge branch '4.0.x' 
Closes gh-50632
 2026-05-30 14:48:00 +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 5bf2a32b11 Merge branch '4.0.x' 2026-05-30 14:39:57 +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 f3cbe60e08 Merge branch '4.0.x' 2026-05-30 13:09:44 +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 3638852fae Merge branch '4.0.x' 
Closes gh-50612
 2026-05-29 11:36:01 +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 f281ff4dd5 Merge branch '4.0.x' 
Closes gh-50610
 2026-05-29 11:13:56 +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
Andy Wilkinson d6a23b72b8 Deprecate SpringJtaPlatform 
This deprecation should have happened as part of c54d05c for #48969.

Closes gh-50592
 2026-05-27 14:35:08 +01:00
Andy Wilkinson a573e121fb fixup! Upgrade to Hibernate 7.4.0.Final 2026-05-27 14:12:09 +01:00
Andy Wilkinson 41dbadeb6b Upgrade to Hibernate 7.4.0.Final 
Closes gh-50578
 2026-05-27 14:12:06 +01:00
Moritz Halbritter 4d4762c1d6 Merge branch '4.0.x' 
Closes gh-50508
 2026-05-27 10:22:54 +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 a243d230b3 Merge branch '4.0.x' 
Closes gh-50497
 2026-05-25 17:09:28 +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 6a74bb85a3 Merge branch '4.0.x' 
Closes gh-50440
 2026-05-14 15:03:44 +01:00
Andy Wilkinson add52b6ccd Merge branch '3.5.x' into 4.0.x 
Closes gh-50439
 2026-05-14 15:02:24 +01:00
Andy Wilkinson a329d7009e Fix graceful shutdown with Jetty 
Thanks to the misleadingly named isJetty10 method, 6b9ccdca
unintentionally introduced a call to Future.get() that was only
required with Jetty 9. The method probably should have been called
isAtLeastJetty10.

See gh-50383
 2026-05-13 20:25:33 +01:00
Phillip Webb 458b8baccf Merge branch '4.0.x' 
Closes gh-50417
 2026-05-12 18:10:51 -07: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 8a1f984466 Merge branch '4.0.x' 
Closes gh-50412
 2026-05-12 12:31:24 -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
Sebastien Tardif 0608a35e0d Remove compatibility code for EOL dependency versions 
Remove NoSuchMethodError catch blocks and reflective fallbacks for
dependency versions that are no longer supported

See gh-50383

Signed-off-by: Sebastien Tardif <sebtardif@ncf.ca>
 2026-05-12 10:08:57 -07:00
Brian Clozel 8a449c52e6 Merge branch '4.0.x' 
Closes gh-50394
 2026-05-11 11:55:28 +02: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 627ac0451d Polish "Handle lazy connection proxy datasource in DataSourceBuilder" 
See gh-50271
 2026-05-04 11:35:17 +02:00
Vedran Pavic 460318e569 Handle lazy connection proxy datasource in DataSourceBuilder 
See gh-50271

Signed-off-by: Vedran Pavic <vedran@vedranpavic.com>
 2026-05-04 11:30:17 +02:00
Stéphane Nicoll 96a36cfc8c Merge branch '4.0.x' 
Closes gh-50287
 2026-05-04 08:22:17 +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 c5969670d1 Merge branch '4.0.x' 
Closes gh-50275
 2026-05-01 11:45:42 +01:00
Andy Wilkinson 5628644848 Merge branch '3.5.x' into 4.0.x 
Closes gh-50274
 2026-05-01 11:41:12 +01:00
Phillip Webb c5cd580073 Support GrpcServerHealthScheduler in servlet environments 
Refine `GrpcServerHealthScheduler` so that it will start when gRPC
is running behind a servlet.

Closes gh-50209
 2026-04-30 21:25:57 -07:00
Phillip Webb ebce054028 Merge branch '4.0.x' 
Closes gh-50266
 2026-04-30 14:36:59 -07: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 1d109887c4 Merge branch '4.0.x' 
Closes gh-50261
 2026-04-30 13:45:24 +01: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 e7d11afe45 Merge branch '4.0.x' 
Closes gh-50258
 2026-04-30 12:38:09 +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