Commit Graph
202 Commits
Author SHA1 Message Date
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
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
Stéphane Nicoll f6a2cae2bb Merge branch '3.5.x'
Closes gh-48283
2025-11-25 10:01:24 +01:00
Stéphane Nicoll f7f11a4f25 Merge branch '3.5.x'
Closes gh-48275
2025-11-24 16:47:49 +01:00
Stéphane Nicoll 949c227698 Restore ApplicationServletEnvironment in web deployments
Closes gh-48254
2025-11-24 15:34:05 +01:00
Andy Wilkinson 3becdc7d47 Move server.error properties to spring.web.error
Closes gh-48201
2025-11-20 11:55:23 +00:00
Phillip Webb d4b9786b8b Merge branch '3.5.x'
Closes gh-48177
2025-11-18 17:08:35 -08:00
Stefan Würsten 9ccec12506 Move mime-mappings.properties to spring-boot-web-server
This commit moves mime-mapping.properties in the module that actually
uses it, rather than in the top-level spring-boot module.

See gh-48138

Signed-off-by: Stefan Würsten <stefan@wuersten.ch>
2025-11-14 14:52:54 +01:00
Andy Wilkinson 8a52f4931b Merge branch '3.5.x'
Closes gh-48136
2025-11-14 09:10:21 +00:00
Stéphane Nicoll 097184c2e4 Merge branch '3.5.x'
Closes gh-48132
2025-11-14 09:55:46 +01:00
Andy Wilkinson 5281f5c6bc Merge branch '3.5.x'
The issue had already been fixed in 4.0 as part of the nullability
work. As such, this commit doesn't fix anything. It does, however,
merge forward a test and makes some stylistic changes to the code so
that it's aligned with the same code in 3.5.x and 3.4.x
2025-11-13 14:06:46 +00:00
Stéphane Nicoll 3d23261f87 Merge branch '3.5.x'
Closes gh-48122
2025-11-13 14:55:19 +01:00
Stéphane Nicoll d1e5fe3248 Merge branch '3.5.x'
Closes gh-48106
2025-11-13 10:31:25 +01:00
Stéphane Nicoll 73087f369b Merge branch '3.5.x'
Closes gh-48071
2025-11-12 13:08:31 +01:00
Stéphane Nicoll 8584f604e3 Rename maxAttempts to maxRetries
Closes gh-48023
2025-11-11 10:22:08 +00:00
Phillip Webb 6158a52b8c Support deprecated EnvironmentPostProcessor arguments
Fixes gh-48047
2025-11-10 15:51:53 -08:00
Andy Wilkinson ef46636c7e Tolerate Podman's response to docker context ls
In Spring Boot 3.x with Jackson 2, a null (or missing) value for
a primitive would be mapped to the primitive's default value. In
Jackson 3, the default behavior is to fail instead. This causes a
failure when trying to deserialize Podman's
`docker context ls response` as it is not in the expected format
and has no entry for `current` that's mapped to a boolean.

This commit disables FAIL_ON_NULL_FOR_PRIMITIVES to restore the
behavior that we had with Jackson 2 in Spring Boot 3.x.

Closes gh-47971
2025-11-06 09:19:47 +00:00
Phillip Webb 08857b4c7f Cache SystemEnvironmentPropertyMapper configuration property names
Add a static cache to `SystemEnvironmentPropertyMapper` for property
source name to configuration property name conversion. This update
should help ease object allocations for system environment names which
are unlikely to change often.

Closes gh-14121
2025-11-05 14:30:31 -08:00
Stéphane Nicoll a3ba9e3bf4 Merge branch '3.5.x'
Closes gh-47906
2025-11-02 10:58:26 +01:00
Phillip Webb 0f3631b7cc Merge branch '3.5.x'
Closes gh-47899
2025-10-31 09:25:55 -07:00
Stéphane Nicoll b0e2f2c770 Configure application task executor with custom AsyncConfigurer
Previously, any user that defines an AsyncConfigurer should provide
the async executor as well, given that our auto-configuration no longer
defines a "taskExecutor" bean.

This commit extends our auto-configuration of async processing to
use the "applicationTaskExecutor" bean name transparently if a user
has configured an AsyncConfigurer, but did not override the
getAsyncExecutor method.

Closes gh-47897
2025-10-31 17:16:49 +01:00
Stéphane Nicoll f11e3f3877 Adapt to new GraalVM metadata format
This commit updates our web resources patterns due to a change in the
GraalVM metadata format. Previously a single `*` was considering a
directory and its sub-folders. The same behavior now requires two `*`.

Closes gh-47894
2025-10-31 12:28:01 +01:00