31 Commits
Author SHA1 Message Date
Andy Wilkinson ea613dc511 Merge branch '4.0.x' into 4.1.x
Closes gh-51599
2026-09-07 08:26:42 +01:00
Manu Sridharan 25a3f8feb9 Remove unnecessary NullAway suppressions
Signed-off-by: Manu Sridharan <msridhar@gmail.com>

See gh-51591
2026-09-07 08:18:11 +01:00
Andy Wilkinson 8350f147ff Merge branch '4.0.x' into 4.1.x
Closes gh-51572
2026-09-04 08:43:15 +01:00
Andy Wilkinson 10190c7cc7 Fix race condition in ProcessRunnerTests
There's a race between destruction of the process completing and the
test checking that the process has been destroyed. When the test
wins the race, it fails.

This commit removes the race condition by updating the test to wait
until the process has been destroyed.

Closes gh-51571
2026-09-04 08:40:35 +01:00
Andy Wilkinson 94ca058844 Merge branch '4.0.x' into 4.1.x
Closes gh-51538
2026-09-02 09:12:54 +01:00
Andy Wilkinson bf8731693b Polish "Improve Docker Compose ProcessRunner's handling of failure cases"
See gh-50963

Signed-off-by: Andy Wilkinson <andy.wilkinson@broadcom.com>
2026-09-02 09:11:53 +01:00
Sebastien Tardif 27e96308ed Improve Docker Compose ProcessRunner's handling of failure cases
Release the output reader latch in a finally block so a failing stream
read or output consumer cannot leave ProcessRunner.run blocked on
CountDownLatch.await after the child process has exited.

Destroy the child process when waitFor is interrupted so Docker Compose
commands are not left running as orphans.

Signed-off-by: Sebastien Tardif <sebtardif@ncf.ca>

See gh-50963
2026-09-02 09:02:00 +01:00
Stéphane Nicoll 325b234918 Merge branch '4.0.x'
Closes gh-50618
2026-05-29 12:31:05 +02:00
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 6a74bb85a3 Merge branch '4.0.x'
Closes gh-50440
2026-05-14 15:03:44 +01:00
Andy Wilkinson add52b6ccd Merge branch '3.5.x' into 4.0.x
Closes gh-50439
2026-05-14 15:02:24 +01:00
Moritz Halbritter 02df21cc07 Polish "Add support for docker.elastic.co/elasticsearch/elasticsearch"
See gh-50119
2026-04-20 09:03:40 +02:00
itsmevichu 1b712e0434 Add support for docker.elastic.co/elasticsearch/elasticsearch
See gh-50119

Signed-off-by: itsmevichu <vishnutheep@gmail.com>
2026-04-20 08:51:50 +02:00
Stéphane Nicoll 1519bcf1e2 Polish "Add support for additional Homebrew home on macOS"
See gh-49721
2026-04-03 16:19:47 +02:00
1233day 2d4c235522 Add support for additional Homebrew home on macOS
Add /opt/homebrew/bin as an additional macOS fallback location when
starting external processes.

The previous fallback assumed /usr/local/bin only, which can fail on
Apple Silicon Homebrew setups in restricted PATH environments (for
example, IDE or UI-launched processes).

Update CredentialHelperTests to verify both macOS fallback paths are
attempted.

See gh-49721

Signed-off-by: 1233day <1233day@naver.com>
2026-04-03 13:32:45 +02:00
Andy Wilkinson 24683045d1 Improve diagnostics for @DockerComposeTest failures
Closes gh-49477
2026-03-06 15:35:01 +00: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 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