From e7b0450a7fc9f98aa341a851b49ef7e63603caeb Mon Sep 17 00:00:00 2001
From: Dave Syer <dsyer@pivotal.io>
Date: Tue, 30 Jul 2019 16:06:15 +0100
Subject: [PATCH 1/2] Add missing repositories to snapshot configuration

See gh-17736
---
 .../gradle/getting-started/snapshot-settings.gradle    | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/main/gradle/getting-started/snapshot-settings.gradle b/spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/main/gradle/getting-started/snapshot-settings.gradle
index 4fa5e135aa..beb6d1761a 100644
--- a/spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/main/gradle/getting-started/snapshot-settings.gradle
+++ b/spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/main/gradle/getting-started/snapshot-settings.gradle
@@ -1,13 +1,13 @@
 pluginManagement {
-	repositories {
-		maven {
-			url 'https://repo.spring.io/libs-snapshot'
-		}
+        repositories {
+                maven { url 'https://repo.spring.io/milestone' }
+                maven { url 'https://repo.spring.io/snapshot' }
+		gradlePluginPortal()
 	}
 	resolutionStrategy {
 		eachPlugin {
 			if (requested.id.id == 'org.springframework.boot') {
-				useModule "org.springframework.boot:spring-boot-gradle-plugin:${requested.version}"
+				useModule("org.springframework.boot:spring-boot-gradle-plugin:${requested.version}")
 			}
 		}
 	}

From 0c560795fd2a22d884ce11e6aa5b962337c81174 Mon Sep 17 00:00:00 2001
From: Stephane Nicoll <snicoll@pivotal.io>
Date: Wed, 31 Jul 2019 15:11:21 +0200
Subject: [PATCH 2/2] Harmonize settings.gradle documentation in Gradle getting
 started guide

See gh-17736
---
 .../main/gradle/getting-started/milestone-settings.gradle | 5 ++---
 .../gradle/getting-started/milestone-settings.gradle.kts  | 5 ++---
 .../main/gradle/getting-started/snapshot-settings.gradle  | 8 ++++----
 .../gradle/getting-started/snapshot-settings.gradle.kts   | 6 +++---
 4 files changed, 11 insertions(+), 13 deletions(-)

diff --git a/spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/main/gradle/getting-started/milestone-settings.gradle b/spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/main/gradle/getting-started/milestone-settings.gradle
index bd12480b19..c4f8a907e3 100644
--- a/spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/main/gradle/getting-started/milestone-settings.gradle
+++ b/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 {
diff --git a/spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/main/gradle/getting-started/milestone-settings.gradle.kts b/spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/main/gradle/getting-started/milestone-settings.gradle.kts
index ba66973b5b..700ce8a6a8 100644
--- a/spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/main/gradle/getting-started/milestone-settings.gradle.kts
+++ b/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 {
diff --git a/spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/main/gradle/getting-started/snapshot-settings.gradle b/spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/main/gradle/getting-started/snapshot-settings.gradle
index beb6d1761a..559c8cc88f 100644
--- a/spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/main/gradle/getting-started/snapshot-settings.gradle
+++ b/spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/main/gradle/getting-started/snapshot-settings.gradle
@@ -1,13 +1,13 @@
 pluginManagement {
-        repositories {
-                maven { url 'https://repo.spring.io/milestone' }
-                maven { url 'https://repo.spring.io/snapshot' }
+	repositories {
+		maven { url 'https://repo.spring.io/milestone' }
+		maven { url 'https://repo.spring.io/snapshot' }
 		gradlePluginPortal()
 	}
 	resolutionStrategy {
 		eachPlugin {
 			if (requested.id.id == 'org.springframework.boot') {
-				useModule("org.springframework.boot:spring-boot-gradle-plugin:${requested.version}")
+				useModule "org.springframework.boot:spring-boot-gradle-plugin:${requested.version}"
 			}
 		}
 	}
diff --git a/spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/main/gradle/getting-started/snapshot-settings.gradle.kts b/spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/main/gradle/getting-started/snapshot-settings.gradle.kts
index 13c35d5776..ab94996559 100644
--- a/spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/main/gradle/getting-started/snapshot-settings.gradle.kts
+++ b/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 {