Merge branch '2.7.x' into 3.0.x

Author: philwebb

spring-boot-project/spring-boot/src/test/java/org/springframework/boot/context/annotation/ImportCandidatesTests.java

@@ -21,12 +21,15 @@
 import java.lang.annotation.RetentionPolicy;
 import java.lang.annotation.Target;
 
-import org.junit.jupiter.api.Disabled;
 import org.junit.jupiter.api.Test;
 
 import static org.assertj.core.api.Assertions.assertThat;
 
-@Disabled
+/**
+ * Tests for {@link ImportCandidates}.
+ *
+ * @author Moritz Halbritter
+ */
 class ImportCandidatesTests {
 
 	@Test