Merge branch '1.11.x' into 1.12.x

micrometer-metrics · May 6, 2024 · 7623a0d · 7623a0d
2 parents ba7d2ea + f0882f7
commit 7623a0d
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 7 deletions.
diff --git a/build.gradle b/build.gradle
@@ -172,7 +172,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'