Merge branch '1.4.x' into 1.5.x

2017-02-28 15:58:08 +00:00
parent f014be59f7 51e7c2eec9
commit 545b29552d
2 changed files with 27 additions and 7 deletions
--- a/spring-boot-test/src/main/java/org/springframework/boot/test/context/ImportsContextCustomizer.java
+++ b/spring-boot-test/src/main/java/org/springframework/boot/test/context/ImportsContextCustomizer.java
@@ -401,8 +401,8 @@ class ImportsContextCustomizer implements ContextCustomizer {

 		@Override
 		public boolean isIgnored(Annotation annotation) {
-			return annotation.annotationType().getName()
-					.startsWith("org.spockframework.");
+			return annotation.annotationType().getName().startsWith("org.spockframework.")
+					|| annotation.annotationType().getName().startsWith("spock.");
 		}

 	}