Start splitting up spring-boot-autoconfigure

Author: wilkinsona

settings.gradle

@@ -58,6 +58,7 @@ include "spring-boot-project:spring-boot-tools:spring-boot-test-support"
 include "spring-boot-project:spring-boot-tools:spring-boot-test-support-docker"
 include "spring-boot-project:spring-boot"
 include "spring-boot-project:spring-boot-autoconfigure"
+include "spring-boot-project:spring-boot-autoconfigure-all"
 include "spring-boot-project:spring-boot-actuator"
 include "spring-boot-project:spring-boot-actuator-autoconfigure"
 include "spring-boot-project:spring-boot-all"

spring-boot-project/spring-boot-actuator-autoconfigure/build.gradle

@@ -12,7 +12,7 @@ description = "Spring Boot Actuator AutoConfigure"
 dependencies {
 	api(project(":spring-boot-project:spring-boot-actuator"))
 	api(project(":spring-boot-project:spring-boot-all"))
-	api(project(":spring-boot-project:spring-boot-autoconfigure"))
+	api(project(":spring-boot-project:spring-boot-autoconfigure-all"))
 
 	implementation("com.fasterxml.jackson.core:jackson-databind")
 	implementation("com.fasterxml.jackson.datatype:jackson-datatype-jsr310")

spring-boot-project/spring-boot-actuator/build.gradle

@@ -11,7 +11,7 @@ description = "Spring Boot Actuator"
 dependencies {
 	api(project(":spring-boot-project:spring-boot-all"))
 
-	dockerTestImplementation(project(":spring-boot-project:spring-boot-autoconfigure"))
+	dockerTestImplementation(project(":spring-boot-project:spring-boot-autoconfigure-all"))
 	dockerTestImplementation(project(":spring-boot-project:spring-boot-test"))
 	dockerTestImplementation(project(":spring-boot-project:spring-boot-tools:spring-boot-test-support-docker"))
 	dockerTestImplementation("com.redis:testcontainers-redis")
@@ -94,7 +94,7 @@ dependencies {
 
 	testImplementation(project(":spring-boot-project:spring-boot-test"))
 	testImplementation(project(":spring-boot-project:spring-boot-tools:spring-boot-test-support"))
-	testImplementation(project(":spring-boot-project:spring-boot-autoconfigure"))
+	testImplementation(project(":spring-boot-project:spring-boot-autoconfigure-all"))
 	testImplementation("org.assertj:assertj-core")
 	testImplementation("com.jayway.jsonpath:json-path")
 	testImplementation("io.micrometer:micrometer-observation-test")

spring-boot-project/spring-boot-autoconfigure-all/build.gradle

@@ -0,0 +1,294 @@
+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"
+}
+
+description = "Spring Boot AutoConfigure All"
+
+configurations.all {
+	resolutionStrategy.eachDependency { DependencyResolveDetails details ->
+		if (details.requested.module.group == "org.apache.kafka" && details.requested.module.name == "kafka-server-common") {
+			details.artifactSelection {
+				selectArtifact(DependencyArtifact.DEFAULT_TYPE, null, null)
+			}
+		}
+	}
+}
+
+dependencies {
+	api(project(":spring-boot-project:spring-boot-all"))
+	api(project(":spring-boot-project:spring-boot-autoconfigure"))
+
+	dockerTestImplementation(project(":spring-boot-project:spring-boot-test"))
+	dockerTestImplementation(project(":spring-boot-project:spring-boot-tools:spring-boot-test-support-docker"))
+	dockerTestImplementation(testFixtures(project(":spring-boot-project:spring-boot-autoconfigure")))
+	dockerTestImplementation("com.redis:testcontainers-redis")
+	dockerTestImplementation("org.assertj:assertj-core")
+	dockerTestImplementation("org.awaitility:awaitility")
+	dockerTestImplementation("org.junit.jupiter:junit-jupiter")
+	dockerTestImplementation("org.mockito:mockito-core")
+	dockerTestImplementation("org.springframework:spring-test")
+	dockerTestImplementation("org.testcontainers:cassandra")
+	dockerTestImplementation("org.testcontainers:couchbase")
+	dockerTestImplementation("org.testcontainers:elasticsearch")
+	dockerTestImplementation("org.testcontainers:junit-jupiter")
+	dockerTestImplementation("org.testcontainers:mongodb")
+	dockerTestImplementation("org.testcontainers:neo4j")
+	dockerTestImplementation("org.testcontainers:pulsar")
+	dockerTestImplementation("org.testcontainers:testcontainers")
+
+	optional(project(":spring-boot-project:spring-boot-tomcat"))
+	optional("co.elastic.clients:elasticsearch-java") {
+		exclude group: "commons-logging", module: "commons-logging"
+	}
+	optional("com.fasterxml.jackson.core:jackson-databind")
+	optional("com.fasterxml.jackson.dataformat:jackson-dataformat-cbor")
+	optional("com.fasterxml.jackson.dataformat:jackson-dataformat-xml")
+	optional("com.fasterxml.jackson.datatype:jackson-datatype-jsr310")
+	optional("com.fasterxml.jackson.module:jackson-module-jakarta-xmlbind-annotations")
+	optional("com.fasterxml.jackson.module:jackson-module-parameter-names")
+	optional("com.google.code.gson:gson")
+	optional("com.hazelcast:hazelcast")
+	optional("com.hazelcast:hazelcast-spring")
+	optional("com.h2database:h2")
+	optional("com.nimbusds:oauth2-oidc-sdk")
+	optional("com.oracle.database.jdbc:ojdbc11")
+	optional("com.oracle.database.jdbc:ucp11")
+	optional("com.querydsl:querydsl-core")
+	optional("com.samskivert:jmustache")
+	optional("io.lettuce:lettuce-core")
+	optional("io.projectreactor.netty:reactor-netty-http")
+	optional("io.r2dbc:r2dbc-spi")
+	optional("io.r2dbc:r2dbc-pool")
+	optional("io.r2dbc:r2dbc-proxy")
+	optional("io.rsocket:rsocket-core")
+	optional("io.rsocket:rsocket-transport-netty")
+	optional("io.undertow:undertow-servlet")
+	optional("io.undertow:undertow-websockets-jsr")
+	optional("jakarta.jms:jakarta.jms-api")
+	optional("jakarta.mail:jakarta.mail-api")
+	optional("jakarta.json.bind:jakarta.json.bind-api")
+	optional("jakarta.persistence:jakarta.persistence-api")
+	optional("jakarta.transaction:jakarta.transaction-api")
+	optional("jakarta.validation:jakarta.validation-api")
+	optional("jakarta.websocket:jakarta.websocket-api")
+	optional("jakarta.ws.rs:jakarta.ws.rs-api")
+	optional("javax.cache:cache-api")
+	optional("javax.money:money-api")
+	optional("org.apache.activemq:activemq-broker")
+	optional("org.apache.activemq:activemq-client")
+	optional("org.apache.activemq:artemis-jakarta-client") {
+		exclude group: "commons-logging", module: "commons-logging"
+	}
+	optional("org.apache.activemq:artemis-jakarta-server") {
+		exclude group: "commons-logging", module: "commons-logging"
+	}
+	optional("org.apache.commons:commons-dbcp2") {
+		exclude group: "commons-logging", module: "commons-logging"
+	}
+	optional("org.apache.httpcomponents.client5:httpclient5")
+	optional("org.apache.httpcomponents.core5:httpcore5-reactive")
+	optional("org.apache.kafka:kafka-streams")
+	optional("org.apache.tomcat.embed:tomcat-embed-core")
+	optional("org.apache.tomcat.embed:tomcat-embed-el")
+	optional("org.apache.tomcat.embed:tomcat-embed-websocket")
+	optional("org.apache.tomcat:tomcat-jdbc")
+	optional("org.apiguardian:apiguardian-api")
+	optional("org.apache.groovy:groovy-templates")
+	optional("org.eclipse.angus:angus-mail")
+	optional("com.github.ben-manes.caffeine:caffeine")
+	optional("com.github.mxab.thymeleaf.extras:thymeleaf-extras-data-attribute")
+	optional("com.sendgrid:sendgrid-java") {
+		exclude group: "commons-logging", module: "commons-logging"
+	}
+	optional("com.unboundid:unboundid-ldapsdk")
+	optional("com.zaxxer:HikariCP")
+	optional("nz.net.ultraq.thymeleaf:thymeleaf-layout-dialect")
+	optional("org.aspectj:aspectjweaver")
+	optional("org.cache2k:cache2k-spring")
+	optional("org.eclipse.jetty.ee10:jetty-ee10-webapp")
+	optional("org.eclipse.jetty:jetty-reactive-httpclient")
+	optional("org.eclipse.jetty.ee10.websocket:jetty-ee10-websocket-jakarta-server")
+	optional("org.eclipse.jetty.ee10.websocket:jetty-ee10-websocket-jetty-server")
+	optional("org.ehcache:ehcache") {
+		artifact {
+			classifier = 'jakarta'
+		}
+	}
+	optional("org.elasticsearch.client:elasticsearch-rest-client") {
+		exclude group: "commons-logging", module: "commons-logging"
+	}
+	optional("org.elasticsearch.client:elasticsearch-rest-client-sniffer") {
+		exclude group: "commons-logging", module: "commons-logging"
+	}
+	optional("org.flywaydb:flyway-core")
+	optional("org.flywaydb:flyway-database-postgresql")
+	optional("org.flywaydb:flyway-database-oracle")
+	optional("org.flywaydb:flyway-sqlserver")
+	optional("org.freemarker:freemarker")
+	optional("org.glassfish.jersey.containers:jersey-container-servlet-core")
+	optional("org.glassfish.jersey.containers:jersey-container-servlet")
+	optional("org.glassfish.jersey.core:jersey-server")
+	optional("org.glassfish.jersey.ext:jersey-spring6")
+	optional("org.glassfish.jersey.media:jersey-media-json-jackson")
+	optional("org.hibernate.orm:hibernate-core")
+	optional("org.hibernate.orm:hibernate-jcache")
+	optional("org.hibernate.validator:hibernate-validator")
+	optional("org.infinispan:infinispan-commons")
+	optional("org.infinispan:infinispan-component-annotations")
+	optional("org.infinispan:infinispan-core")
+	optional("org.infinispan:infinispan-jcache")
+	optional("org.infinispan:infinispan-spring6-embedded")
+	optional("org.influxdb:influxdb-java")
+	optional("org.jooq:jooq") {
+		exclude group: "javax.xml.bind", module: "jaxb-api"
+	}
+	optional("org.liquibase:liquibase-core") {
+		exclude group: "javax.xml.bind", module: "jaxb-api"
+	}
+	optional("org.messaginghub:pooled-jms") {
+		exclude group: "org.apache.geronimo.specs", module: "geronimo-jms_2.0_spec"
+	}
+	optional("org.mongodb:mongodb-driver-reactivestreams")
+	optional("org.mongodb:mongodb-driver-sync")
+	optional("org.opensaml:opensaml-core:4.0.1")
+	optional("org.opensaml:opensaml-saml-api:4.0.1")
+	optional("org.opensaml:opensaml-saml-impl:4.0.1")
+	optional("org.quartz-scheduler:quartz")
+	optional("org.springframework.integration:spring-integration-core")
+	optional("org.springframework.integration:spring-integration-jdbc")
+	optional("org.springframework.integration:spring-integration-jmx")
+	optional("org.springframework.integration:spring-integration-rsocket")
+	optional("org.springframework:spring-aspects")
+	optional("org.springframework:spring-jdbc")
+	optional("org.springframework:spring-jms")
+	optional("org.springframework:spring-orm")
+	optional("org.springframework:spring-tx")
+	optional("org.springframework:spring-web")
+	optional("org.springframework:spring-websocket")
+	optional("org.springframework:spring-webflux")
+	optional("org.springframework:spring-webmvc")
+	optional("org.springframework.batch:spring-batch-core")
+	optional("org.springframework.data:spring-data-couchbase")
+	optional("org.springframework.data:spring-data-envers") {
+		exclude group: "javax.activation", module: "javax.activation-api"
+		exclude group: "javax.persistence", module: "javax.persistence-api"
+		exclude group: "javax.xml.bind", module: "jaxb-api"
+		exclude group: "org.jboss.spec.javax.transaction", module: "jboss-transaction-api_1.2_spec"
+	}
+	optional("org.springframework.data:spring-data-jpa")
+	optional("org.springframework.data:spring-data-rest-webmvc")
+	optional("org.springframework.data:spring-data-cassandra") {
+		exclude group: "org.slf4j", module: "jcl-over-slf4j"
+	}
+	optional("org.springframework.data:spring-data-elasticsearch") {
+		exclude group: "org.elasticsearch.client", module: "transport"
+	}
+	optional("org.springframework.data:spring-data-jdbc")
+	optional("org.springframework.data:spring-data-ldap")
+	optional("org.springframework.data:spring-data-mongodb")
+	optional("org.springframework.data:spring-data-neo4j")
+	optional("org.springframework.data:spring-data-r2dbc")
+	optional("org.springframework.data:spring-data-redis")
+	optional("org.springframework.graphql:spring-graphql")
+	optional("org.springframework.hateoas:spring-hateoas")
+	optional("org.springframework.pulsar:spring-pulsar")
+	optional("org.springframework.pulsar:spring-pulsar-reactive")
+	optional("org.springframework.security:spring-security-acl")
+	optional("org.springframework.security:spring-security-config")
+	optional("org.springframework.security:spring-security-data") {
+		exclude group: "javax.xml.bind", module: "jaxb-api"
+	}
+	optional("org.springframework.security:spring-security-messaging")
+	optional("org.springframework.security:spring-security-oauth2-authorization-server")
+	optional("org.springframework.security:spring-security-oauth2-client")
+	optional("org.springframework.security:spring-security-oauth2-jose")
+	optional("org.springframework.security:spring-security-oauth2-resource-server")
+	optional("org.springframework.security:spring-security-rsocket")
+	optional("org.springframework.security:spring-security-saml2-service-provider") {
+		exclude group: "org.opensaml", module: "opensaml-core"
+		exclude group: "org.opensaml", module: "opensaml-saml-api"
+		exclude group: "org.opensaml", module: "opensaml-saml-impl"
+	}
+	optional("org.springframework.security:spring-security-web")
+	optional("org.springframework.session:spring-session-core")
+	optional("org.springframework.session:spring-session-data-mongodb")
+	optional("org.springframework.session:spring-session-data-redis")
+	optional("org.springframework.session:spring-session-hazelcast")
+	optional("org.springframework.session:spring-session-jdbc")
+	optional("org.springframework.amqp:spring-rabbit")
+	optional("org.springframework.amqp:spring-rabbit-stream")
+	optional("org.springframework.kafka:spring-kafka")
+	optional("org.springframework.ws:spring-ws-core") {
+		exclude group: "com.sun.mail", module: "jakarta.mail"
+		exclude group: "jakarta.platform", module: "jakarta.jakartaee-api"
+		exclude group: "org.eclipse.jetty", module: "jetty-server"
+		exclude group: "org.eclipse.jetty", module: "jetty-servlet"
+		exclude group: "jakarta.mail", module: "jakarta.mail-api"
+	}
+	optional("org.thymeleaf:thymeleaf")
+	optional("org.thymeleaf:thymeleaf-spring6")
+	optional("org.thymeleaf.extras:thymeleaf-extras-springsecurity6")
+	optional("redis.clients:jedis")
+
+	testImplementation(testFixtures(project(":spring-boot-project:spring-boot-autoconfigure")))
+	testImplementation(project(":spring-boot-project:spring-boot-tools:spring-boot-test-support"))
+	testImplementation(project(":spring-boot-project:spring-boot-test"))
+	testImplementation("ch.qos.logback:logback-classic")
+	testImplementation("commons-fileupload:commons-fileupload")
+	testImplementation("com.github.h-thurow:simple-jndi")
+	testImplementation("com.ibm.db2:jcc")
+	testImplementation("com.jayway.jsonpath:json-path")
+	testImplementation("com.mysql:mysql-connector-j")
+	testImplementation("com.squareup.okhttp3:mockwebserver")
+	testImplementation("com.sun.xml.messaging.saaj:saaj-impl")
+	testImplementation("io.micrometer:context-propagation")
+	testImplementation("io.projectreactor:reactor-test")
+	testImplementation("io.r2dbc:r2dbc-h2")
+	testImplementation("jakarta.json:jakarta.json-api")
+	testImplementation("jakarta.xml.ws:jakarta.xml.ws-api")
+	testImplementation("org.apache.logging.log4j:log4j-to-slf4j")
+	testImplementation("org.apache.tomcat.embed:tomcat-embed-jasper")
+	testImplementation("org.assertj:assertj-core")
+	testImplementation("org.awaitility:awaitility")
+	testImplementation("org.eclipse:yasson")
+	testImplementation("org.hsqldb:hsqldb")
+	testImplementation("org.jetbrains.kotlin:kotlin-stdlib-jdk8")
+	testImplementation("org.junit.jupiter:junit-jupiter")
+	testImplementation("org.mockito:mockito-core")
+	testImplementation("org.mockito:mockito-junit-jupiter")
+	testImplementation("org.postgresql:postgresql")
+	testImplementation("org.postgresql:r2dbc-postgresql")
+	testImplementation("org.skyscreamer:jsonassert")
+	testImplementation("org.springframework:spring-test")
+	testImplementation("org.springframework:spring-core-test")
+	testImplementation("org.springframework.graphql:spring-graphql-test")
+	testImplementation("org.springframework.kafka:spring-kafka-test") {
+		exclude group: "commons-logging", module: "commons-logging"
+	}
+	testImplementation("org.springframework.pulsar:spring-pulsar-cache-provider-caffeine")
+	testImplementation("org.springframework.security:spring-security-test")
+	testImplementation("org.yaml:snakeyaml")
+
+	testRuntimeOnly("jakarta.management.j2ee:jakarta.management.j2ee-api")
+	testRuntimeOnly("org.flywaydb:flyway-database-hsqldb")
+	testRuntimeOnly("org.jetbrains.kotlin:kotlin-reflect")
+}
+
+tasks.named("checkSpringConfigurationMetadata").configure {
+	exclusions = [
+		"spring.datasource.dbcp2.*",
+		"spring.datasource.hikari.*",
+		"spring.datasource.oracleucp.*",
+		"spring.datasource.tomcat.*",
+		"spring.groovy.template.configuration.*"
+	]
+}
+
+test {
+	jvmArgs += "--add-opens=java.base/java.net=ALL-UNNAMED"
+}

spring-boot-project/spring-boot-autoconfigure/src/dockerTest/java/org/springframework/boot/autoconfigure/cassandra/CassandraAutoConfigurationIntegrationTests.java renamed to spring-boot-project/spring-boot-autoconfigure-all/src/dockerTest/java/org/springframework/boot/autoconfigure/cassandra/CassandraAutoConfigurationIntegrationTests.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2019 the original author or authors.
+ * Copyright 2012-2025 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -45,10 +45,9 @@ class JacksonHttpMessageConvertersConfiguration {
 	static class MappingJackson2HttpMessageConverterConfiguration {
 
 		@Bean
-		@ConditionalOnMissingBean(value = MappingJackson2HttpMessageConverter.class,
-				ignoredType = {
-						"org.springframework.hateoas.server.mvc.TypeConstrainedMappingJackson2HttpMessageConverter",
-						"org.springframework.data.rest.webmvc.alps.AlpsJsonHttpMessageConverter" })
+		@ConditionalOnMissingBean(ignoredType = {
+				"org.springframework.hateoas.server.mvc.TypeConstrainedMappingJackson2HttpMessageConverter",
+				"org.springframework.data.rest.webmvc.alps.AlpsJsonHttpMessageConverter" })
 		MappingJackson2HttpMessageConverter mappingJackson2HttpMessageConverter(ObjectMapper objectMapper) {
 			return new MappingJackson2HttpMessageConverter(objectMapper);
 		}

spring-boot-project/spring-boot-autoconfigure/src/dockerTest/java/org/springframework/boot/autoconfigure/cassandra/CassandraAutoConfigurationWithPasswordAuthenticationIntegrationTests.java renamed to spring-boot-project/spring-boot-autoconfigure-all/src/dockerTest/java/org/springframework/boot/autoconfigure/cassandra/CassandraAutoConfigurationWithPasswordAuthenticationIntegrationTests.java

@@ -14,10 +14,11 @@
  * limitations under the License.
  */
 
-package org.springframework.boot.autoconfigure.preinitialize;
+package org.springframework.boot.autoconfigure.http;
 
 import org.apache.activemq.artemis.spi.core.protocol.MessageConverter;
 
+import org.springframework.boot.autoconfigure.preinitialize.BackgroundPreinitializer;
 import org.springframework.http.converter.support.AllEncompassingFormHttpMessageConverter;
 
 /**