Merge branch '3.0.x' into 3.1.x

wilkinsona · wilkinsona · commit d9207fcaaf93 · 2023-09-15T08:36:56.000+01:00
Closes spring-projectsgh-37398
diff --git a/buildSrc/src/main/java/org/springframework/boot/build/JavaConventions.java b/buildSrc/src/main/java/org/springframework/boot/build/JavaConventions.java
@@ -179,7 +179,7 @@ private void configureTestConventions(Project project) {
 
 	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);
 	}
 
diff --git a/buildSrc/src/test/java/org/springframework/boot/build/ConventionsPluginTests.java b/buildSrc/src/test/java/org/springframework/boot/build/ConventionsPluginTests.java
@@ -187,7 +187,7 @@ void testRetryIsConfiguredWithThreeRetriesOnCI() throws IOException {
 		}
 		assertThat(runGradle(Collections.singletonMap("CI", "true"), "retryConfig", "--stacktrace").getOutput())
 			.contains("maxRetries: 3")
-			.contains("failOnPassedAfterRetry: true");
+			.contains("failOnPassedAfterRetry: false");
 	}
 
 	@Test
@@ -209,7 +209,7 @@ void testRetryIsConfiguredWithZeroRetriesLocally() throws IOException {
 		}
 		assertThat(runGradle(Collections.singletonMap("CI", "local"), "retryConfig", "--stacktrace").getOutput())
 			.contains("maxRetries: 0")
-			.contains("failOnPassedAfterRetry: true");
+			.contains("failOnPassedAfterRetry: false");
 	}
 
 	private BuildResult runGradle(String... args) {

Original file line number	Diff line number	Diff line change
`@@ -179,7 +179,7 @@ private void configureTestConventions(Project project) {`
`179`	`179`
`180`	`180`	`private void configureTestRetries(Test test) {`
`181`	`181`	`TestRetryExtension testRetry = test.getExtensions().getByType(TestRetryExtension.class);`
`182`		`- testRetry.getFailOnPassedAfterRetry().set(true);`
	`182`	`+ testRetry.getFailOnPassedAfterRetry().set(false);`
`183`	`183`	`testRetry.getMaxRetries().set(isCi() ? 3 : 0);`
`184`	`184`	`}`
`185`	`185`
Original file line number	Diff line number	Diff line change
`@@ -187,7 +187,7 @@ void testRetryIsConfiguredWithThreeRetriesOnCI() throws IOException {`
`187`	`187`	`}`
`188`	`188`	`assertThat(runGradle(Collections.singletonMap("CI", "true"), "retryConfig", "--stacktrace").getOutput())`
`189`	`189`	`.contains("maxRetries: 3")`
`190`		`- .contains("failOnPassedAfterRetry: true");`
	`190`	`+ .contains("failOnPassedAfterRetry: false");`
`191`	`191`	`}`
`192`	`192`
`193`	`193`	`@Test`
`@@ -209,7 +209,7 @@ void testRetryIsConfiguredWithZeroRetriesLocally() throws IOException {`
`209`	`209`	`}`
`210`	`210`	`assertThat(runGradle(Collections.singletonMap("CI", "local"), "retryConfig", "--stacktrace").getOutput())`
`211`	`211`	`.contains("maxRetries: 0")`
`212`		`- .contains("failOnPassedAfterRetry: true");`
	`212`	`+ .contains("failOnPassedAfterRetry: false");`
`213`	`213`	`}`
`214`	`214`
`215`	`215`	`private BuildResult runGradle(String... args) {`