Merge branch '1.5.x'

spring-boot-dependencies/pom.xml

@@ -250,11 +250,6 @@
 				<artifactId>spring-boot-test-autoconfigure</artifactId>
 				<version>2.0.0.BUILD-SNAPSHOT</version>
 			</dependency>
-			<dependency>
-				<groupId>org.springframework.boot</groupId>
-				<artifactId>spring-boot-test-support</artifactId>
-				<version>2.0.0.BUILD-SNAPSHOT</version>
-			</dependency>
 			<dependency>
 				<groupId>org.springframework.boot</groupId>
 				<artifactId>spring-boot-actuator</artifactId>

spring-boot-parent/pom.xml

@@ -41,6 +41,12 @@
 	</ciManagement>
 	<dependencyManagement>
 		<dependencies>
+			<dependency>
+				<groupId>org.springframework.boot</groupId>
+				<artifactId>spring-boot-test-support</artifactId>
+				<version>1.5.2.BUILD-SNAPSHOT</version>
+			</dependency>
+
 			<!-- Additional Dependencies the consumers of spring-boot-dependencies
 				will generally not need -->
 			<dependency> <!-- deprecated but recent version required by 3rd party libs -->

spring-boot/src/main/java/org/springframework/boot/context/embedded/tomcat/SkipPatternJarScanner.java

@@ -40,7 +40,7 @@ class SkipPatternJarScanner extends StandardJarScanner {
 
 	SkipPatternJarScanner(JarScanner jarScanner, Set<String> patterns) {
 		Assert.notNull(jarScanner, "JarScanner must not be null");
-		Assert.notNull(jarScanner, "Patterns must not be null");
+		Assert.notNull(patterns, "Patterns must not be null");
 		this.jarScanner = jarScanner;
 		StandardJarScanFilter filter = new StandardJarScanFilter();
 		filter.setTldSkip(StringUtils.collectionToCommaDelimitedString(patterns));