From f3c93d30a87b75f5b79309e1de036607b9e266b4 Mon Sep 17 00:00:00 2001
From: Leo Li <269739606@qq.com>
Date: Thu, 25 Nov 2021 10:32:25 +0800
Subject: [PATCH 1/2] Fix reference to matching-strategy property

See gh-28809
---
 .../boot/diagnostics/analyzer/PatternParseFailureAnalyzer.java  | 2 +-
 .../diagnostics/analyzer/PatternParseFailureAnalyzerTests.java  | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/diagnostics/analyzer/PatternParseFailureAnalyzer.java b/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/diagnostics/analyzer/PatternParseFailureAnalyzer.java
index cc0d5849687b..c416c410fa5e 100644
--- a/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/diagnostics/analyzer/PatternParseFailureAnalyzer.java
+++ b/spring-boot-project/spring-boot/src/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/spring-boot-project/spring-boot/src/test/java/org/springframework/boot/diagnostics/analyzer/PatternParseFailureAnalyzerTests.java b/spring-boot-project/spring-boot/src/test/java/org/springframework/boot/diagnostics/analyzer/PatternParseFailureAnalyzerTests.java
index 2e367522748b..738ba5ad677f 100644
--- a/spring-boot-project/spring-boot/src/test/java/org/springframework/boot/diagnostics/analyzer/PatternParseFailureAnalyzerTests.java
+++ b/spring-boot-project/spring-boot/src/test/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) {

From 1876b4bcd7e5585a5eb574c4cb25c5af0550c8ff Mon Sep 17 00:00:00 2001
From: Stephane Nicoll <snicoll@vmware.com>
Date: Mon, 29 Nov 2021 09:43:44 +0100
Subject: [PATCH 2/2] Update copyright year of changed files

See gh-28809
---
 .../boot/diagnostics/analyzer/PatternParseFailureAnalyzer.java  | 2 +-
 .../diagnostics/analyzer/PatternParseFailureAnalyzerTests.java  | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/diagnostics/analyzer/PatternParseFailureAnalyzer.java b/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/diagnostics/analyzer/PatternParseFailureAnalyzer.java
index c416c410fa5e..e4cf51746c4c 100644
--- a/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/diagnostics/analyzer/PatternParseFailureAnalyzer.java
+++ b/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/diagnostics/analyzer/PatternParseFailureAnalyzer.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2020 the original author or authors.
+ * Copyright 2012-2021 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/spring-boot-project/spring-boot/src/test/java/org/springframework/boot/diagnostics/analyzer/PatternParseFailureAnalyzerTests.java b/spring-boot-project/spring-boot/src/test/java/org/springframework/boot/diagnostics/analyzer/PatternParseFailureAnalyzerTests.java
index 738ba5ad677f..8bcdd0e5122c 100644
--- a/spring-boot-project/spring-boot/src/test/java/org/springframework/boot/diagnostics/analyzer/PatternParseFailureAnalyzerTests.java
+++ b/spring-boot-project/spring-boot/src/test/java/org/springframework/boot/diagnostics/analyzer/PatternParseFailureAnalyzerTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2020 the original author or authors.
+ * Copyright 2012-2021 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.