Merge branch '2.5.x' into 2.6.x

Closes gh-30436

Author: mhalbritter

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

@@ -1,4 +1,5 @@
 {
+  "groups": [],
   "properties": [
     {
       "name": "info",
@@ -332,13 +333,6 @@
         "reason": "Instead, filter 'process.uptime' and 'process.start.time' metrics."
       }
     },
-    {
-      "name": "management.metrics.system.diskspace.paths",
-      "type": "java.util.List<java.io.File>",
-      "defaultValue": [
-        "."
-      ]
-    },
     {
       "name": "management.metrics.export.appoptics.num-threads",
       "type": "java.lang.Integer",
@@ -544,6 +538,13 @@
       "description": "Whether to enable Mongo connection pool metrics.",
       "defaultValue": true
     },
+    {
+      "name": "management.metrics.system.diskspace.paths",
+      "type": "java.util.List<java.io.File>",
+      "defaultValue": [
+        "."
+      ]
+    },
     {
       "name": "management.metrics.web.client.request.autotime.enabled",
       "description": "Whether to automatically time web client requests.",

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

@@ -1,10 +1,12 @@
 {
+  "groups": [],
   "properties": [
     {
       "name": "management.endpoints.migrate-legacy-ids",
       "type": "java.lang.Boolean",
       "description": "Whether to transparently migrate legacy endpoint IDs.",
       "defaultValue": false
     }
-  ]
+  ],
+  "hints": []
 }

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

@@ -1,4 +1,5 @@
 {
+  "groups": [],
   "properties": [
     {
       "name": "server.compression.enabled",
@@ -514,6 +515,14 @@
         "level": "error"
       }
     },
+    {
+      "name": "spring.data.cassandra.pool.heartbeat-interval",
+      "defaultValue": "30s"
+    },
+    {
+      "name": "spring.data.cassandra.pool.idle-timeout",
+      "defaultValue": "5s"
+    },
     {
       "name": "spring.data.cassandra.pool.max-queue-size",
       "type": "java.lang.Integer",
@@ -549,14 +558,14 @@
       "name": "spring.data.cassandra.request.page-size",
       "defaultValue": 5000
     },
-    {
-      "name": "spring.data.cassandra.request.timeout",
-      "defaultValue": "2s"
-    },
     {
       "name": "spring.data.cassandra.request.throttler.type",
       "defaultValue": "none"
     },
+    {
+      "name": "spring.data.cassandra.request.timeout",
+      "defaultValue": "2s"
+    },
     {
       "name": "spring.data.cassandra.retry-policy",
       "type": "java.lang.Class",
@@ -565,14 +574,6 @@
         "level": "error"
       }
     },
-    {
-      "name": "spring.data.cassandra.pool.heartbeat-interval",
-      "defaultValue": "30s"
-    },
-    {
-      "name": "spring.data.cassandra.pool.idle-timeout",
-      "defaultValue": "5s"
-    },
     {
       "name": "spring.data.couchbase.consistency",
       "type": "org.springframework.data.couchbase.core.query.Consistency",
@@ -1641,6 +1642,10 @@
       "name": "spring.neo4j.uri",
       "defaultValue": "bolt://localhost:7687"
     },
+    {
+      "name": "spring.netty.leak-detection",
+      "defaultValue": "simple"
+    },
     {
       "name": "spring.quartz.jdbc.comment-prefix",
       "defaultValue": [
@@ -2026,10 +2031,6 @@
       "name": "spring.webservices.wsdl-locations",
       "type": "java.util.List<java.lang.String>",
       "description": "Comma-separated list of locations of WSDLs and accompanying XSDs to be exposed as beans."
-    },
-    {
-      "name": "spring.netty.leak-detection",
-      "defaultValue": "simple"
     }
   ],
   "hints": [

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

@@ -1,10 +1,12 @@
 {
+  "groups": [],
   "properties": [
     {
       "name": "spring.devtools.add-properties",
       "type": "java.lang.Boolean",
       "description": "Whether to enable development property defaults.",
       "defaultValue": true
     }
-  ]
+  ],
+  "hints": []
 }