Harmonize settings.gradle documentation in Gradle getting started guide

snicoll · snicoll · commit 0c560795fd2a · 2019-07-31T15:11:53.000+02:00
See gh-17736
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
@@ -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
@@ -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
@@ -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
@@ -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 {

Original file line number	Diff line number	Diff line change
`@@ -1,13 +1,13 @@`
`1`	`1`	`pluginManagement {`
`2`		`- repositories {`
`3`		`- maven { url 'https://repo.spring.io/milestone' }`
`4`		`- maven { url 'https://repo.spring.io/snapshot' }`
	`2`	`+ repositories {`
	`3`	`+ maven { url 'https://repo.spring.io/milestone' }`
	`4`	`+ maven { url 'https://repo.spring.io/snapshot' }`
`5`	`5`	`gradlePluginPortal()`
`6`	`6`	`}`
`7`	`7`	`resolutionStrategy {`
`8`	`8`	`eachPlugin {`
`9`	`9`	`if (requested.id.id == 'org.springframework.boot') {`
`10`		`- useModule("org.springframework.boot:spring-boot-gradle-plugin:${requested.version}")`
	`10`	`+ useModule "org.springframework.boot:spring-boot-gradle-plugin:${requested.version}"`
`11`	`11`	`}`
`12`	`12`	`}`
`13`	`13`	`}`