Merge branch '2.6.x' into 2.7.x

Closes gh-28937
spring-projects · Dec 9, 2021 · 7af589d · 7af589d
2 parents 3cb30cb + 25a2888
commit 7af589d
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/...t-autoconfigure/src/main/resources/META-INF/additional-spring-configuration-metadata.json b/...t-autoconfigure/src/main/resources/META-INF/additional-spring-configuration-metadata.json
@@ -1631,7 +1631,7 @@
     },
     {
       "name": "spring.mvc.pathmatch.matching-strategy",
-      "defaultValue": "ant-path-matcher"
+      "defaultValue": "path-pattern-parser"
     },
     {
       "name": "spring.neo4j.security.trust-strategy",