Commit Graph
239 Commits
Author SHA1 Message Date
Stéphane Nicoll 86fed81403 Merge branch '3.5.x' into 4.0.x
Closes gh-50498
2026-05-25 17:16:59 +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 3213393bf9 Merge branch '3.5.x' into 4.0.x
Closes gh-50424
2026-05-13 07:47:07 -07:00
Phillip Webb 4f846b1645 Merge branch '3.5.x' into 4.0.x
Closes gh-50413
2026-05-12 13:07:55 -07:00
Phillip Webb 86c600eb90 Merge branch '3.5.x' into 4.0.x
Closes gh-50407
2026-05-12 11:33:34 -07:00
Andy Wilkinson 065c463cef Improve nullability of TestPropertyValues
Closes gh-50269
2026-05-01 08:39:18 +01:00
Stéphane Nicoll 813913ccb8 Merge branch '3.5.x' into 4.0.x
Closes gh-50233
2026-04-28 13:54:49 +02:00
Andy Wilkinson afc61f922c Merge branch '3.5.x' into 4.0.x
Closes gh-50213
2026-04-25 07:47:49 +01:00
Andy Wilkinson 98daa8ea30 Merge branch '3.5.x' into 4.0.x 2026-04-23 11:33:21 +01:00
Andy Wilkinson ef8527bb0e Merge branch '3.5.x' into 4.0.x
Closes gh-50185
2026-04-23 08:55:02 +01:00
Andy Wilkinson 4a7bd332b6 Merge branch '3.5.x' into 4.0.x
Closes gh-50183
2026-04-23 08:52:16 +01:00
Andy Wilkinson 8e013b6f90 Merge branch '3.5.x' into 4.0.x
Closes gh-50178
2026-04-23 08:48:16 +01:00
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