Commit Graph
222 Commits
Author SHA1 Message Date
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
Stéphane Nicoll 644ac08886 Add support for context propagation in task execution
Closes gh-48033
2025-12-22 10:24:41 +01:00
Stéphane Nicoll 5399793faf Reinstate Spock support
Closes gh-48513
2025-12-19 15:31:59 +01:00
Stéphane Nicoll 3011155593 Remove support for deprecated logback properties
This commit removes support for the following properties that are
deprecated since Spring Boot 2.4:

- logging.pattern.rolling-file-name
- logging.file.clean-history-on-start
- logging.file.max-size
- logging.file.total-size-cap
- logging.file.max-history

Closes gh-48489
2025-12-19 15:26:01 +01:00
Stéphane Nicoll 7c519ee564 Polish "Add failure analysis for invalid Docker environments"
See gh-47797
2025-12-19 11:45:21 +01:00
Dmytro Nosan 81f7caad24 Add failure analysis for invalid Docker environments
This commit introduces a failure analyzer implementation that provides
actionable guidance when Testcontainers fails to detect a running
Docker-compatible environment.

See gh-47797

Signed-off-by: Dmytro Nosan <dimanosan@gmail.com>
2025-12-19 11:45:20 +01:00
Stefano Cordio b2b0fed285 Decorate all Assert implementations with @CheckReturnValue
See gh-46766

Signed-off-by: Stefano Cordio <stefano.cordio@gmail.com>
2025-12-19 10:39:37 +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
Stéphane Nicoll 63cfeb01ab Merge branch '3.5.x'
Closes gh-48476
2025-12-09 16:54:14 +01:00
Stéphane Nicoll a98b36efbb Start building against Spring Framework 7.0.2 snapshots
See gh-48439
2025-12-08 14:54:53 +01:00
Andy Wilkinson 46f22b2374 Polish NativeImageRequirementsNotMetException
Closes gh-48307
2025-11-26 15:31:48 +00:00
Stéphane Nicoll 8eb90644a6 Merge branch '3.5.x'
Closes gh-48306
2025-11-26 16:02:42 +01:00