Andy Wilkinson
24683045d1
Improve diagnostics for @DockerComposeTest failures
...
Closes gh-49477
2026-03-06 15:35:01 +00:00
Stéphane Nicoll
494e86b56e
Start building against Spring Framework 7.0.6 snapshots
...
See gh-49441
2026-03-06 09:53:35 +01:00
Andy Wilkinson
ad0538f6d9
Log Docker Compose logs when up or start fails
...
Closes gh-49423
2026-03-05 11:01:30 +00:00
Andy Wilkinson
e6ba227e53
Merge branch '4.0.x'
...
Closes gh-49427
2026-03-05 11:01:19 +00: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
785e5bb23d
Merge branch '4.0.x'
2026-03-04 15:06:21 +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
3334f54efe
Merge branch '4.0.x'
...
Closes gh-49384
2026-03-03 11:24:20 +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
3f48dd1db9
Merge branch '4.0.x'
2026-03-03 10:45:14 +01:00
Stéphane Nicoll
c2cb4f2bb1
Fix broken test setup
2026-03-03 10:44:00 +01:00
Stéphane Nicoll
0cf947cc9e
Merge branch '4.0.x'
...
Closes gh-49380
2026-03-03 10:41:35 +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
fae95ee334
Polish "Add support for Log4j2 rolling policy configuration"
...
See gh-47260
2026-03-02 14:38:11 +01:00
hojooo
d865935652
Add support for Log4j2 rolling policy configuration
...
See gh-47260
Signed-off-by: hojooo <ghwn5833@gmail.com >
2026-03-02 11:01:02 +01:00
Phillip Webb
2182339bb1
Add FailureAnalyzedException support
...
Add `FailureAnalyzedException` to reduce the number of internal
`FailureAnalizers` required when only a simple "description" and
"action" are required.
Closes gh-49320
2026-02-24 22:39:00 -08:00
Stéphane Nicoll
6bf72956fd
Merge branch '4.0.x'
...
Closes gh-49301
2026-02-23 16:47:29 +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
Phillip Webb
d102bb69b3
Create reusable default TaskScheduler configuration
...
Create a `DefaultTaskSchedulerConfiguration` for use when standard
task scheduler beans are required.
Closes gh-49280
2026-02-20 16:28:36 -08:00
Andy Wilkinson
4780d5dc81
Merge branch '4.0.x'
...
Closes gh-49194
2026-02-11 13:57:06 +00:00
Andy Wilkinson
c414ec241d
Add TWENTY_SIX to JavaVersion enum
...
Closes gh-49193
2026-02-11 13:56:39 +00:00
Andy Wilkinson
8df13b4709
Polish "Add RabbitMQ Stream service connection from RabbitMQContainer"
...
See gh-42443
2026-02-09 14:11:32 +00:00
Andy Wilkinson
5f797f7af3
Polish "Add time, locale, and work dir data to ProcessInfo"
...
See gh-48959
2026-02-09 14:03:41 +00:00
Jonatan Ivanov
14fdf493b0
Add time, locale, and work dir data to ProcessInfo
...
The new fields are:
- uptime
- startTime
- currentTime
- timezone
- locale
- workingDirectory
See gh-48959
2026-02-09 14:03:41 +00:00
Yanming Zhou
961cd43da9
Remove redundant assertion
...
`isNotNull()` is enforced in `isEmpty()`.
See gh-49156
Signed-off-by: Yanming Zhou <zhouyanming@gmail.com >
2026-02-09 14:51:59 +01:00
Andy Wilkinson
9773be238e
Merge branch '4.0.x'
...
Closes gh-49158
2026-02-09 10:11:30 +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
0a5e7ec135
Polish "Optimize ContextPairs nested name splitting"
...
See gh-48999
2026-02-08 15:37:59 -08:00
aalsanie
dd8ace8d68
Optimize ContextPairs nested name splitting
...
See gh-48999
Signed-off-by: aalsanie <ahmad.alsanie@hotmail.com >
2026-02-08 15:37:42 -08:00
Phillip Webb
764b558887
Polish "Bind Optional value object parameters as empty rather than null"
...
See gh-49152
2026-02-08 09:52:04 -08:00
Ondřej Světlík
4244dd933a
Bind Optional value object parameters as empty rather than null
...
Update `ValueObjectBinder` so that `Optional` parameters are bound as
`Option.empty()` rather than `null`.
See gh-49152
Signed-off-by: Ondřej Světlík <16480390+osvetlik@users.noreply.github.com >
2026-02-08 09:48:02 -08:00
Phillip Webb
e6472d8bc9
Merge branch '4.0.x'
2026-02-06 21:06:35 -08:00
Phillip Webb
775cabcc8b
Disable failing SpringApplicationShutdownHookTests
...
See gh-49154
2026-02-06 20:45:42 -08:00
Phillip Webb
9c188bc732
Refine conventions to exclude checking of generated source
...
Closes gh-49153
2026-02-06 19:05:17 -08:00
Moritz Halbritter
27b9402df1
Polish "Show certificates from truststore in SSL info endpoint"
...
See gh-48967
2026-02-06 13:45:36 +01:00
Garvit Joshi
e1a1d0e233
Show certificates from truststore in SSL info endpoint
...
See gh-48967
Signed-off-by: Garvit Joshi <garvitjoshi9@gmail.com >
2026-02-06 11:55:34 +01:00
Andy Wilkinson
7962e86b89
Merge branch '4.0.x'
...
Closes gh-49042
2026-02-03 18:16:11 +00:00
Andy Wilkinson
94fc407e07
Ignore unloadable includes rather than failing
...
Fixes gh-48981
2026-02-03 17:33:21 +00:00
Moritz Halbritter
3d960bc6d0
Add support for specifying encoding when loading files with spring.config.import
...
In the brackets we can now specify the encoding of the file instead of
only the file extension:
spring.config.import=classpath:import.properties[encoding=utf-8]
The old format
spring.config.import=classpath:import[.properties]
is still supported and is a shorthand for:
spring.config.import=classpath:import[extension=.properties]
Attributes can be combined, too:
spring.config.import=classpath:import[extension=.properties][encoding=utf-8]
Closes gh-28663
2026-02-03 16:30:03 +01:00
Stéphane Nicoll
01364b7099
Merge branch '4.0.x'
...
Closes gh-49027
2026-01-30 19:16:38 +01: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
5baed706c5
Merge branch '4.0.x'
...
Closes gh-49025
2026-01-30 15:19:48 +00: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
f8f1da605e
Merge branch '4.0.x'
...
Closes gh-49011
2026-01-28 14:04:59 +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
84008546c5
Merge branch '4.0.x'
...
Closes gh-48991
2026-01-27 11:27:12 +00:00
Andy Wilkinson
738080946e
Improve nullability of TestPropertyValues.Pair
...
Fixes gh-48948
2026-01-27 11:10:56 +00:00
Stéphane Nicoll
1004f5e88d
Merge branch '4.0.x'
...
Closes gh-48978
2026-01-27 08:15:43 +01:00