Merge branch '2.4.x' into 2.5.x

See gh-26935

spring-boot-project/spring-boot/src/test/java/org/springframework/boot/diagnostics/analyzer/BeanNotOfRequiredTypeFailureAnalyzerTests.java

@@ -47,9 +47,11 @@ class BeanNotOfRequiredTypeFailureAnalyzerTests {
 		assertThat(analysis.getDescription()).startsWith("The bean 'asyncBean'");
 		assertThat(analysis.getDescription())
 				.containsPattern("The bean is of type '" + AsyncBean.class.getPackage().getName() + ".\\$Proxy.*'");
-		assertThat(analysis.getDescription()).contains("and implements:\n\t" + SomeInterface.class.getName());
+		assertThat(analysis.getDescription())
+				.contains(String.format("and implements:%n\t") + SomeInterface.class.getName());
 		assertThat(analysis.getDescription()).contains("Expected a bean of type '" + AsyncBean.class.getName() + "'");
-		assertThat(analysis.getDescription()).contains("which implements:\n\t" + SomeInterface.class.getName());
+		assertThat(analysis.getDescription())
+				.contains(String.format("which implements:%n\t") + SomeInterface.class.getName());
 	}
 
 	private FailureAnalysis performAnalysis(Class<?> configuration) {