Remove test dependencies from spring-boot-starter-parent

Fixes gh-617

Conflicts:

	spring-boot-docs/src/main/asciidoc/spring-boot-features.adoc

spring-boot-docs/src/main/asciidoc/getting-started.adoc

@@ -203,7 +203,7 @@ endif::release[]
 
 	dependencies {
 		compile("org.springframework.boot:spring-boot-starter-web")
-		testCompile("junit:junit")
+		testCompile("org.springframework.boot:spring-boot-starter-test")
 	}
 ----
 
@@ -477,16 +477,11 @@ currently have.
 	$ mvn dependency:tree
 
 	[INFO] com.example:myproject:jar:0.0.1-SNAPSHOT
-	[INFO] +- junit:junit:jar:4.11:test
-	[INFO] |  \- org.hamcrest:hamcrest-core:jar:1.3:test
-	[INFO] +- org.mockito:mockito-core:jar:1.9.5:test
-	[INFO] |  \- org.objenesis:objenesis:jar:1.0:test
-	[INFO] \- org.hamcrest:hamcrest-library:jar:1.3:test
 ----
 
 The `mvn dependency:tree` command prints tree representation of your project dependencies.
-You can see that `spring-boot-starter-parent` has already provided some useful test
-dependencies. Let's edit our `pom.xml` and add the `spring-boot-starter-web` dependency
+You can see that `spring-boot-starter-parent` provides no
+dependenciesby itself. Let's edit our `pom.xml` and add the `spring-boot-starter-web` dependency
 just below the `parent` section:
 
 [source,xml,indent=0,subs="verbatim,quotes,attributes"]

spring-boot-docs/src/main/asciidoc/spring-boot-features.adoc

@@ -1470,20 +1470,20 @@ documentation].
 [[boot-features-testing]]
 == Testing
 Spring Boot provides a number of useful tools for testing your application. The
-`spring-boot-starter-parent` POM provides JUnit, Hamcrest and Mockito ``test'' `scope`
+`spring-boot-starter-test` POM provides Spring Test, JUnit, Hamcrest and Mockito
 dependencies. There are also useful test utilities in the core `spring-boot` module
-under the `org.springframework.boot.test` package. There is also a
-`spring-boot-starter-test` ``Starter POM''.
+under the `org.springframework.boot.test` package.
 
 
 
 [[boot-features-test-scope-dependencies]]
 === Test scope dependencies
-If you extend your Maven project from the `spring-boot-starter-parent` POM, or use the
+If you use the
 `spring-boot-starter-test` ``Starter POM'' (in the `test` `scope`), you will find
 the following provided libraries:
 
-* JUnit -- The de-facto standard for unit testing Java applications.
+* Spring Test -- integration test support for Spring applications.
+* Junit -- The de-facto standard for unit testing Java applications.
 * Hamcrest -- A library of matcher objects (also known as constraints or predicates)
   allowing `assertThat` style JUnit assertions.
 * Mockito -- A Java mocking framework.

spring-boot-docs/src/main/asciidoc/using-spring-boot.adoc

@@ -36,9 +36,6 @@ defaults. The parent project provides the following features:
 * UTF-8 source encoding.
 * A Dependency Management section, allowing you to omit `<version>` tags for common
   dependencies.
-* Generally useful test dependencies (http://junit.org/[JUnit],
-  https://code.google.com/p/hamcrest/[Hamcrest],
-  https://code.google.com/p/mockito/[Mockito]).
 * Sensible https://maven.apache.org/plugins/maven-resources-plugin/examples/filter.html[resource filtering].
 * Sensible plugin configuration (http://mojo.codehaus.org/exec-maven-plugin/[exec plugin],
   http://maven.apache.org/surefire/maven-surefire-plugin/[surefire],

spring-boot-starters/spring-boot-starter-parent/pom.xml

@@ -168,24 +168,6 @@
 			</dependency>
 		</dependencies>
 	</dependencyManagement>
-	<dependencies>
-		<!-- Generally Useful Test Dependencies -->
-		<dependency>
-			<groupId>junit</groupId>
-			<artifactId>junit</artifactId>
-			<scope>test</scope>
-		</dependency>
-		<dependency>
-			<groupId>org.mockito</groupId>
-			<artifactId>mockito-core</artifactId>
-			<scope>test</scope>
-		</dependency>
-		<dependency>
-			<groupId>org.hamcrest</groupId>
-			<artifactId>hamcrest-library</artifactId>
-			<scope>test</scope>
-		</dependency>
-	</dependencies>
 	<build>
 		<!-- Turn on filtering by default for application properties -->
 		<resources>