From 0ff8119a1b343be929d8f0f9283043f0acb4810e Mon Sep 17 00:00:00 2001 From: Moritz Halbritter Date: Fri, 25 Mar 2022 14:54:39 +0100 Subject: [PATCH] Sort entries in additional-spring-configuration metadata alphabetically Closes gh-30434 --- ...itional-spring-configuration-metadata.json | 1 + ...itional-spring-configuration-metadata.json | 4 +- ...itional-spring-configuration-metadata.json | 33 +-- ...itional-spring-configuration-metadata.json | 4 +- ...itional-spring-configuration-metadata.json | 212 +++++++++--------- 5 files changed, 130 insertions(+), 124 deletions(-) diff --git a/spring-boot-project/spring-boot-actuator-autoconfigure/src/main/resources/META-INF/additional-spring-configuration-metadata.json b/spring-boot-project/spring-boot-actuator-autoconfigure/src/main/resources/META-INF/additional-spring-configuration-metadata.json index 0193f7d73df..9c35406c44f 100644 --- a/spring-boot-project/spring-boot-actuator-autoconfigure/src/main/resources/META-INF/additional-spring-configuration-metadata.json +++ b/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", diff --git a/spring-boot-project/spring-boot-actuator/src/main/resources/META-INF/additional-spring-configuration-metadata.json b/spring-boot-project/spring-boot-actuator/src/main/resources/META-INF/additional-spring-configuration-metadata.json index c50a6d86e8d..cd08d79f227 100644 --- a/spring-boot-project/spring-boot-actuator/src/main/resources/META-INF/additional-spring-configuration-metadata.json +++ b/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": [] } diff --git 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 index 88d480c2845..ceea4b65066 100644 --- 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 @@ -1,4 +1,5 @@ { + "groups": [], "properties": [ { "name": "server.compression.enabled", @@ -542,6 +543,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", @@ -577,14 +586,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", @@ -593,14 +602,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", @@ -1607,6 +1608,10 @@ "name": "spring.neo4j.uri", "defaultValue": "bolt://localhost:7687" }, + { + "name": "spring.netty.leak-detection", + "defaultValue": "simple" + }, { "name": "spring.quartz.jdbc.comment-prefix", "defaultValue": [ @@ -1807,10 +1812,6 @@ "name": "spring.webservices.wsdl-locations", "type": "java.util.List", "description": "Comma-separated list of locations of WSDLs and accompanying XSDs to be exposed as beans." - }, - { - "name": "spring.netty.leak-detection", - "defaultValue": "simple" } ], "hints": [ diff --git a/spring-boot-project/spring-boot-devtools/src/main/resources/META-INF/additional-spring-configuration-metadata.json b/spring-boot-project/spring-boot-devtools/src/main/resources/META-INF/additional-spring-configuration-metadata.json index 78be077d778..f852a8ca604 100644 --- a/spring-boot-project/spring-boot-devtools/src/main/resources/META-INF/additional-spring-configuration-metadata.json +++ b/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": [] } diff --git a/spring-boot-project/spring-boot/src/main/resources/META-INF/additional-spring-configuration-metadata.json b/spring-boot-project/spring-boot/src/main/resources/META-INF/additional-spring-configuration-metadata.json index 3369b0676cf..20ca9f32750 100644 --- a/spring-boot-project/spring-boot/src/main/resources/META-INF/additional-spring-configuration-metadata.json +++ b/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>", @@ -69,6 +109,41 @@ "description": "Log levels severity mapping. For instance, `logging.level.org.springframework=DEBUG`.", "sourceType": "org.springframework.boot.context.logging.LoggingApplicationListener" }, + { + "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 +181,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,79 +192,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.", + "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, - "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.", - "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": "spring.application.index", @@ -917,18 +917,18 @@ "description": "Name of the profile to enable if no profile is active.", "defaultValue": "default" }, - { - "name": "spring.profiles.include", - "type": "java.util.List", - "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>", "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", + "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", @@ -1009,22 +1009,6 @@ } ] }, - { - "name": "spring.profiles.active", - "providers": [ - { - "name": "spring-profile-name" - } - ] - }, - { - "name": "spring.profiles.include", - "providers": [ - { - "name": "spring-profile-name" - } - ] - }, { "name": "spring.config.import", "values": [ @@ -1043,6 +1027,22 @@ "name": "any" } ] + }, + { + "name": "spring.profiles.active", + "providers": [ + { + "name": "spring-profile-name" + } + ] + }, + { + "name": "spring.profiles.include", + "providers": [ + { + "name": "spring-profile-name" + } + ] } ] }