Merge branch '1.11.x' into 1.12.x

jonatan-ivanov · jonatan-ivanov · commit 8c1538e7c4c7 · 2024-05-08T13:53:56.000-07:00
diff --git a/micrometer-core/build.gradle b/micrometer-core/build.gradle
@@ -274,7 +274,7 @@ java11Test {
         it.getFile().getAbsolutePath().contains("java11Test")
     }
 
-    retry {
+    develocity.testRetry {
         maxFailures = 5
         maxRetries = 3
     }
diff --git a/micrometer-test/build.gradle b/micrometer-test/build.gradle
@@ -75,7 +75,7 @@ java11Test {
         it.getFile().getAbsolutePath().contains("java11Test")
     }
 
-    retry {
+    develocity.testRetry {
         maxFailures = 5
         maxRetries = 3
     }

Original file line number	Diff line number	Diff line change
`@@ -274,7 +274,7 @@ java11Test {`
`274`	`274`	`it.getFile().getAbsolutePath().contains("java11Test")`
`275`	`275`	`}`
`276`	`276`
`277`		`- retry {`
	`277`	`+ develocity.testRetry {`
`278`	`278`	`maxFailures = 5`
`279`	`279`	`maxRetries = 3`
`280`	`280`	`}`
Original file line number	Diff line number	Diff line change
`@@ -75,7 +75,7 @@ java11Test {`
`75`	`75`	`it.getFile().getAbsolutePath().contains("java11Test")`
`76`	`76`	`}`
`77`	`77`
`78`		`- retry {`
	`78`	`+ develocity.testRetry {`
`79`	`79`	`maxFailures = 5`
`80`	`80`	`maxRetries = 3`
`81`	`81`	`}`