Merge branch '1.0.x'

jonatan-ivanov · jonatan-ivanov · commit a8d37a10222f · 2023-08-10T12:58:56.000-07:00
diff --git a/settings.gradle b/settings.gradle
@@ -6,8 +6,8 @@ pluginManagement {
 
 plugins {
 	id 'com.gradle.enterprise' version '3.14.1'
-	id 'io.spring.ge.conventions' version '0.0.13'
-	id 'org.gradle.toolchains.foojay-resolver-convention' version '0.4.0'
+	id 'io.spring.ge.conventions' version '0.0.14'
+	id 'org.gradle.toolchains.foojay-resolver-convention' version '0.6.0'
 }
 
 rootProject.name = 'context-propagation'

Original file line number	Diff line number	Diff line change
`@@ -6,8 +6,8 @@ pluginManagement {`
`6`	`6`
`7`	`7`	`plugins {`
`8`	`8`	`id 'com.gradle.enterprise' version '3.14.1'`
`9`		`- id 'io.spring.ge.conventions' version '0.0.13'`
`10`		`- id 'org.gradle.toolchains.foojay-resolver-convention' version '0.4.0'`
	`9`	`+ id 'io.spring.ge.conventions' version '0.0.14'`
	`10`	`+ id 'org.gradle.toolchains.foojay-resolver-convention' version '0.6.0'`
`11`	`11`	`}`
`12`	`12`
`13`	`13`	`rootProject.name = 'context-propagation'`