Merge branch '1.2.x' into 1.3.x

jonatan-ivanov · jonatan-ivanov · commit e830428515b0 · 2024-12-06T14:31:40.000-08:00
diff --git a/settings.gradle b/settings.gradle
@@ -5,9 +5,9 @@ pluginManagement {
 }
 
 plugins {
-	id 'com.gradle.develocity' version '3.17.6'
+	id 'com.gradle.develocity' version '3.18.2'
 	id 'io.spring.develocity.conventions' version '0.0.22'
-	id 'org.gradle.toolchains.foojay-resolver-convention' version '0.8.0'
+	id 'org.gradle.toolchains.foojay-resolver-convention' version '0.9.0'
 }
 
 rootProject.name = 'tracing'

Original file line number	Diff line number	Diff line change
`@@ -5,9 +5,9 @@ pluginManagement {`
`5`	`5`	`}`
`6`	`6`
`7`	`7`	`plugins {`
`8`		`- id 'com.gradle.develocity' version '3.17.6'`
	`8`	`+ id 'com.gradle.develocity' version '3.18.2'`
`9`	`9`	`id 'io.spring.develocity.conventions' version '0.0.22'`
`10`		`- id 'org.gradle.toolchains.foojay-resolver-convention' version '0.8.0'`
	`10`	`+ id 'org.gradle.toolchains.foojay-resolver-convention' version '0.9.0'`
`11`	`11`	`}`
`12`	`12`
`13`	`13`	`rootProject.name = 'tracing'`