Merge pull request #28809 from polarbear567

* pr/28809:
  Update copyright year of changed files
  Fix reference to matching-strategy property

Closes gh-28809

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.
@@ -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);
 	}
 

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.
@@ -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) {