Merge branch '2.1.x'

Closes gh-17745

spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/main/gradle/getting-started/milestone-settings.gradle

@@ -1,8 +1,7 @@
 pluginManagement {
 	repositories {
-		maven {
-			url 'https://repo.spring.io/libs-milestone'
-		}
+		maven { url 'https://repo.spring.io/milestone' }
+		gradlePluginPortal()
 	}
 	resolutionStrategy {
 		eachPlugin {

spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/main/gradle/getting-started/milestone-settings.gradle.kts

@@ -1,8 +1,7 @@
 pluginManagement {
 	repositories {
-		maven {
-			url = uri("https://repo.spring.io/libs-milestone")
-		}
+		maven { url = uri("https://repo.spring.io/milestone") }
+		gradlePluginPortal()
 	}
 	resolutionStrategy {
 		eachPlugin {

spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/main/gradle/getting-started/snapshot-settings.gradle

@@ -1,8 +1,8 @@
 pluginManagement {
 	repositories {
-		maven {
-			url 'https://repo.spring.io/libs-snapshot'
-		}
+		maven { url 'https://repo.spring.io/milestone' }
+		maven { url 'https://repo.spring.io/snapshot' }
+		gradlePluginPortal()
 	}
 	resolutionStrategy {
 		eachPlugin {

spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/main/gradle/getting-started/snapshot-settings.gradle.kts

@@ -1,8 +1,8 @@
 pluginManagement {
 	repositories {
-		maven {
-			url = uri("https://repo.spring.io/libs-snapshot")
-		}
+		maven { url = uri("https://repo.spring.io/milestone") }
+		maven { url = uri("https://repo.spring.io/snapshot") }
+		gradlePluginPortal()
 	}
 	resolutionStrategy {
 		eachPlugin {