From 98084aab2b9b206e1e5912e56f90f18e9bedc6b5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?St=C3=A9phane=20Nicoll?= Date: Sat, 30 May 2026 14:27:22 +0200 Subject: [PATCH 1/2] Reformat additional-spring-configuration-metadata.json files --- .../META-INF/additional-spring-configuration-metadata.json | 2 +- .../META-INF/additional-spring-configuration-metadata.json | 2 +- .../META-INF/additional-spring-configuration-metadata.json | 2 +- .../META-INF/additional-spring-configuration-metadata.json | 2 +- .../META-INF/additional-spring-configuration-metadata.json | 2 +- .../META-INF/additional-spring-configuration-metadata.json | 2 +- .../META-INF/additional-spring-configuration-metadata.json | 4 ++-- .../META-INF/additional-spring-configuration-metadata.json | 2 +- .../spring/additional-spring-configuration-metadata.json | 2 +- .../META-INF/additional-spring-configuration-metadata.json | 4 ++-- .../META-INF/additional-spring-configuration-metadata.json | 2 +- .../META-INF/additional-spring-configuration-metadata.json | 2 +- .../META-INF/additional-spring-configuration-metadata.json | 3 +-- .../META-INF/additional-spring-configuration-metadata.json | 4 ++-- .../META-INF/additional-spring-configuration-metadata.json | 2 +- .../META-INF/additional-spring-configuration-metadata.json | 2 +- .../META-INF/additional-spring-configuration-metadata.json | 2 +- .../META-INF/additional-spring-configuration-metadata.json | 4 ++-- .../META-INF/additional-spring-configuration-metadata.json | 2 +- .../META-INF/additional-spring-configuration-metadata.json | 2 +- .../META-INF/additional-spring-configuration-metadata.json | 2 +- .../META-INF/additional-spring-configuration-metadata.json | 3 +-- .../META-INF/additional-spring-configuration-metadata.json | 4 ++-- 23 files changed, 28 insertions(+), 30 deletions(-) diff --git a/core/spring-boot-autoconfigure/src/main/resources/META-INF/additional-spring-configuration-metadata.json b/core/spring-boot-autoconfigure/src/main/resources/META-INF/additional-spring-configuration-metadata.json index 34a5b9630c2..ab30cb37da0 100644 --- a/core/spring-boot-autoconfigure/src/main/resources/META-INF/additional-spring-configuration-metadata.json +++ b/core/spring-boot-autoconfigure/src/main/resources/META-INF/additional-spring-configuration-metadata.json @@ -54,7 +54,7 @@ "messages" ] }, - { + { "name": "spring.resources.add-mappings", "type": "java.lang.Boolean", "deprecation": { diff --git a/core/spring-boot/src/main/resources/META-INF/additional-spring-configuration-metadata.json b/core/spring-boot/src/main/resources/META-INF/additional-spring-configuration-metadata.json index 3afaffa0cdd..593946777e2 100644 --- a/core/spring-boot/src/main/resources/META-INF/additional-spring-configuration-metadata.json +++ b/core/spring-boot/src/main/resources/META-INF/additional-spring-configuration-metadata.json @@ -768,7 +768,7 @@ } ] }, - { + { "name": "logging.structured.json.stacktrace.printer", "values": [ { diff --git a/module/spring-boot-activemq/src/main/resources/META-INF/additional-spring-configuration-metadata.json b/module/spring-boot-activemq/src/main/resources/META-INF/additional-spring-configuration-metadata.json index 1c8816b7b03..19a7ad28c0d 100644 --- a/module/spring-boot-activemq/src/main/resources/META-INF/additional-spring-configuration-metadata.json +++ b/module/spring-boot-activemq/src/main/resources/META-INF/additional-spring-configuration-metadata.json @@ -95,4 +95,4 @@ "defaultValue": true } ] -} \ No newline at end of file +} diff --git a/module/spring-boot-amqp/src/main/resources/META-INF/additional-spring-configuration-metadata.json b/module/spring-boot-amqp/src/main/resources/META-INF/additional-spring-configuration-metadata.json index 297ef6d0ad9..d085fc76440 100644 --- a/module/spring-boot-amqp/src/main/resources/META-INF/additional-spring-configuration-metadata.json +++ b/module/spring-boot-amqp/src/main/resources/META-INF/additional-spring-configuration-metadata.json @@ -66,4 +66,4 @@ } } ] -} \ No newline at end of file +} diff --git a/module/spring-boot-batch-jdbc/src/main/resources/META-INF/additional-spring-configuration-metadata.json b/module/spring-boot-batch-jdbc/src/main/resources/META-INF/additional-spring-configuration-metadata.json index bdefe168c9b..0a45ef57f5a 100644 --- a/module/spring-boot-batch-jdbc/src/main/resources/META-INF/additional-spring-configuration-metadata.json +++ b/module/spring-boot-batch-jdbc/src/main/resources/META-INF/additional-spring-configuration-metadata.json @@ -38,4 +38,4 @@ } } ] -} \ No newline at end of file +} diff --git a/module/spring-boot-batch/src/main/resources/META-INF/additional-spring-configuration-metadata.json b/module/spring-boot-batch/src/main/resources/META-INF/additional-spring-configuration-metadata.json index 2a4b792750f..9684695664e 100644 --- a/module/spring-boot-batch/src/main/resources/META-INF/additional-spring-configuration-metadata.json +++ b/module/spring-boot-batch/src/main/resources/META-INF/additional-spring-configuration-metadata.json @@ -7,4 +7,4 @@ "defaultValue": true } ] -} \ No newline at end of file +} diff --git a/module/spring-boot-data-mongodb/src/main/resources/META-INF/additional-spring-configuration-metadata.json b/module/spring-boot-data-mongodb/src/main/resources/META-INF/additional-spring-configuration-metadata.json index d1da21a87a5..fda36d09bb5 100644 --- a/module/spring-boot-data-mongodb/src/main/resources/META-INF/additional-spring-configuration-metadata.json +++ b/module/spring-boot-data-mongodb/src/main/resources/META-INF/additional-spring-configuration-metadata.json @@ -1,6 +1,6 @@ { "properties": [ - { + { "name": "management.health.mongo.enabled", "deprecation": { "level": "error", @@ -43,4 +43,4 @@ ] } ] -} \ No newline at end of file +} diff --git a/module/spring-boot-elasticsearch/src/main/resources/META-INF/additional-spring-configuration-metadata.json b/module/spring-boot-elasticsearch/src/main/resources/META-INF/additional-spring-configuration-metadata.json index 7f3b2b8e550..4610ab4ac02 100644 --- a/module/spring-boot-elasticsearch/src/main/resources/META-INF/additional-spring-configuration-metadata.json +++ b/module/spring-boot-elasticsearch/src/main/resources/META-INF/additional-spring-configuration-metadata.json @@ -114,4 +114,4 @@ } } ] -} \ No newline at end of file +} diff --git a/module/spring-boot-flyway/src/main/resources/META-INF/spring/additional-spring-configuration-metadata.json b/module/spring-boot-flyway/src/main/resources/META-INF/spring/additional-spring-configuration-metadata.json index 4236408dd9d..d045219bf1e 100644 --- a/module/spring-boot-flyway/src/main/resources/META-INF/spring/additional-spring-configuration-metadata.json +++ b/module/spring-boot-flyway/src/main/resources/META-INF/spring/additional-spring-configuration-metadata.json @@ -210,4 +210,4 @@ } } ] -} \ No newline at end of file +} diff --git a/module/spring-boot-graphql/src/main/resources/META-INF/additional-spring-configuration-metadata.json b/module/spring-boot-graphql/src/main/resources/META-INF/additional-spring-configuration-metadata.json index c6eb50c9498..eb4e76ae226 100644 --- a/module/spring-boot-graphql/src/main/resources/META-INF/additional-spring-configuration-metadata.json +++ b/module/spring-boot-graphql/src/main/resources/META-INF/additional-spring-configuration-metadata.json @@ -66,8 +66,8 @@ } ], "hints": [ - { - "name": "spring.graphql.cors.allowed-headers", + { + "name": "spring.graphql.cors.allowed-headers", "values": [ { "value": "*" diff --git a/module/spring-boot-http-codec/src/main/resources/META-INF/additional-spring-configuration-metadata.json b/module/spring-boot-http-codec/src/main/resources/META-INF/additional-spring-configuration-metadata.json index 61e148b885c..8952f411dfe 100644 --- a/module/spring-boot-http-codec/src/main/resources/META-INF/additional-spring-configuration-metadata.json +++ b/module/spring-boot-http-codec/src/main/resources/META-INF/additional-spring-configuration-metadata.json @@ -1,4 +1,4 @@ -{ +{ "properties": [ { "name": "spring.http.codecs.preferred-json-mapper", diff --git a/module/spring-boot-jdbc/src/main/resources/META-INF/additional-spring-configuration-metadata.json b/module/spring-boot-jdbc/src/main/resources/META-INF/additional-spring-configuration-metadata.json index b15bc1f28f8..7693e1632c6 100644 --- a/module/spring-boot-jdbc/src/main/resources/META-INF/additional-spring-configuration-metadata.json +++ b/module/spring-boot-jdbc/src/main/resources/META-INF/additional-spring-configuration-metadata.json @@ -191,4 +191,4 @@ } ] } -} \ No newline at end of file +} diff --git a/module/spring-boot-jpa/src/main/resources/META-INF/additional-spring-configuration-metadata.json b/module/spring-boot-jpa/src/main/resources/META-INF/additional-spring-configuration-metadata.json index 1b02295bb7f..4b4d99de777 100644 --- a/module/spring-boot-jpa/src/main/resources/META-INF/additional-spring-configuration-metadata.json +++ b/module/spring-boot-jpa/src/main/resources/META-INF/additional-spring-configuration-metadata.json @@ -6,6 +6,5 @@ "defaultValue": true } ], - "hints": [ - ] + "hints": [] } diff --git a/module/spring-boot-kafka/src/main/resources/META-INF/additional-spring-configuration-metadata.json b/module/spring-boot-kafka/src/main/resources/META-INF/additional-spring-configuration-metadata.json index e44376c9604..ff0c0f3be80 100644 --- a/module/spring-boot-kafka/src/main/resources/META-INF/additional-spring-configuration-metadata.json +++ b/module/spring-boot-kafka/src/main/resources/META-INF/additional-spring-configuration-metadata.json @@ -1,6 +1,6 @@ { "properties": [ - { + { "name": "spring.kafka.admin.ssl.keystore-location", "type": "org.springframework.core.io.Resource", "description": "Location of the key store file.", @@ -303,4 +303,4 @@ ] } ] -} \ No newline at end of file +} diff --git a/module/spring-boot-ldap/src/main/resources/META-INF/additional-spring-configuration-metadata.json b/module/spring-boot-ldap/src/main/resources/META-INF/additional-spring-configuration-metadata.json index eb1fc2a1db0..8cb17a7e57b 100644 --- a/module/spring-boot-ldap/src/main/resources/META-INF/additional-spring-configuration-metadata.json +++ b/module/spring-boot-ldap/src/main/resources/META-INF/additional-spring-configuration-metadata.json @@ -7,4 +7,4 @@ "defaultValue": true } ] -} \ No newline at end of file +} diff --git a/module/spring-boot-liquibase/src/main/resources/META-INF/additional-spring-configuration-metadata.json b/module/spring-boot-liquibase/src/main/resources/META-INF/additional-spring-configuration-metadata.json index 38c94a35f09..bc0ba126fbb 100644 --- a/module/spring-boot-liquibase/src/main/resources/META-INF/additional-spring-configuration-metadata.json +++ b/module/spring-boot-liquibase/src/main/resources/META-INF/additional-spring-configuration-metadata.json @@ -45,4 +45,4 @@ ] } ] -} \ No newline at end of file +} diff --git a/module/spring-boot-mail/src/main/resources/META-INF/additional-spring-configuration-metadata.json b/module/spring-boot-mail/src/main/resources/META-INF/additional-spring-configuration-metadata.json index 1a0de547c5e..a7e22911136 100644 --- a/module/spring-boot-mail/src/main/resources/META-INF/additional-spring-configuration-metadata.json +++ b/module/spring-boot-mail/src/main/resources/META-INF/additional-spring-configuration-metadata.json @@ -15,4 +15,4 @@ "defaultValue": false } ] -} \ No newline at end of file +} diff --git a/module/spring-boot-micrometer-metrics/src/main/resources/META-INF/additional-spring-configuration-metadata.json b/module/spring-boot-micrometer-metrics/src/main/resources/META-INF/additional-spring-configuration-metadata.json index 7a3842e3ede..3211a0894c5 100644 --- a/module/spring-boot-micrometer-metrics/src/main/resources/META-INF/additional-spring-configuration-metadata.json +++ b/module/spring-boot-micrometer-metrics/src/main/resources/META-INF/additional-spring-configuration-metadata.json @@ -62,7 +62,7 @@ "since": "2.1.0" } }, - { + { "name": "management.metrics.export.appoptics.api-token", "type": "java.lang.String", "deprecation": { @@ -1756,7 +1756,7 @@ "since": "3.0.0" } }, - { + { "name": "management.metrics.web.server.auto-time-requests", "type": "java.lang.Boolean", "deprecation": { diff --git a/module/spring-boot-reactor/src/main/resources/META-INF/additional-spring-configuration-metadata.json b/module/spring-boot-reactor/src/main/resources/META-INF/additional-spring-configuration-metadata.json index df4eb43eefb..54714105d0e 100644 --- a/module/spring-boot-reactor/src/main/resources/META-INF/additional-spring-configuration-metadata.json +++ b/module/spring-boot-reactor/src/main/resources/META-INF/additional-spring-configuration-metadata.json @@ -1,7 +1,7 @@ { "groups": [], "properties": [ - { + { "name": "spring.reactor.stacktrace-mode.enabled", "description": "Whether Reactor should collect stacktrace information at runtime.", "defaultValue": false, diff --git a/module/spring-boot-security-oauth2-resource-server/src/main/resources/META-INF/additional-spring-configuration-metadata.json b/module/spring-boot-security-oauth2-resource-server/src/main/resources/META-INF/additional-spring-configuration-metadata.json index 8fcd3398be6..774d7801fc4 100644 --- a/module/spring-boot-security-oauth2-resource-server/src/main/resources/META-INF/additional-spring-configuration-metadata.json +++ b/module/spring-boot-security-oauth2-resource-server/src/main/resources/META-INF/additional-spring-configuration-metadata.json @@ -1,7 +1,7 @@ { "groups": [], "properties": [ - { + { "name": "spring.security.oauth2.resourceserver.jwt.jws-algorithm", "type": "java.lang.String", "deprecation": { diff --git a/module/spring-boot-security/src/main/resources/META-INF/additional-spring-configuration-metadata.json b/module/spring-boot-security/src/main/resources/META-INF/additional-spring-configuration-metadata.json index e12f6d39353..83ee5ce1acc 100644 --- a/module/spring-boot-security/src/main/resources/META-INF/additional-spring-configuration-metadata.json +++ b/module/spring-boot-security/src/main/resources/META-INF/additional-spring-configuration-metadata.json @@ -1,7 +1,7 @@ { "groups": [], "properties": [ - { + { "name": "spring.security.filter.dispatcher-types", "defaultValue": [ "async", diff --git a/module/spring-boot-thymeleaf/src/main/resources/META-INF/additional-spring-configuration-metadata.json b/module/spring-boot-thymeleaf/src/main/resources/META-INF/additional-spring-configuration-metadata.json index b27cf3c42e8..9b957dabcaf 100644 --- a/module/spring-boot-thymeleaf/src/main/resources/META-INF/additional-spring-configuration-metadata.json +++ b/module/spring-boot-thymeleaf/src/main/resources/META-INF/additional-spring-configuration-metadata.json @@ -39,7 +39,6 @@ ], "hints": [], "ignored": { - "properties": [ - ] + "properties": [] } } diff --git a/module/spring-boot-web-server/src/main/resources/META-INF/additional-spring-configuration-metadata.json b/module/spring-boot-web-server/src/main/resources/META-INF/additional-spring-configuration-metadata.json index dcb8c46cfd1..4dc1e5db210 100644 --- a/module/spring-boot-web-server/src/main/resources/META-INF/additional-spring-configuration-metadata.json +++ b/module/spring-boot-web-server/src/main/resources/META-INF/additional-spring-configuration-metadata.json @@ -72,7 +72,7 @@ { "name": "server.error.whitelabel.enabled", "description": "Whether to enable the default error page displayed in browsers in case of a server error.", - "defaultValue": true , + "defaultValue": true, "deprecation": { "level": "error", "replacement": "spring.web.error.whitelabel.enabled", @@ -260,4 +260,4 @@ } } ] -} \ No newline at end of file +} From 23829221effef86e09346d0635353bd8ba285cb0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?St=C3=A9phane=20Nicoll?= Date: Sat, 30 May 2026 14:27:53 +0200 Subject: [PATCH 2/2] Remove sourceType from deprecated properties with error level See gh-50375 --- .../META-INF/additional-spring-configuration-metadata.json | 2 -- .../META-INF/additional-spring-configuration-metadata.json | 6 ------ 2 files changed, 8 deletions(-) diff --git a/module/spring-boot-jackson/src/main/resources/META-INF/additional-spring-configuration-metadata.json b/module/spring-boot-jackson/src/main/resources/META-INF/additional-spring-configuration-metadata.json index 8a69f6c8815..2b2e0b5f0ae 100644 --- a/module/spring-boot-jackson/src/main/resources/META-INF/additional-spring-configuration-metadata.json +++ b/module/spring-boot-jackson/src/main/resources/META-INF/additional-spring-configuration-metadata.json @@ -37,7 +37,6 @@ "name": "spring.jackson.read", "type": "java.util.Map", "description": "Jackson on/off token reader features that are specific to JSON.", - "sourceType": "org.springframework.boot.jackson.autoconfigure.JacksonProperties", "deprecation": { "level": "error", "replacement": "spring.jackson.json.read", @@ -48,7 +47,6 @@ "name": "spring.jackson.write", "type": "java.util.Map", "description": "Jackson on/off token writer features that are specific to JSON.", - "sourceType": "org.springframework.boot.jackson.autoconfigure.JacksonProperties", "deprecation": { "level": "error", "replacement": "spring.jackson.json.write", diff --git a/module/spring-boot-opentelemetry/src/main/resources/META-INF/additional-spring-configuration-metadata.json b/module/spring-boot-opentelemetry/src/main/resources/META-INF/additional-spring-configuration-metadata.json index 4566a76af66..cf378fb275e 100644 --- a/module/spring-boot-opentelemetry/src/main/resources/META-INF/additional-spring-configuration-metadata.json +++ b/module/spring-boot-opentelemetry/src/main/resources/META-INF/additional-spring-configuration-metadata.json @@ -11,7 +11,6 @@ "name": "management.otlp.logging.compression", "type": "org.springframework.boot.opentelemetry.actuate.autoconfigure.logging.OpenTelemetryLoggingExportProperties$Compression", "description": "Method used to compress the payload.", - "sourceType": "org.springframework.boot.opentelemetry.actuate.autoconfigure.logging.OpenTelemetryLoggingExportProperties", "defaultValue": "none", "deprecation": { "level": "error", @@ -23,7 +22,6 @@ "name": "management.otlp.logging.connect-timeout", "type": "java.time.Duration", "description": "Connect timeout for the OTel collector connection.", - "sourceType": "org.springframework.boot.opentelemetry.actuate.autoconfigure.logging.OpenTelemetryLoggingExportProperties", "defaultValue": "10s", "deprecation": { "level": "error", @@ -35,7 +33,6 @@ "name": "management.otlp.logging.endpoint", "type": "java.lang.String", "description": "URL to the OTel collector's HTTP API.", - "sourceType": "org.springframework.boot.opentelemetry.actuate.autoconfigure.logging.OpenTelemetryLoggingExportProperties", "deprecation": { "level": "error", "replacement": "management.opentelemetry.logging.export.otlp.endpoint", @@ -54,7 +51,6 @@ "name": "management.otlp.logging.headers", "type": "java.util.Map", "description": "Custom HTTP headers you want to pass to the collector, for example auth headers.", - "sourceType": "org.springframework.boot.opentelemetry.actuate.autoconfigure.logging.OpenTelemetryLoggingExportProperties", "deprecation": { "level": "error", "replacement": "management.opentelemetry.logging.export.otlp.headers", @@ -65,7 +61,6 @@ "name": "management.otlp.logging.timeout", "type": "java.time.Duration", "description": "Call timeout for the OTel Collector to process an exported batch of data. This timeout spans the entire call: resolving DNS, connecting, writing the request body, server processing, and reading the response body. If the call requires redirects or retries all must complete within one timeout period.", - "sourceType": "org.springframework.boot.opentelemetry.actuate.autoconfigure.logging.OpenTelemetryLoggingExportProperties", "defaultValue": "10s", "deprecation": { "level": "error", @@ -77,7 +72,6 @@ "name": "management.otlp.logging.transport", "type": "org.springframework.boot.opentelemetry.actuate.autoconfigure.logging.Transport", "description": "Transport used to send the logs.", - "sourceType": "org.springframework.boot.opentelemetry.actuate.autoconfigure.logging.OpenTelemetryLoggingExportProperties", "defaultValue": "http", "deprecation": { "level": "error",