Merge branch '3.1.x'

Closes gh-37611
2023-09-27 18:16:00 +01:00
parent 192fb346bc 4a3901149b
commit 4e38469ba2
1 changed files with 4 additions and 4 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
@@ -1588,6 +1588,10 @@
        "reason": "Hibernate no longer supports disabling the use of new ID generator mappings."
      }
    },
+    {
+      "name": "spring.jmx.registration-policy",
+      "defaultValue": "fail-on-existing"
+    },
    {
      "name": "spring.jpa.open-in-view",
      "defaultValue": true
@@ -3003,10 +3007,6 @@
        }
      ]
    },
-    {
-      "name": "spring.jmx.registration-policy",
-      "defaultValue": "fail-on-existing"
-    },
    {
      "name": "spring.jmx.server",
      "providers": [