Merge branch '3.1.x' into 3.2.x

Closes gh-39075

spring-boot-project/spring-boot/src/main/java/org/springframework/boot/diagnostics/analyzer/PatternParseFailureAnalyzer.java

@@ -30,7 +30,7 @@ class PatternParseFailureAnalyzer extends AbstractFailureAnalyzer<PatternParseEx
 
 	@Override
 	protected FailureAnalysis analyze(Throwable rootFailure, PatternParseException cause) {
-		return new FailureAnalysis("Invalid mapping pattern detected: " + cause.toDetailedString(),
+		return new FailureAnalysis("Invalid mapping pattern detected:\n" + cause.toDetailedString(),
 				"Fix this pattern in your application or switch to the legacy parser implementation with "
 						+ "'spring.mvc.pathmatch.matching-strategy=ant_path_matcher'.",
 				cause);

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

@@ -36,7 +36,8 @@ class PatternParseFailureAnalyzerTests {
 	@Test
 	void patternParseFailureQuotesPattern() {
 		FailureAnalysis failureAnalysis = performAnalysis("/spring/**/framework");
-		assertThat(failureAnalysis.getDescription()).contains("Invalid mapping pattern detected: /spring/**/framework");
+		assertThat(failureAnalysis.getDescription())
+			.contains("Invalid mapping pattern detected:\n" + "/spring/**/framework\n" + "       ^");
 		assertThat(failureAnalysis.getAction())
 			.contains("Fix this pattern in your application or switch to the legacy parser"
 					+ " implementation with 'spring.mvc.pathmatch.matching-strategy=ant_path_matcher'.");