Fix rebase from master

Author: snicoll

spring-boot-project/spring-boot-test/src/main/java/org/springframework/boot/test/context/filter/TestTypeExcludeFilter.java

@@ -33,8 +33,7 @@
 class TestTypeExcludeFilter extends TypeExcludeFilter {
 
 	private static final String[] CLASS_ANNOTATIONS = { "org.junit.runner.RunWith",
-			"org.junit.jupiter.api.extension.ExtendWith", "org.junit.platform.commons.annotation.Testable",
-			"org.testng.annotations.Test", };
+			"org.junit.jupiter.api.extension.ExtendWith", "org.junit.platform.commons.annotation.Testable" };
 
 	private static final String[] METHOD_ANNOTATIONS = { "org.junit.Test",
 			"org.junit.platform.commons.annotation.Testable" };

spring-boot-project/spring-boot-test/src/test/java/org/springframework/boot/test/context/filter/AbstractJupiterTestWithConfigAndTestable.java

@@ -23,7 +23,7 @@
 @Testable
 public abstract class AbstractJupiterTestWithConfigAndTestable {
 
-	@Configuration(proxyBeanMethods = false)
+	@Configuration
 	static class Config {
 
 	}