diff --git a/spring-boot-project/spring-boot-docker-compose/src/test/java/org/springframework/boot/docker/compose/service/connection/test/AbstractDockerComposeIntegrationTests.java b/spring-boot-project/spring-boot-docker-compose/src/test/java/org/springframework/boot/docker/compose/service/connection/test/AbstractDockerComposeIntegrationTests.java index 3346bb0fc4f..77edcc70d09 100644 --- a/spring-boot-project/spring-boot-docker-compose/src/test/java/org/springframework/boot/docker/compose/service/connection/test/AbstractDockerComposeIntegrationTests.java +++ b/spring-boot-project/spring-boot-docker-compose/src/test/java/org/springframework/boot/docker/compose/service/connection/test/AbstractDockerComposeIntegrationTests.java @@ -25,7 +25,6 @@ import org.springframework.boot.SpringApplication; import org.springframework.boot.SpringApplicationShutdownHandlers; import org.springframework.boot.autoconfigure.service.connection.ConnectionDetails; import org.springframework.boot.testsupport.process.DisabledIfProcessUnavailable; -import org.springframework.boot.testsupport.testcontainers.DisabledIfDockerUnavailable; import org.springframework.context.annotation.Configuration; import org.springframework.core.io.ClassPathResource; import org.springframework.core.io.Resource; @@ -37,7 +36,7 @@ import org.springframework.util.function.ThrowingSupplier; * @author Moritz Halbritter * @author Andy Wilkinson */ -@DisabledIfDockerUnavailable +@DisabledIfProcessUnavailable({ "docker", "version" }) @DisabledIfProcessUnavailable({ "docker", "compose" }) public abstract class AbstractDockerComposeIntegrationTests { diff --git a/spring-boot-project/spring-boot-tools/spring-boot-test-support/src/main/java/org/springframework/boot/testsupport/process/DisabledIfProcessUnavailableCondition.java b/spring-boot-project/spring-boot-tools/spring-boot-test-support/src/main/java/org/springframework/boot/testsupport/process/DisabledIfProcessUnavailableCondition.java index d45e3f97089..9c8a5990b64 100644 --- a/spring-boot-project/spring-boot-tools/spring-boot-test-support/src/main/java/org/springframework/boot/testsupport/process/DisabledIfProcessUnavailableCondition.java +++ b/spring-boot-project/spring-boot-tools/spring-boot-test-support/src/main/java/org/springframework/boot/testsupport/process/DisabledIfProcessUnavailableCondition.java @@ -27,6 +27,7 @@ import org.junit.jupiter.api.extension.ExtensionContext; import org.springframework.core.annotation.MergedAnnotation; import org.springframework.core.annotation.MergedAnnotations; +import org.springframework.core.annotation.MergedAnnotations.SearchStrategy; import org.springframework.util.Assert; import org.springframework.util.StringUtils; @@ -57,7 +58,7 @@ class DisabledIfProcessUnavailableCondition implements ExecutionCondition { } private Stream getAnnotationValue(AnnotatedElement testClass) { - return MergedAnnotations.from(testClass) + return MergedAnnotations.from(testClass, SearchStrategy.TYPE_HIERARCHY) .stream(DisabledIfProcessUnavailable.class) .map((annotation) -> annotation.getStringArray(MergedAnnotation.VALUE)); }