Merge branch '1.2.x'

jonatan-ivanov · jonatan-ivanov · commit 0397d864ed65 · 2024-05-08T11:24:46.000-07:00
diff --git a/build.gradle b/build.gradle
@@ -164,7 +164,7 @@ subprojects {
 				excludeTags 'docker'
 			}
 
-			retry {
+			develocity.testRetry {
 				maxFailures = 5
 				maxRetries = 3
 			}
diff --git a/settings.gradle b/settings.gradle
@@ -5,21 +5,22 @@ pluginManagement {
 }
 
 plugins {
-	id 'com.gradle.enterprise' version '3.17.2'
+	id 'com.gradle.develocity' version '3.17.2'
 	id 'io.spring.ge.conventions' version '0.0.17'
 	id 'org.gradle.toolchains.foojay-resolver-convention' version '0.8.0'
 }
 
 rootProject.name = 'tracing'
 
+develocity {
+	server = 'https://ge.micrometer.io'
+}
+
 buildCache {
-	remote(HttpBuildCache) {
-		url = 'https://ge.micrometer.io/cache/'
+	remote(develocity.buildCache) {
+		server = 'https://ge.micrometer.io'
 	}
 }
-gradleEnterprise {
-	server = 'https://ge.micrometer.io'
-}
 
 include 'micrometer-tracing', 'micrometer-tracing-bom', 'benchmarks'
 

Original file line number	Diff line number	Diff line change
`@@ -5,21 +5,22 @@ pluginManagement {`
`5`	`5`	`}`
`6`	`6`
`7`	`7`	`plugins {`
`8`		`- id 'com.gradle.enterprise' version '3.17.2'`
	`8`	`+ id 'com.gradle.develocity' version '3.17.2'`
`9`	`9`	`id 'io.spring.ge.conventions' version '0.0.17'`
`10`	`10`	`id 'org.gradle.toolchains.foojay-resolver-convention' version '0.8.0'`
`11`	`11`	`}`
`12`	`12`
`13`	`13`	`rootProject.name = 'tracing'`
`14`	`14`
	`15`	`+develocity {`
	`16`	`+ server = 'https://ge.micrometer.io'`
	`17`	`+}`
	`18`	`+`
`15`	`19`	`buildCache {`
`16`		`- remote(HttpBuildCache) {`
`17`		`- url = 'https://ge.micrometer.io/cache/'`
	`20`	`+ remote(develocity.buildCache) {`
	`21`	`+ server = 'https://ge.micrometer.io'`
`18`	`22`	`}`
`19`	`23`	`}`
`20`		`-gradleEnterprise {`
`21`		`- server = 'https://ge.micrometer.io'`
`22`		`-}`
`23`	`24`
`24`	`25`	`include 'micrometer-tracing', 'micrometer-tracing-bom', 'benchmarks'`
`25`	`26`