Commit Graph
16 Commits
Author SHA1 Message Date
Stéphane Nicoll 3209464a8a Merge branch '3.5.x' into 4.0.x
Closes gh-50617
2026-05-29 12:30:52 +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
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
Phillip Webb a4f35688aa Merge branch '3.5.x' into 4.0.x 2026-01-06 12:54:11 -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
Yanming Zhou 609b0b444e Use JsonMapper instead of ObjectMapper where feasible
See gh-47503

Signed-off-by: Yanming Zhou <zhouyanming@gmail.com>
2025-10-20 13:16:52 +02:00
Andy Wilkinson 55e7c83498 Allow modules to contribute to Devtools' default properties
Closes gh-44792
2025-10-15 20:19:02 +01:00
Moritz Halbritter b566b73be6 Add nullability annotations to tests in core/spring-boot-docker-compose
See gh-47263
2025-10-02 12:17:00 +02:00
Moritz Halbritter a6b4400de7 Improve null-safety of core/spring-boot-docker-compose
See gh-46926
2025-09-16 13:52:13 +02:00
Moritz Halbritter e70edced2f Merge branch '3.5.x'
Closes gh-47020
2025-09-02 15:12:58 +02:00
Andy Wilkinson d353038c58 Update Jackson support to require Jackson 3
Closes gh-45535
2025-09-02 11:37:09 +01:00
Moritz Halbritter da2365b8cb Merge branch '3.5.x'
Closes gh-46987
2025-08-28 16:58:28 +02:00
Moritz Halbritter 7ad90fb963 Improve null-safety of core/spring-boot-docker-compose
See gh-46926
2025-08-26 14:22:53 +02:00
Moritz Halbritter cb2a26ceec Add nullability annotations to core/spring-boot-docker-compose
See gh-46587
2025-07-29 14:38:40 +02:00
Phillip Webb decc32dde3 Restructure project directories to better fit Gradle
Closes gh-46358
2025-07-10 17:54:08 -07:00