Merge branch '2.1.x'

Closes gh-17854

Author: snicoll

spring-boot-project/spring-boot-dependencies/pom.xml

@@ -53,6 +53,7 @@
 		<commons-pool2.version>2.7.0</commons-pool2.version>
 		<couchbase-client.version>2.7.9</couchbase-client.version>
 		<couchbase-cache-client.version>2.1.0</couchbase-cache-client.version>
+		<dependency-management-plugin.version>1.0.8.RELEASE</dependency-management-plugin.version>
 		<derby.version>10.14.2.0</derby.version>
 		<dropwizard-metrics.version>4.1.0</dropwizard-metrics.version>
 		<ehcache.version>2.10.6</ehcache.version>
@@ -1158,6 +1159,11 @@
 				<artifactId>jest</artifactId>
 				<version>${jest.version}</version>
 			</dependency>
+			<dependency>
+				<groupId>io.spring.gradle</groupId>
+				<artifactId>dependency-management-plugin</artifactId>
+				<version>${dependency-management-plugin.version}</version>
+			</dependency>
 			<dependency>
 				<groupId>io.undertow</groupId>
 				<artifactId>undertow-core</artifactId>

spring-boot-project/spring-boot-parent/pom.xml

@@ -28,7 +28,6 @@
 		<spock.version>1.0-groovy-2.4</spock.version>
 		<testcontainers.version>1.10.6</testcontainers.version>
 		<testng.version>6.14.3</testng.version>
-		<dependency-management-plugin.version>1.0.8.RELEASE</dependency-management-plugin.version>
 		<spring-doc-resources.version>0.1.2.RELEASE</spring-doc-resources.version>
 	</properties>
 	<scm>
@@ -80,11 +79,6 @@
 				<artifactId>android-json</artifactId>
 				<version>0.0.20131108.vaadin1</version>
 			</dependency>
-			<dependency>
-				<groupId>io.spring.gradle</groupId>
-				<artifactId>dependency-management-plugin</artifactId>
-				<version>${dependency-management-plugin.version}</version>
-			</dependency>
 			<dependency>
 				<groupId>jline</groupId>
 				<artifactId>jline</artifactId>