Merge branch '2.5.x'

Closes gh-28839
spring-projects · Nov 29, 2021 · 46a8673 · 46a8673
2 parents 10251c1 + db94460
commit 46a8673
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/.../main/java/org/springframework/boot/diagnostics/analyzer/PatternParseFailureAnalyzer.java b/.../main/java/org/springframework/boot/diagnostics/analyzer/PatternParseFailureAnalyzer.java
@@ -32,7 +32,7 @@ class PatternParseFailureAnalyzer extends AbstractFailureAnalyzer<PatternParseEx
 	protected FailureAnalysis analyze(Throwable rootFailure, PatternParseException cause) {
 		return new FailureAnalysis("Invalid mapping pattern detected: " + cause.toDetailedString(),
 				"Fix this pattern in your application or switch to the legacy parser implementation with "
-						+ "'spring.mvc.pathpattern.matching-strategy=ant_path_matcher'.",
+						+ "'spring.mvc.pathmatch.matching-strategy=ant_path_matcher'.",
 				cause);
 	}
 

diff --git a/.../java/org/springframework/boot/diagnostics/analyzer/PatternParseFailureAnalyzerTests.java b/.../java/org/springframework/boot/diagnostics/analyzer/PatternParseFailureAnalyzerTests.java
@@ -39,7 +39,7 @@ void patternParseFailureQuotesPattern() {
 		assertThat(failureAnalysis.getDescription()).contains("Invalid mapping pattern detected: /spring/**/framework");
 		assertThat(failureAnalysis.getAction())
 				.contains("Fix this pattern in your application or switch to the legacy parser"
-						+ " implementation with 'spring.mvc.pathpattern.matching-strategy=ant_path_matcher'.");
+						+ " implementation with 'spring.mvc.pathmatch.matching-strategy=ant_path_matcher'.");
 	}
 
 	private FailureAnalysis performAnalysis(String pattern) {