Merge branch '2.5.x' into 2.6.x

Closes gh-30436

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,4 +1,5 @@
 {
+  "groups": [],
   "properties": [
     {
       "name": "management.endpoints.migrate-legacy-ids",
@@ -6,5 +7,6 @@
       "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,4 +1,5 @@
 {
+  "groups": [],
   "properties": [
     {
       "name": "spring.devtools.add-properties",
@@ -6,5 +7,6 @@
       "description": "Whether to enable development property defaults.",
       "defaultValue": true
     }
-  ]
+  ],
+  "hints": []
 }

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

@@ -13,12 +13,6 @@
       "sourceType": "org.springframework.boot.context.logging.LoggingApplicationListener",
       "defaultValue": false
     },
-    {
-      "name": "logging.config",
-      "type": "java.lang.String",
-      "description": "Location of the logging configuration file. For instance, `classpath:logback.xml` for Logback.",
-      "sourceType": "org.springframework.boot.context.logging.LoggingApplicationListener"
-    },
     {
       "name": "logging.charset.console",
       "type": "java.nio.charset.Charset",
@@ -29,6 +23,12 @@
       "type": "java.nio.charset.Charset",
       "description": "Charset to use for file output."
     },
+    {
+      "name": "logging.config",
+      "type": "java.lang.String",
+      "description": "Location of the logging configuration file. For instance, `classpath:logback.xml` for Logback.",
+      "sourceType": "org.springframework.boot.context.logging.LoggingApplicationListener"
+    },
     {
       "name": "logging.exception-conversion-word",
       "type": "java.lang.String",
@@ -45,6 +45,36 @@
         "level": "error"
       }
     },
+    {
+      "name": "logging.file.clean-history-on-start",
+      "type": "java.lang.Boolean",
+      "description": "Whether to clean the archive log files on startup. Only supported with the default logback setup.",
+      "sourceType": "org.springframework.boot.context.logging.LoggingApplicationListener",
+      "defaultValue": false,
+      "deprecation": {
+        "replacement": "logging.logback.rollingpolicy.clean-history-on-start"
+      }
+    },
+    {
+      "name": "logging.file.max-history",
+      "type": "java.lang.Integer",
+      "description": "Maximum number of archive log files to keep. Only supported with the default logback setup.",
+      "sourceType": "org.springframework.boot.context.logging.LoggingApplicationListener",
+      "defaultValue": 7,
+      "deprecation": {
+        "replacement": "logging.logback.rollingpolicy.max-history"
+      }
+    },
+    {
+      "name": "logging.file.max-size",
+      "type": "org.springframework.util.unit.DataSize",
+      "description": "Maximum log file size. Only supported with the default logback setup.",
+      "sourceType": "org.springframework.boot.context.logging.LoggingApplicationListener",
+      "defaultValue": "10MB",
+      "deprecation": {
+        "replacement": "logging.logback.rollingpolicy.max-file-size"
+      }
+    },
     {
       "name": "logging.file.name",
       "type": "java.lang.String",
@@ -57,6 +87,16 @@
       "description": "Location of the log file. For instance, `/var/log`.",
       "sourceType": "org.springframework.boot.context.logging.LoggingApplicationListener"
     },
+    {
+      "name": "logging.file.total-size-cap",
+      "type": "org.springframework.util.unit.DataSize",
+      "description": "Total size of log backups to be kept. Only supported with the default logback setup.",
+      "sourceType": "org.springframework.boot.context.logging.LoggingApplicationListener",
+      "defaultValue": "0B",
+      "deprecation": {
+        "replacement": "logging.logback.rollingpolicy.total-size-cap"
+      }
+    },
     {
       "name": "logging.group",
       "type": "java.util.Map<java.lang.String,java.util.List<java.lang.String>>",
@@ -69,6 +109,46 @@
       "description": "Log levels severity mapping. For instance, `logging.level.org.springframework=DEBUG`.",
       "sourceType": "org.springframework.boot.context.logging.LoggingApplicationListener"
     },
+    {
+      "name": "logging.log4j2.config.override",
+      "type": "java.util.List<java.lang.String>",
+      "description": "Overriding configuration files used to create a composite configuration."
+    },
+    {
+      "name": "logging.logback.rollingpolicy.clean-history-on-start",
+      "type": "java.lang.Boolean",
+      "description": "Whether to clean the archive log files on startup.",
+      "sourceType": "org.springframework.boot.context.logging.LoggingApplicationListener",
+      "defaultValue": false
+    },
+    {
+      "name": "logging.logback.rollingpolicy.file-name-pattern",
+      "type": "java.lang.String",
+      "description": "Pattern for rolled-over log file names.",
+      "sourceType": "org.springframework.boot.context.logging.LoggingApplicationListener",
+      "defaultValue": "${LOG_FILE}.%d{yyyy-MM-dd}.%i.gz"
+    },
+    {
+      "name": "logging.logback.rollingpolicy.max-file-size",
+      "type": "org.springframework.util.unit.DataSize",
+      "description": "Maximum log file size.",
+      "sourceType": "org.springframework.boot.context.logging.LoggingApplicationListener",
+      "defaultValue": "10MB"
+    },
+    {
+      "name": "logging.logback.rollingpolicy.max-history",
+      "type": "java.lang.Integer",
+      "description": "Maximum number of archive log files to keep.",
+      "sourceType": "org.springframework.boot.context.logging.LoggingApplicationListener",
+      "defaultValue": 7
+    },
+    {
+      "name": "logging.logback.rollingpolicy.total-size-cap",
+      "type": "org.springframework.util.unit.DataSize",
+      "description": "Total size of log backups to be kept.",
+      "sourceType": "org.springframework.boot.context.logging.LoggingApplicationListener",
+      "defaultValue": "0B"
+    },
     {
       "name": "logging.path",
       "type": "java.lang.String",
@@ -106,13 +186,6 @@
       "sourceType": "org.springframework.boot.context.logging.LoggingApplicationListener",
       "defaultValue": "%5p"
     },
-    {
-      "name": "logging.register-shutdown-hook",
-      "type": "java.lang.Boolean",
-      "description": "Register a shutdown hook for the logging system when it is initialized. Disabled automatically when deployed as a war file.",
-      "sourceType": "org.springframework.boot.context.logging.LoggingApplicationListener",
-      "defaultValue": true
-    },
     {
       "name": "logging.pattern.rolling-file-name",
       "type": "java.lang.String",
@@ -124,84 +197,11 @@
       }
     },
     {
-      "name": "logging.file.clean-history-on-start",
+      "name": "logging.register-shutdown-hook",
-      "type": "java.lang.Boolean",
-      "description": "Whether to clean the archive log files on startup. Only supported with the default logback setup.",
-      "sourceType": "org.springframework.boot.context.logging.LoggingApplicationListener",
-      "defaultValue": false,
-      "deprecation": {
-        "replacement": "logging.logback.rollingpolicy.clean-history-on-start"
-      }
-    },
-    {
-      "name": "logging.file.max-size",
-      "type": "org.springframework.util.unit.DataSize",
-      "description": "Maximum log file size. Only supported with the default logback setup.",
-      "sourceType": "org.springframework.boot.context.logging.LoggingApplicationListener",
-      "defaultValue": "10MB",
-      "deprecation": {
-        "replacement": "logging.logback.rollingpolicy.max-file-size"
-      }
-    },
-    {
-      "name": "logging.file.total-size-cap",
-      "type": "org.springframework.util.unit.DataSize",
-      "description": "Total size of log backups to be kept. Only supported with the default logback setup.",
-      "sourceType": "org.springframework.boot.context.logging.LoggingApplicationListener",
-      "defaultValue": "0B",
-      "deprecation": {
-        "replacement": "logging.logback.rollingpolicy.total-size-cap"
-      }
-    },
-    {
-      "name": "logging.file.max-history",
-      "type": "java.lang.Integer",
-      "description": "Maximum number of archive log files to keep. Only supported with the default logback setup.",
-      "sourceType": "org.springframework.boot.context.logging.LoggingApplicationListener",
-      "defaultValue": 7,
-      "deprecation": {
-        "replacement": "logging.logback.rollingpolicy.max-history"
-      }
-    },
-    {
-      "name": "logging.logback.rollingpolicy.file-name-pattern",
-      "type": "java.lang.String",
-      "description": "Pattern for rolled-over log file names.",
-      "sourceType": "org.springframework.boot.context.logging.LoggingApplicationListener",
-      "defaultValue": "${LOG_FILE}.%d{yyyy-MM-dd}.%i.gz"
-    },
-    {
-      "name": "logging.logback.rollingpolicy.clean-history-on-start",
       "type": "java.lang.Boolean",
-      "description": "Whether to clean the archive log files on startup.",
+      "description": "Register a shutdown hook for the logging system when it is initialized. Disabled automatically when deployed as a war file.",
-      "sourceType": "org.springframework.boot.context.logging.LoggingApplicationListener",
-      "defaultValue": false
-    },
-    {
-      "name": "logging.logback.rollingpolicy.max-file-size",
-      "type": "org.springframework.util.unit.DataSize",
-      "description": "Maximum log file size.",
-      "sourceType": "org.springframework.boot.context.logging.LoggingApplicationListener",
-      "defaultValue": "10MB"
-    },
-    {
-      "name": "logging.logback.rollingpolicy.total-size-cap",
-      "type": "org.springframework.util.unit.DataSize",
-      "description": "Total size of log backups to be kept.",
-      "sourceType": "org.springframework.boot.context.logging.LoggingApplicationListener",
-      "defaultValue": "0B"
-    },
-    {
-      "name": "logging.logback.rollingpolicy.max-history",
-      "type": "java.lang.Integer",
-      "description": "Maximum number of archive log files to keep.",
       "sourceType": "org.springframework.boot.context.logging.LoggingApplicationListener",
-      "defaultValue": 7
+      "defaultValue": true
-    },
-    {
-      "name": "logging.log4j2.config.override",
-      "type": "java.util.List<java.lang.String>",
-      "description": "Overriding configuration files used to create a composite configuration."
     },
     {
       "name": "spring.application.index",
@@ -929,18 +929,18 @@
       "description": "Name of the profile to enable if no profile is active.",
       "defaultValue": "default"
     },
-    {
-      "name": "spring.profiles.include",
-      "type": "java.util.List<java.lang.String>",
-      "sourceType": "org.springframework.boot.context.config.Profiles",
-      "description": "Unconditionally activate the specified comma-separated list of profiles (or list of profiles if using YAML)."
-    },
     {
       "name": "spring.profiles.group",
       "type": "java.util.Map<java.lang.String,java.util.List<java.lang.String>>",
       "sourceType": "org.springframework.boot.context.config.Profiles",
       "description": "Profile groups to define a logical name for a related group of profiles."
     },
+    {
+      "name": "spring.profiles.include",
+      "type": "java.util.List<java.lang.String>",
+      "sourceType": "org.springframework.boot.context.config.Profiles",
+      "description": "Unconditionally activate the specified comma-separated list of profiles (or list of profiles if using YAML)."
+    },
     {
       "name": "spring.reactor.debug-agent.enabled",
       "type": "java.lang.Boolean",
@@ -1021,22 +1021,6 @@
         }
       ]
     },
-    {
-      "name": "spring.profiles.active",
-      "providers": [
-        {
-          "name": "spring-profile-name"
-        }
-      ]
-    },
-    {
-      "name": "spring.profiles.include",
-      "providers": [
-        {
-          "name": "spring-profile-name"
-        }
-      ]
-    },
     {
       "name": "spring.config.import",
       "values": [
@@ -1055,6 +1039,22 @@
           "name": "any"
         }
       ]
+    },
+    {
+      "name": "spring.profiles.active",
+      "providers": [
+        {
+          "name": "spring-profile-name"
+        }
+      ]
+    },
+    {
+      "name": "spring.profiles.include",
+      "providers": [
+        {
+          "name": "spring-profile-name"
+        }
+      ]
     }
   ]
 }