Merge branch '1.5.x'

2017-01-30 10:02:27 +00:00
parent 784c08514d dd4051686b
commit 15639d39b0
1 changed files with 0 additions and 5 deletions
--- a/spring-boot-test/src/test/java/org/springframework/boot/test/context/ImportsContextCustomizerTests.java
+++ b/spring-boot-test/src/test/java/org/springframework/boot/test/context/ImportsContextCustomizerTests.java
@@ -55,11 +55,6 @@ public class ImportsContextCustomizerTests {
 								SecondDeterminableImportSelectorAnnotatedClass.class));
 	}

-	@Test
-	public void importAutoConfigurationCanIgnoreAdditionalAnnotations() throws Exception {
-
-	}
-
 	@Test
 	public void customizersForTestClassesWithDifferentKotlinMetadataAreEqual() {
 		assertThat(new ImportsContextCustomizer(FirstKotlinAnnotatedTestClass.class))