spring/spring-boot
1
0
Fork 0
mirror of https://github.com/spring-projects/spring-boot.git synced 2026-09-17 12:09:16 +00:00
Code Issues Projects Releases Wiki Activity
59,937 Commits 24 Branches 394 Tags
0d5f6b883f0f9f970daa41dda8ebe7987d8a8e23
Commit Graph
226 Commits
Author SHA1 Message Date
Phillip Webb 3cf39544c3 Merge branch '3.5.x' into 4.0.x 
Closes gh-50064
 2026-04-13 15:41:08 -07:00
Phillip Webb 481b972fad Merge branch '3.5.x' into 4.0.x 
Closes gh-50064
 2026-04-13 15:26:23 -07:00
Stéphane Nicoll 2e7adbdef4 Merge branch '3.5.x' into 4.0.x 
Closes gh-50041
 2026-04-13 09:17:22 +02:00
Andy Wilkinson 9fdb2db07c Merge branch '3.5.x' into 4.0.x 
Closes gh-50012
 2026-04-10 09:56:33 +01:00
Stéphane Nicoll e4c4283dce Polish 
See gh-49837
 2026-03-30 11:24:19 +02:00
Stéphane Nicoll 57a3521c45 Merge branch '3.5.x' into 4.0.x 
Closes gh-49818
 2026-03-27 11:44:54 +01:00
Phillip Webb e8ec285fd5 Merge branch '3.5.x' into 4.0.x 
Closes gh-49736
 2026-03-24 17:39:33 -07:00
Phillip Webb 4694f6fa6a Merge branch '3.5.x' into 4.0.x 
Closes gh-49731
 2026-03-24 13:38:12 -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
Phillip Webb e464348fa4 Merge branch '3.5.x' into 4.0.x 
Closes gh-49697
 2026-03-21 14:22:46 -07:00
Andy Wilkinson 01170c3273 Merge branch '3.5.x' into 4.0.x 
Closes gh-49668
 2026-03-19 18:30:47 +00:00
Andy Wilkinson af774d681f Merge branch '3.5.x' into 4.0.x 
Closes gh-49535
 2026-03-09 17:27:16 +00:00
Andy Wilkinson ace172f8e0 Merge branch '3.5.x' into 4.0.x 
Closes gh-49533
 2026-03-09 17:22:03 +00:00
Andy Wilkinson a249315be3 Merge branch '3.5.x' into 4.0.x 
Closes gh-49516
 2026-03-09 08:58:18 +00:00
Phillip Webb 2cecb37efd Merge branch '3.5.x' into 4.0.x 
Closes gh-49482
 2026-03-06 22:27:12 -05:00
Brian Clozel 7291a1ef58 Merge branch '3.5.x' into 4.0.x 
Closes gh-49479
 2026-03-06 18:04:42 +01:00
Stéphane Nicoll 9c93ff4b78 Start building against Spring Framework 7.0.6 snapshots 
See gh-49418
 2026-03-06 09:29:09 +01:00
Andy Wilkinson 9e2d446dfe Merge branch '3.5.x' into 4.0.x 
Closes gh-49426
 2026-03-05 11:00:44 +00:00
Andy Wilkinson d5f088a61b Allow more time for Docker Compose-managed containers to be healthy 
When running with Elasticsearch 9, the recently added test that
checks connectivity using SSL is flaky on CI. When the test fails,
it does so because Docker Compose reports that the container is
unhealthy when running docker compose up. One possibility is that
this is due to the container taking too long to reach a healthy
state. This commit attempts to confirm that theory and hopefully
address the problem by configuring a wait timeout of 120 seconds
for the up command.

See gh-49385
 2026-03-04 15:02:15 +00:00
Andy Wilkinson 0dd7f6d78d Polish "Allow Log4j2 logging system to be forced by system property" 
See gh-49343
 2026-03-03 11:20:42 +00:00
Fabrice Bibonne 9cf13004d7 Allow Log4j2 logging system to be forced by system property 
Signed-off-by: Fabrice Bibonne <fabrice.bibonne@courriel.eco>

See gh-49343
 2026-03-03 11:20:32 +00:00
Stéphane Nicoll c2cb4f2bb1 Fix broken test setup 2026-03-03 10:44:00 +01:00
Stéphane Nicoll 2a80a3cac6 Polish "Restore error page support in WAR deployments" 
See gh-49176
 2026-03-03 10:41:17 +01:00
Jay Choi 1a42b5c282 Restore error page support in WAR deployments 
See gh-49176

Signed-off-by: Jay Choi <jayyoungchoi22@gmail.com>
 2026-03-03 10:41:16 +01:00
Stéphane Nicoll 5c9dbd4a4d Merge branch '3.5.x' into 4.0.x 
Closes gh-49300
 2026-02-23 16:47:20 +01:00
Andy Wilkinson c414ec241d Add TWENTY_SIX to JavaVersion enum 
Closes gh-49193
 2026-02-11 13:56:39 +00:00
Andy Wilkinson 3b9b0963f2 Merge branch '3.5.x' into 4.0.x 
Closes gh-49157
 2026-02-09 09:56:10 +00:00
Phillip Webb 775cabcc8b Disable failing SpringApplicationShutdownHookTests 
See gh-49154
 2026-02-06 20:45:42 -08:00
Andy Wilkinson 94fc407e07 Ignore unloadable includes rather than failing 
Fixes gh-48981
 2026-02-03 17:33:21 +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
Andy Wilkinson bc3dce6942 Check for AOT initializer before checking native image requirements 
Fixes gh-48963
 2026-01-30 14:54:15 +00: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 738080946e Improve nullability of TestPropertyValues.Pair 
Fixes gh-48948
 2026-01-27 11:10:56 +00:00
Stéphane Nicoll 7cc58f3f84 Merge branch '3.5.x' into 4.0.x 
Closes gh-48977
 2026-01-27 08:15:28 +01:00
Andy Wilkinson 8b3ef3b28b Merge branch '3.5.x' into 4.0.x 
Closes gh-48840
 2026-01-15 11:10:52 +00:00
Andy Wilkinson 774dd9e1de Merge branch '3.5.x' into 4.0.x 
Closes gh-48838
 2026-01-15 10:50:08 +00:00
Andy Wilkinson 90df993c74 Merge branch '3.5.x' into 4.0.x 
Closes gh-48812
 2026-01-13 16:52:51 +00:00
Andy Wilkinson 0ffffee4bf Upgrade to Nullability Plugin 0.0.9 
Closes gh-48638
 2026-01-08 11:59:51 +00:00
Andy Wilkinson 9bd1a460a1 Correct packaging of test code 
Closes gh-48699
 2026-01-08 11:43:43 +00:00
Andy Wilkinson a7122b0ece Merge branch '3.5.x' into 4.0.x 
Closes gh-48691
 2026-01-07 12:04:22 +00:00
Phillip Webb a4f35688aa Merge branch '3.5.x' into 4.0.x 2026-01-06 12:54:11 -08:00
Stéphane Nicoll 2e2981bfe4 Merge branch '3.5.x' into 4.0.x 
Closes gh-48682
 2026-01-06 12:35:34 +01:00
Stéphane Nicoll 9b7451ed9d Merge branch '3.5.x' into 4.0.x 
Closes gh-48622
 2025-12-26 09:01:59 +01:00
Phillip Webb aaf66f4d50 Merge branch '3.5.x' 2025-12-17 20:46:23 -08:00
Phillip Webb e69be7ccce Merge branch '3.5.x' 
Closes gh-48569
 2025-12-17 11:48:48 -08:00
Stéphane Nicoll d489aa685c Polish "Update AOT tests to fail if deprecated code is not suppressed" 
Include use of API that has been marked for removal.

See gh-48566
 2025-12-17 15:41:26 +01:00
Stéphane Nicoll b6974ff51a Make MissingParameterNamesFailureAnalyzerTests more robust 
Explicitly nullify `ParameterNameDiscovery` to simulate code that has
not been compiled with `-parameters`. Previously we were relying on an
initialization behavior that could change and break those tests.
 2025-12-17 15:31:56 +01:00
Stéphane Nicoll 8e895b3bc0 Update AOT tests to fail if deprecated code is not suppressed 
Closes gh-48566
 2025-12-17 15:30:44 +01:00
Phillip Webb da516741b2 Consider modules when deducing WebApplicationType 
Introduce a strategy to `WebApplicationType` to allow modules to
implement deduction logic.

Prior to this commit, modules played no part in deducing the
`WebApplicationType`. This meant that a user with `spring-webflux`
for client purposes would deduce `REACTIVE` despite no
`spring-boot-webflux` module being present.

The following deduction logic order is now implemented:

1) If the `spring-boot-webmvc` module is being used and Spring MVC
   classes are found then `SERVLET` is used.

2) If the `spring-boot-webflux` module is being used and Spring WebFlux
   classes are found then `REACTIVE` is used.

3) If `spring-web` is found and servlet classes are available then
   `SERVLET` is used.

4) If none of the above are satisfied, `NONE` is used.

This commit also updates `SpringBootTestContextBootstrapper` to use
the same deduction logic.

Fixes gh-48517
 2025-12-15 20:30:16 -08:00
Stéphane Nicoll ab69bf9d55 Fix nullability constraint 2025-12-09 17:05:23 +01:00