diff --git a/spring-boot-dependencies/pom.xml b/spring-boot-dependencies/pom.xml index e796efa455..48f93eb6c3 100644 --- a/spring-boot-dependencies/pom.xml +++ b/spring-boot-dependencies/pom.xml @@ -131,7 +131,7 @@ 1.0.0 5.0.0.RC2 3.5.3 - 2.9.0 + 2.9.1 1.2.3 1.16.18 2.1.1 diff --git a/spring-boot-tools/spring-boot-test-support/src/main/java/org/springframework/boot/testsupport/runner/classpath/ModifiedClassPathRunner.java b/spring-boot-tools/spring-boot-test-support/src/main/java/org/springframework/boot/testsupport/runner/classpath/ModifiedClassPathRunner.java index 51dd37cea0..fa182099c6 100644 --- a/spring-boot-tools/spring-boot-test-support/src/main/java/org/springframework/boot/testsupport/runner/classpath/ModifiedClassPathRunner.java +++ b/spring-boot-tools/spring-boot-test-support/src/main/java/org/springframework/boot/testsupport/runner/classpath/ModifiedClassPathRunner.java @@ -216,10 +216,13 @@ public class ModifiedClassPathRunner extends BlockJUnit4ClassRunner { private final AntPathMatcher matcher = new AntPathMatcher(); private ClassPathEntryFilter(Class testClass) throws Exception { + this.exclusions = new ArrayList<>(); + this.exclusions.add("log4j-*.jar"); ClassPathExclusions exclusions = AnnotationUtils.findAnnotation(testClass, ClassPathExclusions.class); - this.exclusions = exclusions == null ? Collections.emptyList() - : Arrays.asList(exclusions.value()); + if (exclusions != null) { + this.exclusions.addAll(Arrays.asList(exclusions.value())); + } } private boolean isExcluded(URL url) throws Exception {