diff --git a/pom.xml b/pom.xml index f65fe87bdd..9c8a4e7ae7 100644 --- a/pom.xml +++ b/pom.xml @@ -81,6 +81,7 @@ spring-boot-dependencies spring-boot-parent spring-boot-tools + spring-boot-junit-runners spring-boot spring-boot-test spring-boot-autoconfigure diff --git a/spring-boot-actuator/pom.xml b/spring-boot-actuator/pom.xml index 984b8cbf5d..f845fe9335 100644 --- a/spring-boot-actuator/pom.xml +++ b/spring-boot-actuator/pom.xml @@ -286,6 +286,11 @@ test-jar test + + org.springframework.boot + spring-boot-junit-runners + test + org.springframework.boot spring-boot-test diff --git a/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/autoconfigure/ManagementServerPropertiesAutoConfigurationNoSecurityTests.java b/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/autoconfigure/ManagementServerPropertiesAutoConfigurationNoSecurityTests.java index 1060636db4..aa66780544 100644 --- a/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/autoconfigure/ManagementServerPropertiesAutoConfigurationNoSecurityTests.java +++ b/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/autoconfigure/ManagementServerPropertiesAutoConfigurationNoSecurityTests.java @@ -20,9 +20,9 @@ import org.junit.After; import org.junit.Test; import org.junit.runner.RunWith; +import org.springframework.boot.junit.runner.classpath.ClassPathExclusions; +import org.springframework.boot.junit.runner.classpath.ModifiedClassPathRunner; import org.springframework.boot.test.util.EnvironmentTestUtils; -import org.springframework.boot.testutil.ClassPathExclusions; -import org.springframework.boot.testutil.ModifiedClassPathRunner; import org.springframework.context.annotation.AnnotationConfigApplicationContext; import static org.assertj.core.api.Assertions.assertThat; diff --git a/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/endpoint/mvc/NoSpringSecurityHealthMvcEndpointIntegrationTests.java b/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/endpoint/mvc/NoSpringSecurityHealthMvcEndpointIntegrationTests.java index 0feaf7f230..b6e52904dc 100644 --- a/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/endpoint/mvc/NoSpringSecurityHealthMvcEndpointIntegrationTests.java +++ b/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/endpoint/mvc/NoSpringSecurityHealthMvcEndpointIntegrationTests.java @@ -30,8 +30,8 @@ import org.springframework.boot.autoconfigure.PropertyPlaceholderAutoConfigurati import org.springframework.boot.autoconfigure.jackson.JacksonAutoConfiguration; import org.springframework.boot.autoconfigure.web.HttpMessageConvertersAutoConfiguration; import org.springframework.boot.autoconfigure.web.WebMvcAutoConfiguration; -import org.springframework.boot.testutil.ClassPathExclusions; -import org.springframework.boot.testutil.ModifiedClassPathRunner; +import org.springframework.boot.junit.runner.classpath.ClassPathExclusions; +import org.springframework.boot.junit.runner.classpath.ModifiedClassPathRunner; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; import org.springframework.mock.web.MockServletContext; diff --git a/spring-boot-autoconfigure/pom.xml b/spring-boot-autoconfigure/pom.xml index fd311054d8..79c324793a 100755 --- a/spring-boot-autoconfigure/pom.xml +++ b/spring-boot-autoconfigure/pom.xml @@ -605,6 +605,11 @@ test-jar test + + org.springframework.boot + spring-boot-junit-runners + test + org.springframework.boot spring-boot-test diff --git a/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/condition/OnBeanConditionTypeDeductionFailureTests.java b/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/condition/OnBeanConditionTypeDeductionFailureTests.java index 0236b94ddf..7d72947f59 100644 --- a/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/condition/OnBeanConditionTypeDeductionFailureTests.java +++ b/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/condition/OnBeanConditionTypeDeductionFailureTests.java @@ -21,8 +21,8 @@ import org.junit.Test; import org.junit.runner.RunWith; import org.springframework.boot.autoconfigure.condition.OnBeanCondition.BeanTypeDeductionException; -import org.springframework.boot.testutil.ClassPathExclusions; -import org.springframework.boot.testutil.ModifiedClassPathRunner; +import org.springframework.boot.junit.runner.classpath.ClassPathExclusions; +import org.springframework.boot.junit.runner.classpath.ModifiedClassPathRunner; import org.springframework.context.annotation.AnnotationConfigApplicationContext; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; diff --git a/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/jdbc/DataSourceBeanCreationFailureAnalyzerTests.java b/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/jdbc/DataSourceBeanCreationFailureAnalyzerTests.java index 5a044d4143..c1086780a7 100644 --- a/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/jdbc/DataSourceBeanCreationFailureAnalyzerTests.java +++ b/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/jdbc/DataSourceBeanCreationFailureAnalyzerTests.java @@ -22,8 +22,8 @@ import org.junit.runner.RunWith; import org.springframework.beans.factory.BeanCreationException; import org.springframework.boot.autoconfigure.ImportAutoConfiguration; import org.springframework.boot.diagnostics.FailureAnalysis; -import org.springframework.boot.testutil.ClassPathExclusions; -import org.springframework.boot.testutil.ModifiedClassPathRunner; +import org.springframework.boot.junit.runner.classpath.ClassPathExclusions; +import org.springframework.boot.junit.runner.classpath.ModifiedClassPathRunner; import org.springframework.context.annotation.AnnotationConfigApplicationContext; import org.springframework.context.annotation.Configuration; diff --git a/spring-boot-dependencies/pom.xml b/spring-boot-dependencies/pom.xml index e4f3db7254..0512aea8d8 100644 --- a/spring-boot-dependencies/pom.xml +++ b/spring-boot-dependencies/pom.xml @@ -203,6 +203,11 @@ test-jar 1.5.0.BUILD-SNAPSHOT + + org.springframework.boot + spring-boot-junit-runners + 1.5.0.BUILD-SNAPSHOT + org.springframework.boot spring-boot-test @@ -2613,4 +2618,4 @@ integration-test - + \ No newline at end of file diff --git a/spring-boot-devtools/pom.xml b/spring-boot-devtools/pom.xml index 7d62b1bef0..55965acc0d 100644 --- a/spring-boot-devtools/pom.xml +++ b/spring-boot-devtools/pom.xml @@ -92,6 +92,11 @@ test-jar test + + org.springframework.boot + spring-boot-junit-runners + test + org.springframework.boot spring-boot-test diff --git a/spring-boot-devtools/src/test/java/org/springframework/boot/devtools/autoconfigure/DevToolsEmbeddedDataSourceAutoConfigurationTests.java b/spring-boot-devtools/src/test/java/org/springframework/boot/devtools/autoconfigure/DevToolsEmbeddedDataSourceAutoConfigurationTests.java index 9fc1a9eddf..52b2a53eeb 100644 --- a/spring-boot-devtools/src/test/java/org/springframework/boot/devtools/autoconfigure/DevToolsEmbeddedDataSourceAutoConfigurationTests.java +++ b/spring-boot-devtools/src/test/java/org/springframework/boot/devtools/autoconfigure/DevToolsEmbeddedDataSourceAutoConfigurationTests.java @@ -25,8 +25,8 @@ import org.junit.Test; import org.junit.runner.RunWith; import org.springframework.boot.autoconfigure.jdbc.DataSourceAutoConfiguration; -import org.springframework.boot.testutil.ClassPathExclusions; -import org.springframework.boot.testutil.ModifiedClassPathRunner; +import org.springframework.boot.junit.runner.classpath.ClassPathExclusions; +import org.springframework.boot.junit.runner.classpath.ModifiedClassPathRunner; import org.springframework.context.ConfigurableApplicationContext; import static org.mockito.Mockito.times; diff --git a/spring-boot-docs/pom.xml b/spring-boot-docs/pom.xml index 00c64be0bd..5c5b4b4598 100644 --- a/spring-boot-docs/pom.xml +++ b/spring-boot-docs/pom.xml @@ -722,6 +722,11 @@ test-jar test + + org.springframework.boot + spring-boot-junit-runners + test + diff --git a/spring-boot-docs/src/test/java/org/springframework/boot/builder/SpringApplicationBuilderExampleTests.java b/spring-boot-docs/src/test/java/org/springframework/boot/builder/SpringApplicationBuilderExampleTests.java index 9927cf0912..2774836a42 100644 --- a/spring-boot-docs/src/test/java/org/springframework/boot/builder/SpringApplicationBuilderExampleTests.java +++ b/spring-boot-docs/src/test/java/org/springframework/boot/builder/SpringApplicationBuilderExampleTests.java @@ -20,9 +20,9 @@ import org.junit.Rule; import org.junit.Test; import org.junit.runner.RunWith; +import org.springframework.boot.junit.runner.classpath.ClassPathExclusions; +import org.springframework.boot.junit.runner.classpath.ModifiedClassPathRunner; import org.springframework.boot.test.rule.OutputCapture; -import org.springframework.boot.testutil.ClassPathExclusions; -import org.springframework.boot.testutil.ModifiedClassPathRunner; import static org.assertj.core.api.Assertions.assertThat; diff --git a/spring-boot-full-build/pom.xml b/spring-boot-full-build/pom.xml index 0a4e5fca65..f552da11da 100644 --- a/spring-boot-full-build/pom.xml +++ b/spring-boot-full-build/pom.xml @@ -48,6 +48,7 @@ ../spring-boot-dependencies ../spring-boot-parent ../spring-boot-tools + ../spring-boot-junit-runners ../spring-boot ../spring-boot-test ../spring-boot-autoconfigure diff --git a/spring-boot-junit-runners/pom.xml b/spring-boot-junit-runners/pom.xml new file mode 100644 index 0000000000..d0c5525f37 --- /dev/null +++ b/spring-boot-junit-runners/pom.xml @@ -0,0 +1,99 @@ + + + 4.0.0 + + org.springframework.boot + spring-boot-parent + 1.5.0.BUILD-SNAPSHOT + ../spring-boot-parent + + spring-boot-junit-runners + Spring Boot JUnit Runners + Spring Boot JUnit Runners + http://projects.spring.io/spring-boot/ + + Pivotal Software, Inc. + http://www.spring.io + + + ${basedir}/.. + + + + + junit + junit + provided + + + + org.apache.maven + maven-aether-provider + + + org.eclipse.sisu.plexus + org.eclipse.sisu + + + + + org.apache.maven + maven-settings-builder + + + org.codehaus.plexus + plexus-component-api + + + * + * + + + + + org.eclipse.aether + aether-api + + + org.eclipse.aether + aether-connector-basic + + + org.eclipse.aether + aether-impl + + + org.eclipse.aether + aether-spi + + + org.eclipse.aether + aether-transport-file + + + org.eclipse.aether + aether-transport-http + + + jcl-over-slf4j + org.slf4j + + + + + org.eclipse.aether + aether-util + + + org.springframework + spring-core + + + + io.projectreactor.spring + reactor-spring-context + test + + + diff --git a/spring-boot/src/test/java/org/springframework/boot/testutil/ClassPathExclusions.java b/spring-boot-junit-runners/src/main/java/org/springframework/boot/junit/runner/classpath/ClassPathExclusions.java similarity index 96% rename from spring-boot/src/test/java/org/springframework/boot/testutil/ClassPathExclusions.java rename to spring-boot-junit-runners/src/main/java/org/springframework/boot/junit/runner/classpath/ClassPathExclusions.java index b42c053a64..ab05e17854 100644 --- a/spring-boot/src/test/java/org/springframework/boot/testutil/ClassPathExclusions.java +++ b/spring-boot-junit-runners/src/main/java/org/springframework/boot/junit/runner/classpath/ClassPathExclusions.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.boot.testutil; +package org.springframework.boot.junit.runner.classpath; import java.io.File; import java.lang.annotation.ElementType; diff --git a/spring-boot/src/test/java/org/springframework/boot/testutil/ClassPathOverrides.java b/spring-boot-junit-runners/src/main/java/org/springframework/boot/junit/runner/classpath/ClassPathOverrides.java similarity index 95% rename from spring-boot/src/test/java/org/springframework/boot/testutil/ClassPathOverrides.java rename to spring-boot-junit-runners/src/main/java/org/springframework/boot/junit/runner/classpath/ClassPathOverrides.java index 93af3c074e..ad3ccbf083 100644 --- a/spring-boot/src/test/java/org/springframework/boot/testutil/ClassPathOverrides.java +++ b/spring-boot-junit-runners/src/main/java/org/springframework/boot/junit/runner/classpath/ClassPathOverrides.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.boot.testutil; +package org.springframework.boot.junit.runner.classpath; import java.lang.annotation.ElementType; import java.lang.annotation.Retention; diff --git a/spring-boot/src/test/java/org/springframework/boot/testutil/ModifiedClassPathRunner.java b/spring-boot-junit-runners/src/main/java/org/springframework/boot/junit/runner/classpath/ModifiedClassPathRunner.java similarity index 99% rename from spring-boot/src/test/java/org/springframework/boot/testutil/ModifiedClassPathRunner.java rename to spring-boot-junit-runners/src/main/java/org/springframework/boot/junit/runner/classpath/ModifiedClassPathRunner.java index c7f05b4866..85656ac3b3 100644 --- a/spring-boot/src/test/java/org/springframework/boot/testutil/ModifiedClassPathRunner.java +++ b/spring-boot-junit-runners/src/main/java/org/springframework/boot/junit/runner/classpath/ModifiedClassPathRunner.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.boot.testutil; +package org.springframework.boot.junit.runner.classpath; import java.io.File; import java.lang.annotation.Annotation; diff --git a/spring-boot-junit-runners/src/main/java/org/springframework/boot/junit/runner/classpath/package-info.java b/spring-boot-junit-runners/src/main/java/org/springframework/boot/junit/runner/classpath/package-info.java new file mode 100644 index 0000000000..6764178349 --- /dev/null +++ b/spring-boot-junit-runners/src/main/java/org/springframework/boot/junit/runner/classpath/package-info.java @@ -0,0 +1,20 @@ +/* + * Copyright 2012-2016 the original author or authors. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +/** + * Custom JUnit runner to change the classpath. + */ +package org.springframework.boot.junit.runner.classpath; diff --git a/spring-boot-junit-runners/src/main/java/org/springframework/boot/junit/runner/package-info.java b/spring-boot-junit-runners/src/main/java/org/springframework/boot/junit/runner/package-info.java new file mode 100644 index 0000000000..5e4237e267 --- /dev/null +++ b/spring-boot-junit-runners/src/main/java/org/springframework/boot/junit/runner/package-info.java @@ -0,0 +1,20 @@ +/* + * Copyright 2012-2016 the original author or authors. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +/** + * Custom JUnit runners used in Spring Boot's own tests. + */ +package org.springframework.boot.junit.runner; diff --git a/spring-boot/src/test/java/org/springframework/boot/testutil/ModifiedClassPathRunnerExclusionsTests.java b/spring-boot-junit-runners/src/test/java/org/springframework/boot/junit/runner/classpath/ModifiedClassPathRunnerExclusionsTests.java similarity index 96% rename from spring-boot/src/test/java/org/springframework/boot/testutil/ModifiedClassPathRunnerExclusionsTests.java rename to spring-boot-junit-runners/src/test/java/org/springframework/boot/junit/runner/classpath/ModifiedClassPathRunnerExclusionsTests.java index 40803d8e4b..5628cb8046 100644 --- a/spring-boot/src/test/java/org/springframework/boot/testutil/ModifiedClassPathRunnerExclusionsTests.java +++ b/spring-boot-junit-runners/src/test/java/org/springframework/boot/junit/runner/classpath/ModifiedClassPathRunnerExclusionsTests.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.boot.testutil; +package org.springframework.boot.junit.runner.classpath; import org.junit.Test; import org.junit.runner.RunWith; diff --git a/spring-boot/src/test/java/org/springframework/boot/testutil/ModifiedClassPathRunnerOverridesTests.java b/spring-boot-junit-runners/src/test/java/org/springframework/boot/junit/runner/classpath/ModifiedClassPathRunnerOverridesTests.java similarity index 96% rename from spring-boot/src/test/java/org/springframework/boot/testutil/ModifiedClassPathRunnerOverridesTests.java rename to spring-boot-junit-runners/src/test/java/org/springframework/boot/junit/runner/classpath/ModifiedClassPathRunnerOverridesTests.java index 8d51b23034..a7ce73a3ee 100644 --- a/spring-boot/src/test/java/org/springframework/boot/testutil/ModifiedClassPathRunnerOverridesTests.java +++ b/spring-boot-junit-runners/src/test/java/org/springframework/boot/junit/runner/classpath/ModifiedClassPathRunnerOverridesTests.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.boot.testutil; +package org.springframework.boot.junit.runner.classpath; import org.junit.Test; import org.junit.runner.RunWith; diff --git a/spring-boot-samples/spring-boot-sample-ant/pom.xml b/spring-boot-samples/spring-boot-sample-ant/pom.xml index c681c3e232..47e3e96500 100644 --- a/spring-boot-samples/spring-boot-sample-ant/pom.xml +++ b/spring-boot-samples/spring-boot-sample-ant/pom.xml @@ -1,5 +1,4 @@ - - + 4.0.0 @@ -60,8 +59,8 @@ package - - + + @@ -101,4 +100,4 @@ - + \ No newline at end of file diff --git a/spring-boot-test/pom.xml b/spring-boot-test/pom.xml index d9f03e8234..eb1af9b776 100644 --- a/spring-boot-test/pom.xml +++ b/spring-boot-test/pom.xml @@ -118,6 +118,11 @@ test-jar test + + org.springframework.boot + spring-boot-junit-runners + test + org.jetbrains.kotlin kotlin-runtime diff --git a/spring-boot-test/src/test/java/org/springframework/boot/test/mock/mockito/Mockito21Tests.java b/spring-boot-test/src/test/java/org/springframework/boot/test/mock/mockito/Mockito21Tests.java index 495a772080..c6878dea47 100644 --- a/spring-boot-test/src/test/java/org/springframework/boot/test/mock/mockito/Mockito21Tests.java +++ b/spring-boot-test/src/test/java/org/springframework/boot/test/mock/mockito/Mockito21Tests.java @@ -21,8 +21,8 @@ import org.junit.runner.JUnitCore; import org.junit.runner.Result; import org.junit.runner.RunWith; -import org.springframework.boot.testutil.ClassPathOverrides; -import org.springframework.boot.testutil.ModifiedClassPathRunner; +import org.springframework.boot.junit.runner.classpath.ClassPathOverrides; +import org.springframework.boot.junit.runner.classpath.ModifiedClassPathRunner; import static org.assertj.core.api.Assertions.assertThat; diff --git a/spring-boot-test/src/test/java/org/springframework/boot/test/mock/mockito/Mockito22Tests.java b/spring-boot-test/src/test/java/org/springframework/boot/test/mock/mockito/Mockito22Tests.java index 57df08053a..967f1b79ba 100644 --- a/spring-boot-test/src/test/java/org/springframework/boot/test/mock/mockito/Mockito22Tests.java +++ b/spring-boot-test/src/test/java/org/springframework/boot/test/mock/mockito/Mockito22Tests.java @@ -21,8 +21,8 @@ import org.junit.runner.JUnitCore; import org.junit.runner.Result; import org.junit.runner.RunWith; -import org.springframework.boot.testutil.ClassPathOverrides; -import org.springframework.boot.testutil.ModifiedClassPathRunner; +import org.springframework.boot.junit.runner.classpath.ClassPathOverrides; +import org.springframework.boot.junit.runner.classpath.ModifiedClassPathRunner; import static org.assertj.core.api.Assertions.assertThat; diff --git a/spring-boot/pom.xml b/spring-boot/pom.xml index 16b412cab1..16f001da68 100644 --- a/spring-boot/pom.xml +++ b/spring-boot/pom.xml @@ -246,6 +246,11 @@ true + + org.springframework.boot + spring-boot-junit-runners + test + com.google.appengine appengine-api-1.0-sdk @@ -290,64 +295,6 @@ org.apache.httpcomponents httpasyncclient test - - - org.apache.maven - maven-aether-provider - - - org.eclipse.sisu.plexus - org.eclipse.sisu - - - - - org.apache.maven - maven-settings-builder - - - org.codehaus.plexus - plexus-component-api - - - * - * - - - - - org.eclipse.aether - aether-api - - - org.eclipse.aether - aether-connector-basic - - - org.eclipse.aether - aether-impl - - - org.eclipse.aether - aether-spi - - - org.eclipse.aether - aether-transport-file - - - org.eclipse.aether - aether-transport-http - - - jcl-over-slf4j - org.slf4j - - - - - org.eclipse.aether - aether-util org.firebirdsql.jdbc diff --git a/spring-boot/src/test/java/org/springframework/boot/diagnostics/analyzer/ValidationExceptionFailureAnalyzerTests.java b/spring-boot/src/test/java/org/springframework/boot/diagnostics/analyzer/ValidationExceptionFailureAnalyzerTests.java index e70e949f96..1be55cf125 100644 --- a/spring-boot/src/test/java/org/springframework/boot/diagnostics/analyzer/ValidationExceptionFailureAnalyzerTests.java +++ b/spring-boot/src/test/java/org/springframework/boot/diagnostics/analyzer/ValidationExceptionFailureAnalyzerTests.java @@ -22,8 +22,8 @@ import org.junit.runner.RunWith; import org.springframework.boot.context.properties.ConfigurationProperties; import org.springframework.boot.context.properties.EnableConfigurationProperties; import org.springframework.boot.diagnostics.FailureAnalysis; -import org.springframework.boot.testutil.ClassPathExclusions; -import org.springframework.boot.testutil.ModifiedClassPathRunner; +import org.springframework.boot.junit.runner.classpath.ClassPathExclusions; +import org.springframework.boot.junit.runner.classpath.ModifiedClassPathRunner; import org.springframework.context.annotation.AnnotationConfigApplicationContext; import static org.assertj.core.api.Assertions.assertThat;