Spring/spring-boot
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch '1.5.x'

Browse Source
This commit is contained in:
Stephane Nicoll
2016-12-01 16:28:29 +01:00
parent 4445bb6c60 ee72e788ed
commit 816c236e5b
18 changed files with 15 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
pom.xml
View File

@@ -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>

2
spring-boot-actuator/pom.xml
View File

@@ -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>

2
spring-boot-autoconfigure/pom.xml
View File

@@ -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>

6
spring-boot-dependencies/pom.xml
View File

@@ -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>

2
spring-boot-devtools/pom.xml
View File

@@ -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>

2
spring-boot-docs/pom.xml
View File

@@ -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>

2
spring-boot-full-build/pom.xml
View File

@@ -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>

2
spring-boot-test-autoconfigure/pom.xml
View File

@@ -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>

6
spring-boot-junit-runners/pom.xml → spring-boot-test-support/pom.xml
View File

@@ -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>

0
spring-boot-junit-runners/src/main/java/org/springframework/boot/junit/runner/classpath/ClassPathExclusions.java → spring-boot-test-support/src/main/java/org/springframework/boot/junit/runner/classpath/ClassPathExclusions.java
View File

0
spring-boot-junit-runners/src/main/java/org/springframework/boot/junit/runner/classpath/ClassPathOverrides.java → spring-boot-test-support/src/main/java/org/springframework/boot/junit/runner/classpath/ClassPathOverrides.java
View File

0
spring-boot-junit-runners/src/main/java/org/springframework/boot/junit/runner/classpath/ModifiedClassPathRunner.java → spring-boot-test-support/src/main/java/org/springframework/boot/junit/runner/classpath/ModifiedClassPathRunner.java
View File

0
spring-boot-junit-runners/src/main/java/org/springframework/boot/junit/runner/classpath/package-info.java → spring-boot-test-support/src/main/java/org/springframework/boot/junit/runner/classpath/package-info.java
View File

0
spring-boot-junit-runners/src/main/java/org/springframework/boot/junit/runner/package-info.java → spring-boot-test-support/src/main/java/org/springframework/boot/junit/runner/package-info.java
View File

0
spring-boot-junit-runners/src/test/java/org/springframework/boot/junit/runner/classpath/ModifiedClassPathRunnerExclusionsTests.java → spring-boot-test-support/src/test/java/org/springframework/boot/junit/runner/classpath/ModifiedClassPathRunnerExclusionsTests.java
View File

0
spring-boot-junit-runners/src/test/java/org/springframework/boot/junit/runner/classpath/ModifiedClassPathRunnerOverridesTests.java → spring-boot-test-support/src/test/java/org/springframework/boot/junit/runner/classpath/ModifiedClassPathRunnerOverridesTests.java
View File

2
spring-boot-test/pom.xml
View File

@@ -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>

2
spring-boot/pom.xml
View File

@@ -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>