Commit Graph
239 Commits
Author SHA1 Message Date
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
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 2d1df02866 Merge branch '4.0.x'
Closes gh-48841
2026-01-15 11:11:05 +00: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 d1e4d72fa5 Polish
See 8bd140305a
2026-01-15 11:06:56 +00:00
Andy Wilkinson 8bd140305a Merge branch '4.0.x' 2026-01-15 10:52:15 +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 f091546c86 Merge branch '4.0.x'
Closes gh-48813
2026-01-13 16:53:05 +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 0ed5f2674f Avoid losing type information in on bean condition messages 2026-01-13 10:44:18 +00:00
Andy Wilkinson 3d6671d47a Merge branch '4.0.x'
Closes gh-48701
2026-01-08 12:14:50 +00:00
Andy Wilkinson ef1f4e2fa2 Merge branch '4.0.x'
Closes gh-48700
2026-01-08 12:01:09 +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 5edd5213ac Merge branch '4.0.x'
Closes gh-48693
2026-01-07 12:19:29 +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 dad1ca5e95 Merge branch '4.0.x' 2026-01-06 12:54:30 -08:00
Phillip Webb a4f35688aa Merge branch '3.5.x' into 4.0.x 2026-01-06 12:54:11 -08:00
Stéphane Nicoll 82cb083869 Merge branch '4.0.x'
Closes gh-48683
2026-01-06 12:36:06 +01: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 916c1fd3ff Merge branch '4.0.x'
Closes gh-48623
2025-12-26 09:02:21 +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