Merge branch '3.2.x'

Closes gh-41172
spring-projects · Jun 20, 2024 · 8e405c0 · 8e405c0
2 parents e7ffeb3 + c2f21e9
commit 8e405c0
Showing 1 changed file with 4 additions and 0 deletions.
diff --git a/...va/org/springframework/boot/docker/compose/service/connection/test/DockerComposeTest.java b/...va/org/springframework/boot/docker/compose/service/connection/test/DockerComposeTest.java
@@ -27,7 +27,9 @@
 
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.service.connection.ConnectionDetails;
+import org.springframework.boot.testsupport.container.DisabledIfDockerUnavailable;
 import org.springframework.boot.testsupport.container.TestImage;
+import org.springframework.boot.testsupport.process.DisabledIfProcessUnavailable;
 
 /**
  * A {@link Test test} that exercises Spring Boot's Docker Compose support.
@@ -48,6 +50,8 @@
 @Retention(RetentionPolicy.RUNTIME)
 @Documented
 @ExtendWith(DockerComposeTestExtension.class)
+@DisabledIfDockerUnavailable
+@DisabledIfProcessUnavailable({ "docker", "compose" })
 public @interface DockerComposeTest {
 
 	/**