Merge branch '1.5.x'

kekemu · Dec 1, 2016 · 816c236 · 816c236
2 parents 4445bb6 + ee72e78
commit 816c236
Show file tree

Hide file tree

Showing 18 changed files with 15 additions and 15 deletions.
diff --git a/pom.xml b/pom.xml
@@ -81,7 +81,7 @@
 				<module>spring-boot-dependencies</module>
 				<module>spring-boot-parent</module>
 				<module>spring-boot-tools</module>
-				<module>spring-boot-junit-runners</module>
+				<module>spring-boot-test-support</module>
 				<module>spring-boot</module>
 				<module>spring-boot-test</module>
 				<module>spring-boot-autoconfigure</module>

diff --git a/spring-boot-actuator/pom.xml b/spring-boot-actuator/pom.xml
@@ -279,7 +279,7 @@
 		</dependency>
 		<dependency>
 			<groupId>org.springframework.boot</groupId>
-			<artifactId>spring-boot-junit-runners</artifactId>
+			<artifactId>spring-boot-test-support</artifactId>
 			<scope>test</scope>
 		</dependency>
 		<dependency>

diff --git a/spring-boot-autoconfigure/pom.xml b/spring-boot-autoconfigure/pom.xml
@@ -637,7 +637,7 @@
 		</dependency>
 		<dependency>
 			<groupId>org.springframework.boot</groupId>
-			<artifactId>spring-boot-junit-runners</artifactId>
+			<artifactId>spring-boot-test-support</artifactId>
 			<scope>test</scope>
 		</dependency>
 		<dependency>

diff --git a/spring-boot-dependencies/pom.xml b/spring-boot-dependencies/pom.xml
@@ -201,12 +201,13 @@
 			</dependency>
 			<dependency>
 				<groupId>org.springframework.boot</groupId>
-				<artifactId>spring-boot-junit-runners</artifactId>
+				<artifactId>spring-boot-test</artifactId>
 				<version>2.0.0.BUILD-SNAPSHOT</version>
 			</dependency>
 			<dependency>
 				<groupId>org.springframework.boot</groupId>
 				<artifactId>spring-boot-test</artifactId>
+				<type>test-jar</type>
 				<version>2.0.0.BUILD-SNAPSHOT</version>
 			</dependency>
 			<dependency>
@@ -216,8 +217,7 @@
 			</dependency>
 			<dependency>
 				<groupId>org.springframework.boot</groupId>
-				<artifactId>spring-boot-test</artifactId>
-				<type>test-jar</type>
+				<artifactId>spring-boot-test-support</artifactId>
 				<version>2.0.0.BUILD-SNAPSHOT</version>
 			</dependency>
 			<dependency>

diff --git a/spring-boot-devtools/pom.xml b/spring-boot-devtools/pom.xml
@@ -94,7 +94,7 @@
 		</dependency>
 		<dependency>
 			<groupId>org.springframework.boot</groupId>
-			<artifactId>spring-boot-junit-runners</artifactId>
+			<artifactId>spring-boot-test-support</artifactId>
 			<scope>test</scope>
 		</dependency>
 		<dependency>

diff --git a/spring-boot-docs/pom.xml b/spring-boot-docs/pom.xml
@@ -732,7 +732,7 @@
 		</dependency>
 		<dependency>
 			<groupId>org.springframework.boot</groupId>
-			<artifactId>spring-boot-junit-runners</artifactId>
+			<artifactId>spring-boot-test-support</artifactId>
 			<scope>test</scope>
 		</dependency>
 	</dependencies>

diff --git a/spring-boot-full-build/pom.xml b/spring-boot-full-build/pom.xml
@@ -48,7 +48,7 @@
 		<module>../spring-boot-dependencies</module>
 		<module>../spring-boot-parent</module>
 		<module>../spring-boot-tools</module>
-		<module>../spring-boot-junit-runners</module>
+		<module>../spring-boot-test-support</module>
 		<module>../spring-boot</module>
 		<module>../spring-boot-test</module>
 		<module>../spring-boot-autoconfigure</module>

diff --git a/spring-boot-test-autoconfigure/pom.xml b/spring-boot-test-autoconfigure/pom.xml
@@ -130,7 +130,7 @@
 		<!-- Test -->
 		<dependency>
 			<groupId>org.springframework.boot</groupId>
-			<artifactId>spring-boot-junit-runners</artifactId>
+			<artifactId>spring-boot-test-support</artifactId>
 			<scope>test</scope>
 		</dependency>
 		<dependency>

diff --git a/spring-boot-junit-runners/pom.xml → spring-boot-test-support/pom.xml b/spring-boot-junit-runners/pom.xml → spring-boot-test-support/pom.xml
@@ -8,9 +8,9 @@
 		<version>2.0.0.BUILD-SNAPSHOT</version>
 		<relativePath>../spring-boot-parent</relativePath>
 	</parent>
-	<artifactId>spring-boot-junit-runners</artifactId>
-	<name>Spring Boot JUnit Runners</name>
-	<description>Spring Boot JUnit Runners</description>
+	<artifactId>spring-boot-test-support</artifactId>
+	<name>Spring Boot Testing Support</name>
+	<description>Spring Boot Testing Support</description>
 	<url>http://projects.spring.io/spring-boot/</url>
 	<organization>
 		<name>Pivotal Software, Inc.</name>

diff --git a/...runner/classpath/ClassPathExclusions.java → ...runner/classpath/ClassPathExclusions.java b/...runner/classpath/ClassPathExclusions.java → ...runner/classpath/ClassPathExclusions.java
diff --git a/.../runner/classpath/ClassPathOverrides.java → .../runner/classpath/ClassPathOverrides.java b/.../runner/classpath/ClassPathOverrides.java → .../runner/classpath/ClassPathOverrides.java
diff --git a/...er/classpath/ModifiedClassPathRunner.java → ...er/classpath/ModifiedClassPathRunner.java b/...er/classpath/ModifiedClassPathRunner.java → ...er/classpath/ModifiedClassPathRunner.java
diff --git a/.../junit/runner/classpath/package-info.java → .../junit/runner/classpath/package-info.java b/.../junit/runner/classpath/package-info.java → .../junit/runner/classpath/package-info.java
diff --git a/...ework/boot/junit/runner/package-info.java → ...ework/boot/junit/runner/package-info.java b/...ework/boot/junit/runner/package-info.java → ...ework/boot/junit/runner/package-info.java
diff --git a/...difiedClassPathRunnerExclusionsTests.java → ...difiedClassPathRunnerExclusionsTests.java b/...difiedClassPathRunnerExclusionsTests.java → ...difiedClassPathRunnerExclusionsTests.java
diff --git a/...odifiedClassPathRunnerOverridesTests.java → ...odifiedClassPathRunnerOverridesTests.java b/...odifiedClassPathRunnerOverridesTests.java → ...odifiedClassPathRunnerOverridesTests.java
diff --git a/spring-boot-test/pom.xml b/spring-boot-test/pom.xml
@@ -120,7 +120,7 @@
 		</dependency>
 		<dependency>
 			<groupId>org.springframework.boot</groupId>
-			<artifactId>spring-boot-junit-runners</artifactId>
+			<artifactId>spring-boot-test-support</artifactId>
 			<scope>test</scope>
 		</dependency>
 		<dependency>

diff --git a/spring-boot/pom.xml b/spring-boot/pom.xml
@@ -248,7 +248,7 @@
 		<!-- Test -->
 		<dependency>
 			<groupId>org.springframework.boot</groupId>
-			<artifactId>spring-boot-junit-runners</artifactId>
+			<artifactId>spring-boot-test-support</artifactId>
 			<scope>test</scope>
 		</dependency>
 		<dependency>