From 95e7fbeb1d96f7ebcc48ef582859d210d1828d2e Mon Sep 17 00:00:00 2001
From: Stephane Nicoll <snicoll@pivotal.io>
Date: Wed, 8 Feb 2017 14:38:45 +0100
Subject: [PATCH 1/2] Make sure `spring-boot-test-support` is not public

The `spring-boot-test-support` module is internal and is not deployed so
we should not offer public dependency management for it.

Closes gh-8165
---
 spring-boot-dependencies/pom.xml | 5 -----
 spring-boot-parent/pom.xml       | 6 ++++++
 2 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/spring-boot-dependencies/pom.xml b/spring-boot-dependencies/pom.xml
index b15999f241..e9e4265f14 100644
--- a/spring-boot-dependencies/pom.xml
+++ b/spring-boot-dependencies/pom.xml
@@ -250,11 +250,6 @@
 				<artifactId>spring-boot-test-autoconfigure</artifactId>
 				<version>1.5.2.BUILD-SNAPSHOT</version>
 			</dependency>
-			<dependency>
-				<groupId>org.springframework.boot</groupId>
-				<artifactId>spring-boot-test-support</artifactId>
-				<version>1.5.2.BUILD-SNAPSHOT</version>
-			</dependency>
 			<dependency>
 				<groupId>org.springframework.boot</groupId>
 				<artifactId>spring-boot-actuator</artifactId>
diff --git a/spring-boot-parent/pom.xml b/spring-boot-parent/pom.xml
index 73feb01857..dbf7a5d337 100644
--- a/spring-boot-parent/pom.xml
+++ b/spring-boot-parent/pom.xml
@@ -40,6 +40,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 -->

From b3203058be9aba7abbbfa8091413a75603b270bc Mon Sep 17 00:00:00 2001
From: Johnny Lim <izeye@naver.com>
Date: Wed, 1 Feb 2017 01:24:22 +0900
Subject: [PATCH 2/2] Fix an assertion in SkipPatternJarScanner

Closes gh-8153
---
 .../boot/context/embedded/tomcat/SkipPatternJarScanner.java     | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/spring-boot/src/main/java/org/springframework/boot/context/embedded/tomcat/SkipPatternJarScanner.java b/spring-boot/src/main/java/org/springframework/boot/context/embedded/tomcat/SkipPatternJarScanner.java
index f5665b4871..4f4c19065f 100644
--- a/spring-boot/src/main/java/org/springframework/boot/context/embedded/tomcat/SkipPatternJarScanner.java
+++ b/spring-boot/src/main/java/org/springframework/boot/context/embedded/tomcat/SkipPatternJarScanner.java
@@ -50,7 +50,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;
 		this.patterns = patterns;
 		setPatternToTomcat8SkipFilter();