Merge branch '3.1.x'

spring-boot-project/spring-boot-autoconfigure/src/main/resources/META-INF/additional-spring-configuration-metadata.json

@@ -1579,6 +1579,10 @@
       "name": "spring.jms.template.session.acknowledge-mode",
       "defaultValue": "auto"
     },
+    {
+      "name": "spring.jmx.registration-policy",
+      "defaultValue": "fail-on-existing"
+    },
     {
       "name": "spring.jpa.hibernate.use-new-id-generator-mappings",
       "type": "java.lang.Boolean",
@@ -1588,10 +1592,6 @@
         "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