Merge branch '2.7.x' into 3.0.x

wilkinsona · wilkinsona · commit 042c8e94a90c · 2023-03-24T15:34:08.000Z
Closes gh-34750
diff --git a/settings.gradle b/settings.gradle
@@ -19,7 +19,7 @@ pluginManagement {
 }
 
 plugins {
-	id "com.gradle.enterprise" version "3.12.4"
+	id "com.gradle.enterprise" version "3.12.5"
 	id "io.spring.ge.conventions" version "0.0.13"
 }
 

Original file line number	Diff line number	Diff line change
`@@ -19,7 +19,7 @@ pluginManagement {`
`19`	`19`	`}`
`20`	`20`
`21`	`21`	`plugins {`
`22`		`- id "com.gradle.enterprise" version "3.12.4"`
	`22`	`+ id "com.gradle.enterprise" version "3.12.5"`
`23`	`23`	`id "io.spring.ge.conventions" version "0.0.13"`
`24`	`24`	`}`
`25`	`25`