diff --git a/documentation/spring-boot-docs/build.gradle b/documentation/spring-boot-docs/build.gradle index 2aea0f47ca2..16540375333 100644 --- a/documentation/spring-boot-docs/build.gradle +++ b/documentation/spring-boot-docs/build.gradle @@ -84,6 +84,7 @@ dependencies { autoConfiguration(project(path: ":module:spring-boot-batch", configuration: "autoConfigurationMetadata")) autoConfiguration(project(path: ":module:spring-boot-cache", configuration: "autoConfigurationMetadata")) autoConfiguration(project(path: ":module:spring-boot-cassandra", configuration: "autoConfigurationMetadata")) + autoConfiguration(project(path: ":module:spring-boot-cloudfoundry", configuration: "autoConfigurationMetadata")) autoConfiguration(project(path: ":module:spring-boot-couchbase", configuration: "autoConfigurationMetadata")) autoConfiguration(project(path: ":module:spring-boot-data-cassandra", configuration: "autoConfigurationMetadata")) autoConfiguration(project(path: ":module:spring-boot-data-commons", configuration: "autoConfigurationMetadata")) @@ -102,14 +103,16 @@ dependencies { autoConfiguration(project(path: ":module:spring-boot-flyway", configuration: "autoConfigurationMetadata")) autoConfiguration(project(path: ":module:spring-boot-freemarker", configuration: "autoConfigurationMetadata")) autoConfiguration(project(path: ":module:spring-boot-graphql", configuration: "autoConfigurationMetadata")) + autoConfiguration(project(path: ":module:spring-boot-groovy-templates", configuration: "autoConfigurationMetadata")) autoConfiguration(project(path: ":module:spring-boot-gson", configuration: "autoConfigurationMetadata")) autoConfiguration(project(path: ":module:spring-boot-h2console", configuration: "autoConfigurationMetadata")) autoConfiguration(project(path: ":module:spring-boot-hateoas", configuration: "autoConfigurationMetadata")) autoConfiguration(project(path: ":module:spring-boot-hazelcast", configuration: "autoConfigurationMetadata")) + autoConfiguration(project(path: ":module:spring-boot-health", configuration: "autoConfigurationMetadata")) autoConfiguration(project(path: ":module:spring-boot-hibernate", configuration: "autoConfigurationMetadata")) autoConfiguration(project(path: ":module:spring-boot-http-client", configuration: "autoConfigurationMetadata")) - autoConfiguration(project(path: ":module:spring-boot-http-converter", configuration: "autoConfigurationMetadata")) autoConfiguration(project(path: ":module:spring-boot-http-codec", configuration: "autoConfigurationMetadata")) + autoConfiguration(project(path: ":module:spring-boot-http-converter", configuration: "autoConfigurationMetadata")) autoConfiguration(project(path: ":module:spring-boot-integration", configuration: "autoConfigurationMetadata")) autoConfiguration(project(path: ":module:spring-boot-jackson", configuration: "autoConfigurationMetadata")) autoConfiguration(project(path: ":module:spring-boot-jdbc", configuration: "autoConfigurationMetadata")) @@ -159,6 +162,7 @@ dependencies { autoConfiguration(project(path: ":module:spring-boot-webmvc", configuration: "autoConfigurationMetadata")) autoConfiguration(project(path: ":module:spring-boot-webservices", configuration: "autoConfigurationMetadata")) autoConfiguration(project(path: ":module:spring-boot-websocket", configuration: "autoConfigurationMetadata")) + autoConfiguration(project(path: ":module:spring-boot-zipkin", configuration: "autoConfigurationMetadata")) configurationProperties(project(path: ":core:spring-boot", configuration: "configurationPropertiesMetadata")) configurationProperties(project(path: ":core:spring-boot-autoconfigure", configuration: "configurationPropertiesMetadata")) @@ -179,6 +183,7 @@ dependencies { configurationProperties(project(path: ":module:spring-boot-data-elasticsearch", configuration: "configurationPropertiesMetadata")) configurationProperties(project(path: ":module:spring-boot-data-jdbc", configuration: "configurationPropertiesMetadata")) configurationProperties(project(path: ":module:spring-boot-data-jpa", configuration: "configurationPropertiesMetadata")) + configurationProperties(project(path: ":module:spring-boot-data-mongodb", configuration: "configurationPropertiesMetadata")) configurationProperties(project(path: ":module:spring-boot-data-ldap", configuration: "configurationPropertiesMetadata")) configurationProperties(project(path: ":module:spring-boot-data-neo4j", configuration: "configurationPropertiesMetadata")) configurationProperties(project(path: ":module:spring-boot-data-r2dbc", configuration: "configurationPropertiesMetadata")) @@ -189,22 +194,23 @@ dependencies { configurationProperties(project(path: ":module:spring-boot-flyway", configuration: "configurationPropertiesMetadata")) configurationProperties(project(path: ":module:spring-boot-freemarker", configuration: "configurationPropertiesMetadata")) configurationProperties(project(path: ":module:spring-boot-graphql", configuration: "configurationPropertiesMetadata")) + configurationProperties(project(path: ":module:spring-boot-groovy-templates", configuration: "configurationPropertiesMetadata")) configurationProperties(project(path: ":module:spring-boot-gson", configuration: "configurationPropertiesMetadata")) configurationProperties(project(path: ":module:spring-boot-h2console", configuration: "configurationPropertiesMetadata")) configurationProperties(project(path: ":module:spring-boot-hateoas", configuration: "configurationPropertiesMetadata")) configurationProperties(project(path: ":module:spring-boot-hazelcast", configuration: "configurationPropertiesMetadata")) configurationProperties(project(path: ":module:spring-boot-hibernate", configuration: "configurationPropertiesMetadata")) configurationProperties(project(path: ":module:spring-boot-http-client", configuration: "configurationPropertiesMetadata")) - configurationProperties(project(path: ":module:spring-boot-http-converter", configuration: "configurationPropertiesMetadata")) configurationProperties(project(path: ":module:spring-boot-http-codec", configuration: "configurationPropertiesMetadata")) + configurationProperties(project(path: ":module:spring-boot-http-converter", configuration: "configurationPropertiesMetadata")) configurationProperties(project(path: ":module:spring-boot-integration", configuration: "configurationPropertiesMetadata")) configurationProperties(project(path: ":module:spring-boot-jackson", configuration: "configurationPropertiesMetadata")) configurationProperties(project(path: ":module:spring-boot-jdbc", configuration: "configurationPropertiesMetadata")) configurationProperties(project(path: ":module:spring-boot-jersey", configuration: "configurationPropertiesMetadata")) - configurationProperties(project(path: ":module:spring-boot-jooq", configuration: "configurationPropertiesMetadata")) - configurationProperties(project(path: ":module:spring-boot-jpa", configuration: "configurationPropertiesMetadata")) configurationProperties(project(path: ":module:spring-boot-jetty", configuration: "configurationPropertiesMetadata")) configurationProperties(project(path: ":module:spring-boot-jms", configuration: "configurationPropertiesMetadata")) + configurationProperties(project(path: ":module:spring-boot-jooq", configuration: "configurationPropertiesMetadata")) + configurationProperties(project(path: ":module:spring-boot-jpa", configuration: "configurationPropertiesMetadata")) configurationProperties(project(path: ":module:spring-boot-kafka", configuration: "configurationPropertiesMetadata")) configurationProperties(project(path: ":module:spring-boot-ldap", configuration: "configurationPropertiesMetadata")) configurationProperties(project(path: ":module:spring-boot-liquibase", configuration: "configurationPropertiesMetadata")) @@ -221,6 +227,7 @@ dependencies { configurationProperties(project(path: ":module:spring-boot-r2dbc", configuration: "configurationPropertiesMetadata")) configurationProperties(project(path: ":module:spring-boot-reactor", configuration: "configurationPropertiesMetadata")) configurationProperties(project(path: ":module:spring-boot-reactor-netty", configuration: "configurationPropertiesMetadata")) + configurationProperties(project(path: ":module:spring-boot-restclient", configuration: "configurationPropertiesMetadata")) configurationProperties(project(path: ":module:spring-boot-rsocket", configuration: "configurationPropertiesMetadata")) configurationProperties(project(path: ":module:spring-boot-security", configuration: "configurationPropertiesMetadata")) configurationProperties(project(path: ":module:spring-boot-security-oauth2-authorization-server", configuration: "configurationPropertiesMetadata")) @@ -241,10 +248,13 @@ dependencies { configurationProperties(project(path: ":module:spring-boot-tracing", configuration: "configurationPropertiesMetadata")) configurationProperties(project(path: ":module:spring-boot-tx", configuration: "configurationPropertiesMetadata")) configurationProperties(project(path: ":module:spring-boot-undertow", configuration: "configurationPropertiesMetadata")) + configurationProperties(project(path: ":module:spring-boot-validation", configuration: "configurationPropertiesMetadata")) configurationProperties(project(path: ":module:spring-boot-web-server", configuration: "configurationPropertiesMetadata")) + configurationProperties(project(path: ":module:spring-boot-webclient", configuration: "configurationPropertiesMetadata")) configurationProperties(project(path: ":module:spring-boot-webflux", configuration: "configurationPropertiesMetadata")) configurationProperties(project(path: ":module:spring-boot-webmvc", configuration: "configurationPropertiesMetadata")) configurationProperties(project(path: ":module:spring-boot-webservices", configuration: "configurationPropertiesMetadata")) + configurationProperties(project(path: ":module:spring-boot-zipkin", configuration: "configurationPropertiesMetadata")) implementation(project(path: ":cli:spring-boot-cli")) implementation(project(path: ":core:spring-boot-docker-compose")) diff --git a/module/spring-boot-data-mongodb/build.gradle b/module/spring-boot-data-mongodb/build.gradle index 0acd10980e8..a45cfd3b76f 100644 --- a/module/spring-boot-data-mongodb/build.gradle +++ b/module/spring-boot-data-mongodb/build.gradle @@ -17,6 +17,7 @@ plugins { id "java-library" id "org.springframework.boot.auto-configuration" + id "org.springframework.boot.configuration-properties" id "org.springframework.boot.deployed" id "org.springframework.boot.docker-test" id "org.springframework.boot.optional-dependencies" diff --git a/module/spring-boot-health/build.gradle b/module/spring-boot-health/build.gradle index f68e4b9d37e..a7affe03f4d 100644 --- a/module/spring-boot-health/build.gradle +++ b/module/spring-boot-health/build.gradle @@ -16,6 +16,7 @@ plugins { id "java-library" + id "org.springframework.boot.auto-configuration" id "org.springframework.boot.deployed" id "org.springframework.boot.optional-dependencies" } diff --git a/module/spring-boot-http-client/src/main/java/org/springframework/boot/http/client/autoconfigure/AbstractHttpRequestFactoryProperties.java b/module/spring-boot-http-client/src/main/java/org/springframework/boot/http/client/autoconfigure/AbstractHttpRequestFactoryProperties.java index ec66226632f..1d0e44a06d1 100644 --- a/module/spring-boot-http-client/src/main/java/org/springframework/boot/http/client/autoconfigure/AbstractHttpRequestFactoryProperties.java +++ b/module/spring-boot-http-client/src/main/java/org/springframework/boot/http/client/autoconfigure/AbstractHttpRequestFactoryProperties.java @@ -20,6 +20,7 @@ import java.time.Duration; import java.util.function.Supplier; import org.springframework.boot.context.properties.ConfigurationProperties; +import org.springframework.boot.context.properties.ConfigurationPropertiesSource; import org.springframework.boot.http.client.ClientHttpRequestFactoryBuilder; import org.springframework.boot.http.client.ClientHttpRequestFactorySettings; import org.springframework.boot.http.client.HttpRedirects; @@ -33,6 +34,7 @@ import org.springframework.http.client.ClientHttpRequestFactory; * @since 4.0.0 * @see ClientHttpRequestFactorySettings */ +@ConfigurationPropertiesSource public abstract class AbstractHttpRequestFactoryProperties { /** @@ -99,6 +101,7 @@ public abstract class AbstractHttpRequestFactoryProperties { /** * SSL configuration. */ + @ConfigurationPropertiesSource public static class Ssl { /** diff --git a/module/spring-boot-http-client/src/main/java/org/springframework/boot/http/client/autoconfigure/reactive/AbstractClientHttpConnectorProperties.java b/module/spring-boot-http-client/src/main/java/org/springframework/boot/http/client/autoconfigure/reactive/AbstractClientHttpConnectorProperties.java index 844769aa724..7793e4c3814 100644 --- a/module/spring-boot-http-client/src/main/java/org/springframework/boot/http/client/autoconfigure/reactive/AbstractClientHttpConnectorProperties.java +++ b/module/spring-boot-http-client/src/main/java/org/springframework/boot/http/client/autoconfigure/reactive/AbstractClientHttpConnectorProperties.java @@ -20,6 +20,7 @@ import java.time.Duration; import java.util.function.Supplier; import org.springframework.boot.context.properties.ConfigurationProperties; +import org.springframework.boot.context.properties.ConfigurationPropertiesSource; import org.springframework.boot.http.client.HttpRedirects; import org.springframework.boot.http.client.reactive.ClientHttpConnectorBuilder; import org.springframework.boot.http.client.reactive.ClientHttpConnectorSettings; @@ -33,6 +34,7 @@ import org.springframework.http.client.reactive.ClientHttpConnector; * @since 3.5.0 * @see ClientHttpConnectorSettings */ +@ConfigurationPropertiesSource public abstract class AbstractClientHttpConnectorProperties { /** @@ -99,6 +101,7 @@ public abstract class AbstractClientHttpConnectorProperties { /** * SSL configuration. */ + @ConfigurationPropertiesSource public static class Ssl { /** diff --git a/module/spring-boot-restclient/build.gradle b/module/spring-boot-restclient/build.gradle index 35d3638d7fc..3effc0e015a 100644 --- a/module/spring-boot-restclient/build.gradle +++ b/module/spring-boot-restclient/build.gradle @@ -17,6 +17,7 @@ plugins { id "java-library" id "org.springframework.boot.auto-configuration" + id "org.springframework.boot.configuration-properties" id "org.springframework.boot.deployed" id "org.springframework.boot.optional-dependencies" } diff --git a/module/spring-boot-sql/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports b/module/spring-boot-sql/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports deleted file mode 100644 index e69de29bb2d..00000000000 diff --git a/module/spring-boot-web-server-test/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports b/module/spring-boot-web-server-test/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports deleted file mode 100644 index e69de29bb2d..00000000000 diff --git a/module/spring-boot-webclient/build.gradle b/module/spring-boot-webclient/build.gradle index 51f20e66adc..912753ce373 100644 --- a/module/spring-boot-webclient/build.gradle +++ b/module/spring-boot-webclient/build.gradle @@ -17,6 +17,7 @@ plugins { id "java-library" id "org.springframework.boot.auto-configuration" + id "org.springframework.boot.configuration-properties" id "org.springframework.boot.deployed" id "org.springframework.boot.optional-dependencies" }