Merge branch '2.5.x' into 2.6.x

snicoll · snicoll · commit a048e4ccb70d · 2022-04-19T08:47:42.000+02:00
Closes gh-30736
diff --git a/settings.gradle b/settings.gradle
@@ -22,7 +22,7 @@ pluginManagement {
 }
 
 plugins {
-	id "com.gradle.enterprise" version "3.8.1"
+	id "com.gradle.enterprise" version "3.9"
 	id "io.spring.ge.conventions" version "0.0.9"
 }
 

Original file line number	Diff line number	Diff line change
`@@ -22,7 +22,7 @@ pluginManagement {`
`22`	`22`	`}`
`23`	`23`
`24`	`24`	`plugins {`
`25`		`- id "com.gradle.enterprise" version "3.8.1"`
	`25`	`+ id "com.gradle.enterprise" version "3.9"`
`26`	`26`	`id "io.spring.ge.conventions" version "0.0.9"`
`27`	`27`	`}`
`28`	`28`