Start splitting up spring-boot

Author: wilkinsona

buildSrc/src/main/java/org/springframework/boot/build/ConventionsPlugin.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2024 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.
@@ -50,6 +50,7 @@ public void apply(Project project) {
 		new KotlinConventions().apply(project);
 		new WarConventions().apply(project);
 		new EclipseConventions().apply(project);
+		new TestFixturesConventions().apply(project);
 		RepositoryTransformersExtension.apply(project);
 	}
 

buildSrc/src/main/java/org/springframework/boot/build/TestFixturesConventions.java

@@ -0,0 +1,50 @@
+/*
+ * 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.
+ * You may obtain a copy of the License at
+ *
+ *      https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.springframework.boot.build;
+
+import org.gradle.api.Project;
+import org.gradle.api.artifacts.ConfigurationContainer;
+import org.gradle.api.component.AdhocComponentWithVariants;
+import org.gradle.api.plugins.JavaTestFixturesPlugin;
+
+/**
+ * Conventions that are applied in the presence of the {@link JavaTestFixturesPlugin}.
+ * When the plugin is applied:
+ *
+ * <ul>
+ * <li>Publishing of the test fixtures is disabled.
+ * </ul>
+ *
+ * @author Andy Wilkinson
+ */
+class TestFixturesConventions {
+
+	void apply(Project project) {
+		project.getPlugins().withType(JavaTestFixturesPlugin.class, (testFixtures) -> disablePublishing(project));
+	}
+
+	private void disablePublishing(Project project) {
+		ConfigurationContainer configurations = project.getConfigurations();
+		AdhocComponentWithVariants javaComponent = (AdhocComponentWithVariants) project.getComponents()
+			.getByName("java");
+		javaComponent.withVariantsFromConfiguration(configurations.getByName("testFixturesApiElements"),
+				(variant) -> variant.skip());
+		javaComponent.withVariantsFromConfiguration(configurations.getByName("testFixturesRuntimeElements"),
+				(variant) -> variant.skip());
+	}
+
+}

settings.gradle

@@ -60,6 +60,7 @@ include "spring-boot-project:spring-boot"
 include "spring-boot-project:spring-boot-autoconfigure"
 include "spring-boot-project:spring-boot-actuator"
 include "spring-boot-project:spring-boot-actuator-autoconfigure"
+include "spring-boot-project:spring-boot-all"
 include "spring-boot-project:spring-boot-docker-compose"
 include "spring-boot-project:spring-boot-devtools"
 include "spring-boot-project:spring-boot-docs"

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

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

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

@@ -9,7 +9,7 @@ plugins {
 description = "Spring Boot Actuator"
 
 dependencies {
-	api(project(":spring-boot-project:spring-boot"))
+	api(project(":spring-boot-project:spring-boot-all"))
 
 	dockerTestImplementation(project(":spring-boot-project:spring-boot-autoconfigure"))
 	dockerTestImplementation(project(":spring-boot-project:spring-boot-test"))

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

@@ -0,0 +1,193 @@
+plugins {
+	id "dev.adamko.dokkatoo-html"
+	id "java-library"
+	id "org.jetbrains.kotlin.jvm"
+	id "org.springframework.boot.deployed"
+	id "org.springframework.boot.optional-dependencies"
+}
+
+description = "Spring Boot All"
+
+def tomcatConfigProperties = layout.buildDirectory.dir("tomcat-config-properties")
+
+configurations {
+	tomcatDistribution
+}
+
+dependencies {
+	api(project(":spring-boot-project:spring-boot"))
+	api("org.springframework:spring-core")
+	api("org.springframework:spring-context")
+
+	optional("ch.qos.logback:logback-classic")
+	optional("com.clickhouse:clickhouse-jdbc")
+	optional("com.fasterxml.jackson.core:jackson-databind")
+	optional("com.h2database:h2")
+	optional("com.google.code.gson:gson")
+	optional("com.mchange:c3p0")
+	optional("com.oracle.database.jdbc:ucp11")
+	optional("com.oracle.database.jdbc:ojdbc11")
+	optional("com.samskivert:jmustache")
+	optional("com.zaxxer:HikariCP")
+	optional("io.netty:netty-tcnative-boringssl-static")
+	optional("io.projectreactor:reactor-tools")
+	optional("io.projectreactor.netty:reactor-netty-http")
+	optional("io.r2dbc:r2dbc-pool")
+	optional("io.rsocket:rsocket-core")
+	optional("io.rsocket:rsocket-transport-netty")
+	optional("io.undertow:undertow-servlet")
+	optional("jakarta.jms:jakarta.jms-api")
+	optional("jakarta.persistence:jakarta.persistence-api")
+	optional("jakarta.servlet:jakarta.servlet-api")
+	optional("jakarta.transaction:jakarta.transaction-api")
+	optional("junit:junit")
+	optional("org.apache.commons:commons-dbcp2") {
+		exclude(group: "commons-logging", module: "commons-logging")
+	}
+	optional("org.apache.httpcomponents.client5:httpclient5")
+	optional("org.apache.logging.log4j:log4j-api")
+	optional("org.apache.logging.log4j:log4j-core")
+	optional("org.apache.logging.log4j:log4j-jul")
+	optional("org.apache.tomcat.embed:tomcat-embed-core")
+	optional("org.apache.tomcat.embed:tomcat-embed-jasper")
+	optional("org.apache.tomcat:tomcat-jdbc")
+	optional("org.assertj:assertj-core")
+	optional("org.apache.groovy:groovy")
+	optional("org.apache.groovy:groovy-xml")
+	optional("org.crac:crac")
+	optional("org.eclipse.jetty:jetty-alpn-conscrypt-server")
+	optional("org.eclipse.jetty:jetty-client")
+	optional("org.eclipse.jetty:jetty-util")
+	optional("org.eclipse.jetty.ee10:jetty-ee10-servlets")
+	optional("org.eclipse.jetty.ee10:jetty-ee10-webapp")
+	optional("org.eclipse.jetty.http2:jetty-http2-server")
+	optional("org.flywaydb:flyway-core")
+	optional("org.hamcrest:hamcrest-library")
+	optional("org.hibernate.orm:hibernate-core")
+	optional("org.hibernate.validator:hibernate-validator")
+	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.postgresql:postgresql")
+	optional("org.slf4j:jul-to-slf4j")
+	optional("org.slf4j:slf4j-api")
+	optional("org.springframework:spring-messaging")
+	optional("org.springframework:spring-orm")
+	optional("org.springframework:spring-jms")
+	optional("org.springframework:spring-oxm")
+	optional("org.springframework:spring-r2dbc")
+	optional("org.springframework:spring-test")
+	optional("org.springframework:spring-web")
+	optional("org.springframework:spring-webflux")
+	optional("org.springframework:spring-webmvc")
+	optional("org.springframework.security:spring-security-web")
+	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.vibur:vibur-dbcp")
+	optional("org.yaml:snakeyaml")
+	optional("org.jetbrains.kotlin:kotlin-reflect")
+	optional("org.jetbrains.kotlin:kotlin-stdlib")
+	optional("software.amazon.jdbc:aws-advanced-jdbc-wrapper") {
+		exclude(group: "commons-logging", module: "commons-logging")
+	}
+
+	testImplementation(project(":spring-boot-project:spring-boot-tools:spring-boot-test-support"))
+	testImplementation(testFixtures(project(":spring-boot-project:spring-boot")))
+	testImplementation("org.springframework:spring-core-test")
+	testImplementation("com.ibm.db2:jcc")
+	testImplementation("com.jayway.jsonpath:json-path")
+	testImplementation("com.microsoft.sqlserver:mssql-jdbc")
+	testImplementation("com.mysql:mysql-connector-j")
+	testImplementation("com.sun.xml.messaging.saaj:saaj-impl")
+	testImplementation("io.projectreactor:reactor-test")
+	testImplementation("io.r2dbc:r2dbc-h2")
+	testImplementation("jakarta.inject:jakarta.inject-api")
+	testImplementation("jakarta.xml.ws:jakarta.xml.ws-api")
+	testImplementation("net.sourceforge.jtds:jtds")
+	testImplementation("org.apache.derby:derby")
+	testImplementation("org.apache.derby:derbytools")
+	testImplementation("org.awaitility:awaitility")
+	testImplementation("org.codehaus.janino:janino")
+	testImplementation("org.eclipse.jetty:jetty-client")
+	testImplementation("org.eclipse.jetty.http2:jetty-http2-client")
+	testImplementation("org.eclipse.jetty.http2:jetty-http2-client-transport")
+	testImplementation("org.firebirdsql.jdbc:jaybird") {
+		exclude group: "javax.resource", module: "connector-api"
+	}
+	testImplementation("org.hsqldb:hsqldb")
+	testImplementation("org.junit.jupiter:junit-jupiter")
+	testImplementation("org.mariadb.jdbc:mariadb-java-client") {
+		exclude group: "org.slf4j", module: "jcl-over-slf4j"
+	}
+	testImplementation("org.mockito:mockito-core")
+	testImplementation("org.mockito:mockito-junit-jupiter")
+	testImplementation("org.springframework:spring-context-support")
+	testImplementation("org.springframework:spring-core-test")
+	testImplementation("org.springframework.data:spring-data-redis")
+	testImplementation("org.springframework.data:spring-data-r2dbc")
+	testImplementation("org.xerial:sqlite-jdbc")
+
+	testRuntimeOnly("org.testcontainers:jdbc") {
+		exclude group: "javax.annotation", module: "javax.annotation-api"
+		exclude group: "javax.xml.bind", module: "jaxb-api"
+	}
+
+	tomcatDistribution("org.apache.tomcat:tomcat:${tomcatVersion}@zip")
+}
+
+task extractTomcatConfigProperties(type: Sync) {
+	destinationDir = file(tomcatConfigProperties)
+	from {
+		zipTree(configurations.tomcatDistribution.incoming.files.singleFile).matching {
+			include '**/conf/catalina.properties'
+		}.singleFile
+	}
+}
+
+def syncJavaTemplates = tasks.register("syncJavaTemplates", Sync) {
+	from("src/main/javaTemplates")
+	into("build/generated-sources/main")
+	def properties = ["springBootVersion": project.version]
+	expand(properties)
+	inputs.properties(properties)
+}
+
+tasks.named("checkFormatMain") {
+	def generatedSources = fileTree("build/generated-sources/main")
+	// Exclude source generated from the templates as expand(properties) changes line endings on Windows
+	exclude { candidate -> generatedSources.contains(candidate.file) }
+	// Add the templates to check that the input is correctly formatted
+	source(fileTree("src/main/javaTemplates"))
+}
+
+plugins.withType(EclipsePlugin) {
+	eclipse {
+		synchronizationTasks syncJavaTemplates
+	}
+}
+
+sourceSets {
+	main {
+		java {
+			srcDirs syncJavaTemplates
+		}
+	}
+	test {
+		output.dir(tomcatConfigProperties, builtBy: "extractTomcatConfigProperties")
+	}
+}
+
+test {
+	jvmArgs += "--add-opens=java.base/java.net=ALL-UNNAMED"
+}

spring-boot-project/spring-boot/src/main/java/org/springframework/boot/flyway/FlywayDatabaseInitializerDetector.java renamed to spring-boot-project/spring-boot-all/src/main/java/org/springframework/boot/flyway/FlywayDatabaseInitializerDetector.java

@@ -0,0 +1,27 @@
+# Application Context Initializers
+org.springframework.context.ApplicationContextInitializer=\
+org.springframework.boot.rsocket.context.RSocketPortInfoApplicationContextInitializer
+
+# Environment Post Processors
+org.springframework.boot.env.EnvironmentPostProcessor=\
+org.springframework.boot.reactor.ReactorEnvironmentPostProcessor
+
+# Failure Analyzers
+org.springframework.boot.diagnostics.FailureAnalyzer=\
+org.springframework.boot.liquibase.LiquibaseChangelogMissingFailureAnalyzer,\
+org.springframework.boot.web.server.tomcat.ConnectorStartFailureAnalyzer
+
+# Database Initializer Detectors
+org.springframework.boot.sql.init.dependency.DatabaseInitializerDetector=\
+org.springframework.boot.flyway.FlywayDatabaseInitializerDetector,\
+org.springframework.boot.jdbc.init.DataSourceScriptDatabaseInitializerDetector,\
+org.springframework.boot.liquibase.LiquibaseDatabaseInitializerDetector,\
+org.springframework.boot.orm.jpa.JpaDatabaseInitializerDetector,\
+org.springframework.boot.r2dbc.init.R2dbcScriptDatabaseInitializerDetector
+
+# Depends On Database Initialization Detectors
+org.springframework.boot.sql.init.dependency.DependsOnDatabaseInitializationDetector=\
+org.springframework.boot.sql.init.dependency.AnnotationDependsOnDatabaseInitializationDetector,\
+org.springframework.boot.jdbc.SpringJdbcDependsOnDatabaseInitializationDetector,\
+org.springframework.boot.jooq.JooqDependsOnDatabaseInitializationDetector,\
+org.springframework.boot.orm.jpa.JpaDependsOnDatabaseInitializationDetector

spring-boot-project/spring-boot/src/main/java/org/springframework/boot/flyway/package-info.java renamed to spring-boot-project/spring-boot-all/src/main/java/org/springframework/boot/flyway/package-info.java

@@ -0,0 +1,13 @@
+org.springframework.aot.hint.RuntimeHintsRegistrar=\
+org.springframework.boot.http.client.ClientHttpRequestFactoryRuntimeHints,\
+org.springframework.boot.jdbc.DataSourceBuilderRuntimeHints,\
+org.springframework.boot.json.JacksonRuntimeHints,\
+org.springframework.boot.logging.java.JavaLoggingSystemRuntimeHints,\
+org.springframework.boot.logging.logback.LogbackRuntimeHints,\
+org.springframework.boot.web.server.undertow.UndertowWebServer.UndertowWebServerRuntimeHints
+
+org.springframework.beans.factory.aot.BeanFactoryInitializationAotProcessor=\
+org.springframework.boot.jackson.JsonComponentModule.JsonComponentBeanFactoryInitializationAotProcessor
+
+org.springframework.beans.factory.aot.BeanRegistrationAotProcessor=\
+org.springframework.boot.jackson.JsonMixinModuleEntriesBeanRegistrationAotProcessor