Merge branch '1.2.x' into 1.3.x

jonatan-ivanov · jonatan-ivanov · commit 66f9fa85df98 · 2024-07-22T16:51:39.000-07:00
diff --git a/settings.gradle b/settings.gradle
@@ -6,7 +6,7 @@ pluginManagement {
 
 plugins {
 	id 'com.gradle.develocity' version '3.17.5'
-	id 'io.spring.ge.conventions' version '0.0.17'
+	id 'io.spring.develocity.conventions' version '0.0.19'
 	id 'org.gradle.toolchains.foojay-resolver-convention' version '0.8.0'
 }
 

Original file line number	Diff line number	Diff line change
`@@ -6,7 +6,7 @@ pluginManagement {`
`6`	`6`
`7`	`7`	`plugins {`
`8`	`8`	`id 'com.gradle.develocity' version '3.17.5'`
`9`		`- id 'io.spring.ge.conventions' version '0.0.17'`
	`9`	`+ id 'io.spring.develocity.conventions' version '0.0.19'`
`10`	`10`	`id 'org.gradle.toolchains.foojay-resolver-convention' version '0.8.0'`
`11`	`11`	`}`
`12`	`12`