From d0e7766d72d381c621e009e363d92fc79ad364ca Mon Sep 17 00:00:00 2001 From: Andy Wilkinson Date: Wed, 4 Jun 2025 18:43:58 +0100 Subject: [PATCH] Move additional property metadata out of autoconfigure-all --- ...itional-spring-configuration-metadata.json | 494 ------------------ ...itional-spring-configuration-metadata.json | 199 +++++++ ...itional-spring-configuration-metadata.json | 41 ++ ...itional-spring-configuration-metadata.json | 24 + ...itional-spring-configuration-metadata.json | 6 + 5 files changed, 270 insertions(+), 494 deletions(-) diff --git a/spring-boot-project/spring-boot-autoconfigure-all/src/main/resources/META-INF/additional-spring-configuration-metadata.json b/spring-boot-project/spring-boot-autoconfigure-all/src/main/resources/META-INF/additional-spring-configuration-metadata.json index 57f93544ea..78428c95f4 100644 --- a/spring-boot-project/spring-boot-autoconfigure-all/src/main/resources/META-INF/additional-spring-configuration-metadata.json +++ b/spring-boot-project/spring-boot-autoconfigure-all/src/main/resources/META-INF/additional-spring-configuration-metadata.json @@ -69,505 +69,11 @@ "level": "error" } }, - { - "name": "spring.influx.password", - "deprecation": { - "level": "error", - "reason": "The new InfluxDb Java client provides Spring Boot integration." - } - }, - { - "name": "spring.influx.url", - "deprecation": { - "level": "error", - "reason": "The new InfluxDb Java client provides Spring Boot integration." - } - }, - { - "name": "spring.influx.user", - "deprecation": { - "level": "error", - "reason": "The new InfluxDb Java client provides Spring Boot integration." - } - }, - { - "name": "spring.jta.enabled", - "type": "java.lang.Boolean", - "description": "Whether to enable JTA support.", - "defaultValue": true - }, - { - "name": "spring.jta.narayana.default-timeout", - "type": "java.time.Duration", - "description": "Transaction timeout. If a duration suffix is not specified, seconds will be used.", - "defaultValue": "60s", - "deprecation": { - "level": "error", - "reason": "Narayana support has moved to third party starter." - } - }, - { - "name": "spring.jta.narayana.expiry-scanners", - "type": "java.util.List", - "description": "Comma-separated list of expiry scanners.", - "defaultValue": [ - "com.arjuna.ats.internal.arjuna.recovery.ExpiredTransactionStatusManagerScanner" - ], - "deprecation": { - "level": "error", - "reason": "Narayana support has moved to third party starter." - } - }, - { - "name": "spring.jta.narayana.log-dir", - "type": "java.lang.String", - "description": "Transaction object store directory.", - "deprecation": { - "level": "error", - "reason": "Narayana support has moved to third party starter." - } - }, - { - "name": "spring.jta.narayana.one-phase-commit", - "type": "java.lang.Boolean", - "description": "Whether to enable one phase commit optimization.", - "defaultValue": true, - "deprecation": { - "level": "error", - "reason": "Narayana support has moved to third party starter." - } - }, - { - "name": "spring.jta.narayana.periodic-recovery-period", - "type": "java.time.Duration", - "description": "Interval in which periodic recovery scans are performed. If a duration suffix is not specified, seconds will be used.", - "defaultValue": "120s", - "deprecation": { - "level": "error", - "reason": "Narayana support has moved to third party starter." - } - }, - { - "name": "spring.jta.narayana.recovery-backoff-period", - "type": "java.time.Duration", - "description": "Back off period between first and second phases of the recovery scan. If a duration suffix is not specified, seconds will be used.", - "defaultValue": "10s", - "deprecation": { - "level": "error", - "reason": "Narayana support has moved to third party starter." - } - }, - { - "name": "spring.jta.narayana.recovery-db-pass", - "type": "java.lang.String", - "description": "Database password to be used by the recovery manager.", - "deprecation": { - "level": "error", - "reason": "Narayana support has moved to third party starter." - } - }, - { - "name": "spring.jta.narayana.recovery-db-user", - "type": "java.lang.String", - "description": "Database username to be used by the recovery manager.", - "deprecation": { - "level": "error", - "reason": "Narayana support has moved to third party starter." - } - }, - { - "name": "spring.jta.narayana.recovery-jms-pass", - "type": "java.lang.String", - "description": "JMS password to be used by the recovery manager.", - "deprecation": { - "level": "error", - "reason": "Narayana support has moved to third party starter." - } - }, - { - "name": "spring.jta.narayana.recovery-jms-user", - "type": "java.lang.String", - "description": "JMS username to be used by the recovery manager.", - "deprecation": { - "level": "error", - "reason": "Narayana support has moved to third party starter." - } - }, - { - "name": "spring.jta.narayana.recovery-modules", - "type": "java.util.List", - "description": "Comma-separated list of recovery modules.", - "deprecation": { - "level": "error", - "reason": "Narayana support has moved to third party starter." - } - }, - { - "name": "spring.jta.narayana.transaction-manager-id", - "type": "java.lang.String", - "description": "Unique transaction manager id.", - "defaultValue": "1", - "deprecation": { - "level": "error", - "reason": "Narayana support has moved to third party starter." - } - }, - { - "name": "spring.jta.narayana.xa-resource-orphan-filters", - "type": "java.util.List", - "description": "Comma-separated list of orphan filters.", - "deprecation": { - "level": "error", - "reason": "Narayana support has moved to third party starter." - } - }, - { - "name": "spring.resources.add-mappings", - "type": "java.lang.Boolean", - "deprecation": { - "replacement": "spring.web.resources.add-mappings", - "level": "error" - } - }, - { - "name": "spring.resources.cache.cachecontrol.cache-private", - "type": "java.lang.Boolean", - "deprecation": { - "replacement": "spring.web.resources.cache.cachecontrol.cache-private", - "level": "error" - } - }, - { - "name": "spring.resources.cache.cachecontrol.cache-public", - "type": "java.lang.Boolean", - "deprecation": { - "replacement": "spring.web.resources.cache.cachecontrol.cache-public", - "level": "error" - } - }, - { - "name": "spring.resources.cache.cachecontrol.max-age", - "type": "java.time.Duration", - "deprecation": { - "replacement": "spring.web.resources.cache.cachecontrol.max-age", - "level": "error" - } - }, - { - "name": "spring.resources.cache.cachecontrol.must-revalidate", - "type": "java.lang.Boolean", - "deprecation": { - "replacement": "spring.web.resources.cache.cachecontrol.must-revalidate", - "level": "error" - } - }, - { - "name": "spring.resources.cache.cachecontrol.no-cache", - "type": "java.lang.Boolean", - "deprecation": { - "replacement": "spring.web.resources.cache.cachecontrol.no-cache", - "level": "error" - } - }, - { - "name": "spring.resources.cache.cachecontrol.no-store", - "type": "java.lang.Boolean", - "deprecation": { - "replacement": "spring.web.resources.cache.cachecontrol.no-store", - "level": "error" - } - }, - { - "name": "spring.resources.cache.cachecontrol.no-transform", - "type": "java.lang.Boolean", - "deprecation": { - "replacement": "spring.web.resources.cache.cachecontrol.no-transform", - "level": "error" - } - }, - { - "name": "spring.resources.cache.cachecontrol.proxy-revalidate", - "type": "java.lang.Boolean", - "deprecation": { - "replacement": "spring.web.resources.cache.cachecontrol.proxy-revalidate", - "level": "error" - } - }, - { - "name": "spring.resources.cache.cachecontrol.s-max-age", - "type": "java.time.Duration", - "deprecation": { - "replacement": "spring.web.resources.cache.cachecontrol.s-max-age", - "level": "error" - } - }, - { - "name": "spring.resources.cache.cachecontrol.stale-if-error", - "type": "java.time.Duration", - "deprecation": { - "replacement": "spring.web.resources.cache.cachecontrol.stale-if-error", - "level": "error" - } - }, - { - "name": "spring.resources.cache.cachecontrol.stale-while-revalidate", - "type": "java.time.Duration", - "deprecation": { - "replacement": "spring.web.resources.cache.cachecontrol.stale-while-revalidate", - "level": "error" - } - }, - { - "name": "spring.resources.cache.period", - "type": "java.time.Duration", - "deprecation": { - "replacement": "spring.web.resources.cache.period", - "level": "error" - } - }, - { - "name": "spring.resources.cache.use-last-modified", - "type": "java.lang.Boolean", - "deprecation": { - "replacement": "spring.web.resources.cache.use-last-modified", - "level": "error" - } - }, - { - "name": "spring.resources.chain.cache", - "type": "java.lang.Boolean", - "deprecation": { - "replacement": "spring.web.resources.chain.cache", - "level": "error" - } - }, - { - "name": "spring.resources.chain.compressed", - "type": "java.lang.Boolean", - "deprecation": { - "replacement": "spring.web.resources.chain.compressed", - "level": "error" - } - }, - { - "name": "spring.resources.chain.enabled", - "type": "java.lang.Boolean", - "deprecation": { - "replacement": "spring.web.resources.chain.enabled", - "level": "error" - } - }, - { - "name": "spring.resources.chain.gzipped", - "type": "java.lang.Boolean", - "deprecation": { - "replacement": "spring.web.resources.chain.compressed", - "level": "error" - } - }, - { - "name": "spring.resources.chain.html-application-cache", - "type": "java.lang.Boolean", - "deprecation": { - "level": "error" - } - }, - { - "name": "spring.resources.chain.strategy.content.enabled", - "type": "java.lang.Boolean", - "deprecation": { - "replacement": "spring.web.resources.chain.strategy.content.enabled", - "level": "error" - } - }, - { - "name": "spring.resources.chain.strategy.content.paths", - "type": "java.lang.String[]", - "deprecation": { - "replacement": "spring.web.resources.chain.strategy.content.paths", - "level": "error" - } - }, - { - "name": "spring.resources.chain.strategy.fixed.enabled", - "type": "java.lang.Boolean", - "deprecation": { - "replacement": "spring.web.resources.chain.strategy.fixed.enabled", - "level": "error" - } - }, - { - "name": "spring.resources.chain.strategy.fixed.paths", - "type": "java.lang.String[]", - "deprecation": { - "replacement": "spring.web.resources.chain.strategy.fixed.paths", - "level": "error" - } - }, - { - "name": "spring.resources.chain.strategy.fixed.version", - "type": "java.lang.String", - "deprecation": { - "replacement": "spring.web.resources.chain.strategy.fixed.version", - "level": "error" - } - }, - { - "name": "spring.resources.static-locations", - "type": "java.lang.String[]", - "deprecation": { - "replacement": "spring.web.resources.static-locations", - "level": "error" - } - }, { "name": "spring.servlet.encoding.enabled", "type": "java.lang.Boolean", "description": "Whether to enable Servlet HTTP encoding support.", "defaultValue": true - }, - { - "name": "spring.sql.init.enabled", - "type": "java.lang.Boolean", - "description": "Whether basic script-based initialization of an SQL database is enabled.", - "defaultValue": true, - "deprecation": { - "replacement": "spring.sql.init.mode", - "level": "warning" - } - } - ], - "hints": [ - { - "name": "spring.graphql.cors.allowed-headers", - "values": [ - { - "value": "*" - } - ], - "providers": [ - { - "name": "any" - } - ] - }, - { - "name": "spring.graphql.cors.allowed-methods", - "values": [ - { - "value": "*" - } - ], - "providers": [ - { - "name": "any" - } - ] - }, - { - "name": "spring.graphql.cors.allowed-origins", - "values": [ - { - "value": "*" - } - ], - "providers": [ - { - "name": "any" - } - ] - }, - { - "name": "spring.kafka.consumer.auto-offset-reset", - "values": [ - { - "value": "earliest", - "description": "Automatically reset the offset to the earliest offset." - }, - { - "value": "latest", - "description": "Automatically reset the offset to the latest offset." - }, - { - "value": "none", - "description": "Throw exception to the consumer if no previous offset is found for the consumer's group." - }, - { - "value": "exception", - "description": "Throw exception to the consumer." - } - ], - "providers": [ - { - "name": "any" - } - ] - }, - { - "name": "spring.kafka.consumer.key-deserializer", - "providers": [ - { - "name": "handle-as", - "parameters": { - "target": "org.apache.kafka.common.serialization.Deserializer" - } - } - ] - }, - { - "name": "spring.kafka.consumer.value-deserializer", - "providers": [ - { - "name": "handle-as", - "parameters": { - "target": "org.apache.kafka.common.serialization.Deserializer" - } - } - ] - }, - { - "name": "spring.kafka.producer.key-serializer", - "providers": [ - { - "name": "handle-as", - "parameters": { - "target": "org.apache.kafka.common.serialization.Serializer" - } - } - ] - }, - { - "name": "spring.kafka.producer.value-serializer", - "providers": [ - { - "name": "handle-as", - "parameters": { - "target": "org.apache.kafka.common.serialization.Serializer" - } - } - ] - }, - { - "name": "spring.sql.init.data-locations", - "providers": [ - { - "name": "handle-as", - "parameters": { - "target": "java.util.List" - } - } - ] - }, - { - "name": "spring.sql.init.schema-locations", - "providers": [ - { - "name": "handle-as", - "parameters": { - "target": "java.util.List" - } - } - ] } ] } 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 41fc59514e..1ebc87bf4e 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 @@ -52,6 +52,205 @@ "defaultValue": [ "messages" ] + }, + { + "name": "spring.resources.add-mappings", + "type": "java.lang.Boolean", + "deprecation": { + "replacement": "spring.web.resources.add-mappings", + "level": "error" + } + }, + { + "name": "spring.resources.cache.cachecontrol.cache-private", + "type": "java.lang.Boolean", + "deprecation": { + "replacement": "spring.web.resources.cache.cachecontrol.cache-private", + "level": "error" + } + }, + { + "name": "spring.resources.cache.cachecontrol.cache-public", + "type": "java.lang.Boolean", + "deprecation": { + "replacement": "spring.web.resources.cache.cachecontrol.cache-public", + "level": "error" + } + }, + { + "name": "spring.resources.cache.cachecontrol.max-age", + "type": "java.time.Duration", + "deprecation": { + "replacement": "spring.web.resources.cache.cachecontrol.max-age", + "level": "error" + } + }, + { + "name": "spring.resources.cache.cachecontrol.must-revalidate", + "type": "java.lang.Boolean", + "deprecation": { + "replacement": "spring.web.resources.cache.cachecontrol.must-revalidate", + "level": "error" + } + }, + { + "name": "spring.resources.cache.cachecontrol.no-cache", + "type": "java.lang.Boolean", + "deprecation": { + "replacement": "spring.web.resources.cache.cachecontrol.no-cache", + "level": "error" + } + }, + { + "name": "spring.resources.cache.cachecontrol.no-store", + "type": "java.lang.Boolean", + "deprecation": { + "replacement": "spring.web.resources.cache.cachecontrol.no-store", + "level": "error" + } + }, + { + "name": "spring.resources.cache.cachecontrol.no-transform", + "type": "java.lang.Boolean", + "deprecation": { + "replacement": "spring.web.resources.cache.cachecontrol.no-transform", + "level": "error" + } + }, + { + "name": "spring.resources.cache.cachecontrol.proxy-revalidate", + "type": "java.lang.Boolean", + "deprecation": { + "replacement": "spring.web.resources.cache.cachecontrol.proxy-revalidate", + "level": "error" + } + }, + { + "name": "spring.resources.cache.cachecontrol.s-max-age", + "type": "java.time.Duration", + "deprecation": { + "replacement": "spring.web.resources.cache.cachecontrol.s-max-age", + "level": "error" + } + }, + { + "name": "spring.resources.cache.cachecontrol.stale-if-error", + "type": "java.time.Duration", + "deprecation": { + "replacement": "spring.web.resources.cache.cachecontrol.stale-if-error", + "level": "error" + } + }, + { + "name": "spring.resources.cache.cachecontrol.stale-while-revalidate", + "type": "java.time.Duration", + "deprecation": { + "replacement": "spring.web.resources.cache.cachecontrol.stale-while-revalidate", + "level": "error" + } + }, + { + "name": "spring.resources.cache.period", + "type": "java.time.Duration", + "deprecation": { + "replacement": "spring.web.resources.cache.period", + "level": "error" + } + }, + { + "name": "spring.resources.cache.use-last-modified", + "type": "java.lang.Boolean", + "deprecation": { + "replacement": "spring.web.resources.cache.use-last-modified", + "level": "error" + } + }, + { + "name": "spring.resources.chain.cache", + "type": "java.lang.Boolean", + "deprecation": { + "replacement": "spring.web.resources.chain.cache", + "level": "error" + } + }, + { + "name": "spring.resources.chain.compressed", + "type": "java.lang.Boolean", + "deprecation": { + "replacement": "spring.web.resources.chain.compressed", + "level": "error" + } + }, + { + "name": "spring.resources.chain.enabled", + "type": "java.lang.Boolean", + "deprecation": { + "replacement": "spring.web.resources.chain.enabled", + "level": "error" + } + }, + { + "name": "spring.resources.chain.gzipped", + "type": "java.lang.Boolean", + "deprecation": { + "replacement": "spring.web.resources.chain.compressed", + "level": "error" + } + }, + { + "name": "spring.resources.chain.html-application-cache", + "type": "java.lang.Boolean", + "deprecation": { + "level": "error" + } + }, + { + "name": "spring.resources.chain.strategy.content.enabled", + "type": "java.lang.Boolean", + "deprecation": { + "replacement": "spring.web.resources.chain.strategy.content.enabled", + "level": "error" + } + }, + { + "name": "spring.resources.chain.strategy.content.paths", + "type": "java.lang.String[]", + "deprecation": { + "replacement": "spring.web.resources.chain.strategy.content.paths", + "level": "error" + } + }, + { + "name": "spring.resources.chain.strategy.fixed.enabled", + "type": "java.lang.Boolean", + "deprecation": { + "replacement": "spring.web.resources.chain.strategy.fixed.enabled", + "level": "error" + } + }, + { + "name": "spring.resources.chain.strategy.fixed.paths", + "type": "java.lang.String[]", + "deprecation": { + "replacement": "spring.web.resources.chain.strategy.fixed.paths", + "level": "error" + } + }, + { + "name": "spring.resources.chain.strategy.fixed.version", + "type": "java.lang.String", + "deprecation": { + "replacement": "spring.web.resources.chain.strategy.fixed.version", + "level": "error" + } + }, + { + "name": "spring.resources.static-locations", + "type": "java.lang.String[]", + "deprecation": { + "replacement": "spring.web.resources.static-locations", + "level": "error" + } }, { "name": "spring.threads.virtual.enabled", diff --git a/spring-boot-project/spring-boot-graphql/src/main/resources/META-INF/additional-spring-configuration-metadata.json b/spring-boot-project/spring-boot-graphql/src/main/resources/META-INF/additional-spring-configuration-metadata.json index 42c2a7246a..382db46a08 100644 --- a/spring-boot-project/spring-boot-graphql/src/main/resources/META-INF/additional-spring-configuration-metadata.json +++ b/spring-boot-project/spring-boot-graphql/src/main/resources/META-INF/additional-spring-configuration-metadata.json @@ -35,5 +35,46 @@ "name": "spring.graphql.schema.locations", "defaultValue": "classpath:graphql/**/" } + ], + "hints": [ + { + "name": "spring.graphql.cors.allowed-headers", + "values": [ + { + "value": "*" + } + ], + "providers": [ + { + "name": "any" + } + ] + }, + { + "name": "spring.graphql.cors.allowed-methods", + "values": [ + { + "value": "*" + } + ], + "providers": [ + { + "name": "any" + } + ] + }, + { + "name": "spring.graphql.cors.allowed-origins", + "values": [ + { + "value": "*" + } + ], + "providers": [ + { + "name": "any" + } + ] + } ] } diff --git a/spring-boot-project/spring-boot-sql/src/main/resources/META-INF/additional-spring-configuration-metadata.json b/spring-boot-project/spring-boot-sql/src/main/resources/META-INF/additional-spring-configuration-metadata.json index 071b164d4b..c7df526ef4 100644 --- a/spring-boot-project/spring-boot-sql/src/main/resources/META-INF/additional-spring-configuration-metadata.json +++ b/spring-boot-project/spring-boot-sql/src/main/resources/META-INF/additional-spring-configuration-metadata.json @@ -10,5 +10,29 @@ "level": "warning" } } + ], + "hints": [ + { + "name": "spring.sql.init.data-locations", + "providers": [ + { + "name": "handle-as", + "parameters": { + "target": "java.util.List" + } + } + ] + }, + { + "name": "spring.sql.init.schema-locations", + "providers": [ + { + "name": "handle-as", + "parameters": { + "target": "java.util.List" + } + } + ] + } ] } diff --git a/spring-boot-project/spring-boot-tx/src/main/resources/META-INF/additional-spring-configuration-metadata.json b/spring-boot-project/spring-boot-tx/src/main/resources/META-INF/additional-spring-configuration-metadata.json index 03d1720dde..eff1f2bb28 100644 --- a/spring-boot-project/spring-boot-tx/src/main/resources/META-INF/additional-spring-configuration-metadata.json +++ b/spring-boot-project/spring-boot-tx/src/main/resources/META-INF/additional-spring-configuration-metadata.json @@ -5,6 +5,12 @@ "type": "java.lang.Boolean", "description": "Whether to enable the PersistenceExceptionTranslationPostProcessor.", "defaultValue": true + }, + { + "name": "spring.jta.enabled", + "type": "java.lang.Boolean", + "description": "Whether to enable JTA support.", + "defaultValue": true } ] }