Merge branch '1.9.x' into 1.11.x

jonatan-ivanov · jonatan-ivanov · commit f0882f7e3d9d · 2024-05-06T12:23:30.000-07:00
diff --git a/build.gradle b/build.gradle
@@ -158,7 +158,7 @@ subprojects {
                 excludeTags 'docker'
             }
 
-            retry {
+            develocity.testRetry {
                 maxFailures = 5
                 maxRetries = 3
             }
diff --git a/settings.gradle b/settings.gradle
@@ -5,7 +5,7 @@ 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'
 }
@@ -14,14 +14,15 @@ rootProject.name = 'micrometer'
 
 enableFeaturePreview("STABLE_CONFIGURATION_CACHE")
 
+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-commons', 'micrometer-core', 'micrometer-observation'
 

Original file line number	Diff line number	Diff line change
`@@ -5,7 +5,7 @@ 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`	`}`
`@@ -14,14 +14,15 @@ rootProject.name = 'micrometer'`
`14`	`14`
`15`	`15`	`enableFeaturePreview("STABLE_CONFIGURATION_CACHE")`
`16`	`16`
	`17`	`+develocity {`
	`18`	`+ server = 'https://ge.micrometer.io'`
	`19`	`+}`
	`20`	`+`
`17`	`21`	`buildCache {`
`18`		`- remote(HttpBuildCache) {`
`19`		`- url = 'https://ge.micrometer.io/cache/'`
	`22`	`+ remote(develocity.buildCache) {`
	`23`	`+ server = 'https://ge.micrometer.io'`
`20`	`24`	`}`
`21`	`25`	`}`
`22`		`-gradleEnterprise {`
`23`		`- server = 'https://ge.micrometer.io'`
`24`		`-}`
`25`	`26`
`26`	`27`	`include 'micrometer-commons', 'micrometer-core', 'micrometer-observation'`
`27`	`28`