Merge branch '2.7.x' into 3.0.x

Closes gh-37397

buildSrc/src/main/java/org/springframework/boot/build/JavaConventions.java

@@ -179,7 +179,7 @@ class JavaConventions {
 
 	private void configureTestRetries(Test test) {
 		TestRetryExtension testRetry = test.getExtensions().getByType(TestRetryExtension.class);
-		testRetry.getFailOnPassedAfterRetry().set(true);
+		testRetry.getFailOnPassedAfterRetry().set(false);
 		testRetry.getMaxRetries().set(isCi() ? 3 : 0);
 	}
 

buildSrc/src/test/java/org/springframework/boot/build/ConventionsPluginTests.java

@@ -187,7 +187,7 @@ class ConventionsPluginTests {
 		}
 		assertThat(runGradle(Collections.singletonMap("CI", "true"), "retryConfig", "--stacktrace").getOutput())
 			.contains("maxRetries: 3")
-			.contains("failOnPassedAfterRetry: true");
+			.contains("failOnPassedAfterRetry: false");
 	}
 
 	@Test
@@ -209,7 +209,7 @@ class ConventionsPluginTests {
 		}
 		assertThat(runGradle(Collections.singletonMap("CI", "local"), "retryConfig", "--stacktrace").getOutput())
 			.contains("maxRetries: 0")
-			.contains("failOnPassedAfterRetry: true");
+			.contains("failOnPassedAfterRetry: false");
 	}
 
 	private BuildResult runGradle(String... args) {