Merge branch '2.6.x' into 2.7.x

Closes gh-28937
3 years ago · 7af589d31a
parent 3cb30cb283 25a2888be5
commit 7af589d31a
1 changed files with 1 additions and 1 deletions
--- a/spring-boot-project/spring-boot-autoconfigure/src/main/resources/META-INF/additional-spring-configuration-metadata.json
+++ b/spring-boot-project/spring-boot-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",