Fix disabled conditions on AbstractDockerComposeIntegrationTests

Author: wilkinsona

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.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 @@
  * @author Moritz Halbritter
  * @author Andy Wilkinson
  */
-@DisabledIfDockerUnavailable
+@DisabledIfProcessUnavailable({ "docker", "version" })
 @DisabledIfProcessUnavailable({ "docker", "compose" })
 public abstract class AbstractDockerComposeIntegrationTests {
 

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.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 @@ public ConditionEvaluationResult evaluateExecutionCondition(ExtensionContext con
 	}
 
 	private Stream<String[]> getAnnotationValue(AnnotatedElement testClass) {
-		return MergedAnnotations.from(testClass)
+		return MergedAnnotations.from(testClass, SearchStrategy.TYPE_HIERARCHY)
 			.stream(DisabledIfProcessUnavailable.class)
 			.map((annotation) -> annotation.getStringArray(MergedAnnotation.VALUE));
 	}