Merge branch '2.6.x' into 2.7.x

wilkinsona · wilkinsona · commit 878d09fe79ce · 2022-06-20T15:56:58.000+01:00
Closes gh-31471
diff --git a/settings.gradle b/settings.gradle
@@ -23,7 +23,7 @@ pluginManagement {
 
 plugins {
 	id "com.gradle.enterprise" version "3.9"
-	id "io.spring.ge.conventions" version "0.0.9"
+	id "io.spring.ge.conventions" version "0.0.10"
 }
 
 rootProject.name="spring-boot-build"

Original file line number	Diff line number	Diff line change
`@@ -23,7 +23,7 @@ pluginManagement {`
`23`	`23`
`24`	`24`	`plugins {`
`25`	`25`	`id "com.gradle.enterprise" version "3.9"`
`26`		`- id "io.spring.ge.conventions" version "0.0.9"`
	`26`	`+ id "io.spring.ge.conventions" version "0.0.10"`
`27`	`27`	`}`
`28`	`28`
`29`	`29`	`rootProject.name="spring-boot-build"`