Merge branch '1.1.x' into 1.2.x

jonatan-ivanov · jonatan-ivanov · commit 5de5ee44fa8d · 2024-04-05T18:01:01.000-07:00
Closes gh-651
diff --git a/settings.gradle b/settings.gradle
@@ -7,7 +7,7 @@ pluginManagement {
 plugins {
 	id 'com.gradle.enterprise' version '3.17'
 	id 'io.spring.ge.conventions' version '0.0.16'
-	id 'org.gradle.toolchains.foojay-resolver-convention' version '0.7.0'
+	id 'org.gradle.toolchains.foojay-resolver-convention' version '0.8.0'
 }
 
 rootProject.name = 'tracing'

Original file line number	Diff line number	Diff line change
`@@ -7,7 +7,7 @@ pluginManagement {`
`7`	`7`	`plugins {`
`8`	`8`	`id 'com.gradle.enterprise' version '3.17'`
`9`	`9`	`id 'io.spring.ge.conventions' version '0.0.16'`
`10`		`- id 'org.gradle.toolchains.foojay-resolver-convention' version '0.7.0'`
	`10`	`+ id 'org.gradle.toolchains.foojay-resolver-convention' version '0.8.0'`
`11`	`11`	`}`
`12`	`12`
`13`	`13`	`rootProject.name = 'tracing'`