diff --git a/settings.gradle b/settings.gradle
index c04b109c4a6..4da6bf37633 100644
--- a/settings.gradle
+++ b/settings.gradle
@@ -56,6 +56,7 @@ settings.gradle.projectsLoaded {
include "spring-boot-project:spring-boot"
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-autoconfigure"
include "spring-boot-project:spring-boot-dependencies"
include "spring-boot-project:spring-boot-devtools"
diff --git a/spring-boot-project/spring-boot-actuator-autoconfigure/build.gradle b/spring-boot-project/spring-boot-actuator-autoconfigure/build.gradle
index d6a3016a2b1..d7c83a9a3c5 100644
--- a/spring-boot-project/spring-boot-actuator-autoconfigure/build.gradle
+++ b/spring-boot-project/spring-boot-actuator-autoconfigure/build.gradle
@@ -26,8 +26,8 @@ plugins {
description = "Spring Boot Actuator AutoConfigure"
dependencies {
- api(project(":spring-boot-project:spring-boot"))
api(project(":spring-boot-project:spring-boot-actuator"))
+ api(project(":spring-boot-project:spring-boot-all"))
api(project(":spring-boot-project:spring-boot-autoconfigure"))
implementation("com.fasterxml.jackson.core:jackson-databind")
diff --git a/spring-boot-project/spring-boot-actuator/build.gradle b/spring-boot-project/spring-boot-actuator/build.gradle
index c842d940de4..5a59ecff7be 100644
--- a/spring-boot-project/spring-boot-actuator/build.gradle
+++ b/spring-boot-project/spring-boot-actuator/build.gradle
@@ -25,7 +25,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"))
diff --git a/spring-boot-project/spring-boot-all/build.gradle b/spring-boot-project/spring-boot-all/build.gradle
new file mode 100644
index 00000000000..c69bdd49b30
--- /dev/null
+++ b/spring-boot-project/spring-boot-all/build.gradle
@@ -0,0 +1,202 @@
+/*
+ * Copyright 2012-present 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.
+ */
+
+
+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.httpcomponents.core5:httpcore5-reactive")
+ 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")
+ 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("com.ibm.db2:jcc")
+ 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.codehaus.janino:janino")
+ testImplementation("org.eclipse.jetty:jetty-client")
+ testImplementation("org.eclipse.jetty:jetty-reactive-httpclient")
+ 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.mariadb.jdbc:mariadb-java-client") {
+ exclude group: "org.slf4j", module: "jcl-over-slf4j"
+ }
+ testImplementation("org.springframework:spring-context-support")
+ 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"
+ }
+
+ 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"
+}
diff --git a/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/flyway/FlywayDatabaseInitializerDetector.java b/spring-boot-project/spring-boot-all/src/main/java/org/springframework/boot/flyway/FlywayDatabaseInitializerDetector.java
similarity index 100%
rename from spring-boot-project/spring-boot/src/main/java/org/springframework/boot/flyway/FlywayDatabaseInitializerDetector.java
rename to spring-boot-project/spring-boot-all/src/main/java/org/springframework/boot/flyway/FlywayDatabaseInitializerDetector.java
diff --git a/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/flyway/package-info.java b/spring-boot-project/spring-boot-all/src/main/java/org/springframework/boot/flyway/package-info.java
similarity index 100%
rename from spring-boot-project/spring-boot/src/main/java/org/springframework/boot/flyway/package-info.java
rename to spring-boot-project/spring-boot-all/src/main/java/org/springframework/boot/flyway/package-info.java
diff --git a/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/http/client/AbstractClientHttpRequestFactoryBuilder.java b/spring-boot-project/spring-boot-all/src/main/java/org/springframework/boot/http/client/AbstractClientHttpRequestFactoryBuilder.java
similarity index 100%
rename from spring-boot-project/spring-boot/src/main/java/org/springframework/boot/http/client/AbstractClientHttpRequestFactoryBuilder.java
rename to spring-boot-project/spring-boot-all/src/main/java/org/springframework/boot/http/client/AbstractClientHttpRequestFactoryBuilder.java
diff --git a/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/http/client/ClientHttpRequestFactoryBuilder.java b/spring-boot-project/spring-boot-all/src/main/java/org/springframework/boot/http/client/ClientHttpRequestFactoryBuilder.java
similarity index 100%
rename from spring-boot-project/spring-boot/src/main/java/org/springframework/boot/http/client/ClientHttpRequestFactoryBuilder.java
rename to spring-boot-project/spring-boot-all/src/main/java/org/springframework/boot/http/client/ClientHttpRequestFactoryBuilder.java
diff --git a/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/http/client/ClientHttpRequestFactoryRuntimeHints.java b/spring-boot-project/spring-boot-all/src/main/java/org/springframework/boot/http/client/ClientHttpRequestFactoryRuntimeHints.java
similarity index 100%
rename from spring-boot-project/spring-boot/src/main/java/org/springframework/boot/http/client/ClientHttpRequestFactoryRuntimeHints.java
rename to spring-boot-project/spring-boot-all/src/main/java/org/springframework/boot/http/client/ClientHttpRequestFactoryRuntimeHints.java
diff --git a/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/http/client/ClientHttpRequestFactorySettings.java b/spring-boot-project/spring-boot-all/src/main/java/org/springframework/boot/http/client/ClientHttpRequestFactorySettings.java
similarity index 100%
rename from spring-boot-project/spring-boot/src/main/java/org/springframework/boot/http/client/ClientHttpRequestFactorySettings.java
rename to spring-boot-project/spring-boot-all/src/main/java/org/springframework/boot/http/client/ClientHttpRequestFactorySettings.java
diff --git a/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/http/client/Empty.java b/spring-boot-project/spring-boot-all/src/main/java/org/springframework/boot/http/client/Empty.java
similarity index 100%
rename from spring-boot-project/spring-boot/src/main/java/org/springframework/boot/http/client/Empty.java
rename to spring-boot-project/spring-boot-all/src/main/java/org/springframework/boot/http/client/Empty.java
diff --git a/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/http/client/HttpClientSettings.java b/spring-boot-project/spring-boot-all/src/main/java/org/springframework/boot/http/client/HttpClientSettings.java
similarity index 100%
rename from spring-boot-project/spring-boot/src/main/java/org/springframework/boot/http/client/HttpClientSettings.java
rename to spring-boot-project/spring-boot-all/src/main/java/org/springframework/boot/http/client/HttpClientSettings.java
diff --git a/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/http/client/HttpComponentsClientHttpRequestFactoryBuilder.java b/spring-boot-project/spring-boot-all/src/main/java/org/springframework/boot/http/client/HttpComponentsClientHttpRequestFactoryBuilder.java
similarity index 100%
rename from spring-boot-project/spring-boot/src/main/java/org/springframework/boot/http/client/HttpComponentsClientHttpRequestFactoryBuilder.java
rename to spring-boot-project/spring-boot-all/src/main/java/org/springframework/boot/http/client/HttpComponentsClientHttpRequestFactoryBuilder.java
diff --git a/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/http/client/HttpComponentsHttpAsyncClientBuilder.java b/spring-boot-project/spring-boot-all/src/main/java/org/springframework/boot/http/client/HttpComponentsHttpAsyncClientBuilder.java
similarity index 100%
rename from spring-boot-project/spring-boot/src/main/java/org/springframework/boot/http/client/HttpComponentsHttpAsyncClientBuilder.java
rename to spring-boot-project/spring-boot-all/src/main/java/org/springframework/boot/http/client/HttpComponentsHttpAsyncClientBuilder.java
diff --git a/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/http/client/HttpComponentsHttpClientBuilder.java b/spring-boot-project/spring-boot-all/src/main/java/org/springframework/boot/http/client/HttpComponentsHttpClientBuilder.java
similarity index 100%
rename from spring-boot-project/spring-boot/src/main/java/org/springframework/boot/http/client/HttpComponentsHttpClientBuilder.java
rename to spring-boot-project/spring-boot-all/src/main/java/org/springframework/boot/http/client/HttpComponentsHttpClientBuilder.java
diff --git a/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/http/client/HttpComponentsRedirectStrategy.java b/spring-boot-project/spring-boot-all/src/main/java/org/springframework/boot/http/client/HttpComponentsRedirectStrategy.java
similarity index 100%
rename from spring-boot-project/spring-boot/src/main/java/org/springframework/boot/http/client/HttpComponentsRedirectStrategy.java
rename to spring-boot-project/spring-boot-all/src/main/java/org/springframework/boot/http/client/HttpComponentsRedirectStrategy.java
diff --git a/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/http/client/HttpComponentsSslBundleTlsStrategy.java b/spring-boot-project/spring-boot-all/src/main/java/org/springframework/boot/http/client/HttpComponentsSslBundleTlsStrategy.java
similarity index 100%
rename from spring-boot-project/spring-boot/src/main/java/org/springframework/boot/http/client/HttpComponentsSslBundleTlsStrategy.java
rename to spring-boot-project/spring-boot-all/src/main/java/org/springframework/boot/http/client/HttpComponentsSslBundleTlsStrategy.java
diff --git a/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/http/client/HttpRedirects.java b/spring-boot-project/spring-boot-all/src/main/java/org/springframework/boot/http/client/HttpRedirects.java
similarity index 100%
rename from spring-boot-project/spring-boot/src/main/java/org/springframework/boot/http/client/HttpRedirects.java
rename to spring-boot-project/spring-boot-all/src/main/java/org/springframework/boot/http/client/HttpRedirects.java
diff --git a/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/http/client/JdkClientHttpRequestFactoryBuilder.java b/spring-boot-project/spring-boot-all/src/main/java/org/springframework/boot/http/client/JdkClientHttpRequestFactoryBuilder.java
similarity index 100%
rename from spring-boot-project/spring-boot/src/main/java/org/springframework/boot/http/client/JdkClientHttpRequestFactoryBuilder.java
rename to spring-boot-project/spring-boot-all/src/main/java/org/springframework/boot/http/client/JdkClientHttpRequestFactoryBuilder.java
diff --git a/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/http/client/JdkHttpClientBuilder.java b/spring-boot-project/spring-boot-all/src/main/java/org/springframework/boot/http/client/JdkHttpClientBuilder.java
similarity index 100%
rename from spring-boot-project/spring-boot/src/main/java/org/springframework/boot/http/client/JdkHttpClientBuilder.java
rename to spring-boot-project/spring-boot-all/src/main/java/org/springframework/boot/http/client/JdkHttpClientBuilder.java
diff --git a/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/http/client/JettyClientHttpRequestFactoryBuilder.java b/spring-boot-project/spring-boot-all/src/main/java/org/springframework/boot/http/client/JettyClientHttpRequestFactoryBuilder.java
similarity index 100%
rename from spring-boot-project/spring-boot/src/main/java/org/springframework/boot/http/client/JettyClientHttpRequestFactoryBuilder.java
rename to spring-boot-project/spring-boot-all/src/main/java/org/springframework/boot/http/client/JettyClientHttpRequestFactoryBuilder.java
diff --git a/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/http/client/JettyHttpClientBuilder.java b/spring-boot-project/spring-boot-all/src/main/java/org/springframework/boot/http/client/JettyHttpClientBuilder.java
similarity index 100%
rename from spring-boot-project/spring-boot/src/main/java/org/springframework/boot/http/client/JettyHttpClientBuilder.java
rename to spring-boot-project/spring-boot-all/src/main/java/org/springframework/boot/http/client/JettyHttpClientBuilder.java
diff --git a/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/http/client/ReactorClientHttpRequestFactoryBuilder.java b/spring-boot-project/spring-boot-all/src/main/java/org/springframework/boot/http/client/ReactorClientHttpRequestFactoryBuilder.java
similarity index 100%
rename from spring-boot-project/spring-boot/src/main/java/org/springframework/boot/http/client/ReactorClientHttpRequestFactoryBuilder.java
rename to spring-boot-project/spring-boot-all/src/main/java/org/springframework/boot/http/client/ReactorClientHttpRequestFactoryBuilder.java
diff --git a/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/http/client/ReactorHttpClientBuilder.java b/spring-boot-project/spring-boot-all/src/main/java/org/springframework/boot/http/client/ReactorHttpClientBuilder.java
similarity index 100%
rename from spring-boot-project/spring-boot/src/main/java/org/springframework/boot/http/client/ReactorHttpClientBuilder.java
rename to spring-boot-project/spring-boot-all/src/main/java/org/springframework/boot/http/client/ReactorHttpClientBuilder.java
diff --git a/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/http/client/ReflectiveComponentsClientHttpRequestFactoryBuilder.java b/spring-boot-project/spring-boot-all/src/main/java/org/springframework/boot/http/client/ReflectiveComponentsClientHttpRequestFactoryBuilder.java
similarity index 100%
rename from spring-boot-project/spring-boot/src/main/java/org/springframework/boot/http/client/ReflectiveComponentsClientHttpRequestFactoryBuilder.java
rename to spring-boot-project/spring-boot-all/src/main/java/org/springframework/boot/http/client/ReflectiveComponentsClientHttpRequestFactoryBuilder.java
diff --git a/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/http/client/SimpleClientHttpRequestFactoryBuilder.java b/spring-boot-project/spring-boot-all/src/main/java/org/springframework/boot/http/client/SimpleClientHttpRequestFactoryBuilder.java
similarity index 100%
rename from spring-boot-project/spring-boot/src/main/java/org/springframework/boot/http/client/SimpleClientHttpRequestFactoryBuilder.java
rename to spring-boot-project/spring-boot-all/src/main/java/org/springframework/boot/http/client/SimpleClientHttpRequestFactoryBuilder.java
diff --git a/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/http/client/package-info.java b/spring-boot-project/spring-boot-all/src/main/java/org/springframework/boot/http/client/package-info.java
similarity index 100%
rename from spring-boot-project/spring-boot/src/main/java/org/springframework/boot/http/client/package-info.java
rename to spring-boot-project/spring-boot-all/src/main/java/org/springframework/boot/http/client/package-info.java
diff --git a/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/http/client/reactive/AbstractClientHttpConnectorBuilder.java b/spring-boot-project/spring-boot-all/src/main/java/org/springframework/boot/http/client/reactive/AbstractClientHttpConnectorBuilder.java
similarity index 100%
rename from spring-boot-project/spring-boot/src/main/java/org/springframework/boot/http/client/reactive/AbstractClientHttpConnectorBuilder.java
rename to spring-boot-project/spring-boot-all/src/main/java/org/springframework/boot/http/client/reactive/AbstractClientHttpConnectorBuilder.java
diff --git a/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/http/client/reactive/ClientHttpConnectorBuilder.java b/spring-boot-project/spring-boot-all/src/main/java/org/springframework/boot/http/client/reactive/ClientHttpConnectorBuilder.java
similarity index 100%
rename from spring-boot-project/spring-boot/src/main/java/org/springframework/boot/http/client/reactive/ClientHttpConnectorBuilder.java
rename to spring-boot-project/spring-boot-all/src/main/java/org/springframework/boot/http/client/reactive/ClientHttpConnectorBuilder.java
diff --git a/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/http/client/reactive/ClientHttpConnectorSettings.java b/spring-boot-project/spring-boot-all/src/main/java/org/springframework/boot/http/client/reactive/ClientHttpConnectorSettings.java
similarity index 100%
rename from spring-boot-project/spring-boot/src/main/java/org/springframework/boot/http/client/reactive/ClientHttpConnectorSettings.java
rename to spring-boot-project/spring-boot-all/src/main/java/org/springframework/boot/http/client/reactive/ClientHttpConnectorSettings.java
diff --git a/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/http/client/reactive/HttpComponentsClientHttpConnectorBuilder.java b/spring-boot-project/spring-boot-all/src/main/java/org/springframework/boot/http/client/reactive/HttpComponentsClientHttpConnectorBuilder.java
similarity index 100%
rename from spring-boot-project/spring-boot/src/main/java/org/springframework/boot/http/client/reactive/HttpComponentsClientHttpConnectorBuilder.java
rename to spring-boot-project/spring-boot-all/src/main/java/org/springframework/boot/http/client/reactive/HttpComponentsClientHttpConnectorBuilder.java
diff --git a/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/http/client/reactive/JdkClientHttpConnectorBuilder.java b/spring-boot-project/spring-boot-all/src/main/java/org/springframework/boot/http/client/reactive/JdkClientHttpConnectorBuilder.java
similarity index 100%
rename from spring-boot-project/spring-boot/src/main/java/org/springframework/boot/http/client/reactive/JdkClientHttpConnectorBuilder.java
rename to spring-boot-project/spring-boot-all/src/main/java/org/springframework/boot/http/client/reactive/JdkClientHttpConnectorBuilder.java
diff --git a/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/http/client/reactive/JettyClientHttpConnectorBuilder.java b/spring-boot-project/spring-boot-all/src/main/java/org/springframework/boot/http/client/reactive/JettyClientHttpConnectorBuilder.java
similarity index 100%
rename from spring-boot-project/spring-boot/src/main/java/org/springframework/boot/http/client/reactive/JettyClientHttpConnectorBuilder.java
rename to spring-boot-project/spring-boot-all/src/main/java/org/springframework/boot/http/client/reactive/JettyClientHttpConnectorBuilder.java
diff --git a/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/http/client/reactive/ReactorClientHttpConnectorBuilder.java b/spring-boot-project/spring-boot-all/src/main/java/org/springframework/boot/http/client/reactive/ReactorClientHttpConnectorBuilder.java
similarity index 100%
rename from spring-boot-project/spring-boot/src/main/java/org/springframework/boot/http/client/reactive/ReactorClientHttpConnectorBuilder.java
rename to spring-boot-project/spring-boot-all/src/main/java/org/springframework/boot/http/client/reactive/ReactorClientHttpConnectorBuilder.java
diff --git a/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/http/client/reactive/package-info.java b/spring-boot-project/spring-boot-all/src/main/java/org/springframework/boot/http/client/reactive/package-info.java
similarity index 100%
rename from spring-boot-project/spring-boot/src/main/java/org/springframework/boot/http/client/reactive/package-info.java
rename to spring-boot-project/spring-boot-all/src/main/java/org/springframework/boot/http/client/reactive/package-info.java
diff --git a/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/jackson/JsonComponent.java b/spring-boot-project/spring-boot-all/src/main/java/org/springframework/boot/jackson/JsonComponent.java
similarity index 100%
rename from spring-boot-project/spring-boot/src/main/java/org/springframework/boot/jackson/JsonComponent.java
rename to spring-boot-project/spring-boot-all/src/main/java/org/springframework/boot/jackson/JsonComponent.java
diff --git a/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/jackson/JsonComponentModule.java b/spring-boot-project/spring-boot-all/src/main/java/org/springframework/boot/jackson/JsonComponentModule.java
similarity index 100%
rename from spring-boot-project/spring-boot/src/main/java/org/springframework/boot/jackson/JsonComponentModule.java
rename to spring-boot-project/spring-boot-all/src/main/java/org/springframework/boot/jackson/JsonComponentModule.java
diff --git a/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/jackson/JsonMixin.java b/spring-boot-project/spring-boot-all/src/main/java/org/springframework/boot/jackson/JsonMixin.java
similarity index 100%
rename from spring-boot-project/spring-boot/src/main/java/org/springframework/boot/jackson/JsonMixin.java
rename to spring-boot-project/spring-boot-all/src/main/java/org/springframework/boot/jackson/JsonMixin.java
diff --git a/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/jackson/JsonMixinModule.java b/spring-boot-project/spring-boot-all/src/main/java/org/springframework/boot/jackson/JsonMixinModule.java
similarity index 100%
rename from spring-boot-project/spring-boot/src/main/java/org/springframework/boot/jackson/JsonMixinModule.java
rename to spring-boot-project/spring-boot-all/src/main/java/org/springframework/boot/jackson/JsonMixinModule.java
diff --git a/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/jackson/JsonMixinModuleEntries.java b/spring-boot-project/spring-boot-all/src/main/java/org/springframework/boot/jackson/JsonMixinModuleEntries.java
similarity index 100%
rename from spring-boot-project/spring-boot/src/main/java/org/springframework/boot/jackson/JsonMixinModuleEntries.java
rename to spring-boot-project/spring-boot-all/src/main/java/org/springframework/boot/jackson/JsonMixinModuleEntries.java
diff --git a/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/jackson/JsonMixinModuleEntriesBeanRegistrationAotProcessor.java b/spring-boot-project/spring-boot-all/src/main/java/org/springframework/boot/jackson/JsonMixinModuleEntriesBeanRegistrationAotProcessor.java
similarity index 100%
rename from spring-boot-project/spring-boot/src/main/java/org/springframework/boot/jackson/JsonMixinModuleEntriesBeanRegistrationAotProcessor.java
rename to spring-boot-project/spring-boot-all/src/main/java/org/springframework/boot/jackson/JsonMixinModuleEntriesBeanRegistrationAotProcessor.java
diff --git a/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/jackson/JsonObjectDeserializer.java b/spring-boot-project/spring-boot-all/src/main/java/org/springframework/boot/jackson/JsonObjectDeserializer.java
similarity index 100%
rename from spring-boot-project/spring-boot/src/main/java/org/springframework/boot/jackson/JsonObjectDeserializer.java
rename to spring-boot-project/spring-boot-all/src/main/java/org/springframework/boot/jackson/JsonObjectDeserializer.java
diff --git a/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/jackson/JsonObjectSerializer.java b/spring-boot-project/spring-boot-all/src/main/java/org/springframework/boot/jackson/JsonObjectSerializer.java
similarity index 100%
rename from spring-boot-project/spring-boot/src/main/java/org/springframework/boot/jackson/JsonObjectSerializer.java
rename to spring-boot-project/spring-boot-all/src/main/java/org/springframework/boot/jackson/JsonObjectSerializer.java
diff --git a/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/jackson/package-info.java b/spring-boot-project/spring-boot-all/src/main/java/org/springframework/boot/jackson/package-info.java
similarity index 100%
rename from spring-boot-project/spring-boot/src/main/java/org/springframework/boot/jackson/package-info.java
rename to spring-boot-project/spring-boot-all/src/main/java/org/springframework/boot/jackson/package-info.java
diff --git a/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/jdbc/DataSourceBuilder.java b/spring-boot-project/spring-boot-all/src/main/java/org/springframework/boot/jdbc/DataSourceBuilder.java
similarity index 100%
rename from spring-boot-project/spring-boot/src/main/java/org/springframework/boot/jdbc/DataSourceBuilder.java
rename to spring-boot-project/spring-boot-all/src/main/java/org/springframework/boot/jdbc/DataSourceBuilder.java
diff --git a/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/jdbc/DataSourceBuilderRuntimeHints.java b/spring-boot-project/spring-boot-all/src/main/java/org/springframework/boot/jdbc/DataSourceBuilderRuntimeHints.java
similarity index 100%
rename from spring-boot-project/spring-boot/src/main/java/org/springframework/boot/jdbc/DataSourceBuilderRuntimeHints.java
rename to spring-boot-project/spring-boot-all/src/main/java/org/springframework/boot/jdbc/DataSourceBuilderRuntimeHints.java
diff --git a/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/jdbc/DataSourceUnwrapper.java b/spring-boot-project/spring-boot-all/src/main/java/org/springframework/boot/jdbc/DataSourceUnwrapper.java
similarity index 100%
rename from spring-boot-project/spring-boot/src/main/java/org/springframework/boot/jdbc/DataSourceUnwrapper.java
rename to spring-boot-project/spring-boot-all/src/main/java/org/springframework/boot/jdbc/DataSourceUnwrapper.java
diff --git a/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/jdbc/DatabaseDriver.java b/spring-boot-project/spring-boot-all/src/main/java/org/springframework/boot/jdbc/DatabaseDriver.java
similarity index 100%
rename from spring-boot-project/spring-boot/src/main/java/org/springframework/boot/jdbc/DatabaseDriver.java
rename to spring-boot-project/spring-boot-all/src/main/java/org/springframework/boot/jdbc/DatabaseDriver.java
diff --git a/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/jdbc/EmbeddedDatabaseConnection.java b/spring-boot-project/spring-boot-all/src/main/java/org/springframework/boot/jdbc/EmbeddedDatabaseConnection.java
similarity index 100%
rename from spring-boot-project/spring-boot/src/main/java/org/springframework/boot/jdbc/EmbeddedDatabaseConnection.java
rename to spring-boot-project/spring-boot-all/src/main/java/org/springframework/boot/jdbc/EmbeddedDatabaseConnection.java
diff --git a/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/jdbc/HikariCheckpointRestoreLifecycle.java b/spring-boot-project/spring-boot-all/src/main/java/org/springframework/boot/jdbc/HikariCheckpointRestoreLifecycle.java
similarity index 100%
rename from spring-boot-project/spring-boot/src/main/java/org/springframework/boot/jdbc/HikariCheckpointRestoreLifecycle.java
rename to spring-boot-project/spring-boot-all/src/main/java/org/springframework/boot/jdbc/HikariCheckpointRestoreLifecycle.java
diff --git a/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/jdbc/SchemaManagement.java b/spring-boot-project/spring-boot-all/src/main/java/org/springframework/boot/jdbc/SchemaManagement.java
similarity index 100%
rename from spring-boot-project/spring-boot/src/main/java/org/springframework/boot/jdbc/SchemaManagement.java
rename to spring-boot-project/spring-boot-all/src/main/java/org/springframework/boot/jdbc/SchemaManagement.java
diff --git a/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/jdbc/SchemaManagementProvider.java b/spring-boot-project/spring-boot-all/src/main/java/org/springframework/boot/jdbc/SchemaManagementProvider.java
similarity index 100%
rename from spring-boot-project/spring-boot/src/main/java/org/springframework/boot/jdbc/SchemaManagementProvider.java
rename to spring-boot-project/spring-boot-all/src/main/java/org/springframework/boot/jdbc/SchemaManagementProvider.java
diff --git a/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/jdbc/SpringJdbcDependsOnDatabaseInitializationDetector.java b/spring-boot-project/spring-boot-all/src/main/java/org/springframework/boot/jdbc/SpringJdbcDependsOnDatabaseInitializationDetector.java
similarity index 100%
rename from spring-boot-project/spring-boot/src/main/java/org/springframework/boot/jdbc/SpringJdbcDependsOnDatabaseInitializationDetector.java
rename to spring-boot-project/spring-boot-all/src/main/java/org/springframework/boot/jdbc/SpringJdbcDependsOnDatabaseInitializationDetector.java
diff --git a/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/jdbc/UnsupportedDataSourcePropertyException.java b/spring-boot-project/spring-boot-all/src/main/java/org/springframework/boot/jdbc/UnsupportedDataSourcePropertyException.java
similarity index 100%
rename from spring-boot-project/spring-boot/src/main/java/org/springframework/boot/jdbc/UnsupportedDataSourcePropertyException.java
rename to spring-boot-project/spring-boot-all/src/main/java/org/springframework/boot/jdbc/UnsupportedDataSourcePropertyException.java
diff --git a/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/jdbc/XADataSourceWrapper.java b/spring-boot-project/spring-boot-all/src/main/java/org/springframework/boot/jdbc/XADataSourceWrapper.java
similarity index 100%
rename from spring-boot-project/spring-boot/src/main/java/org/springframework/boot/jdbc/XADataSourceWrapper.java
rename to spring-boot-project/spring-boot-all/src/main/java/org/springframework/boot/jdbc/XADataSourceWrapper.java
diff --git a/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/jdbc/init/DataSourceScriptDatabaseInitializer.java b/spring-boot-project/spring-boot-all/src/main/java/org/springframework/boot/jdbc/init/DataSourceScriptDatabaseInitializer.java
similarity index 100%
rename from spring-boot-project/spring-boot/src/main/java/org/springframework/boot/jdbc/init/DataSourceScriptDatabaseInitializer.java
rename to spring-boot-project/spring-boot-all/src/main/java/org/springframework/boot/jdbc/init/DataSourceScriptDatabaseInitializer.java
diff --git a/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/jdbc/init/DataSourceScriptDatabaseInitializerDetector.java b/spring-boot-project/spring-boot-all/src/main/java/org/springframework/boot/jdbc/init/DataSourceScriptDatabaseInitializerDetector.java
similarity index 100%
rename from spring-boot-project/spring-boot/src/main/java/org/springframework/boot/jdbc/init/DataSourceScriptDatabaseInitializerDetector.java
rename to spring-boot-project/spring-boot-all/src/main/java/org/springframework/boot/jdbc/init/DataSourceScriptDatabaseInitializerDetector.java
diff --git a/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/jdbc/init/PlatformPlaceholderDatabaseDriverResolver.java b/spring-boot-project/spring-boot-all/src/main/java/org/springframework/boot/jdbc/init/PlatformPlaceholderDatabaseDriverResolver.java
similarity index 100%
rename from spring-boot-project/spring-boot/src/main/java/org/springframework/boot/jdbc/init/PlatformPlaceholderDatabaseDriverResolver.java
rename to spring-boot-project/spring-boot-all/src/main/java/org/springframework/boot/jdbc/init/PlatformPlaceholderDatabaseDriverResolver.java
diff --git a/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/jdbc/init/package-info.java b/spring-boot-project/spring-boot-all/src/main/java/org/springframework/boot/jdbc/init/package-info.java
similarity index 100%
rename from spring-boot-project/spring-boot/src/main/java/org/springframework/boot/jdbc/init/package-info.java
rename to spring-boot-project/spring-boot-all/src/main/java/org/springframework/boot/jdbc/init/package-info.java
diff --git a/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/jdbc/metadata/AbstractDataSourcePoolMetadata.java b/spring-boot-project/spring-boot-all/src/main/java/org/springframework/boot/jdbc/metadata/AbstractDataSourcePoolMetadata.java
similarity index 100%
rename from spring-boot-project/spring-boot/src/main/java/org/springframework/boot/jdbc/metadata/AbstractDataSourcePoolMetadata.java
rename to spring-boot-project/spring-boot-all/src/main/java/org/springframework/boot/jdbc/metadata/AbstractDataSourcePoolMetadata.java
diff --git a/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/jdbc/metadata/CommonsDbcp2DataSourcePoolMetadata.java b/spring-boot-project/spring-boot-all/src/main/java/org/springframework/boot/jdbc/metadata/CommonsDbcp2DataSourcePoolMetadata.java
similarity index 100%
rename from spring-boot-project/spring-boot/src/main/java/org/springframework/boot/jdbc/metadata/CommonsDbcp2DataSourcePoolMetadata.java
rename to spring-boot-project/spring-boot-all/src/main/java/org/springframework/boot/jdbc/metadata/CommonsDbcp2DataSourcePoolMetadata.java
diff --git a/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/jdbc/metadata/CompositeDataSourcePoolMetadataProvider.java b/spring-boot-project/spring-boot-all/src/main/java/org/springframework/boot/jdbc/metadata/CompositeDataSourcePoolMetadataProvider.java
similarity index 100%
rename from spring-boot-project/spring-boot/src/main/java/org/springframework/boot/jdbc/metadata/CompositeDataSourcePoolMetadataProvider.java
rename to spring-boot-project/spring-boot-all/src/main/java/org/springframework/boot/jdbc/metadata/CompositeDataSourcePoolMetadataProvider.java
diff --git a/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/jdbc/metadata/DataSourcePoolMetadata.java b/spring-boot-project/spring-boot-all/src/main/java/org/springframework/boot/jdbc/metadata/DataSourcePoolMetadata.java
similarity index 100%
rename from spring-boot-project/spring-boot/src/main/java/org/springframework/boot/jdbc/metadata/DataSourcePoolMetadata.java
rename to spring-boot-project/spring-boot-all/src/main/java/org/springframework/boot/jdbc/metadata/DataSourcePoolMetadata.java
diff --git a/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/jdbc/metadata/DataSourcePoolMetadataProvider.java b/spring-boot-project/spring-boot-all/src/main/java/org/springframework/boot/jdbc/metadata/DataSourcePoolMetadataProvider.java
similarity index 100%
rename from spring-boot-project/spring-boot/src/main/java/org/springframework/boot/jdbc/metadata/DataSourcePoolMetadataProvider.java
rename to spring-boot-project/spring-boot-all/src/main/java/org/springframework/boot/jdbc/metadata/DataSourcePoolMetadataProvider.java
diff --git a/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/jdbc/metadata/HikariDataSourcePoolMetadata.java b/spring-boot-project/spring-boot-all/src/main/java/org/springframework/boot/jdbc/metadata/HikariDataSourcePoolMetadata.java
similarity index 100%
rename from spring-boot-project/spring-boot/src/main/java/org/springframework/boot/jdbc/metadata/HikariDataSourcePoolMetadata.java
rename to spring-boot-project/spring-boot-all/src/main/java/org/springframework/boot/jdbc/metadata/HikariDataSourcePoolMetadata.java
diff --git a/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/jdbc/metadata/OracleUcpDataSourcePoolMetadata.java b/spring-boot-project/spring-boot-all/src/main/java/org/springframework/boot/jdbc/metadata/OracleUcpDataSourcePoolMetadata.java
similarity index 100%
rename from spring-boot-project/spring-boot/src/main/java/org/springframework/boot/jdbc/metadata/OracleUcpDataSourcePoolMetadata.java
rename to spring-boot-project/spring-boot-all/src/main/java/org/springframework/boot/jdbc/metadata/OracleUcpDataSourcePoolMetadata.java
diff --git a/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/jdbc/metadata/TomcatDataSourcePoolMetadata.java b/spring-boot-project/spring-boot-all/src/main/java/org/springframework/boot/jdbc/metadata/TomcatDataSourcePoolMetadata.java
similarity index 100%
rename from spring-boot-project/spring-boot/src/main/java/org/springframework/boot/jdbc/metadata/TomcatDataSourcePoolMetadata.java
rename to spring-boot-project/spring-boot-all/src/main/java/org/springframework/boot/jdbc/metadata/TomcatDataSourcePoolMetadata.java
diff --git a/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/jdbc/metadata/package-info.java b/spring-boot-project/spring-boot-all/src/main/java/org/springframework/boot/jdbc/metadata/package-info.java
similarity index 100%
rename from spring-boot-project/spring-boot/src/main/java/org/springframework/boot/jdbc/metadata/package-info.java
rename to spring-boot-project/spring-boot-all/src/main/java/org/springframework/boot/jdbc/metadata/package-info.java
diff --git a/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/jdbc/package-info.java b/spring-boot-project/spring-boot-all/src/main/java/org/springframework/boot/jdbc/package-info.java
similarity index 100%
rename from spring-boot-project/spring-boot/src/main/java/org/springframework/boot/jdbc/package-info.java
rename to spring-boot-project/spring-boot-all/src/main/java/org/springframework/boot/jdbc/package-info.java
diff --git a/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/jms/ConnectionFactoryUnwrapper.java b/spring-boot-project/spring-boot-all/src/main/java/org/springframework/boot/jms/ConnectionFactoryUnwrapper.java
similarity index 100%
rename from spring-boot-project/spring-boot/src/main/java/org/springframework/boot/jms/ConnectionFactoryUnwrapper.java
rename to spring-boot-project/spring-boot-all/src/main/java/org/springframework/boot/jms/ConnectionFactoryUnwrapper.java
diff --git a/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/jms/XAConnectionFactoryWrapper.java b/spring-boot-project/spring-boot-all/src/main/java/org/springframework/boot/jms/XAConnectionFactoryWrapper.java
similarity index 100%
rename from spring-boot-project/spring-boot/src/main/java/org/springframework/boot/jms/XAConnectionFactoryWrapper.java
rename to spring-boot-project/spring-boot-all/src/main/java/org/springframework/boot/jms/XAConnectionFactoryWrapper.java
diff --git a/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/jms/package-info.java b/spring-boot-project/spring-boot-all/src/main/java/org/springframework/boot/jms/package-info.java
similarity index 100%
rename from spring-boot-project/spring-boot/src/main/java/org/springframework/boot/jms/package-info.java
rename to spring-boot-project/spring-boot-all/src/main/java/org/springframework/boot/jms/package-info.java
diff --git a/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/jooq/JooqDependsOnDatabaseInitializationDetector.java b/spring-boot-project/spring-boot-all/src/main/java/org/springframework/boot/jooq/JooqDependsOnDatabaseInitializationDetector.java
similarity index 100%
rename from spring-boot-project/spring-boot/src/main/java/org/springframework/boot/jooq/JooqDependsOnDatabaseInitializationDetector.java
rename to spring-boot-project/spring-boot-all/src/main/java/org/springframework/boot/jooq/JooqDependsOnDatabaseInitializationDetector.java
diff --git a/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/jooq/package-info.java b/spring-boot-project/spring-boot-all/src/main/java/org/springframework/boot/jooq/package-info.java
similarity index 100%
rename from spring-boot-project/spring-boot/src/main/java/org/springframework/boot/jooq/package-info.java
rename to spring-boot-project/spring-boot-all/src/main/java/org/springframework/boot/jooq/package-info.java
diff --git a/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/liquibase/LiquibaseChangelogMissingFailureAnalyzer.java b/spring-boot-project/spring-boot-all/src/main/java/org/springframework/boot/liquibase/LiquibaseChangelogMissingFailureAnalyzer.java
similarity index 100%
rename from spring-boot-project/spring-boot/src/main/java/org/springframework/boot/liquibase/LiquibaseChangelogMissingFailureAnalyzer.java
rename to spring-boot-project/spring-boot-all/src/main/java/org/springframework/boot/liquibase/LiquibaseChangelogMissingFailureAnalyzer.java
diff --git a/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/liquibase/LiquibaseDatabaseInitializerDetector.java b/spring-boot-project/spring-boot-all/src/main/java/org/springframework/boot/liquibase/LiquibaseDatabaseInitializerDetector.java
similarity index 100%
rename from spring-boot-project/spring-boot/src/main/java/org/springframework/boot/liquibase/LiquibaseDatabaseInitializerDetector.java
rename to spring-boot-project/spring-boot-all/src/main/java/org/springframework/boot/liquibase/LiquibaseDatabaseInitializerDetector.java
diff --git a/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/liquibase/package-info.java b/spring-boot-project/spring-boot-all/src/main/java/org/springframework/boot/liquibase/package-info.java
similarity index 100%
rename from spring-boot-project/spring-boot/src/main/java/org/springframework/boot/liquibase/package-info.java
rename to spring-boot-project/spring-boot-all/src/main/java/org/springframework/boot/liquibase/package-info.java
diff --git a/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/orm/jpa/EntityManagerFactoryBuilder.java b/spring-boot-project/spring-boot-all/src/main/java/org/springframework/boot/orm/jpa/EntityManagerFactoryBuilder.java
similarity index 100%
rename from spring-boot-project/spring-boot/src/main/java/org/springframework/boot/orm/jpa/EntityManagerFactoryBuilder.java
rename to spring-boot-project/spring-boot-all/src/main/java/org/springframework/boot/orm/jpa/EntityManagerFactoryBuilder.java
diff --git a/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/orm/jpa/JpaDatabaseInitializerDetector.java b/spring-boot-project/spring-boot-all/src/main/java/org/springframework/boot/orm/jpa/JpaDatabaseInitializerDetector.java
similarity index 100%
rename from spring-boot-project/spring-boot/src/main/java/org/springframework/boot/orm/jpa/JpaDatabaseInitializerDetector.java
rename to spring-boot-project/spring-boot-all/src/main/java/org/springframework/boot/orm/jpa/JpaDatabaseInitializerDetector.java
diff --git a/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/orm/jpa/JpaDependsOnDatabaseInitializationDetector.java b/spring-boot-project/spring-boot-all/src/main/java/org/springframework/boot/orm/jpa/JpaDependsOnDatabaseInitializationDetector.java
similarity index 100%
rename from spring-boot-project/spring-boot/src/main/java/org/springframework/boot/orm/jpa/JpaDependsOnDatabaseInitializationDetector.java
rename to spring-boot-project/spring-boot-all/src/main/java/org/springframework/boot/orm/jpa/JpaDependsOnDatabaseInitializationDetector.java
diff --git a/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/orm/jpa/hibernate/SpringImplicitNamingStrategy.java b/spring-boot-project/spring-boot-all/src/main/java/org/springframework/boot/orm/jpa/hibernate/SpringImplicitNamingStrategy.java
similarity index 100%
rename from spring-boot-project/spring-boot/src/main/java/org/springframework/boot/orm/jpa/hibernate/SpringImplicitNamingStrategy.java
rename to spring-boot-project/spring-boot-all/src/main/java/org/springframework/boot/orm/jpa/hibernate/SpringImplicitNamingStrategy.java
diff --git a/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/orm/jpa/hibernate/SpringJtaPlatform.java b/spring-boot-project/spring-boot-all/src/main/java/org/springframework/boot/orm/jpa/hibernate/SpringJtaPlatform.java
similarity index 100%
rename from spring-boot-project/spring-boot/src/main/java/org/springframework/boot/orm/jpa/hibernate/SpringJtaPlatform.java
rename to spring-boot-project/spring-boot-all/src/main/java/org/springframework/boot/orm/jpa/hibernate/SpringJtaPlatform.java
diff --git a/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/orm/jpa/hibernate/package-info.java b/spring-boot-project/spring-boot-all/src/main/java/org/springframework/boot/orm/jpa/hibernate/package-info.java
similarity index 100%
rename from spring-boot-project/spring-boot/src/main/java/org/springframework/boot/orm/jpa/hibernate/package-info.java
rename to spring-boot-project/spring-boot-all/src/main/java/org/springframework/boot/orm/jpa/hibernate/package-info.java
diff --git a/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/orm/jpa/package-info.java b/spring-boot-project/spring-boot-all/src/main/java/org/springframework/boot/orm/jpa/package-info.java
similarity index 100%
rename from spring-boot-project/spring-boot/src/main/java/org/springframework/boot/orm/jpa/package-info.java
rename to spring-boot-project/spring-boot-all/src/main/java/org/springframework/boot/orm/jpa/package-info.java
diff --git a/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/r2dbc/ConnectionFactoryBuilder.java b/spring-boot-project/spring-boot-all/src/main/java/org/springframework/boot/r2dbc/ConnectionFactoryBuilder.java
similarity index 100%
rename from spring-boot-project/spring-boot/src/main/java/org/springframework/boot/r2dbc/ConnectionFactoryBuilder.java
rename to spring-boot-project/spring-boot-all/src/main/java/org/springframework/boot/r2dbc/ConnectionFactoryBuilder.java
diff --git a/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/r2dbc/ConnectionFactoryDecorator.java b/spring-boot-project/spring-boot-all/src/main/java/org/springframework/boot/r2dbc/ConnectionFactoryDecorator.java
similarity index 100%
rename from spring-boot-project/spring-boot/src/main/java/org/springframework/boot/r2dbc/ConnectionFactoryDecorator.java
rename to spring-boot-project/spring-boot-all/src/main/java/org/springframework/boot/r2dbc/ConnectionFactoryDecorator.java
diff --git a/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/r2dbc/EmbeddedDatabaseConnection.java b/spring-boot-project/spring-boot-all/src/main/java/org/springframework/boot/r2dbc/EmbeddedDatabaseConnection.java
similarity index 100%
rename from spring-boot-project/spring-boot/src/main/java/org/springframework/boot/r2dbc/EmbeddedDatabaseConnection.java
rename to spring-boot-project/spring-boot-all/src/main/java/org/springframework/boot/r2dbc/EmbeddedDatabaseConnection.java
diff --git a/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/r2dbc/OptionsCapableConnectionFactory.java b/spring-boot-project/spring-boot-all/src/main/java/org/springframework/boot/r2dbc/OptionsCapableConnectionFactory.java
similarity index 100%
rename from spring-boot-project/spring-boot/src/main/java/org/springframework/boot/r2dbc/OptionsCapableConnectionFactory.java
rename to spring-boot-project/spring-boot-all/src/main/java/org/springframework/boot/r2dbc/OptionsCapableConnectionFactory.java
diff --git a/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/r2dbc/init/R2dbcScriptDatabaseInitializer.java b/spring-boot-project/spring-boot-all/src/main/java/org/springframework/boot/r2dbc/init/R2dbcScriptDatabaseInitializer.java
similarity index 100%
rename from spring-boot-project/spring-boot/src/main/java/org/springframework/boot/r2dbc/init/R2dbcScriptDatabaseInitializer.java
rename to spring-boot-project/spring-boot-all/src/main/java/org/springframework/boot/r2dbc/init/R2dbcScriptDatabaseInitializer.java
diff --git a/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/r2dbc/init/R2dbcScriptDatabaseInitializerDetector.java b/spring-boot-project/spring-boot-all/src/main/java/org/springframework/boot/r2dbc/init/R2dbcScriptDatabaseInitializerDetector.java
similarity index 100%
rename from spring-boot-project/spring-boot/src/main/java/org/springframework/boot/r2dbc/init/R2dbcScriptDatabaseInitializerDetector.java
rename to spring-boot-project/spring-boot-all/src/main/java/org/springframework/boot/r2dbc/init/R2dbcScriptDatabaseInitializerDetector.java
diff --git a/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/r2dbc/init/package-info.java b/spring-boot-project/spring-boot-all/src/main/java/org/springframework/boot/r2dbc/init/package-info.java
similarity index 100%
rename from spring-boot-project/spring-boot/src/main/java/org/springframework/boot/r2dbc/init/package-info.java
rename to spring-boot-project/spring-boot-all/src/main/java/org/springframework/boot/r2dbc/init/package-info.java
diff --git a/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/r2dbc/package-info.java b/spring-boot-project/spring-boot-all/src/main/java/org/springframework/boot/r2dbc/package-info.java
similarity index 100%
rename from spring-boot-project/spring-boot/src/main/java/org/springframework/boot/r2dbc/package-info.java
rename to spring-boot-project/spring-boot-all/src/main/java/org/springframework/boot/r2dbc/package-info.java
diff --git a/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/reactor/ReactorEnvironmentPostProcessor.java b/spring-boot-project/spring-boot-all/src/main/java/org/springframework/boot/reactor/ReactorEnvironmentPostProcessor.java
similarity index 100%
rename from spring-boot-project/spring-boot/src/main/java/org/springframework/boot/reactor/ReactorEnvironmentPostProcessor.java
rename to spring-boot-project/spring-boot-all/src/main/java/org/springframework/boot/reactor/ReactorEnvironmentPostProcessor.java
diff --git a/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/reactor/package-info.java b/spring-boot-project/spring-boot-all/src/main/java/org/springframework/boot/reactor/package-info.java
similarity index 100%
rename from spring-boot-project/spring-boot/src/main/java/org/springframework/boot/reactor/package-info.java
rename to spring-boot-project/spring-boot-all/src/main/java/org/springframework/boot/reactor/package-info.java
diff --git a/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/rsocket/context/RSocketPortInfoApplicationContextInitializer.java b/spring-boot-project/spring-boot-all/src/main/java/org/springframework/boot/rsocket/context/RSocketPortInfoApplicationContextInitializer.java
similarity index 100%
rename from spring-boot-project/spring-boot/src/main/java/org/springframework/boot/rsocket/context/RSocketPortInfoApplicationContextInitializer.java
rename to spring-boot-project/spring-boot-all/src/main/java/org/springframework/boot/rsocket/context/RSocketPortInfoApplicationContextInitializer.java
diff --git a/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/rsocket/context/RSocketServerBootstrap.java b/spring-boot-project/spring-boot-all/src/main/java/org/springframework/boot/rsocket/context/RSocketServerBootstrap.java
similarity index 100%
rename from spring-boot-project/spring-boot/src/main/java/org/springframework/boot/rsocket/context/RSocketServerBootstrap.java
rename to spring-boot-project/spring-boot-all/src/main/java/org/springframework/boot/rsocket/context/RSocketServerBootstrap.java
diff --git a/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/rsocket/context/RSocketServerInitializedEvent.java b/spring-boot-project/spring-boot-all/src/main/java/org/springframework/boot/rsocket/context/RSocketServerInitializedEvent.java
similarity index 100%
rename from spring-boot-project/spring-boot/src/main/java/org/springframework/boot/rsocket/context/RSocketServerInitializedEvent.java
rename to spring-boot-project/spring-boot-all/src/main/java/org/springframework/boot/rsocket/context/RSocketServerInitializedEvent.java
diff --git a/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/rsocket/context/package-info.java b/spring-boot-project/spring-boot-all/src/main/java/org/springframework/boot/rsocket/context/package-info.java
similarity index 100%
rename from spring-boot-project/spring-boot/src/main/java/org/springframework/boot/rsocket/context/package-info.java
rename to spring-boot-project/spring-boot-all/src/main/java/org/springframework/boot/rsocket/context/package-info.java
diff --git a/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/rsocket/messaging/RSocketStrategiesCustomizer.java b/spring-boot-project/spring-boot-all/src/main/java/org/springframework/boot/rsocket/messaging/RSocketStrategiesCustomizer.java
similarity index 100%
rename from spring-boot-project/spring-boot/src/main/java/org/springframework/boot/rsocket/messaging/RSocketStrategiesCustomizer.java
rename to spring-boot-project/spring-boot-all/src/main/java/org/springframework/boot/rsocket/messaging/RSocketStrategiesCustomizer.java
diff --git a/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/rsocket/messaging/package-info.java b/spring-boot-project/spring-boot-all/src/main/java/org/springframework/boot/rsocket/messaging/package-info.java
similarity index 100%
rename from spring-boot-project/spring-boot/src/main/java/org/springframework/boot/rsocket/messaging/package-info.java
rename to spring-boot-project/spring-boot-all/src/main/java/org/springframework/boot/rsocket/messaging/package-info.java
diff --git a/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/rsocket/netty/NettyRSocketServer.java b/spring-boot-project/spring-boot-all/src/main/java/org/springframework/boot/rsocket/netty/NettyRSocketServer.java
similarity index 100%
rename from spring-boot-project/spring-boot/src/main/java/org/springframework/boot/rsocket/netty/NettyRSocketServer.java
rename to spring-boot-project/spring-boot-all/src/main/java/org/springframework/boot/rsocket/netty/NettyRSocketServer.java
diff --git a/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/rsocket/netty/NettyRSocketServerFactory.java b/spring-boot-project/spring-boot-all/src/main/java/org/springframework/boot/rsocket/netty/NettyRSocketServerFactory.java
similarity index 100%
rename from spring-boot-project/spring-boot/src/main/java/org/springframework/boot/rsocket/netty/NettyRSocketServerFactory.java
rename to spring-boot-project/spring-boot-all/src/main/java/org/springframework/boot/rsocket/netty/NettyRSocketServerFactory.java
diff --git a/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/rsocket/netty/package-info.java b/spring-boot-project/spring-boot-all/src/main/java/org/springframework/boot/rsocket/netty/package-info.java
similarity index 100%
rename from spring-boot-project/spring-boot/src/main/java/org/springframework/boot/rsocket/netty/package-info.java
rename to spring-boot-project/spring-boot-all/src/main/java/org/springframework/boot/rsocket/netty/package-info.java
diff --git a/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/rsocket/server/ConfigurableRSocketServerFactory.java b/spring-boot-project/spring-boot-all/src/main/java/org/springframework/boot/rsocket/server/ConfigurableRSocketServerFactory.java
similarity index 100%
rename from spring-boot-project/spring-boot/src/main/java/org/springframework/boot/rsocket/server/ConfigurableRSocketServerFactory.java
rename to spring-boot-project/spring-boot-all/src/main/java/org/springframework/boot/rsocket/server/ConfigurableRSocketServerFactory.java
diff --git a/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/rsocket/server/RSocketServer.java b/spring-boot-project/spring-boot-all/src/main/java/org/springframework/boot/rsocket/server/RSocketServer.java
similarity index 100%
rename from spring-boot-project/spring-boot/src/main/java/org/springframework/boot/rsocket/server/RSocketServer.java
rename to spring-boot-project/spring-boot-all/src/main/java/org/springframework/boot/rsocket/server/RSocketServer.java
diff --git a/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/rsocket/server/RSocketServerCustomizer.java b/spring-boot-project/spring-boot-all/src/main/java/org/springframework/boot/rsocket/server/RSocketServerCustomizer.java
similarity index 100%
rename from spring-boot-project/spring-boot/src/main/java/org/springframework/boot/rsocket/server/RSocketServerCustomizer.java
rename to spring-boot-project/spring-boot-all/src/main/java/org/springframework/boot/rsocket/server/RSocketServerCustomizer.java
diff --git a/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/rsocket/server/RSocketServerException.java b/spring-boot-project/spring-boot-all/src/main/java/org/springframework/boot/rsocket/server/RSocketServerException.java
similarity index 100%
rename from spring-boot-project/spring-boot/src/main/java/org/springframework/boot/rsocket/server/RSocketServerException.java
rename to spring-boot-project/spring-boot-all/src/main/java/org/springframework/boot/rsocket/server/RSocketServerException.java
diff --git a/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/rsocket/server/RSocketServerFactory.java b/spring-boot-project/spring-boot-all/src/main/java/org/springframework/boot/rsocket/server/RSocketServerFactory.java
similarity index 100%
rename from spring-boot-project/spring-boot/src/main/java/org/springframework/boot/rsocket/server/RSocketServerFactory.java
rename to spring-boot-project/spring-boot-all/src/main/java/org/springframework/boot/rsocket/server/RSocketServerFactory.java
diff --git a/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/rsocket/server/package-info.java b/spring-boot-project/spring-boot-all/src/main/java/org/springframework/boot/rsocket/server/package-info.java
similarity index 100%
rename from spring-boot-project/spring-boot/src/main/java/org/springframework/boot/rsocket/server/package-info.java
rename to spring-boot-project/spring-boot-all/src/main/java/org/springframework/boot/rsocket/server/package-info.java
diff --git a/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/security/package-info.java b/spring-boot-project/spring-boot-all/src/main/java/org/springframework/boot/security/package-info.java
similarity index 100%
rename from spring-boot-project/spring-boot/src/main/java/org/springframework/boot/security/package-info.java
rename to spring-boot-project/spring-boot-all/src/main/java/org/springframework/boot/security/package-info.java
diff --git a/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/security/reactive/ApplicationContextServerWebExchangeMatcher.java b/spring-boot-project/spring-boot-all/src/main/java/org/springframework/boot/security/reactive/ApplicationContextServerWebExchangeMatcher.java
similarity index 100%
rename from spring-boot-project/spring-boot/src/main/java/org/springframework/boot/security/reactive/ApplicationContextServerWebExchangeMatcher.java
rename to spring-boot-project/spring-boot-all/src/main/java/org/springframework/boot/security/reactive/ApplicationContextServerWebExchangeMatcher.java
diff --git a/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/security/reactive/package-info.java b/spring-boot-project/spring-boot-all/src/main/java/org/springframework/boot/security/reactive/package-info.java
similarity index 100%
rename from spring-boot-project/spring-boot/src/main/java/org/springframework/boot/security/reactive/package-info.java
rename to spring-boot-project/spring-boot-all/src/main/java/org/springframework/boot/security/reactive/package-info.java
diff --git a/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/security/servlet/ApplicationContextRequestMatcher.java b/spring-boot-project/spring-boot-all/src/main/java/org/springframework/boot/security/servlet/ApplicationContextRequestMatcher.java
similarity index 100%
rename from spring-boot-project/spring-boot/src/main/java/org/springframework/boot/security/servlet/ApplicationContextRequestMatcher.java
rename to spring-boot-project/spring-boot-all/src/main/java/org/springframework/boot/security/servlet/ApplicationContextRequestMatcher.java
diff --git a/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/security/servlet/package-info.java b/spring-boot-project/spring-boot-all/src/main/java/org/springframework/boot/security/servlet/package-info.java
similarity index 100%
rename from spring-boot-project/spring-boot/src/main/java/org/springframework/boot/security/servlet/package-info.java
rename to spring-boot-project/spring-boot-all/src/main/java/org/springframework/boot/security/servlet/package-info.java
diff --git a/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/sql/init/AbstractScriptDatabaseInitializer.java b/spring-boot-project/spring-boot-all/src/main/java/org/springframework/boot/sql/init/AbstractScriptDatabaseInitializer.java
similarity index 100%
rename from spring-boot-project/spring-boot/src/main/java/org/springframework/boot/sql/init/AbstractScriptDatabaseInitializer.java
rename to spring-boot-project/spring-boot-all/src/main/java/org/springframework/boot/sql/init/AbstractScriptDatabaseInitializer.java
diff --git a/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/sql/init/DatabaseInitializationMode.java b/spring-boot-project/spring-boot-all/src/main/java/org/springframework/boot/sql/init/DatabaseInitializationMode.java
similarity index 100%
rename from spring-boot-project/spring-boot/src/main/java/org/springframework/boot/sql/init/DatabaseInitializationMode.java
rename to spring-boot-project/spring-boot-all/src/main/java/org/springframework/boot/sql/init/DatabaseInitializationMode.java
diff --git a/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/sql/init/DatabaseInitializationSettings.java b/spring-boot-project/spring-boot-all/src/main/java/org/springframework/boot/sql/init/DatabaseInitializationSettings.java
similarity index 100%
rename from spring-boot-project/spring-boot/src/main/java/org/springframework/boot/sql/init/DatabaseInitializationSettings.java
rename to spring-boot-project/spring-boot-all/src/main/java/org/springframework/boot/sql/init/DatabaseInitializationSettings.java
diff --git a/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/sql/init/dependency/AbstractBeansOfTypeDatabaseInitializerDetector.java b/spring-boot-project/spring-boot-all/src/main/java/org/springframework/boot/sql/init/dependency/AbstractBeansOfTypeDatabaseInitializerDetector.java
similarity index 100%
rename from spring-boot-project/spring-boot/src/main/java/org/springframework/boot/sql/init/dependency/AbstractBeansOfTypeDatabaseInitializerDetector.java
rename to spring-boot-project/spring-boot-all/src/main/java/org/springframework/boot/sql/init/dependency/AbstractBeansOfTypeDatabaseInitializerDetector.java
diff --git a/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/sql/init/dependency/AbstractBeansOfTypeDependsOnDatabaseInitializationDetector.java b/spring-boot-project/spring-boot-all/src/main/java/org/springframework/boot/sql/init/dependency/AbstractBeansOfTypeDependsOnDatabaseInitializationDetector.java
similarity index 100%
rename from spring-boot-project/spring-boot/src/main/java/org/springframework/boot/sql/init/dependency/AbstractBeansOfTypeDependsOnDatabaseInitializationDetector.java
rename to spring-boot-project/spring-boot-all/src/main/java/org/springframework/boot/sql/init/dependency/AbstractBeansOfTypeDependsOnDatabaseInitializationDetector.java
diff --git a/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/sql/init/dependency/AnnotationDependsOnDatabaseInitializationDetector.java b/spring-boot-project/spring-boot-all/src/main/java/org/springframework/boot/sql/init/dependency/AnnotationDependsOnDatabaseInitializationDetector.java
similarity index 100%
rename from spring-boot-project/spring-boot/src/main/java/org/springframework/boot/sql/init/dependency/AnnotationDependsOnDatabaseInitializationDetector.java
rename to spring-boot-project/spring-boot-all/src/main/java/org/springframework/boot/sql/init/dependency/AnnotationDependsOnDatabaseInitializationDetector.java
diff --git a/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/sql/init/dependency/BeansOfTypeDetector.java b/spring-boot-project/spring-boot-all/src/main/java/org/springframework/boot/sql/init/dependency/BeansOfTypeDetector.java
similarity index 100%
rename from spring-boot-project/spring-boot/src/main/java/org/springframework/boot/sql/init/dependency/BeansOfTypeDetector.java
rename to spring-boot-project/spring-boot-all/src/main/java/org/springframework/boot/sql/init/dependency/BeansOfTypeDetector.java
diff --git a/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/sql/init/dependency/DatabaseInitializationDependencyConfigurer.java b/spring-boot-project/spring-boot-all/src/main/java/org/springframework/boot/sql/init/dependency/DatabaseInitializationDependencyConfigurer.java
similarity index 100%
rename from spring-boot-project/spring-boot/src/main/java/org/springframework/boot/sql/init/dependency/DatabaseInitializationDependencyConfigurer.java
rename to spring-boot-project/spring-boot-all/src/main/java/org/springframework/boot/sql/init/dependency/DatabaseInitializationDependencyConfigurer.java
diff --git a/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/sql/init/dependency/DatabaseInitializerDetector.java b/spring-boot-project/spring-boot-all/src/main/java/org/springframework/boot/sql/init/dependency/DatabaseInitializerDetector.java
similarity index 100%
rename from spring-boot-project/spring-boot/src/main/java/org/springframework/boot/sql/init/dependency/DatabaseInitializerDetector.java
rename to spring-boot-project/spring-boot-all/src/main/java/org/springframework/boot/sql/init/dependency/DatabaseInitializerDetector.java
diff --git a/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/sql/init/dependency/DependsOnDatabaseInitialization.java b/spring-boot-project/spring-boot-all/src/main/java/org/springframework/boot/sql/init/dependency/DependsOnDatabaseInitialization.java
similarity index 100%
rename from spring-boot-project/spring-boot/src/main/java/org/springframework/boot/sql/init/dependency/DependsOnDatabaseInitialization.java
rename to spring-boot-project/spring-boot-all/src/main/java/org/springframework/boot/sql/init/dependency/DependsOnDatabaseInitialization.java
diff --git a/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/sql/init/dependency/DependsOnDatabaseInitializationDetector.java b/spring-boot-project/spring-boot-all/src/main/java/org/springframework/boot/sql/init/dependency/DependsOnDatabaseInitializationDetector.java
similarity index 100%
rename from spring-boot-project/spring-boot/src/main/java/org/springframework/boot/sql/init/dependency/DependsOnDatabaseInitializationDetector.java
rename to spring-boot-project/spring-boot-all/src/main/java/org/springframework/boot/sql/init/dependency/DependsOnDatabaseInitializationDetector.java
diff --git a/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/sql/init/dependency/package-info.java b/spring-boot-project/spring-boot-all/src/main/java/org/springframework/boot/sql/init/dependency/package-info.java
similarity index 100%
rename from spring-boot-project/spring-boot/src/main/java/org/springframework/boot/sql/init/dependency/package-info.java
rename to spring-boot-project/spring-boot-all/src/main/java/org/springframework/boot/sql/init/dependency/package-info.java
diff --git a/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/sql/init/package-info.java b/spring-boot-project/spring-boot-all/src/main/java/org/springframework/boot/sql/init/package-info.java
similarity index 100%
rename from spring-boot-project/spring-boot/src/main/java/org/springframework/boot/sql/init/package-info.java
rename to spring-boot-project/spring-boot-all/src/main/java/org/springframework/boot/sql/init/package-info.java
diff --git a/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/web/client/BasicAuthentication.java b/spring-boot-project/spring-boot-all/src/main/java/org/springframework/boot/web/client/BasicAuthentication.java
similarity index 100%
rename from spring-boot-project/spring-boot/src/main/java/org/springframework/boot/web/client/BasicAuthentication.java
rename to spring-boot-project/spring-boot-all/src/main/java/org/springframework/boot/web/client/BasicAuthentication.java
diff --git a/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/web/client/ClientHttpRequestFactories.java b/spring-boot-project/spring-boot-all/src/main/java/org/springframework/boot/web/client/ClientHttpRequestFactories.java
similarity index 100%
rename from spring-boot-project/spring-boot/src/main/java/org/springframework/boot/web/client/ClientHttpRequestFactories.java
rename to spring-boot-project/spring-boot-all/src/main/java/org/springframework/boot/web/client/ClientHttpRequestFactories.java
diff --git a/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/web/client/ClientHttpRequestFactorySettings.java b/spring-boot-project/spring-boot-all/src/main/java/org/springframework/boot/web/client/ClientHttpRequestFactorySettings.java
similarity index 100%
rename from spring-boot-project/spring-boot/src/main/java/org/springframework/boot/web/client/ClientHttpRequestFactorySettings.java
rename to spring-boot-project/spring-boot-all/src/main/java/org/springframework/boot/web/client/ClientHttpRequestFactorySettings.java
diff --git a/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/web/client/RestClientCustomizer.java b/spring-boot-project/spring-boot-all/src/main/java/org/springframework/boot/web/client/RestClientCustomizer.java
similarity index 100%
rename from spring-boot-project/spring-boot/src/main/java/org/springframework/boot/web/client/RestClientCustomizer.java
rename to spring-boot-project/spring-boot-all/src/main/java/org/springframework/boot/web/client/RestClientCustomizer.java
diff --git a/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/web/client/RestTemplateBuilder.java b/spring-boot-project/spring-boot-all/src/main/java/org/springframework/boot/web/client/RestTemplateBuilder.java
similarity index 100%
rename from spring-boot-project/spring-boot/src/main/java/org/springframework/boot/web/client/RestTemplateBuilder.java
rename to spring-boot-project/spring-boot-all/src/main/java/org/springframework/boot/web/client/RestTemplateBuilder.java
diff --git a/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/web/client/RestTemplateBuilderClientHttpRequestInitializer.java b/spring-boot-project/spring-boot-all/src/main/java/org/springframework/boot/web/client/RestTemplateBuilderClientHttpRequestInitializer.java
similarity index 100%
rename from spring-boot-project/spring-boot/src/main/java/org/springframework/boot/web/client/RestTemplateBuilderClientHttpRequestInitializer.java
rename to spring-boot-project/spring-boot-all/src/main/java/org/springframework/boot/web/client/RestTemplateBuilderClientHttpRequestInitializer.java
diff --git a/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/web/client/RestTemplateCustomizer.java b/spring-boot-project/spring-boot-all/src/main/java/org/springframework/boot/web/client/RestTemplateCustomizer.java
similarity index 100%
rename from spring-boot-project/spring-boot/src/main/java/org/springframework/boot/web/client/RestTemplateCustomizer.java
rename to spring-boot-project/spring-boot-all/src/main/java/org/springframework/boot/web/client/RestTemplateCustomizer.java
diff --git a/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/web/client/RestTemplateRequestCustomizer.java b/spring-boot-project/spring-boot-all/src/main/java/org/springframework/boot/web/client/RestTemplateRequestCustomizer.java
similarity index 100%
rename from spring-boot-project/spring-boot/src/main/java/org/springframework/boot/web/client/RestTemplateRequestCustomizer.java
rename to spring-boot-project/spring-boot-all/src/main/java/org/springframework/boot/web/client/RestTemplateRequestCustomizer.java
diff --git a/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/web/client/RootUriBuilderFactory.java b/spring-boot-project/spring-boot-all/src/main/java/org/springframework/boot/web/client/RootUriBuilderFactory.java
similarity index 100%
rename from spring-boot-project/spring-boot/src/main/java/org/springframework/boot/web/client/RootUriBuilderFactory.java
rename to spring-boot-project/spring-boot-all/src/main/java/org/springframework/boot/web/client/RootUriBuilderFactory.java
diff --git a/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/web/client/RootUriTemplateHandler.java b/spring-boot-project/spring-boot-all/src/main/java/org/springframework/boot/web/client/RootUriTemplateHandler.java
similarity index 100%
rename from spring-boot-project/spring-boot/src/main/java/org/springframework/boot/web/client/RootUriTemplateHandler.java
rename to spring-boot-project/spring-boot-all/src/main/java/org/springframework/boot/web/client/RootUriTemplateHandler.java
diff --git a/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/web/client/package-info.java b/spring-boot-project/spring-boot-all/src/main/java/org/springframework/boot/web/client/package-info.java
similarity index 100%
rename from spring-boot-project/spring-boot/src/main/java/org/springframework/boot/web/client/package-info.java
rename to spring-boot-project/spring-boot-all/src/main/java/org/springframework/boot/web/client/package-info.java
diff --git a/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/web/codec/CodecCustomizer.java b/spring-boot-project/spring-boot-all/src/main/java/org/springframework/boot/web/codec/CodecCustomizer.java
similarity index 100%
rename from spring-boot-project/spring-boot/src/main/java/org/springframework/boot/web/codec/CodecCustomizer.java
rename to spring-boot-project/spring-boot-all/src/main/java/org/springframework/boot/web/codec/CodecCustomizer.java
diff --git a/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/web/codec/package-info.java b/spring-boot-project/spring-boot-all/src/main/java/org/springframework/boot/web/codec/package-info.java
similarity index 100%
rename from spring-boot-project/spring-boot/src/main/java/org/springframework/boot/web/codec/package-info.java
rename to spring-boot-project/spring-boot-all/src/main/java/org/springframework/boot/web/codec/package-info.java
diff --git a/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/web/reactive/error/DefaultErrorAttributes.java b/spring-boot-project/spring-boot-all/src/main/java/org/springframework/boot/web/reactive/error/DefaultErrorAttributes.java
similarity index 100%
rename from spring-boot-project/spring-boot/src/main/java/org/springframework/boot/web/reactive/error/DefaultErrorAttributes.java
rename to spring-boot-project/spring-boot-all/src/main/java/org/springframework/boot/web/reactive/error/DefaultErrorAttributes.java
diff --git a/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/web/reactive/error/ErrorAttributes.java b/spring-boot-project/spring-boot-all/src/main/java/org/springframework/boot/web/reactive/error/ErrorAttributes.java
similarity index 100%
rename from spring-boot-project/spring-boot/src/main/java/org/springframework/boot/web/reactive/error/ErrorAttributes.java
rename to spring-boot-project/spring-boot-all/src/main/java/org/springframework/boot/web/reactive/error/ErrorAttributes.java
diff --git a/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/web/reactive/error/ErrorWebExceptionHandler.java b/spring-boot-project/spring-boot-all/src/main/java/org/springframework/boot/web/reactive/error/ErrorWebExceptionHandler.java
similarity index 100%
rename from spring-boot-project/spring-boot/src/main/java/org/springframework/boot/web/reactive/error/ErrorWebExceptionHandler.java
rename to spring-boot-project/spring-boot-all/src/main/java/org/springframework/boot/web/reactive/error/ErrorWebExceptionHandler.java
diff --git a/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/web/reactive/error/package-info.java b/spring-boot-project/spring-boot-all/src/main/java/org/springframework/boot/web/reactive/error/package-info.java
similarity index 100%
rename from spring-boot-project/spring-boot/src/main/java/org/springframework/boot/web/reactive/error/package-info.java
rename to spring-boot-project/spring-boot-all/src/main/java/org/springframework/boot/web/reactive/error/package-info.java
diff --git a/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/web/reactive/filter/OrderedHiddenHttpMethodFilter.java b/spring-boot-project/spring-boot-all/src/main/java/org/springframework/boot/web/reactive/filter/OrderedHiddenHttpMethodFilter.java
similarity index 100%
rename from spring-boot-project/spring-boot/src/main/java/org/springframework/boot/web/reactive/filter/OrderedHiddenHttpMethodFilter.java
rename to spring-boot-project/spring-boot-all/src/main/java/org/springframework/boot/web/reactive/filter/OrderedHiddenHttpMethodFilter.java
diff --git a/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/web/reactive/filter/OrderedWebFilter.java b/spring-boot-project/spring-boot-all/src/main/java/org/springframework/boot/web/reactive/filter/OrderedWebFilter.java
similarity index 100%
rename from spring-boot-project/spring-boot/src/main/java/org/springframework/boot/web/reactive/filter/OrderedWebFilter.java
rename to spring-boot-project/spring-boot-all/src/main/java/org/springframework/boot/web/reactive/filter/OrderedWebFilter.java
diff --git a/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/web/reactive/filter/package-info.java b/spring-boot-project/spring-boot-all/src/main/java/org/springframework/boot/web/reactive/filter/package-info.java
similarity index 100%
rename from spring-boot-project/spring-boot/src/main/java/org/springframework/boot/web/reactive/filter/package-info.java
rename to spring-boot-project/spring-boot-all/src/main/java/org/springframework/boot/web/reactive/filter/package-info.java
diff --git a/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/web/reactive/function/client/WebClientCustomizer.java b/spring-boot-project/spring-boot-all/src/main/java/org/springframework/boot/web/reactive/function/client/WebClientCustomizer.java
similarity index 100%
rename from spring-boot-project/spring-boot/src/main/java/org/springframework/boot/web/reactive/function/client/WebClientCustomizer.java
rename to spring-boot-project/spring-boot-all/src/main/java/org/springframework/boot/web/reactive/function/client/WebClientCustomizer.java
diff --git a/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/web/reactive/function/client/package-info.java b/spring-boot-project/spring-boot-all/src/main/java/org/springframework/boot/web/reactive/function/client/package-info.java
similarity index 100%
rename from spring-boot-project/spring-boot/src/main/java/org/springframework/boot/web/reactive/function/client/package-info.java
rename to spring-boot-project/spring-boot-all/src/main/java/org/springframework/boot/web/reactive/function/client/package-info.java
diff --git a/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/web/reactive/result/view/MustacheView.java b/spring-boot-project/spring-boot-all/src/main/java/org/springframework/boot/web/reactive/result/view/MustacheView.java
similarity index 100%
rename from spring-boot-project/spring-boot/src/main/java/org/springframework/boot/web/reactive/result/view/MustacheView.java
rename to spring-boot-project/spring-boot-all/src/main/java/org/springframework/boot/web/reactive/result/view/MustacheView.java
diff --git a/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/web/reactive/result/view/MustacheViewResolver.java b/spring-boot-project/spring-boot-all/src/main/java/org/springframework/boot/web/reactive/result/view/MustacheViewResolver.java
similarity index 100%
rename from spring-boot-project/spring-boot/src/main/java/org/springframework/boot/web/reactive/result/view/MustacheViewResolver.java
rename to spring-boot-project/spring-boot-all/src/main/java/org/springframework/boot/web/reactive/result/view/MustacheViewResolver.java
diff --git a/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/web/reactive/result/view/package-info.java b/spring-boot-project/spring-boot-all/src/main/java/org/springframework/boot/web/reactive/result/view/package-info.java
similarity index 100%
rename from spring-boot-project/spring-boot/src/main/java/org/springframework/boot/web/reactive/result/view/package-info.java
rename to spring-boot-project/spring-boot-all/src/main/java/org/springframework/boot/web/reactive/result/view/package-info.java
diff --git a/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/web/server/jetty/ConfigurableJettyWebServerFactory.java b/spring-boot-project/spring-boot-all/src/main/java/org/springframework/boot/web/server/jetty/ConfigurableJettyWebServerFactory.java
similarity index 100%
rename from spring-boot-project/spring-boot/src/main/java/org/springframework/boot/web/server/jetty/ConfigurableJettyWebServerFactory.java
rename to spring-boot-project/spring-boot-all/src/main/java/org/springframework/boot/web/server/jetty/ConfigurableJettyWebServerFactory.java
diff --git a/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/web/server/jetty/ForwardHeadersCustomizer.java b/spring-boot-project/spring-boot-all/src/main/java/org/springframework/boot/web/server/jetty/ForwardHeadersCustomizer.java
similarity index 100%
rename from spring-boot-project/spring-boot/src/main/java/org/springframework/boot/web/server/jetty/ForwardHeadersCustomizer.java
rename to spring-boot-project/spring-boot-all/src/main/java/org/springframework/boot/web/server/jetty/ForwardHeadersCustomizer.java
diff --git a/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/web/server/jetty/GracefulShutdown.java b/spring-boot-project/spring-boot-all/src/main/java/org/springframework/boot/web/server/jetty/GracefulShutdown.java
similarity index 100%
rename from spring-boot-project/spring-boot/src/main/java/org/springframework/boot/web/server/jetty/GracefulShutdown.java
rename to spring-boot-project/spring-boot-all/src/main/java/org/springframework/boot/web/server/jetty/GracefulShutdown.java
diff --git a/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/web/server/jetty/JettyHandlerWrappers.java b/spring-boot-project/spring-boot-all/src/main/java/org/springframework/boot/web/server/jetty/JettyHandlerWrappers.java
similarity index 100%
rename from spring-boot-project/spring-boot/src/main/java/org/springframework/boot/web/server/jetty/JettyHandlerWrappers.java
rename to spring-boot-project/spring-boot-all/src/main/java/org/springframework/boot/web/server/jetty/JettyHandlerWrappers.java
diff --git a/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/web/server/jetty/JettyServerCustomizer.java b/spring-boot-project/spring-boot-all/src/main/java/org/springframework/boot/web/server/jetty/JettyServerCustomizer.java
similarity index 100%
rename from spring-boot-project/spring-boot/src/main/java/org/springframework/boot/web/server/jetty/JettyServerCustomizer.java
rename to spring-boot-project/spring-boot-all/src/main/java/org/springframework/boot/web/server/jetty/JettyServerCustomizer.java
diff --git a/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/web/server/jetty/JettyWebServer.java b/spring-boot-project/spring-boot-all/src/main/java/org/springframework/boot/web/server/jetty/JettyWebServer.java
similarity index 100%
rename from spring-boot-project/spring-boot/src/main/java/org/springframework/boot/web/server/jetty/JettyWebServer.java
rename to spring-boot-project/spring-boot-all/src/main/java/org/springframework/boot/web/server/jetty/JettyWebServer.java
diff --git a/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/web/server/jetty/JettyWebServerFactory.java b/spring-boot-project/spring-boot-all/src/main/java/org/springframework/boot/web/server/jetty/JettyWebServerFactory.java
similarity index 100%
rename from spring-boot-project/spring-boot/src/main/java/org/springframework/boot/web/server/jetty/JettyWebServerFactory.java
rename to spring-boot-project/spring-boot-all/src/main/java/org/springframework/boot/web/server/jetty/JettyWebServerFactory.java
diff --git a/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/web/server/jetty/SslServerCustomizer.java b/spring-boot-project/spring-boot-all/src/main/java/org/springframework/boot/web/server/jetty/SslServerCustomizer.java
similarity index 100%
rename from spring-boot-project/spring-boot/src/main/java/org/springframework/boot/web/server/jetty/SslServerCustomizer.java
rename to spring-boot-project/spring-boot-all/src/main/java/org/springframework/boot/web/server/jetty/SslServerCustomizer.java
diff --git a/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/web/server/jetty/package-info.java b/spring-boot-project/spring-boot-all/src/main/java/org/springframework/boot/web/server/jetty/package-info.java
similarity index 100%
rename from spring-boot-project/spring-boot/src/main/java/org/springframework/boot/web/server/jetty/package-info.java
rename to spring-boot-project/spring-boot-all/src/main/java/org/springframework/boot/web/server/jetty/package-info.java
diff --git a/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/web/server/reactive/jetty/JettyReactiveWebServerFactory.java b/spring-boot-project/spring-boot-all/src/main/java/org/springframework/boot/web/server/reactive/jetty/JettyReactiveWebServerFactory.java
similarity index 100%
rename from spring-boot-project/spring-boot/src/main/java/org/springframework/boot/web/server/reactive/jetty/JettyReactiveWebServerFactory.java
rename to spring-boot-project/spring-boot-all/src/main/java/org/springframework/boot/web/server/reactive/jetty/JettyReactiveWebServerFactory.java
diff --git a/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/web/server/reactive/jetty/package-info.java b/spring-boot-project/spring-boot-all/src/main/java/org/springframework/boot/web/server/reactive/jetty/package-info.java
similarity index 100%
rename from spring-boot-project/spring-boot/src/main/java/org/springframework/boot/web/server/reactive/jetty/package-info.java
rename to spring-boot-project/spring-boot-all/src/main/java/org/springframework/boot/web/server/reactive/jetty/package-info.java
diff --git a/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/web/server/reactive/netty/CompressionCustomizer.java b/spring-boot-project/spring-boot-all/src/main/java/org/springframework/boot/web/server/reactive/netty/CompressionCustomizer.java
similarity index 100%
rename from spring-boot-project/spring-boot/src/main/java/org/springframework/boot/web/server/reactive/netty/CompressionCustomizer.java
rename to spring-boot-project/spring-boot-all/src/main/java/org/springframework/boot/web/server/reactive/netty/CompressionCustomizer.java
diff --git a/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/web/server/reactive/netty/GracefulShutdown.java b/spring-boot-project/spring-boot-all/src/main/java/org/springframework/boot/web/server/reactive/netty/GracefulShutdown.java
similarity index 100%
rename from spring-boot-project/spring-boot/src/main/java/org/springframework/boot/web/server/reactive/netty/GracefulShutdown.java
rename to spring-boot-project/spring-boot-all/src/main/java/org/springframework/boot/web/server/reactive/netty/GracefulShutdown.java
diff --git a/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/web/server/reactive/netty/NettyReactiveWebServerFactory.java b/spring-boot-project/spring-boot-all/src/main/java/org/springframework/boot/web/server/reactive/netty/NettyReactiveWebServerFactory.java
similarity index 100%
rename from spring-boot-project/spring-boot/src/main/java/org/springframework/boot/web/server/reactive/netty/NettyReactiveWebServerFactory.java
rename to spring-boot-project/spring-boot-all/src/main/java/org/springframework/boot/web/server/reactive/netty/NettyReactiveWebServerFactory.java
diff --git a/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/web/server/reactive/netty/NettyRouteProvider.java b/spring-boot-project/spring-boot-all/src/main/java/org/springframework/boot/web/server/reactive/netty/NettyRouteProvider.java
similarity index 100%
rename from spring-boot-project/spring-boot/src/main/java/org/springframework/boot/web/server/reactive/netty/NettyRouteProvider.java
rename to spring-boot-project/spring-boot-all/src/main/java/org/springframework/boot/web/server/reactive/netty/NettyRouteProvider.java
diff --git a/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/web/server/reactive/netty/NettyServerCustomizer.java b/spring-boot-project/spring-boot-all/src/main/java/org/springframework/boot/web/server/reactive/netty/NettyServerCustomizer.java
similarity index 100%
rename from spring-boot-project/spring-boot/src/main/java/org/springframework/boot/web/server/reactive/netty/NettyServerCustomizer.java
rename to spring-boot-project/spring-boot-all/src/main/java/org/springframework/boot/web/server/reactive/netty/NettyServerCustomizer.java
diff --git a/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/web/server/reactive/netty/NettyWebServer.java b/spring-boot-project/spring-boot-all/src/main/java/org/springframework/boot/web/server/reactive/netty/NettyWebServer.java
similarity index 100%
rename from spring-boot-project/spring-boot/src/main/java/org/springframework/boot/web/server/reactive/netty/NettyWebServer.java
rename to spring-boot-project/spring-boot-all/src/main/java/org/springframework/boot/web/server/reactive/netty/NettyWebServer.java
diff --git a/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/web/server/reactive/netty/SslServerCustomizer.java b/spring-boot-project/spring-boot-all/src/main/java/org/springframework/boot/web/server/reactive/netty/SslServerCustomizer.java
similarity index 100%
rename from spring-boot-project/spring-boot/src/main/java/org/springframework/boot/web/server/reactive/netty/SslServerCustomizer.java
rename to spring-boot-project/spring-boot-all/src/main/java/org/springframework/boot/web/server/reactive/netty/SslServerCustomizer.java
diff --git a/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/web/server/reactive/netty/package-info.java b/spring-boot-project/spring-boot-all/src/main/java/org/springframework/boot/web/server/reactive/netty/package-info.java
similarity index 100%
rename from spring-boot-project/spring-boot/src/main/java/org/springframework/boot/web/server/reactive/netty/package-info.java
rename to spring-boot-project/spring-boot-all/src/main/java/org/springframework/boot/web/server/reactive/netty/package-info.java
diff --git a/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/web/server/reactive/tomcat/TomcatReactiveWebServerFactory.java b/spring-boot-project/spring-boot-all/src/main/java/org/springframework/boot/web/server/reactive/tomcat/TomcatReactiveWebServerFactory.java
similarity index 100%
rename from spring-boot-project/spring-boot/src/main/java/org/springframework/boot/web/server/reactive/tomcat/TomcatReactiveWebServerFactory.java
rename to spring-boot-project/spring-boot-all/src/main/java/org/springframework/boot/web/server/reactive/tomcat/TomcatReactiveWebServerFactory.java
diff --git a/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/web/server/reactive/tomcat/package-info.java b/spring-boot-project/spring-boot-all/src/main/java/org/springframework/boot/web/server/reactive/tomcat/package-info.java
similarity index 100%
rename from spring-boot-project/spring-boot/src/main/java/org/springframework/boot/web/server/reactive/tomcat/package-info.java
rename to spring-boot-project/spring-boot-all/src/main/java/org/springframework/boot/web/server/reactive/tomcat/package-info.java
diff --git a/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/web/server/reactive/undertow/UndertowReactiveWebServerFactory.java b/spring-boot-project/spring-boot-all/src/main/java/org/springframework/boot/web/server/reactive/undertow/UndertowReactiveWebServerFactory.java
similarity index 100%
rename from spring-boot-project/spring-boot/src/main/java/org/springframework/boot/web/server/reactive/undertow/UndertowReactiveWebServerFactory.java
rename to spring-boot-project/spring-boot-all/src/main/java/org/springframework/boot/web/server/reactive/undertow/UndertowReactiveWebServerFactory.java
diff --git a/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/web/server/reactive/undertow/package-info.java b/spring-boot-project/spring-boot-all/src/main/java/org/springframework/boot/web/server/reactive/undertow/package-info.java
similarity index 100%
rename from spring-boot-project/spring-boot/src/main/java/org/springframework/boot/web/server/reactive/undertow/package-info.java
rename to spring-boot-project/spring-boot-all/src/main/java/org/springframework/boot/web/server/reactive/undertow/package-info.java
diff --git a/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/web/server/servlet/jetty/JasperInitializer.java b/spring-boot-project/spring-boot-all/src/main/java/org/springframework/boot/web/server/servlet/jetty/JasperInitializer.java
similarity index 100%
rename from spring-boot-project/spring-boot/src/main/java/org/springframework/boot/web/server/servlet/jetty/JasperInitializer.java
rename to spring-boot-project/spring-boot-all/src/main/java/org/springframework/boot/web/server/servlet/jetty/JasperInitializer.java
diff --git a/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/web/server/servlet/jetty/JettyEmbeddedErrorHandler.java b/spring-boot-project/spring-boot-all/src/main/java/org/springframework/boot/web/server/servlet/jetty/JettyEmbeddedErrorHandler.java
similarity index 100%
rename from spring-boot-project/spring-boot/src/main/java/org/springframework/boot/web/server/servlet/jetty/JettyEmbeddedErrorHandler.java
rename to spring-boot-project/spring-boot-all/src/main/java/org/springframework/boot/web/server/servlet/jetty/JettyEmbeddedErrorHandler.java
diff --git a/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/web/server/servlet/jetty/JettyEmbeddedWebAppContext.java b/spring-boot-project/spring-boot-all/src/main/java/org/springframework/boot/web/server/servlet/jetty/JettyEmbeddedWebAppContext.java
similarity index 100%
rename from spring-boot-project/spring-boot/src/main/java/org/springframework/boot/web/server/servlet/jetty/JettyEmbeddedWebAppContext.java
rename to spring-boot-project/spring-boot-all/src/main/java/org/springframework/boot/web/server/servlet/jetty/JettyEmbeddedWebAppContext.java
diff --git a/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/web/server/servlet/jetty/JettyServletWebServer.java b/spring-boot-project/spring-boot-all/src/main/java/org/springframework/boot/web/server/servlet/jetty/JettyServletWebServer.java
similarity index 100%
rename from spring-boot-project/spring-boot/src/main/java/org/springframework/boot/web/server/servlet/jetty/JettyServletWebServer.java
rename to spring-boot-project/spring-boot-all/src/main/java/org/springframework/boot/web/server/servlet/jetty/JettyServletWebServer.java
diff --git a/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/web/server/servlet/jetty/JettyServletWebServerFactory.java b/spring-boot-project/spring-boot-all/src/main/java/org/springframework/boot/web/server/servlet/jetty/JettyServletWebServerFactory.java
similarity index 100%
rename from spring-boot-project/spring-boot/src/main/java/org/springframework/boot/web/server/servlet/jetty/JettyServletWebServerFactory.java
rename to spring-boot-project/spring-boot-all/src/main/java/org/springframework/boot/web/server/servlet/jetty/JettyServletWebServerFactory.java
diff --git a/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/web/server/servlet/jetty/LoaderHidingResource.java b/spring-boot-project/spring-boot-all/src/main/java/org/springframework/boot/web/server/servlet/jetty/LoaderHidingResource.java
similarity index 100%
rename from spring-boot-project/spring-boot/src/main/java/org/springframework/boot/web/server/servlet/jetty/LoaderHidingResource.java
rename to spring-boot-project/spring-boot-all/src/main/java/org/springframework/boot/web/server/servlet/jetty/LoaderHidingResource.java
diff --git a/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/web/server/servlet/jetty/ServletContextInitializerConfiguration.java b/spring-boot-project/spring-boot-all/src/main/java/org/springframework/boot/web/server/servlet/jetty/ServletContextInitializerConfiguration.java
similarity index 100%
rename from spring-boot-project/spring-boot/src/main/java/org/springframework/boot/web/server/servlet/jetty/ServletContextInitializerConfiguration.java
rename to spring-boot-project/spring-boot-all/src/main/java/org/springframework/boot/web/server/servlet/jetty/ServletContextInitializerConfiguration.java
diff --git a/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/web/server/servlet/jetty/package-info.java b/spring-boot-project/spring-boot-all/src/main/java/org/springframework/boot/web/server/servlet/jetty/package-info.java
similarity index 100%
rename from spring-boot-project/spring-boot/src/main/java/org/springframework/boot/web/server/servlet/jetty/package-info.java
rename to spring-boot-project/spring-boot-all/src/main/java/org/springframework/boot/web/server/servlet/jetty/package-info.java
diff --git a/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/web/server/servlet/tomcat/NestedJarResourceSet.java b/spring-boot-project/spring-boot-all/src/main/java/org/springframework/boot/web/server/servlet/tomcat/NestedJarResourceSet.java
similarity index 100%
rename from spring-boot-project/spring-boot/src/main/java/org/springframework/boot/web/server/servlet/tomcat/NestedJarResourceSet.java
rename to spring-boot-project/spring-boot-all/src/main/java/org/springframework/boot/web/server/servlet/tomcat/NestedJarResourceSet.java
diff --git a/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/web/server/servlet/tomcat/TldPatterns.java b/spring-boot-project/spring-boot-all/src/main/java/org/springframework/boot/web/server/servlet/tomcat/TldPatterns.java
similarity index 100%
rename from spring-boot-project/spring-boot/src/main/java/org/springframework/boot/web/server/servlet/tomcat/TldPatterns.java
rename to spring-boot-project/spring-boot-all/src/main/java/org/springframework/boot/web/server/servlet/tomcat/TldPatterns.java
diff --git a/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/web/server/servlet/tomcat/TomcatServletWebServerFactory.java b/spring-boot-project/spring-boot-all/src/main/java/org/springframework/boot/web/server/servlet/tomcat/TomcatServletWebServerFactory.java
similarity index 100%
rename from spring-boot-project/spring-boot/src/main/java/org/springframework/boot/web/server/servlet/tomcat/TomcatServletWebServerFactory.java
rename to spring-boot-project/spring-boot-all/src/main/java/org/springframework/boot/web/server/servlet/tomcat/TomcatServletWebServerFactory.java
diff --git a/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/web/server/servlet/tomcat/package-info.java b/spring-boot-project/spring-boot-all/src/main/java/org/springframework/boot/web/server/servlet/tomcat/package-info.java
similarity index 100%
rename from spring-boot-project/spring-boot/src/main/java/org/springframework/boot/web/server/servlet/tomcat/package-info.java
rename to spring-boot-project/spring-boot-all/src/main/java/org/springframework/boot/web/server/servlet/tomcat/package-info.java
diff --git a/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/web/server/servlet/undertow/CompositeResourceManager.java b/spring-boot-project/spring-boot-all/src/main/java/org/springframework/boot/web/server/servlet/undertow/CompositeResourceManager.java
similarity index 100%
rename from spring-boot-project/spring-boot/src/main/java/org/springframework/boot/web/server/servlet/undertow/CompositeResourceManager.java
rename to spring-boot-project/spring-boot-all/src/main/java/org/springframework/boot/web/server/servlet/undertow/CompositeResourceManager.java
diff --git a/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/web/server/servlet/undertow/DeploymentManagerHttpHandlerFactory.java b/spring-boot-project/spring-boot-all/src/main/java/org/springframework/boot/web/server/servlet/undertow/DeploymentManagerHttpHandlerFactory.java
similarity index 100%
rename from spring-boot-project/spring-boot/src/main/java/org/springframework/boot/web/server/servlet/undertow/DeploymentManagerHttpHandlerFactory.java
rename to spring-boot-project/spring-boot-all/src/main/java/org/springframework/boot/web/server/servlet/undertow/DeploymentManagerHttpHandlerFactory.java
diff --git a/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/web/server/servlet/undertow/FileSessionPersistence.java b/spring-boot-project/spring-boot-all/src/main/java/org/springframework/boot/web/server/servlet/undertow/FileSessionPersistence.java
similarity index 100%
rename from spring-boot-project/spring-boot/src/main/java/org/springframework/boot/web/server/servlet/undertow/FileSessionPersistence.java
rename to spring-boot-project/spring-boot-all/src/main/java/org/springframework/boot/web/server/servlet/undertow/FileSessionPersistence.java
diff --git a/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/web/server/servlet/undertow/JarResourceManager.java b/spring-boot-project/spring-boot-all/src/main/java/org/springframework/boot/web/server/servlet/undertow/JarResourceManager.java
similarity index 100%
rename from spring-boot-project/spring-boot/src/main/java/org/springframework/boot/web/server/servlet/undertow/JarResourceManager.java
rename to spring-boot-project/spring-boot-all/src/main/java/org/springframework/boot/web/server/servlet/undertow/JarResourceManager.java
diff --git a/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/web/server/servlet/undertow/UndertowDeploymentInfoCustomizer.java b/spring-boot-project/spring-boot-all/src/main/java/org/springframework/boot/web/server/servlet/undertow/UndertowDeploymentInfoCustomizer.java
similarity index 100%
rename from spring-boot-project/spring-boot/src/main/java/org/springframework/boot/web/server/servlet/undertow/UndertowDeploymentInfoCustomizer.java
rename to spring-boot-project/spring-boot-all/src/main/java/org/springframework/boot/web/server/servlet/undertow/UndertowDeploymentInfoCustomizer.java
diff --git a/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/web/server/servlet/undertow/UndertowServletWebServer.java b/spring-boot-project/spring-boot-all/src/main/java/org/springframework/boot/web/server/servlet/undertow/UndertowServletWebServer.java
similarity index 100%
rename from spring-boot-project/spring-boot/src/main/java/org/springframework/boot/web/server/servlet/undertow/UndertowServletWebServer.java
rename to spring-boot-project/spring-boot-all/src/main/java/org/springframework/boot/web/server/servlet/undertow/UndertowServletWebServer.java
diff --git a/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/web/server/servlet/undertow/UndertowServletWebServerFactory.java b/spring-boot-project/spring-boot-all/src/main/java/org/springframework/boot/web/server/servlet/undertow/UndertowServletWebServerFactory.java
similarity index 100%
rename from spring-boot-project/spring-boot/src/main/java/org/springframework/boot/web/server/servlet/undertow/UndertowServletWebServerFactory.java
rename to spring-boot-project/spring-boot-all/src/main/java/org/springframework/boot/web/server/servlet/undertow/UndertowServletWebServerFactory.java
diff --git a/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/web/server/servlet/undertow/package-info.java b/spring-boot-project/spring-boot-all/src/main/java/org/springframework/boot/web/server/servlet/undertow/package-info.java
similarity index 100%
rename from spring-boot-project/spring-boot/src/main/java/org/springframework/boot/web/server/servlet/undertow/package-info.java
rename to spring-boot-project/spring-boot-all/src/main/java/org/springframework/boot/web/server/servlet/undertow/package-info.java
diff --git a/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/web/server/tomcat/CompressionConnectorCustomizer.java b/spring-boot-project/spring-boot-all/src/main/java/org/springframework/boot/web/server/tomcat/CompressionConnectorCustomizer.java
similarity index 100%
rename from spring-boot-project/spring-boot/src/main/java/org/springframework/boot/web/server/tomcat/CompressionConnectorCustomizer.java
rename to spring-boot-project/spring-boot-all/src/main/java/org/springframework/boot/web/server/tomcat/CompressionConnectorCustomizer.java
diff --git a/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/web/server/tomcat/ConfigurableTomcatWebServerFactory.java b/spring-boot-project/spring-boot-all/src/main/java/org/springframework/boot/web/server/tomcat/ConfigurableTomcatWebServerFactory.java
similarity index 100%
rename from spring-boot-project/spring-boot/src/main/java/org/springframework/boot/web/server/tomcat/ConfigurableTomcatWebServerFactory.java
rename to spring-boot-project/spring-boot-all/src/main/java/org/springframework/boot/web/server/tomcat/ConfigurableTomcatWebServerFactory.java
diff --git a/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/web/server/tomcat/ConnectorStartFailedException.java b/spring-boot-project/spring-boot-all/src/main/java/org/springframework/boot/web/server/tomcat/ConnectorStartFailedException.java
similarity index 100%
rename from spring-boot-project/spring-boot/src/main/java/org/springframework/boot/web/server/tomcat/ConnectorStartFailedException.java
rename to spring-boot-project/spring-boot-all/src/main/java/org/springframework/boot/web/server/tomcat/ConnectorStartFailedException.java
diff --git a/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/web/server/tomcat/ConnectorStartFailureAnalyzer.java b/spring-boot-project/spring-boot-all/src/main/java/org/springframework/boot/web/server/tomcat/ConnectorStartFailureAnalyzer.java
similarity index 100%
rename from spring-boot-project/spring-boot/src/main/java/org/springframework/boot/web/server/tomcat/ConnectorStartFailureAnalyzer.java
rename to spring-boot-project/spring-boot-all/src/main/java/org/springframework/boot/web/server/tomcat/ConnectorStartFailureAnalyzer.java
diff --git a/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/web/server/tomcat/DisableReferenceClearingContextCustomizer.java b/spring-boot-project/spring-boot-all/src/main/java/org/springframework/boot/web/server/tomcat/DisableReferenceClearingContextCustomizer.java
similarity index 100%
rename from spring-boot-project/spring-boot/src/main/java/org/springframework/boot/web/server/tomcat/DisableReferenceClearingContextCustomizer.java
rename to spring-boot-project/spring-boot-all/src/main/java/org/springframework/boot/web/server/tomcat/DisableReferenceClearingContextCustomizer.java
diff --git a/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/web/server/tomcat/GracefulShutdown.java b/spring-boot-project/spring-boot-all/src/main/java/org/springframework/boot/web/server/tomcat/GracefulShutdown.java
similarity index 100%
rename from spring-boot-project/spring-boot/src/main/java/org/springframework/boot/web/server/tomcat/GracefulShutdown.java
rename to spring-boot-project/spring-boot-all/src/main/java/org/springframework/boot/web/server/tomcat/GracefulShutdown.java
diff --git a/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/web/server/tomcat/LazySessionIdGenerator.java b/spring-boot-project/spring-boot-all/src/main/java/org/springframework/boot/web/server/tomcat/LazySessionIdGenerator.java
similarity index 100%
rename from spring-boot-project/spring-boot/src/main/java/org/springframework/boot/web/server/tomcat/LazySessionIdGenerator.java
rename to spring-boot-project/spring-boot-all/src/main/java/org/springframework/boot/web/server/tomcat/LazySessionIdGenerator.java
diff --git a/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/web/server/tomcat/SslConnectorCustomizer.java b/spring-boot-project/spring-boot-all/src/main/java/org/springframework/boot/web/server/tomcat/SslConnectorCustomizer.java
similarity index 100%
rename from spring-boot-project/spring-boot/src/main/java/org/springframework/boot/web/server/tomcat/SslConnectorCustomizer.java
rename to spring-boot-project/spring-boot-all/src/main/java/org/springframework/boot/web/server/tomcat/SslConnectorCustomizer.java
diff --git a/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/web/server/tomcat/TomcatConnectorCustomizer.java b/spring-boot-project/spring-boot-all/src/main/java/org/springframework/boot/web/server/tomcat/TomcatConnectorCustomizer.java
similarity index 100%
rename from spring-boot-project/spring-boot/src/main/java/org/springframework/boot/web/server/tomcat/TomcatConnectorCustomizer.java
rename to spring-boot-project/spring-boot-all/src/main/java/org/springframework/boot/web/server/tomcat/TomcatConnectorCustomizer.java
diff --git a/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/web/server/tomcat/TomcatContextCustomizer.java b/spring-boot-project/spring-boot-all/src/main/java/org/springframework/boot/web/server/tomcat/TomcatContextCustomizer.java
similarity index 100%
rename from spring-boot-project/spring-boot/src/main/java/org/springframework/boot/web/server/tomcat/TomcatContextCustomizer.java
rename to spring-boot-project/spring-boot-all/src/main/java/org/springframework/boot/web/server/tomcat/TomcatContextCustomizer.java
diff --git a/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/web/server/tomcat/TomcatEmbeddedContext.java b/spring-boot-project/spring-boot-all/src/main/java/org/springframework/boot/web/server/tomcat/TomcatEmbeddedContext.java
similarity index 100%
rename from spring-boot-project/spring-boot/src/main/java/org/springframework/boot/web/server/tomcat/TomcatEmbeddedContext.java
rename to spring-boot-project/spring-boot-all/src/main/java/org/springframework/boot/web/server/tomcat/TomcatEmbeddedContext.java
diff --git a/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/web/server/tomcat/TomcatEmbeddedWebappClassLoader.java b/spring-boot-project/spring-boot-all/src/main/java/org/springframework/boot/web/server/tomcat/TomcatEmbeddedWebappClassLoader.java
similarity index 100%
rename from spring-boot-project/spring-boot/src/main/java/org/springframework/boot/web/server/tomcat/TomcatEmbeddedWebappClassLoader.java
rename to spring-boot-project/spring-boot-all/src/main/java/org/springframework/boot/web/server/tomcat/TomcatEmbeddedWebappClassLoader.java
diff --git a/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/web/server/tomcat/TomcatProtocolHandlerCustomizer.java b/spring-boot-project/spring-boot-all/src/main/java/org/springframework/boot/web/server/tomcat/TomcatProtocolHandlerCustomizer.java
similarity index 100%
rename from spring-boot-project/spring-boot/src/main/java/org/springframework/boot/web/server/tomcat/TomcatProtocolHandlerCustomizer.java
rename to spring-boot-project/spring-boot-all/src/main/java/org/springframework/boot/web/server/tomcat/TomcatProtocolHandlerCustomizer.java
diff --git a/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/web/server/tomcat/TomcatStarter.java b/spring-boot-project/spring-boot-all/src/main/java/org/springframework/boot/web/server/tomcat/TomcatStarter.java
similarity index 100%
rename from spring-boot-project/spring-boot/src/main/java/org/springframework/boot/web/server/tomcat/TomcatStarter.java
rename to spring-boot-project/spring-boot-all/src/main/java/org/springframework/boot/web/server/tomcat/TomcatStarter.java
diff --git a/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/web/server/tomcat/TomcatWebServer.java b/spring-boot-project/spring-boot-all/src/main/java/org/springframework/boot/web/server/tomcat/TomcatWebServer.java
similarity index 100%
rename from spring-boot-project/spring-boot/src/main/java/org/springframework/boot/web/server/tomcat/TomcatWebServer.java
rename to spring-boot-project/spring-boot-all/src/main/java/org/springframework/boot/web/server/tomcat/TomcatWebServer.java
diff --git a/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/web/server/tomcat/TomcatWebServerFactory.java b/spring-boot-project/spring-boot-all/src/main/java/org/springframework/boot/web/server/tomcat/TomcatWebServerFactory.java
similarity index 100%
rename from spring-boot-project/spring-boot/src/main/java/org/springframework/boot/web/server/tomcat/TomcatWebServerFactory.java
rename to spring-boot-project/spring-boot-all/src/main/java/org/springframework/boot/web/server/tomcat/TomcatWebServerFactory.java
diff --git a/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/web/server/tomcat/package-info.java b/spring-boot-project/spring-boot-all/src/main/java/org/springframework/boot/web/server/tomcat/package-info.java
similarity index 100%
rename from spring-boot-project/spring-boot/src/main/java/org/springframework/boot/web/server/tomcat/package-info.java
rename to spring-boot-project/spring-boot-all/src/main/java/org/springframework/boot/web/server/tomcat/package-info.java
diff --git a/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/web/server/undertow/AccessLogHttpHandlerFactory.java b/spring-boot-project/spring-boot-all/src/main/java/org/springframework/boot/web/server/undertow/AccessLogHttpHandlerFactory.java
similarity index 100%
rename from spring-boot-project/spring-boot/src/main/java/org/springframework/boot/web/server/undertow/AccessLogHttpHandlerFactory.java
rename to spring-boot-project/spring-boot-all/src/main/java/org/springframework/boot/web/server/undertow/AccessLogHttpHandlerFactory.java
diff --git a/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/web/server/undertow/CompressionHttpHandlerFactory.java b/spring-boot-project/spring-boot-all/src/main/java/org/springframework/boot/web/server/undertow/CompressionHttpHandlerFactory.java
similarity index 100%
rename from spring-boot-project/spring-boot/src/main/java/org/springframework/boot/web/server/undertow/CompressionHttpHandlerFactory.java
rename to spring-boot-project/spring-boot-all/src/main/java/org/springframework/boot/web/server/undertow/CompressionHttpHandlerFactory.java
diff --git a/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/web/server/undertow/ConfigurableUndertowWebServerFactory.java b/spring-boot-project/spring-boot-all/src/main/java/org/springframework/boot/web/server/undertow/ConfigurableUndertowWebServerFactory.java
similarity index 100%
rename from spring-boot-project/spring-boot/src/main/java/org/springframework/boot/web/server/undertow/ConfigurableUndertowWebServerFactory.java
rename to spring-boot-project/spring-boot-all/src/main/java/org/springframework/boot/web/server/undertow/ConfigurableUndertowWebServerFactory.java
diff --git a/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/web/server/undertow/HttpHandlerFactory.java b/spring-boot-project/spring-boot-all/src/main/java/org/springframework/boot/web/server/undertow/HttpHandlerFactory.java
similarity index 100%
rename from spring-boot-project/spring-boot/src/main/java/org/springframework/boot/web/server/undertow/HttpHandlerFactory.java
rename to spring-boot-project/spring-boot-all/src/main/java/org/springframework/boot/web/server/undertow/HttpHandlerFactory.java
diff --git a/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/web/server/undertow/SslBuilderCustomizer.java b/spring-boot-project/spring-boot-all/src/main/java/org/springframework/boot/web/server/undertow/SslBuilderCustomizer.java
similarity index 100%
rename from spring-boot-project/spring-boot/src/main/java/org/springframework/boot/web/server/undertow/SslBuilderCustomizer.java
rename to spring-boot-project/spring-boot-all/src/main/java/org/springframework/boot/web/server/undertow/SslBuilderCustomizer.java
diff --git a/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/web/server/undertow/UndertowBuilderCustomizer.java b/spring-boot-project/spring-boot-all/src/main/java/org/springframework/boot/web/server/undertow/UndertowBuilderCustomizer.java
similarity index 100%
rename from spring-boot-project/spring-boot/src/main/java/org/springframework/boot/web/server/undertow/UndertowBuilderCustomizer.java
rename to spring-boot-project/spring-boot-all/src/main/java/org/springframework/boot/web/server/undertow/UndertowBuilderCustomizer.java
diff --git a/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/web/server/undertow/UndertowWebServer.java b/spring-boot-project/spring-boot-all/src/main/java/org/springframework/boot/web/server/undertow/UndertowWebServer.java
similarity index 100%
rename from spring-boot-project/spring-boot/src/main/java/org/springframework/boot/web/server/undertow/UndertowWebServer.java
rename to spring-boot-project/spring-boot-all/src/main/java/org/springframework/boot/web/server/undertow/UndertowWebServer.java
diff --git a/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/web/server/undertow/UndertowWebServerFactory.java b/spring-boot-project/spring-boot-all/src/main/java/org/springframework/boot/web/server/undertow/UndertowWebServerFactory.java
similarity index 100%
rename from spring-boot-project/spring-boot/src/main/java/org/springframework/boot/web/server/undertow/UndertowWebServerFactory.java
rename to spring-boot-project/spring-boot-all/src/main/java/org/springframework/boot/web/server/undertow/UndertowWebServerFactory.java
diff --git a/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/web/server/undertow/package-info.java b/spring-boot-project/spring-boot-all/src/main/java/org/springframework/boot/web/server/undertow/package-info.java
similarity index 100%
rename from spring-boot-project/spring-boot/src/main/java/org/springframework/boot/web/server/undertow/package-info.java
rename to spring-boot-project/spring-boot-all/src/main/java/org/springframework/boot/web/server/undertow/package-info.java
diff --git a/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/web/servlet/view/MustacheView.java b/spring-boot-project/spring-boot-all/src/main/java/org/springframework/boot/web/servlet/view/MustacheView.java
similarity index 100%
rename from spring-boot-project/spring-boot/src/main/java/org/springframework/boot/web/servlet/view/MustacheView.java
rename to spring-boot-project/spring-boot-all/src/main/java/org/springframework/boot/web/servlet/view/MustacheView.java
diff --git a/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/web/servlet/view/MustacheViewResolver.java b/spring-boot-project/spring-boot-all/src/main/java/org/springframework/boot/web/servlet/view/MustacheViewResolver.java
similarity index 100%
rename from spring-boot-project/spring-boot/src/main/java/org/springframework/boot/web/servlet/view/MustacheViewResolver.java
rename to spring-boot-project/spring-boot-all/src/main/java/org/springframework/boot/web/servlet/view/MustacheViewResolver.java
diff --git a/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/web/servlet/view/package-info.java b/spring-boot-project/spring-boot-all/src/main/java/org/springframework/boot/web/servlet/view/package-info.java
similarity index 100%
rename from spring-boot-project/spring-boot/src/main/java/org/springframework/boot/web/servlet/view/package-info.java
rename to spring-boot-project/spring-boot-all/src/main/java/org/springframework/boot/web/servlet/view/package-info.java
diff --git a/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/webservices/client/HttpWebServiceMessageSenderBuilder.java b/spring-boot-project/spring-boot-all/src/main/java/org/springframework/boot/webservices/client/HttpWebServiceMessageSenderBuilder.java
similarity index 100%
rename from spring-boot-project/spring-boot/src/main/java/org/springframework/boot/webservices/client/HttpWebServiceMessageSenderBuilder.java
rename to spring-boot-project/spring-boot-all/src/main/java/org/springframework/boot/webservices/client/HttpWebServiceMessageSenderBuilder.java
diff --git a/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/webservices/client/WebServiceMessageSenderFactory.java b/spring-boot-project/spring-boot-all/src/main/java/org/springframework/boot/webservices/client/WebServiceMessageSenderFactory.java
similarity index 100%
rename from spring-boot-project/spring-boot/src/main/java/org/springframework/boot/webservices/client/WebServiceMessageSenderFactory.java
rename to spring-boot-project/spring-boot-all/src/main/java/org/springframework/boot/webservices/client/WebServiceMessageSenderFactory.java
diff --git a/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/webservices/client/WebServiceTemplateBuilder.java b/spring-boot-project/spring-boot-all/src/main/java/org/springframework/boot/webservices/client/WebServiceTemplateBuilder.java
similarity index 100%
rename from spring-boot-project/spring-boot/src/main/java/org/springframework/boot/webservices/client/WebServiceTemplateBuilder.java
rename to spring-boot-project/spring-boot-all/src/main/java/org/springframework/boot/webservices/client/WebServiceTemplateBuilder.java
diff --git a/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/webservices/client/WebServiceTemplateCustomizer.java b/spring-boot-project/spring-boot-all/src/main/java/org/springframework/boot/webservices/client/WebServiceTemplateCustomizer.java
similarity index 100%
rename from spring-boot-project/spring-boot/src/main/java/org/springframework/boot/webservices/client/WebServiceTemplateCustomizer.java
rename to spring-boot-project/spring-boot-all/src/main/java/org/springframework/boot/webservices/client/WebServiceTemplateCustomizer.java
diff --git a/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/webservices/client/package-info.java b/spring-boot-project/spring-boot-all/src/main/java/org/springframework/boot/webservices/client/package-info.java
similarity index 100%
rename from spring-boot-project/spring-boot/src/main/java/org/springframework/boot/webservices/client/package-info.java
rename to spring-boot-project/spring-boot-all/src/main/java/org/springframework/boot/webservices/client/package-info.java
diff --git a/spring-boot-project/spring-boot-all/src/main/resources/META-INF/spring.factories b/spring-boot-project/spring-boot-all/src/main/resources/META-INF/spring.factories
new file mode 100644
index 00000000000..3f534dcaa8a
--- /dev/null
+++ b/spring-boot-project/spring-boot-all/src/main/resources/META-INF/spring.factories
@@ -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.jdbc.SpringJdbcDependsOnDatabaseInitializationDetector,\
+org.springframework.boot.jooq.JooqDependsOnDatabaseInitializationDetector,\
+org.springframework.boot.orm.jpa.JpaDependsOnDatabaseInitializationDetector,\
+org.springframework.boot.sql.init.dependency.AnnotationDependsOnDatabaseInitializationDetector
diff --git a/spring-boot-project/spring-boot-all/src/main/resources/META-INF/spring/aot.factories b/spring-boot-project/spring-boot-all/src/main/resources/META-INF/spring/aot.factories
new file mode 100644
index 00000000000..cbdce6b6d95
--- /dev/null
+++ b/spring-boot-project/spring-boot-all/src/main/resources/META-INF/spring/aot.factories
@@ -0,0 +1,10 @@
+org.springframework.aot.hint.RuntimeHintsRegistrar=\
+org.springframework.boot.http.client.ClientHttpRequestFactoryRuntimeHints,\
+org.springframework.boot.jdbc.DataSourceBuilderRuntimeHints,\
+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
diff --git a/spring-boot-project/spring-boot/src/test/java/org/springframework/boot/http/client/AbstractClientHttpRequestFactoryBuilderTests.java b/spring-boot-project/spring-boot-all/src/test/java/org/springframework/boot/http/client/AbstractClientHttpRequestFactoryBuilderTests.java
similarity index 100%
rename from spring-boot-project/spring-boot/src/test/java/org/springframework/boot/http/client/AbstractClientHttpRequestFactoryBuilderTests.java
rename to spring-boot-project/spring-boot-all/src/test/java/org/springframework/boot/http/client/AbstractClientHttpRequestFactoryBuilderTests.java
diff --git a/spring-boot-project/spring-boot/src/test/java/org/springframework/boot/http/client/ClientHttpRequestFactoryBuilderTests.java b/spring-boot-project/spring-boot-all/src/test/java/org/springframework/boot/http/client/ClientHttpRequestFactoryBuilderTests.java
similarity index 100%
rename from spring-boot-project/spring-boot/src/test/java/org/springframework/boot/http/client/ClientHttpRequestFactoryBuilderTests.java
rename to spring-boot-project/spring-boot-all/src/test/java/org/springframework/boot/http/client/ClientHttpRequestFactoryBuilderTests.java
diff --git a/spring-boot-project/spring-boot/src/test/java/org/springframework/boot/http/client/ClientHttpRequestFactoryRuntimeHintsTests.java b/spring-boot-project/spring-boot-all/src/test/java/org/springframework/boot/http/client/ClientHttpRequestFactoryRuntimeHintsTests.java
similarity index 100%
rename from spring-boot-project/spring-boot/src/test/java/org/springframework/boot/http/client/ClientHttpRequestFactoryRuntimeHintsTests.java
rename to spring-boot-project/spring-boot-all/src/test/java/org/springframework/boot/http/client/ClientHttpRequestFactoryRuntimeHintsTests.java
diff --git a/spring-boot-project/spring-boot/src/test/java/org/springframework/boot/http/client/ClientHttpRequestFactorySettingsTests.java b/spring-boot-project/spring-boot-all/src/test/java/org/springframework/boot/http/client/ClientHttpRequestFactorySettingsTests.java
similarity index 100%
rename from spring-boot-project/spring-boot/src/test/java/org/springframework/boot/http/client/ClientHttpRequestFactorySettingsTests.java
rename to spring-boot-project/spring-boot-all/src/test/java/org/springframework/boot/http/client/ClientHttpRequestFactorySettingsTests.java
diff --git a/spring-boot-project/spring-boot/src/test/java/org/springframework/boot/http/client/HttpComponentsClientHttpRequestFactoryBuilderTests.java b/spring-boot-project/spring-boot-all/src/test/java/org/springframework/boot/http/client/HttpComponentsClientHttpRequestFactoryBuilderTests.java
similarity index 100%
rename from spring-boot-project/spring-boot/src/test/java/org/springframework/boot/http/client/HttpComponentsClientHttpRequestFactoryBuilderTests.java
rename to spring-boot-project/spring-boot-all/src/test/java/org/springframework/boot/http/client/HttpComponentsClientHttpRequestFactoryBuilderTests.java
diff --git a/spring-boot-project/spring-boot/src/test/java/org/springframework/boot/http/client/JdkClientHttpRequestFactoryBuilderTests.java b/spring-boot-project/spring-boot-all/src/test/java/org/springframework/boot/http/client/JdkClientHttpRequestFactoryBuilderTests.java
similarity index 100%
rename from spring-boot-project/spring-boot/src/test/java/org/springframework/boot/http/client/JdkClientHttpRequestFactoryBuilderTests.java
rename to spring-boot-project/spring-boot-all/src/test/java/org/springframework/boot/http/client/JdkClientHttpRequestFactoryBuilderTests.java
diff --git a/spring-boot-project/spring-boot/src/test/java/org/springframework/boot/http/client/JettyClientHttpRequestFactoryBuilderTests.java b/spring-boot-project/spring-boot-all/src/test/java/org/springframework/boot/http/client/JettyClientHttpRequestFactoryBuilderTests.java
similarity index 100%
rename from spring-boot-project/spring-boot/src/test/java/org/springframework/boot/http/client/JettyClientHttpRequestFactoryBuilderTests.java
rename to spring-boot-project/spring-boot-all/src/test/java/org/springframework/boot/http/client/JettyClientHttpRequestFactoryBuilderTests.java
diff --git a/spring-boot-project/spring-boot/src/test/java/org/springframework/boot/http/client/ReactorClientHttpRequestFactoryBuilderTests.java b/spring-boot-project/spring-boot-all/src/test/java/org/springframework/boot/http/client/ReactorClientHttpRequestFactoryBuilderTests.java
similarity index 100%
rename from spring-boot-project/spring-boot/src/test/java/org/springframework/boot/http/client/ReactorClientHttpRequestFactoryBuilderTests.java
rename to spring-boot-project/spring-boot-all/src/test/java/org/springframework/boot/http/client/ReactorClientHttpRequestFactoryBuilderTests.java
diff --git a/spring-boot-project/spring-boot/src/test/java/org/springframework/boot/http/client/ReflectiveComponentsClientHttpRequestFactoryBuilderTests.java b/spring-boot-project/spring-boot-all/src/test/java/org/springframework/boot/http/client/ReflectiveComponentsClientHttpRequestFactoryBuilderTests.java
similarity index 100%
rename from spring-boot-project/spring-boot/src/test/java/org/springframework/boot/http/client/ReflectiveComponentsClientHttpRequestFactoryBuilderTests.java
rename to spring-boot-project/spring-boot-all/src/test/java/org/springframework/boot/http/client/ReflectiveComponentsClientHttpRequestFactoryBuilderTests.java
diff --git a/spring-boot-project/spring-boot/src/test/java/org/springframework/boot/http/client/SimpleClientHttpRequestFactoryBuilderTests.java b/spring-boot-project/spring-boot-all/src/test/java/org/springframework/boot/http/client/SimpleClientHttpRequestFactoryBuilderTests.java
similarity index 100%
rename from spring-boot-project/spring-boot/src/test/java/org/springframework/boot/http/client/SimpleClientHttpRequestFactoryBuilderTests.java
rename to spring-boot-project/spring-boot-all/src/test/java/org/springframework/boot/http/client/SimpleClientHttpRequestFactoryBuilderTests.java
diff --git a/spring-boot-project/spring-boot/src/test/java/org/springframework/boot/http/client/TestCustomizer.java b/spring-boot-project/spring-boot-all/src/test/java/org/springframework/boot/http/client/TestCustomizer.java
similarity index 100%
rename from spring-boot-project/spring-boot/src/test/java/org/springframework/boot/http/client/TestCustomizer.java
rename to spring-boot-project/spring-boot-all/src/test/java/org/springframework/boot/http/client/TestCustomizer.java
diff --git a/spring-boot-project/spring-boot/src/test/java/org/springframework/boot/http/client/reactive/AbstractClientHttpConnectorBuilderTests.java b/spring-boot-project/spring-boot-all/src/test/java/org/springframework/boot/http/client/reactive/AbstractClientHttpConnectorBuilderTests.java
similarity index 100%
rename from spring-boot-project/spring-boot/src/test/java/org/springframework/boot/http/client/reactive/AbstractClientHttpConnectorBuilderTests.java
rename to spring-boot-project/spring-boot-all/src/test/java/org/springframework/boot/http/client/reactive/AbstractClientHttpConnectorBuilderTests.java
diff --git a/spring-boot-project/spring-boot/src/test/java/org/springframework/boot/http/client/reactive/ClientHttpConnectorBuilderTests.java b/spring-boot-project/spring-boot-all/src/test/java/org/springframework/boot/http/client/reactive/ClientHttpConnectorBuilderTests.java
similarity index 100%
rename from spring-boot-project/spring-boot/src/test/java/org/springframework/boot/http/client/reactive/ClientHttpConnectorBuilderTests.java
rename to spring-boot-project/spring-boot-all/src/test/java/org/springframework/boot/http/client/reactive/ClientHttpConnectorBuilderTests.java
diff --git a/spring-boot-project/spring-boot/src/test/java/org/springframework/boot/http/client/reactive/HttpComponentsClientHttpConnectorBuilderTests.java b/spring-boot-project/spring-boot-all/src/test/java/org/springframework/boot/http/client/reactive/HttpComponentsClientHttpConnectorBuilderTests.java
similarity index 100%
rename from spring-boot-project/spring-boot/src/test/java/org/springframework/boot/http/client/reactive/HttpComponentsClientHttpConnectorBuilderTests.java
rename to spring-boot-project/spring-boot-all/src/test/java/org/springframework/boot/http/client/reactive/HttpComponentsClientHttpConnectorBuilderTests.java
diff --git a/spring-boot-project/spring-boot/src/test/java/org/springframework/boot/http/client/reactive/JdkClientHttpConnectorBuilderTests.java b/spring-boot-project/spring-boot-all/src/test/java/org/springframework/boot/http/client/reactive/JdkClientHttpConnectorBuilderTests.java
similarity index 100%
rename from spring-boot-project/spring-boot/src/test/java/org/springframework/boot/http/client/reactive/JdkClientHttpConnectorBuilderTests.java
rename to spring-boot-project/spring-boot-all/src/test/java/org/springframework/boot/http/client/reactive/JdkClientHttpConnectorBuilderTests.java
diff --git a/spring-boot-project/spring-boot/src/test/java/org/springframework/boot/http/client/reactive/JettyClientHttpConnectorBuilderTests.java b/spring-boot-project/spring-boot-all/src/test/java/org/springframework/boot/http/client/reactive/JettyClientHttpConnectorBuilderTests.java
similarity index 100%
rename from spring-boot-project/spring-boot/src/test/java/org/springframework/boot/http/client/reactive/JettyClientHttpConnectorBuilderTests.java
rename to spring-boot-project/spring-boot-all/src/test/java/org/springframework/boot/http/client/reactive/JettyClientHttpConnectorBuilderTests.java
diff --git a/spring-boot-project/spring-boot/src/test/java/org/springframework/boot/http/client/reactive/ReactorClientHttpConnectorBuilderTests.java b/spring-boot-project/spring-boot-all/src/test/java/org/springframework/boot/http/client/reactive/ReactorClientHttpConnectorBuilderTests.java
similarity index 100%
rename from spring-boot-project/spring-boot/src/test/java/org/springframework/boot/http/client/reactive/ReactorClientHttpConnectorBuilderTests.java
rename to spring-boot-project/spring-boot-all/src/test/java/org/springframework/boot/http/client/reactive/ReactorClientHttpConnectorBuilderTests.java
diff --git a/spring-boot-project/spring-boot/src/test/java/org/springframework/boot/http/client/reactive/TestCustomizer.java b/spring-boot-project/spring-boot-all/src/test/java/org/springframework/boot/http/client/reactive/TestCustomizer.java
similarity index 100%
rename from spring-boot-project/spring-boot/src/test/java/org/springframework/boot/http/client/reactive/TestCustomizer.java
rename to spring-boot-project/spring-boot-all/src/test/java/org/springframework/boot/http/client/reactive/TestCustomizer.java
diff --git a/spring-boot-project/spring-boot/src/test/java/org/springframework/boot/jackson/JsonComponentModuleTests.java b/spring-boot-project/spring-boot-all/src/test/java/org/springframework/boot/jackson/JsonComponentModuleTests.java
similarity index 100%
rename from spring-boot-project/spring-boot/src/test/java/org/springframework/boot/jackson/JsonComponentModuleTests.java
rename to spring-boot-project/spring-boot-all/src/test/java/org/springframework/boot/jackson/JsonComponentModuleTests.java
diff --git a/spring-boot-project/spring-boot/src/test/java/org/springframework/boot/jackson/JsonMixinModuleEntriesBeanRegistrationAotProcessorTests.java b/spring-boot-project/spring-boot-all/src/test/java/org/springframework/boot/jackson/JsonMixinModuleEntriesBeanRegistrationAotProcessorTests.java
similarity index 100%
rename from spring-boot-project/spring-boot/src/test/java/org/springframework/boot/jackson/JsonMixinModuleEntriesBeanRegistrationAotProcessorTests.java
rename to spring-boot-project/spring-boot-all/src/test/java/org/springframework/boot/jackson/JsonMixinModuleEntriesBeanRegistrationAotProcessorTests.java
diff --git a/spring-boot-project/spring-boot/src/test/java/org/springframework/boot/jackson/JsonMixinModuleTests.java b/spring-boot-project/spring-boot-all/src/test/java/org/springframework/boot/jackson/JsonMixinModuleTests.java
similarity index 100%
rename from spring-boot-project/spring-boot/src/test/java/org/springframework/boot/jackson/JsonMixinModuleTests.java
rename to spring-boot-project/spring-boot-all/src/test/java/org/springframework/boot/jackson/JsonMixinModuleTests.java
diff --git a/spring-boot-project/spring-boot/src/test/java/org/springframework/boot/jackson/JsonObjectDeserializerTests.java b/spring-boot-project/spring-boot-all/src/test/java/org/springframework/boot/jackson/JsonObjectDeserializerTests.java
similarity index 100%
rename from spring-boot-project/spring-boot/src/test/java/org/springframework/boot/jackson/JsonObjectDeserializerTests.java
rename to spring-boot-project/spring-boot-all/src/test/java/org/springframework/boot/jackson/JsonObjectDeserializerTests.java
diff --git a/spring-boot-project/spring-boot/src/test/java/org/springframework/boot/jackson/JsonObjectSerializerTests.java b/spring-boot-project/spring-boot-all/src/test/java/org/springframework/boot/jackson/JsonObjectSerializerTests.java
similarity index 100%
rename from spring-boot-project/spring-boot/src/test/java/org/springframework/boot/jackson/JsonObjectSerializerTests.java
rename to spring-boot-project/spring-boot-all/src/test/java/org/springframework/boot/jackson/JsonObjectSerializerTests.java
diff --git a/spring-boot-project/spring-boot/src/test/java/org/springframework/boot/jackson/NameAndAgeJsonComponent.java b/spring-boot-project/spring-boot-all/src/test/java/org/springframework/boot/jackson/NameAndAgeJsonComponent.java
similarity index 100%
rename from spring-boot-project/spring-boot/src/test/java/org/springframework/boot/jackson/NameAndAgeJsonComponent.java
rename to spring-boot-project/spring-boot-all/src/test/java/org/springframework/boot/jackson/NameAndAgeJsonComponent.java
diff --git a/spring-boot-project/spring-boot/src/test/java/org/springframework/boot/jackson/NameAndAgeJsonKeyComponent.java b/spring-boot-project/spring-boot-all/src/test/java/org/springframework/boot/jackson/NameAndAgeJsonKeyComponent.java
similarity index 100%
rename from spring-boot-project/spring-boot/src/test/java/org/springframework/boot/jackson/NameAndAgeJsonKeyComponent.java
rename to spring-boot-project/spring-boot-all/src/test/java/org/springframework/boot/jackson/NameAndAgeJsonKeyComponent.java
diff --git a/spring-boot-project/spring-boot/src/test/java/org/springframework/boot/jackson/NameAndCareerJsonComponent.java b/spring-boot-project/spring-boot-all/src/test/java/org/springframework/boot/jackson/NameAndCareerJsonComponent.java
similarity index 100%
rename from spring-boot-project/spring-boot/src/test/java/org/springframework/boot/jackson/NameAndCareerJsonComponent.java
rename to spring-boot-project/spring-boot-all/src/test/java/org/springframework/boot/jackson/NameAndCareerJsonComponent.java
diff --git a/spring-boot-project/spring-boot/src/test/java/org/springframework/boot/jackson/scan/a/RenameMixInClass.java b/spring-boot-project/spring-boot-all/src/test/java/org/springframework/boot/jackson/scan/a/RenameMixInClass.java
similarity index 100%
rename from spring-boot-project/spring-boot/src/test/java/org/springframework/boot/jackson/scan/a/RenameMixInClass.java
rename to spring-boot-project/spring-boot-all/src/test/java/org/springframework/boot/jackson/scan/a/RenameMixInClass.java
diff --git a/spring-boot-project/spring-boot/src/test/java/org/springframework/boot/jackson/scan/b/RenameMixInAbstractClass.java b/spring-boot-project/spring-boot-all/src/test/java/org/springframework/boot/jackson/scan/b/RenameMixInAbstractClass.java
similarity index 100%
rename from spring-boot-project/spring-boot/src/test/java/org/springframework/boot/jackson/scan/b/RenameMixInAbstractClass.java
rename to spring-boot-project/spring-boot-all/src/test/java/org/springframework/boot/jackson/scan/b/RenameMixInAbstractClass.java
diff --git a/spring-boot-project/spring-boot/src/test/java/org/springframework/boot/jackson/scan/c/RenameMixInInterface.java b/spring-boot-project/spring-boot-all/src/test/java/org/springframework/boot/jackson/scan/c/RenameMixInInterface.java
similarity index 100%
rename from spring-boot-project/spring-boot/src/test/java/org/springframework/boot/jackson/scan/c/RenameMixInInterface.java
rename to spring-boot-project/spring-boot-all/src/test/java/org/springframework/boot/jackson/scan/c/RenameMixInInterface.java
diff --git a/spring-boot-project/spring-boot/src/test/java/org/springframework/boot/jackson/scan/d/EmptyMixInClass.java b/spring-boot-project/spring-boot-all/src/test/java/org/springframework/boot/jackson/scan/d/EmptyMixInClass.java
similarity index 100%
rename from spring-boot-project/spring-boot/src/test/java/org/springframework/boot/jackson/scan/d/EmptyMixInClass.java
rename to spring-boot-project/spring-boot-all/src/test/java/org/springframework/boot/jackson/scan/d/EmptyMixInClass.java
diff --git a/spring-boot-project/spring-boot/src/test/java/org/springframework/boot/jackson/scan/e/PrivateMixInClass.java b/spring-boot-project/spring-boot-all/src/test/java/org/springframework/boot/jackson/scan/e/PrivateMixInClass.java
similarity index 100%
rename from spring-boot-project/spring-boot/src/test/java/org/springframework/boot/jackson/scan/e/PrivateMixInClass.java
rename to spring-boot-project/spring-boot-all/src/test/java/org/springframework/boot/jackson/scan/e/PrivateMixInClass.java
diff --git a/spring-boot-project/spring-boot/src/test/java/org/springframework/boot/jackson/scan/f/EmptyMixIn.java b/spring-boot-project/spring-boot-all/src/test/java/org/springframework/boot/jackson/scan/f/EmptyMixIn.java
similarity index 100%
rename from spring-boot-project/spring-boot/src/test/java/org/springframework/boot/jackson/scan/f/EmptyMixIn.java
rename to spring-boot-project/spring-boot-all/src/test/java/org/springframework/boot/jackson/scan/f/EmptyMixIn.java
diff --git a/spring-boot-project/spring-boot/src/test/java/org/springframework/boot/jackson/types/Name.java b/spring-boot-project/spring-boot-all/src/test/java/org/springframework/boot/jackson/types/Name.java
similarity index 100%
rename from spring-boot-project/spring-boot/src/test/java/org/springframework/boot/jackson/types/Name.java
rename to spring-boot-project/spring-boot-all/src/test/java/org/springframework/boot/jackson/types/Name.java
diff --git a/spring-boot-project/spring-boot/src/test/java/org/springframework/boot/jackson/types/NameAndAge.java b/spring-boot-project/spring-boot-all/src/test/java/org/springframework/boot/jackson/types/NameAndAge.java
similarity index 100%
rename from spring-boot-project/spring-boot/src/test/java/org/springframework/boot/jackson/types/NameAndAge.java
rename to spring-boot-project/spring-boot-all/src/test/java/org/springframework/boot/jackson/types/NameAndAge.java
diff --git a/spring-boot-project/spring-boot/src/test/java/org/springframework/boot/jackson/types/NameAndCareer.java b/spring-boot-project/spring-boot-all/src/test/java/org/springframework/boot/jackson/types/NameAndCareer.java
similarity index 100%
rename from spring-boot-project/spring-boot/src/test/java/org/springframework/boot/jackson/types/NameAndCareer.java
rename to spring-boot-project/spring-boot-all/src/test/java/org/springframework/boot/jackson/types/NameAndCareer.java
diff --git a/spring-boot-project/spring-boot/src/test/java/org/springframework/boot/jdbc/DataSourceBuilderNoHikariTests.java b/spring-boot-project/spring-boot-all/src/test/java/org/springframework/boot/jdbc/DataSourceBuilderNoHikariTests.java
similarity index 100%
rename from spring-boot-project/spring-boot/src/test/java/org/springframework/boot/jdbc/DataSourceBuilderNoHikariTests.java
rename to spring-boot-project/spring-boot-all/src/test/java/org/springframework/boot/jdbc/DataSourceBuilderNoHikariTests.java
diff --git a/spring-boot-project/spring-boot/src/test/java/org/springframework/boot/jdbc/DataSourceBuilderRuntimeHintsTests.java b/spring-boot-project/spring-boot-all/src/test/java/org/springframework/boot/jdbc/DataSourceBuilderRuntimeHintsTests.java
similarity index 100%
rename from spring-boot-project/spring-boot/src/test/java/org/springframework/boot/jdbc/DataSourceBuilderRuntimeHintsTests.java
rename to spring-boot-project/spring-boot-all/src/test/java/org/springframework/boot/jdbc/DataSourceBuilderRuntimeHintsTests.java
diff --git a/spring-boot-project/spring-boot/src/test/java/org/springframework/boot/jdbc/DataSourceBuilderTests.java b/spring-boot-project/spring-boot-all/src/test/java/org/springframework/boot/jdbc/DataSourceBuilderTests.java
similarity index 100%
rename from spring-boot-project/spring-boot/src/test/java/org/springframework/boot/jdbc/DataSourceBuilderTests.java
rename to spring-boot-project/spring-boot-all/src/test/java/org/springframework/boot/jdbc/DataSourceBuilderTests.java
diff --git a/spring-boot-project/spring-boot/src/test/java/org/springframework/boot/jdbc/DataSourceUnwrapperNoSpringJdbcTests.java b/spring-boot-project/spring-boot-all/src/test/java/org/springframework/boot/jdbc/DataSourceUnwrapperNoSpringJdbcTests.java
similarity index 100%
rename from spring-boot-project/spring-boot/src/test/java/org/springframework/boot/jdbc/DataSourceUnwrapperNoSpringJdbcTests.java
rename to spring-boot-project/spring-boot-all/src/test/java/org/springframework/boot/jdbc/DataSourceUnwrapperNoSpringJdbcTests.java
diff --git a/spring-boot-project/spring-boot/src/test/java/org/springframework/boot/jdbc/DataSourceUnwrapperTests.java b/spring-boot-project/spring-boot-all/src/test/java/org/springframework/boot/jdbc/DataSourceUnwrapperTests.java
similarity index 100%
rename from spring-boot-project/spring-boot/src/test/java/org/springframework/boot/jdbc/DataSourceUnwrapperTests.java
rename to spring-boot-project/spring-boot-all/src/test/java/org/springframework/boot/jdbc/DataSourceUnwrapperTests.java
diff --git a/spring-boot-project/spring-boot/src/test/java/org/springframework/boot/jdbc/DatabaseDriverClassNameTests.java b/spring-boot-project/spring-boot-all/src/test/java/org/springframework/boot/jdbc/DatabaseDriverClassNameTests.java
similarity index 100%
rename from spring-boot-project/spring-boot/src/test/java/org/springframework/boot/jdbc/DatabaseDriverClassNameTests.java
rename to spring-boot-project/spring-boot-all/src/test/java/org/springframework/boot/jdbc/DatabaseDriverClassNameTests.java
diff --git a/spring-boot-project/spring-boot/src/test/java/org/springframework/boot/jdbc/DatabaseDriverTests.java b/spring-boot-project/spring-boot-all/src/test/java/org/springframework/boot/jdbc/DatabaseDriverTests.java
similarity index 100%
rename from spring-boot-project/spring-boot/src/test/java/org/springframework/boot/jdbc/DatabaseDriverTests.java
rename to spring-boot-project/spring-boot-all/src/test/java/org/springframework/boot/jdbc/DatabaseDriverTests.java
diff --git a/spring-boot-project/spring-boot/src/test/java/org/springframework/boot/jdbc/EmbeddedDatabaseConnectionTests.java b/spring-boot-project/spring-boot-all/src/test/java/org/springframework/boot/jdbc/EmbeddedDatabaseConnectionTests.java
similarity index 100%
rename from spring-boot-project/spring-boot/src/test/java/org/springframework/boot/jdbc/EmbeddedDatabaseConnectionTests.java
rename to spring-boot-project/spring-boot-all/src/test/java/org/springframework/boot/jdbc/EmbeddedDatabaseConnectionTests.java
diff --git a/spring-boot-project/spring-boot/src/test/java/org/springframework/boot/jdbc/HikariCheckpointRestoreLifecycleTests.java b/spring-boot-project/spring-boot-all/src/test/java/org/springframework/boot/jdbc/HikariCheckpointRestoreLifecycleTests.java
similarity index 100%
rename from spring-boot-project/spring-boot/src/test/java/org/springframework/boot/jdbc/HikariCheckpointRestoreLifecycleTests.java
rename to spring-boot-project/spring-boot-all/src/test/java/org/springframework/boot/jdbc/HikariCheckpointRestoreLifecycleTests.java
diff --git a/spring-boot-project/spring-boot/src/test/java/org/springframework/boot/jdbc/init/DataSourceScriptDatabaseInitializerTests.java b/spring-boot-project/spring-boot-all/src/test/java/org/springframework/boot/jdbc/init/DataSourceScriptDatabaseInitializerTests.java
similarity index 100%
rename from spring-boot-project/spring-boot/src/test/java/org/springframework/boot/jdbc/init/DataSourceScriptDatabaseInitializerTests.java
rename to spring-boot-project/spring-boot-all/src/test/java/org/springframework/boot/jdbc/init/DataSourceScriptDatabaseInitializerTests.java
diff --git a/spring-boot-project/spring-boot/src/test/java/org/springframework/boot/jdbc/init/PlatformPlaceholderDatabaseDriverResolverTests.java b/spring-boot-project/spring-boot-all/src/test/java/org/springframework/boot/jdbc/init/PlatformPlaceholderDatabaseDriverResolverTests.java
similarity index 100%
rename from spring-boot-project/spring-boot/src/test/java/org/springframework/boot/jdbc/init/PlatformPlaceholderDatabaseDriverResolverTests.java
rename to spring-boot-project/spring-boot-all/src/test/java/org/springframework/boot/jdbc/init/PlatformPlaceholderDatabaseDriverResolverTests.java
diff --git a/spring-boot-project/spring-boot/src/test/java/org/springframework/boot/jdbc/metadata/AbstractDataSourcePoolMetadataTests.java b/spring-boot-project/spring-boot-all/src/test/java/org/springframework/boot/jdbc/metadata/AbstractDataSourcePoolMetadataTests.java
similarity index 100%
rename from spring-boot-project/spring-boot/src/test/java/org/springframework/boot/jdbc/metadata/AbstractDataSourcePoolMetadataTests.java
rename to spring-boot-project/spring-boot-all/src/test/java/org/springframework/boot/jdbc/metadata/AbstractDataSourcePoolMetadataTests.java
diff --git a/spring-boot-project/spring-boot/src/test/java/org/springframework/boot/jdbc/metadata/CommonsDbcp2DataSourcePoolMetadataTests.java b/spring-boot-project/spring-boot-all/src/test/java/org/springframework/boot/jdbc/metadata/CommonsDbcp2DataSourcePoolMetadataTests.java
similarity index 100%
rename from spring-boot-project/spring-boot/src/test/java/org/springframework/boot/jdbc/metadata/CommonsDbcp2DataSourcePoolMetadataTests.java
rename to spring-boot-project/spring-boot-all/src/test/java/org/springframework/boot/jdbc/metadata/CommonsDbcp2DataSourcePoolMetadataTests.java
diff --git a/spring-boot-project/spring-boot/src/test/java/org/springframework/boot/jdbc/metadata/CompositeDataSourcePoolMetadataProviderTests.java b/spring-boot-project/spring-boot-all/src/test/java/org/springframework/boot/jdbc/metadata/CompositeDataSourcePoolMetadataProviderTests.java
similarity index 100%
rename from spring-boot-project/spring-boot/src/test/java/org/springframework/boot/jdbc/metadata/CompositeDataSourcePoolMetadataProviderTests.java
rename to spring-boot-project/spring-boot-all/src/test/java/org/springframework/boot/jdbc/metadata/CompositeDataSourcePoolMetadataProviderTests.java
diff --git a/spring-boot-project/spring-boot/src/test/java/org/springframework/boot/jdbc/metadata/HikariDataSourcePoolMetadataTests.java b/spring-boot-project/spring-boot-all/src/test/java/org/springframework/boot/jdbc/metadata/HikariDataSourcePoolMetadataTests.java
similarity index 100%
rename from spring-boot-project/spring-boot/src/test/java/org/springframework/boot/jdbc/metadata/HikariDataSourcePoolMetadataTests.java
rename to spring-boot-project/spring-boot-all/src/test/java/org/springframework/boot/jdbc/metadata/HikariDataSourcePoolMetadataTests.java
diff --git a/spring-boot-project/spring-boot/src/test/java/org/springframework/boot/jdbc/metadata/OracleUcpDataSourcePoolMetadataTests.java b/spring-boot-project/spring-boot-all/src/test/java/org/springframework/boot/jdbc/metadata/OracleUcpDataSourcePoolMetadataTests.java
similarity index 100%
rename from spring-boot-project/spring-boot/src/test/java/org/springframework/boot/jdbc/metadata/OracleUcpDataSourcePoolMetadataTests.java
rename to spring-boot-project/spring-boot-all/src/test/java/org/springframework/boot/jdbc/metadata/OracleUcpDataSourcePoolMetadataTests.java
diff --git a/spring-boot-project/spring-boot/src/test/java/org/springframework/boot/jdbc/metadata/TomcatDataSourcePoolMetadataTests.java b/spring-boot-project/spring-boot-all/src/test/java/org/springframework/boot/jdbc/metadata/TomcatDataSourcePoolMetadataTests.java
similarity index 100%
rename from spring-boot-project/spring-boot/src/test/java/org/springframework/boot/jdbc/metadata/TomcatDataSourcePoolMetadataTests.java
rename to spring-boot-project/spring-boot-all/src/test/java/org/springframework/boot/jdbc/metadata/TomcatDataSourcePoolMetadataTests.java
diff --git a/spring-boot-project/spring-boot/src/test/java/org/springframework/boot/jms/ConnectionFactoryUnwrapperTests.java b/spring-boot-project/spring-boot-all/src/test/java/org/springframework/boot/jms/ConnectionFactoryUnwrapperTests.java
similarity index 100%
rename from spring-boot-project/spring-boot/src/test/java/org/springframework/boot/jms/ConnectionFactoryUnwrapperTests.java
rename to spring-boot-project/spring-boot-all/src/test/java/org/springframework/boot/jms/ConnectionFactoryUnwrapperTests.java
diff --git a/spring-boot-project/spring-boot/src/test/java/org/springframework/boot/liquibase/LiquibaseChangelogMissingFailureAnalyzerTests.java b/spring-boot-project/spring-boot-all/src/test/java/org/springframework/boot/liquibase/LiquibaseChangelogMissingFailureAnalyzerTests.java
similarity index 100%
rename from spring-boot-project/spring-boot/src/test/java/org/springframework/boot/liquibase/LiquibaseChangelogMissingFailureAnalyzerTests.java
rename to spring-boot-project/spring-boot-all/src/test/java/org/springframework/boot/liquibase/LiquibaseChangelogMissingFailureAnalyzerTests.java
diff --git a/spring-boot-project/spring-boot/src/test/java/org/springframework/boot/r2dbc/ConnectionFactoryBuilderTests.java b/spring-boot-project/spring-boot-all/src/test/java/org/springframework/boot/r2dbc/ConnectionFactoryBuilderTests.java
similarity index 100%
rename from spring-boot-project/spring-boot/src/test/java/org/springframework/boot/r2dbc/ConnectionFactoryBuilderTests.java
rename to spring-boot-project/spring-boot-all/src/test/java/org/springframework/boot/r2dbc/ConnectionFactoryBuilderTests.java
diff --git a/spring-boot-project/spring-boot/src/test/java/org/springframework/boot/r2dbc/EmbeddedDatabaseConnectionTests.java b/spring-boot-project/spring-boot-all/src/test/java/org/springframework/boot/r2dbc/EmbeddedDatabaseConnectionTests.java
similarity index 100%
rename from spring-boot-project/spring-boot/src/test/java/org/springframework/boot/r2dbc/EmbeddedDatabaseConnectionTests.java
rename to spring-boot-project/spring-boot-all/src/test/java/org/springframework/boot/r2dbc/EmbeddedDatabaseConnectionTests.java
diff --git a/spring-boot-project/spring-boot/src/test/java/org/springframework/boot/r2dbc/init/R2dbcScriptDatabaseInitializerTests.java b/spring-boot-project/spring-boot-all/src/test/java/org/springframework/boot/r2dbc/init/R2dbcScriptDatabaseInitializerTests.java
similarity index 100%
rename from spring-boot-project/spring-boot/src/test/java/org/springframework/boot/r2dbc/init/R2dbcScriptDatabaseInitializerTests.java
rename to spring-boot-project/spring-boot-all/src/test/java/org/springframework/boot/r2dbc/init/R2dbcScriptDatabaseInitializerTests.java
diff --git a/spring-boot-project/spring-boot/src/test/java/org/springframework/boot/reactor/InstrumentedFluxProvider.java b/spring-boot-project/spring-boot-all/src/test/java/org/springframework/boot/reactor/InstrumentedFluxProvider.java
similarity index 100%
rename from spring-boot-project/spring-boot/src/test/java/org/springframework/boot/reactor/InstrumentedFluxProvider.java
rename to spring-boot-project/spring-boot-all/src/test/java/org/springframework/boot/reactor/InstrumentedFluxProvider.java
diff --git a/spring-boot-project/spring-boot/src/test/java/org/springframework/boot/reactor/ReactorEnvironmentPostProcessorTests.java b/spring-boot-project/spring-boot-all/src/test/java/org/springframework/boot/reactor/ReactorEnvironmentPostProcessorTests.java
similarity index 100%
rename from spring-boot-project/spring-boot/src/test/java/org/springframework/boot/reactor/ReactorEnvironmentPostProcessorTests.java
rename to spring-boot-project/spring-boot-all/src/test/java/org/springframework/boot/reactor/ReactorEnvironmentPostProcessorTests.java
diff --git a/spring-boot-project/spring-boot/src/test/java/org/springframework/boot/rsocket/context/RSocketPortInfoApplicationContextInitializerTests.java b/spring-boot-project/spring-boot-all/src/test/java/org/springframework/boot/rsocket/context/RSocketPortInfoApplicationContextInitializerTests.java
similarity index 100%
rename from spring-boot-project/spring-boot/src/test/java/org/springframework/boot/rsocket/context/RSocketPortInfoApplicationContextInitializerTests.java
rename to spring-boot-project/spring-boot-all/src/test/java/org/springframework/boot/rsocket/context/RSocketPortInfoApplicationContextInitializerTests.java
diff --git a/spring-boot-project/spring-boot/src/test/java/org/springframework/boot/rsocket/netty/NettyRSocketServerFactoryTests.java b/spring-boot-project/spring-boot-all/src/test/java/org/springframework/boot/rsocket/netty/NettyRSocketServerFactoryTests.java
similarity index 100%
rename from spring-boot-project/spring-boot/src/test/java/org/springframework/boot/rsocket/netty/NettyRSocketServerFactoryTests.java
rename to spring-boot-project/spring-boot-all/src/test/java/org/springframework/boot/rsocket/netty/NettyRSocketServerFactoryTests.java
diff --git a/spring-boot-project/spring-boot/src/test/java/org/springframework/boot/security/reactive/ApplicationContextServerWebExchangeMatcherTests.java b/spring-boot-project/spring-boot-all/src/test/java/org/springframework/boot/security/reactive/ApplicationContextServerWebExchangeMatcherTests.java
similarity index 100%
rename from spring-boot-project/spring-boot/src/test/java/org/springframework/boot/security/reactive/ApplicationContextServerWebExchangeMatcherTests.java
rename to spring-boot-project/spring-boot-all/src/test/java/org/springframework/boot/security/reactive/ApplicationContextServerWebExchangeMatcherTests.java
diff --git a/spring-boot-project/spring-boot/src/test/java/org/springframework/boot/security/servlet/ApplicationContextRequestMatcherTests.java b/spring-boot-project/spring-boot-all/src/test/java/org/springframework/boot/security/servlet/ApplicationContextRequestMatcherTests.java
similarity index 100%
rename from spring-boot-project/spring-boot/src/test/java/org/springframework/boot/security/servlet/ApplicationContextRequestMatcherTests.java
rename to spring-boot-project/spring-boot-all/src/test/java/org/springframework/boot/security/servlet/ApplicationContextRequestMatcherTests.java
diff --git a/spring-boot-project/spring-boot/src/test/java/org/springframework/boot/sql/init/AbstractScriptDatabaseInitializerTests.java b/spring-boot-project/spring-boot-all/src/test/java/org/springframework/boot/sql/init/AbstractScriptDatabaseInitializerTests.java
similarity index 100%
rename from spring-boot-project/spring-boot/src/test/java/org/springframework/boot/sql/init/AbstractScriptDatabaseInitializerTests.java
rename to spring-boot-project/spring-boot-all/src/test/java/org/springframework/boot/sql/init/AbstractScriptDatabaseInitializerTests.java
diff --git a/spring-boot-project/spring-boot/src/test/java/org/springframework/boot/sql/init/dependency/DatabaseInitializationDependencyConfigurerTests.java b/spring-boot-project/spring-boot-all/src/test/java/org/springframework/boot/sql/init/dependency/DatabaseInitializationDependencyConfigurerTests.java
similarity index 100%
rename from spring-boot-project/spring-boot/src/test/java/org/springframework/boot/sql/init/dependency/DatabaseInitializationDependencyConfigurerTests.java
rename to spring-boot-project/spring-boot-all/src/test/java/org/springframework/boot/sql/init/dependency/DatabaseInitializationDependencyConfigurerTests.java
diff --git a/spring-boot-project/spring-boot/src/test/java/org/springframework/boot/web/client/AbstractClientHttpRequestFactoriesTests.java b/spring-boot-project/spring-boot-all/src/test/java/org/springframework/boot/web/client/AbstractClientHttpRequestFactoriesTests.java
similarity index 100%
rename from spring-boot-project/spring-boot/src/test/java/org/springframework/boot/web/client/AbstractClientHttpRequestFactoriesTests.java
rename to spring-boot-project/spring-boot-all/src/test/java/org/springframework/boot/web/client/AbstractClientHttpRequestFactoriesTests.java
diff --git a/spring-boot-project/spring-boot/src/test/java/org/springframework/boot/web/client/ClientHttpRequestFactoriesHttpComponentsTests.java b/spring-boot-project/spring-boot-all/src/test/java/org/springframework/boot/web/client/ClientHttpRequestFactoriesHttpComponentsTests.java
similarity index 100%
rename from spring-boot-project/spring-boot/src/test/java/org/springframework/boot/web/client/ClientHttpRequestFactoriesHttpComponentsTests.java
rename to spring-boot-project/spring-boot-all/src/test/java/org/springframework/boot/web/client/ClientHttpRequestFactoriesHttpComponentsTests.java
diff --git a/spring-boot-project/spring-boot/src/test/java/org/springframework/boot/web/client/ClientHttpRequestFactoriesJettyTests.java b/spring-boot-project/spring-boot-all/src/test/java/org/springframework/boot/web/client/ClientHttpRequestFactoriesJettyTests.java
similarity index 100%
rename from spring-boot-project/spring-boot/src/test/java/org/springframework/boot/web/client/ClientHttpRequestFactoriesJettyTests.java
rename to spring-boot-project/spring-boot-all/src/test/java/org/springframework/boot/web/client/ClientHttpRequestFactoriesJettyTests.java
diff --git a/spring-boot-project/spring-boot/src/test/java/org/springframework/boot/web/client/ClientHttpRequestFactoriesReactorTests.java b/spring-boot-project/spring-boot-all/src/test/java/org/springframework/boot/web/client/ClientHttpRequestFactoriesReactorTests.java
similarity index 100%
rename from spring-boot-project/spring-boot/src/test/java/org/springframework/boot/web/client/ClientHttpRequestFactoriesReactorTests.java
rename to spring-boot-project/spring-boot-all/src/test/java/org/springframework/boot/web/client/ClientHttpRequestFactoriesReactorTests.java
diff --git a/spring-boot-project/spring-boot/src/test/java/org/springframework/boot/web/client/ClientHttpRequestFactoriesSimpleTests.java b/spring-boot-project/spring-boot-all/src/test/java/org/springframework/boot/web/client/ClientHttpRequestFactoriesSimpleTests.java
similarity index 100%
rename from spring-boot-project/spring-boot/src/test/java/org/springframework/boot/web/client/ClientHttpRequestFactoriesSimpleTests.java
rename to spring-boot-project/spring-boot-all/src/test/java/org/springframework/boot/web/client/ClientHttpRequestFactoriesSimpleTests.java
diff --git a/spring-boot-project/spring-boot/src/test/java/org/springframework/boot/web/client/ClientHttpRequestFactoriesTests.java b/spring-boot-project/spring-boot-all/src/test/java/org/springframework/boot/web/client/ClientHttpRequestFactoriesTests.java
similarity index 100%
rename from spring-boot-project/spring-boot/src/test/java/org/springframework/boot/web/client/ClientHttpRequestFactoriesTests.java
rename to spring-boot-project/spring-boot-all/src/test/java/org/springframework/boot/web/client/ClientHttpRequestFactoriesTests.java
diff --git a/spring-boot-project/spring-boot/src/test/java/org/springframework/boot/web/client/ClientHttpRequestFactorySettingsTests.java b/spring-boot-project/spring-boot-all/src/test/java/org/springframework/boot/web/client/ClientHttpRequestFactorySettingsTests.java
similarity index 100%
rename from spring-boot-project/spring-boot/src/test/java/org/springframework/boot/web/client/ClientHttpRequestFactorySettingsTests.java
rename to spring-boot-project/spring-boot-all/src/test/java/org/springframework/boot/web/client/ClientHttpRequestFactorySettingsTests.java
diff --git a/spring-boot-project/spring-boot/src/test/java/org/springframework/boot/web/client/RestTemplateBuilderClientHttpRequestInitializerTests.java b/spring-boot-project/spring-boot-all/src/test/java/org/springframework/boot/web/client/RestTemplateBuilderClientHttpRequestInitializerTests.java
similarity index 100%
rename from spring-boot-project/spring-boot/src/test/java/org/springframework/boot/web/client/RestTemplateBuilderClientHttpRequestInitializerTests.java
rename to spring-boot-project/spring-boot-all/src/test/java/org/springframework/boot/web/client/RestTemplateBuilderClientHttpRequestInitializerTests.java
diff --git a/spring-boot-project/spring-boot/src/test/java/org/springframework/boot/web/client/RestTemplateBuilderTests.java b/spring-boot-project/spring-boot-all/src/test/java/org/springframework/boot/web/client/RestTemplateBuilderTests.java
similarity index 100%
rename from spring-boot-project/spring-boot/src/test/java/org/springframework/boot/web/client/RestTemplateBuilderTests.java
rename to spring-boot-project/spring-boot-all/src/test/java/org/springframework/boot/web/client/RestTemplateBuilderTests.java
diff --git a/spring-boot-project/spring-boot/src/test/java/org/springframework/boot/web/client/RootUriBuilderFactoryTests.java b/spring-boot-project/spring-boot-all/src/test/java/org/springframework/boot/web/client/RootUriBuilderFactoryTests.java
similarity index 100%
rename from spring-boot-project/spring-boot/src/test/java/org/springframework/boot/web/client/RootUriBuilderFactoryTests.java
rename to spring-boot-project/spring-boot-all/src/test/java/org/springframework/boot/web/client/RootUriBuilderFactoryTests.java
diff --git a/spring-boot-project/spring-boot/src/test/java/org/springframework/boot/web/client/RootUriTemplateHandlerTests.java b/spring-boot-project/spring-boot-all/src/test/java/org/springframework/boot/web/client/RootUriTemplateHandlerTests.java
similarity index 100%
rename from spring-boot-project/spring-boot/src/test/java/org/springframework/boot/web/client/RootUriTemplateHandlerTests.java
rename to spring-boot-project/spring-boot-all/src/test/java/org/springframework/boot/web/client/RootUriTemplateHandlerTests.java
diff --git a/spring-boot-project/spring-boot/src/test/java/org/springframework/boot/web/reactive/error/DefaultErrorAttributesTests.java b/spring-boot-project/spring-boot-all/src/test/java/org/springframework/boot/web/reactive/error/DefaultErrorAttributesTests.java
similarity index 100%
rename from spring-boot-project/spring-boot/src/test/java/org/springframework/boot/web/reactive/error/DefaultErrorAttributesTests.java
rename to spring-boot-project/spring-boot-all/src/test/java/org/springframework/boot/web/reactive/error/DefaultErrorAttributesTests.java
diff --git a/spring-boot-project/spring-boot/src/test/java/org/springframework/boot/web/reactive/result/view/MustacheViewResolverTests.java b/spring-boot-project/spring-boot-all/src/test/java/org/springframework/boot/web/reactive/result/view/MustacheViewResolverTests.java
similarity index 100%
rename from spring-boot-project/spring-boot/src/test/java/org/springframework/boot/web/reactive/result/view/MustacheViewResolverTests.java
rename to spring-boot-project/spring-boot-all/src/test/java/org/springframework/boot/web/reactive/result/view/MustacheViewResolverTests.java
diff --git a/spring-boot-project/spring-boot/src/test/java/org/springframework/boot/web/reactive/result/view/MustacheViewTests.java b/spring-boot-project/spring-boot-all/src/test/java/org/springframework/boot/web/reactive/result/view/MustacheViewTests.java
similarity index 100%
rename from spring-boot-project/spring-boot/src/test/java/org/springframework/boot/web/reactive/result/view/MustacheViewTests.java
rename to spring-boot-project/spring-boot-all/src/test/java/org/springframework/boot/web/reactive/result/view/MustacheViewTests.java
diff --git a/spring-boot-project/spring-boot/src/test/java/org/springframework/boot/web/server/jetty/JettyAccess.java b/spring-boot-project/spring-boot-all/src/test/java/org/springframework/boot/web/server/jetty/JettyAccess.java
similarity index 100%
rename from spring-boot-project/spring-boot/src/test/java/org/springframework/boot/web/server/jetty/JettyAccess.java
rename to spring-boot-project/spring-boot-all/src/test/java/org/springframework/boot/web/server/jetty/JettyAccess.java
diff --git a/spring-boot-project/spring-boot/src/test/java/org/springframework/boot/web/server/jetty/SslServerCustomizerTests.java b/spring-boot-project/spring-boot-all/src/test/java/org/springframework/boot/web/server/jetty/SslServerCustomizerTests.java
similarity index 100%
rename from spring-boot-project/spring-boot/src/test/java/org/springframework/boot/web/server/jetty/SslServerCustomizerTests.java
rename to spring-boot-project/spring-boot-all/src/test/java/org/springframework/boot/web/server/jetty/SslServerCustomizerTests.java
diff --git a/spring-boot-project/spring-boot/src/test/java/org/springframework/boot/web/server/reactive/jetty/JettyReactiveWebServerFactoryTests.java b/spring-boot-project/spring-boot-all/src/test/java/org/springframework/boot/web/server/reactive/jetty/JettyReactiveWebServerFactoryTests.java
similarity index 100%
rename from spring-boot-project/spring-boot/src/test/java/org/springframework/boot/web/server/reactive/jetty/JettyReactiveWebServerFactoryTests.java
rename to spring-boot-project/spring-boot-all/src/test/java/org/springframework/boot/web/server/reactive/jetty/JettyReactiveWebServerFactoryTests.java
diff --git a/spring-boot-project/spring-boot/src/test/java/org/springframework/boot/web/server/reactive/netty/NettyReactiveWebServerFactoryTests.java b/spring-boot-project/spring-boot-all/src/test/java/org/springframework/boot/web/server/reactive/netty/NettyReactiveWebServerFactoryTests.java
similarity index 100%
rename from spring-boot-project/spring-boot/src/test/java/org/springframework/boot/web/server/reactive/netty/NettyReactiveWebServerFactoryTests.java
rename to spring-boot-project/spring-boot-all/src/test/java/org/springframework/boot/web/server/reactive/netty/NettyReactiveWebServerFactoryTests.java
diff --git a/spring-boot-project/spring-boot/src/test/java/org/springframework/boot/web/server/reactive/tomcat/TomcatReactiveWebServerFactoryTests.java b/spring-boot-project/spring-boot-all/src/test/java/org/springframework/boot/web/server/reactive/tomcat/TomcatReactiveWebServerFactoryTests.java
similarity index 100%
rename from spring-boot-project/spring-boot/src/test/java/org/springframework/boot/web/server/reactive/tomcat/TomcatReactiveWebServerFactoryTests.java
rename to spring-boot-project/spring-boot-all/src/test/java/org/springframework/boot/web/server/reactive/tomcat/TomcatReactiveWebServerFactoryTests.java
diff --git a/spring-boot-project/spring-boot/src/test/java/org/springframework/boot/web/server/reactive/undertow/UndertowReactiveWebServerFactoryTests.java b/spring-boot-project/spring-boot-all/src/test/java/org/springframework/boot/web/server/reactive/undertow/UndertowReactiveWebServerFactoryTests.java
similarity index 100%
rename from spring-boot-project/spring-boot/src/test/java/org/springframework/boot/web/server/reactive/undertow/UndertowReactiveWebServerFactoryTests.java
rename to spring-boot-project/spring-boot-all/src/test/java/org/springframework/boot/web/server/reactive/undertow/UndertowReactiveWebServerFactoryTests.java
diff --git a/spring-boot-project/spring-boot/src/test/java/org/springframework/boot/web/server/servlet/jetty/JettyServletWebServerFactoryTests.java b/spring-boot-project/spring-boot-all/src/test/java/org/springframework/boot/web/server/servlet/jetty/JettyServletWebServerFactoryTests.java
similarity index 100%
rename from spring-boot-project/spring-boot/src/test/java/org/springframework/boot/web/server/servlet/jetty/JettyServletWebServerFactoryTests.java
rename to spring-boot-project/spring-boot-all/src/test/java/org/springframework/boot/web/server/servlet/jetty/JettyServletWebServerFactoryTests.java
diff --git a/spring-boot-project/spring-boot/src/test/java/org/springframework/boot/web/server/servlet/jetty/LoaderHidingResourceTests.java b/spring-boot-project/spring-boot-all/src/test/java/org/springframework/boot/web/server/servlet/jetty/LoaderHidingResourceTests.java
similarity index 100%
rename from spring-boot-project/spring-boot/src/test/java/org/springframework/boot/web/server/servlet/jetty/LoaderHidingResourceTests.java
rename to spring-boot-project/spring-boot-all/src/test/java/org/springframework/boot/web/server/servlet/jetty/LoaderHidingResourceTests.java
diff --git a/spring-boot-project/spring-boot/src/test/java/org/springframework/boot/web/server/servlet/tomcat/TldPatternsTests.java b/spring-boot-project/spring-boot-all/src/test/java/org/springframework/boot/web/server/servlet/tomcat/TldPatternsTests.java
similarity index 100%
rename from spring-boot-project/spring-boot/src/test/java/org/springframework/boot/web/server/servlet/tomcat/TldPatternsTests.java
rename to spring-boot-project/spring-boot-all/src/test/java/org/springframework/boot/web/server/servlet/tomcat/TldPatternsTests.java
diff --git a/spring-boot-project/spring-boot/src/test/java/org/springframework/boot/web/server/servlet/tomcat/TomcatServletWebServerFactoryTests.java b/spring-boot-project/spring-boot-all/src/test/java/org/springframework/boot/web/server/servlet/tomcat/TomcatServletWebServerFactoryTests.java
similarity index 100%
rename from spring-boot-project/spring-boot/src/test/java/org/springframework/boot/web/server/servlet/tomcat/TomcatServletWebServerFactoryTests.java
rename to spring-boot-project/spring-boot-all/src/test/java/org/springframework/boot/web/server/servlet/tomcat/TomcatServletWebServerFactoryTests.java
diff --git a/spring-boot-project/spring-boot/src/test/java/org/springframework/boot/web/server/servlet/undertow/FileSessionPersistenceTests.java b/spring-boot-project/spring-boot-all/src/test/java/org/springframework/boot/web/server/servlet/undertow/FileSessionPersistenceTests.java
similarity index 100%
rename from spring-boot-project/spring-boot/src/test/java/org/springframework/boot/web/server/servlet/undertow/FileSessionPersistenceTests.java
rename to spring-boot-project/spring-boot-all/src/test/java/org/springframework/boot/web/server/servlet/undertow/FileSessionPersistenceTests.java
diff --git a/spring-boot-project/spring-boot/src/test/java/org/springframework/boot/web/server/servlet/undertow/JarResourceManagerTests.java b/spring-boot-project/spring-boot-all/src/test/java/org/springframework/boot/web/server/servlet/undertow/JarResourceManagerTests.java
similarity index 100%
rename from spring-boot-project/spring-boot/src/test/java/org/springframework/boot/web/server/servlet/undertow/JarResourceManagerTests.java
rename to spring-boot-project/spring-boot-all/src/test/java/org/springframework/boot/web/server/servlet/undertow/JarResourceManagerTests.java
diff --git a/spring-boot-project/spring-boot/src/test/java/org/springframework/boot/web/server/servlet/undertow/UndertowServletWebServerFactoryTests.java b/spring-boot-project/spring-boot-all/src/test/java/org/springframework/boot/web/server/servlet/undertow/UndertowServletWebServerFactoryTests.java
similarity index 100%
rename from spring-boot-project/spring-boot/src/test/java/org/springframework/boot/web/server/servlet/undertow/UndertowServletWebServerFactoryTests.java
rename to spring-boot-project/spring-boot-all/src/test/java/org/springframework/boot/web/server/servlet/undertow/UndertowServletWebServerFactoryTests.java
diff --git a/spring-boot-project/spring-boot/src/test/java/org/springframework/boot/web/server/tomcat/CompressionConnectorCustomizerTests.java b/spring-boot-project/spring-boot-all/src/test/java/org/springframework/boot/web/server/tomcat/CompressionConnectorCustomizerTests.java
similarity index 100%
rename from spring-boot-project/spring-boot/src/test/java/org/springframework/boot/web/server/tomcat/CompressionConnectorCustomizerTests.java
rename to spring-boot-project/spring-boot-all/src/test/java/org/springframework/boot/web/server/tomcat/CompressionConnectorCustomizerTests.java
diff --git a/spring-boot-project/spring-boot/src/test/java/org/springframework/boot/web/server/tomcat/SslConnectorCustomizerTests.java b/spring-boot-project/spring-boot-all/src/test/java/org/springframework/boot/web/server/tomcat/SslConnectorCustomizerTests.java
similarity index 100%
rename from spring-boot-project/spring-boot/src/test/java/org/springframework/boot/web/server/tomcat/SslConnectorCustomizerTests.java
rename to spring-boot-project/spring-boot-all/src/test/java/org/springframework/boot/web/server/tomcat/SslConnectorCustomizerTests.java
diff --git a/spring-boot-project/spring-boot/src/test/java/org/springframework/boot/web/server/tomcat/TomcatAccess.java b/spring-boot-project/spring-boot-all/src/test/java/org/springframework/boot/web/server/tomcat/TomcatAccess.java
similarity index 100%
rename from spring-boot-project/spring-boot/src/test/java/org/springframework/boot/web/server/tomcat/TomcatAccess.java
rename to spring-boot-project/spring-boot-all/src/test/java/org/springframework/boot/web/server/tomcat/TomcatAccess.java
diff --git a/spring-boot-project/spring-boot/src/test/java/org/springframework/boot/web/server/tomcat/TomcatEmbeddedWebappClassLoaderTests.java b/spring-boot-project/spring-boot-all/src/test/java/org/springframework/boot/web/server/tomcat/TomcatEmbeddedWebappClassLoaderTests.java
similarity index 100%
rename from spring-boot-project/spring-boot/src/test/java/org/springframework/boot/web/server/tomcat/TomcatEmbeddedWebappClassLoaderTests.java
rename to spring-boot-project/spring-boot-all/src/test/java/org/springframework/boot/web/server/tomcat/TomcatEmbeddedWebappClassLoaderTests.java
diff --git a/spring-boot-project/spring-boot/src/test/java/org/springframework/boot/web/server/undertow/UndertowAccess.java b/spring-boot-project/spring-boot-all/src/test/java/org/springframework/boot/web/server/undertow/UndertowAccess.java
similarity index 100%
rename from spring-boot-project/spring-boot/src/test/java/org/springframework/boot/web/server/undertow/UndertowAccess.java
rename to spring-boot-project/spring-boot-all/src/test/java/org/springframework/boot/web/server/undertow/UndertowAccess.java
diff --git a/spring-boot-project/spring-boot/src/test/java/org/springframework/boot/web/server/undertow/UndertowWebServerRuntimeHintsTests.java b/spring-boot-project/spring-boot-all/src/test/java/org/springframework/boot/web/server/undertow/UndertowWebServerRuntimeHintsTests.java
similarity index 100%
rename from spring-boot-project/spring-boot/src/test/java/org/springframework/boot/web/server/undertow/UndertowWebServerRuntimeHintsTests.java
rename to spring-boot-project/spring-boot-all/src/test/java/org/springframework/boot/web/server/undertow/UndertowWebServerRuntimeHintsTests.java
diff --git a/spring-boot-project/spring-boot/src/test/java/org/springframework/boot/web/servlet/context/ServletWebServerMvcIntegrationTests.java b/spring-boot-project/spring-boot-all/src/test/java/org/springframework/boot/web/servlet/context/ServletWebServerMvcIntegrationTests.java
similarity index 100%
rename from spring-boot-project/spring-boot/src/test/java/org/springframework/boot/web/servlet/context/ServletWebServerMvcIntegrationTests.java
rename to spring-boot-project/spring-boot-all/src/test/java/org/springframework/boot/web/servlet/context/ServletWebServerMvcIntegrationTests.java
diff --git a/spring-boot-project/spring-boot/src/test/java/org/springframework/boot/web/servlet/support/ErrorPageFilterIntegrationTests.java b/spring-boot-project/spring-boot-all/src/test/java/org/springframework/boot/web/servlet/support/ErrorPageFilterIntegrationTests.java
similarity index 100%
rename from spring-boot-project/spring-boot/src/test/java/org/springframework/boot/web/servlet/support/ErrorPageFilterIntegrationTests.java
rename to spring-boot-project/spring-boot-all/src/test/java/org/springframework/boot/web/servlet/support/ErrorPageFilterIntegrationTests.java
diff --git a/spring-boot-project/spring-boot/src/test/java/org/springframework/boot/web/servlet/view/MustacheViewResolverTests.java b/spring-boot-project/spring-boot-all/src/test/java/org/springframework/boot/web/servlet/view/MustacheViewResolverTests.java
similarity index 100%
rename from spring-boot-project/spring-boot/src/test/java/org/springframework/boot/web/servlet/view/MustacheViewResolverTests.java
rename to spring-boot-project/spring-boot-all/src/test/java/org/springframework/boot/web/servlet/view/MustacheViewResolverTests.java
diff --git a/spring-boot-project/spring-boot/src/test/java/org/springframework/boot/web/servlet/view/MustacheViewTests.java b/spring-boot-project/spring-boot-all/src/test/java/org/springframework/boot/web/servlet/view/MustacheViewTests.java
similarity index 100%
rename from spring-boot-project/spring-boot/src/test/java/org/springframework/boot/web/servlet/view/MustacheViewTests.java
rename to spring-boot-project/spring-boot-all/src/test/java/org/springframework/boot/web/servlet/view/MustacheViewTests.java
diff --git a/spring-boot-project/spring-boot/src/test/java/org/springframework/boot/webservices/client/HttpWebServiceMessageSenderBuilderJettyClientIntegrationTests.java b/spring-boot-project/spring-boot-all/src/test/java/org/springframework/boot/webservices/client/HttpWebServiceMessageSenderBuilderJettyClientIntegrationTests.java
similarity index 100%
rename from spring-boot-project/spring-boot/src/test/java/org/springframework/boot/webservices/client/HttpWebServiceMessageSenderBuilderJettyClientIntegrationTests.java
rename to spring-boot-project/spring-boot-all/src/test/java/org/springframework/boot/webservices/client/HttpWebServiceMessageSenderBuilderJettyClientIntegrationTests.java
diff --git a/spring-boot-project/spring-boot/src/test/java/org/springframework/boot/webservices/client/HttpWebServiceMessageSenderBuilderReactorClientIntegrationTests.java b/spring-boot-project/spring-boot-all/src/test/java/org/springframework/boot/webservices/client/HttpWebServiceMessageSenderBuilderReactorClientIntegrationTests.java
similarity index 100%
rename from spring-boot-project/spring-boot/src/test/java/org/springframework/boot/webservices/client/HttpWebServiceMessageSenderBuilderReactorClientIntegrationTests.java
rename to spring-boot-project/spring-boot-all/src/test/java/org/springframework/boot/webservices/client/HttpWebServiceMessageSenderBuilderReactorClientIntegrationTests.java
diff --git a/spring-boot-project/spring-boot/src/test/java/org/springframework/boot/webservices/client/HttpWebServiceMessageSenderBuilderSimpleIntegrationTests.java b/spring-boot-project/spring-boot-all/src/test/java/org/springframework/boot/webservices/client/HttpWebServiceMessageSenderBuilderSimpleIntegrationTests.java
similarity index 100%
rename from spring-boot-project/spring-boot/src/test/java/org/springframework/boot/webservices/client/HttpWebServiceMessageSenderBuilderSimpleIntegrationTests.java
rename to spring-boot-project/spring-boot-all/src/test/java/org/springframework/boot/webservices/client/HttpWebServiceMessageSenderBuilderSimpleIntegrationTests.java
diff --git a/spring-boot-project/spring-boot/src/test/java/org/springframework/boot/webservices/client/HttpWebServiceMessageSenderBuilderTests.java b/spring-boot-project/spring-boot-all/src/test/java/org/springframework/boot/webservices/client/HttpWebServiceMessageSenderBuilderTests.java
similarity index 100%
rename from spring-boot-project/spring-boot/src/test/java/org/springframework/boot/webservices/client/HttpWebServiceMessageSenderBuilderTests.java
rename to spring-boot-project/spring-boot-all/src/test/java/org/springframework/boot/webservices/client/HttpWebServiceMessageSenderBuilderTests.java
diff --git a/spring-boot-project/spring-boot/src/test/java/org/springframework/boot/webservices/client/WebServiceMessageSenderFactoryTests.java b/spring-boot-project/spring-boot-all/src/test/java/org/springframework/boot/webservices/client/WebServiceMessageSenderFactoryTests.java
similarity index 100%
rename from spring-boot-project/spring-boot/src/test/java/org/springframework/boot/webservices/client/WebServiceMessageSenderFactoryTests.java
rename to spring-boot-project/spring-boot-all/src/test/java/org/springframework/boot/webservices/client/WebServiceMessageSenderFactoryTests.java
diff --git a/spring-boot-project/spring-boot/src/test/java/org/springframework/boot/webservices/client/WebServiceTemplateBuilderTests.java b/spring-boot-project/spring-boot-all/src/test/java/org/springframework/boot/webservices/client/WebServiceTemplateBuilderTests.java
similarity index 100%
rename from spring-boot-project/spring-boot/src/test/java/org/springframework/boot/webservices/client/WebServiceTemplateBuilderTests.java
rename to spring-boot-project/spring-boot-all/src/test/java/org/springframework/boot/webservices/client/WebServiceTemplateBuilderTests.java
diff --git a/spring-boot-project/spring-boot-all/src/test/resources/log4j2-test.xml b/spring-boot-project/spring-boot-all/src/test/resources/log4j2-test.xml
new file mode 100644
index 00000000000..66496afcd8a
--- /dev/null
+++ b/spring-boot-project/spring-boot-all/src/test/resources/log4j2-test.xml
@@ -0,0 +1,17 @@
+
+
+
+ %xwEx
+ %5p
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/spring-boot-project/spring-boot/src/test/resources/org/springframework/boot/http/client/reactive/test.jks b/spring-boot-project/spring-boot-all/src/test/resources/org/springframework/boot/http/client/reactive/test.jks
similarity index 100%
rename from spring-boot-project/spring-boot/src/test/resources/org/springframework/boot/http/client/reactive/test.jks
rename to spring-boot-project/spring-boot-all/src/test/resources/org/springframework/boot/http/client/reactive/test.jks
diff --git a/spring-boot-project/spring-boot/src/test/resources/org/springframework/boot/http/client/test.jks b/spring-boot-project/spring-boot-all/src/test/resources/org/springframework/boot/http/client/test.jks
similarity index 100%
rename from spring-boot-project/spring-boot/src/test/resources/org/springframework/boot/http/client/test.jks
rename to spring-boot-project/spring-boot-all/src/test/resources/org/springframework/boot/http/client/test.jks
diff --git a/spring-boot-project/spring-boot/src/test/resources/org/springframework/boot/rsocket/netty/test-cert.pem b/spring-boot-project/spring-boot-all/src/test/resources/org/springframework/boot/rsocket/netty/test-cert.pem
similarity index 100%
rename from spring-boot-project/spring-boot/src/test/resources/org/springframework/boot/rsocket/netty/test-cert.pem
rename to spring-boot-project/spring-boot-all/src/test/resources/org/springframework/boot/rsocket/netty/test-cert.pem
diff --git a/spring-boot-project/spring-boot/src/test/resources/org/springframework/boot/rsocket/netty/test-key.pem b/spring-boot-project/spring-boot-all/src/test/resources/org/springframework/boot/rsocket/netty/test-key.pem
similarity index 100%
rename from spring-boot-project/spring-boot/src/test/resources/org/springframework/boot/rsocket/netty/test-key.pem
rename to spring-boot-project/spring-boot-all/src/test/resources/org/springframework/boot/rsocket/netty/test-key.pem
diff --git a/spring-boot-project/spring-boot/src/test/resources/org/springframework/boot/rsocket/netty/test.jks b/spring-boot-project/spring-boot-all/src/test/resources/org/springframework/boot/rsocket/netty/test.jks
similarity index 100%
rename from spring-boot-project/spring-boot/src/test/resources/org/springframework/boot/rsocket/netty/test.jks
rename to spring-boot-project/spring-boot-all/src/test/resources/org/springframework/boot/rsocket/netty/test.jks
diff --git a/spring-boot-project/spring-boot/src/test/resources/org/springframework/boot/web/client/test.jks b/spring-boot-project/spring-boot-all/src/test/resources/org/springframework/boot/web/client/test.jks
similarity index 100%
rename from spring-boot-project/spring-boot/src/test/resources/org/springframework/boot/web/client/test.jks
rename to spring-boot-project/spring-boot-all/src/test/resources/org/springframework/boot/web/client/test.jks
diff --git a/spring-boot-project/spring-boot/src/test/resources/org/springframework/boot/web/server/jetty/test.jks b/spring-boot-project/spring-boot-all/src/test/resources/org/springframework/boot/web/server/jetty/test.jks
similarity index 100%
rename from spring-boot-project/spring-boot/src/test/resources/org/springframework/boot/web/server/jetty/test.jks
rename to spring-boot-project/spring-boot-all/src/test/resources/org/springframework/boot/web/server/jetty/test.jks
diff --git a/spring-boot-project/spring-boot/src/test/resources/org/springframework/boot/web/server/reactive/netty/1.crt b/spring-boot-project/spring-boot-all/src/test/resources/org/springframework/boot/web/server/reactive/netty/1.crt
similarity index 100%
rename from spring-boot-project/spring-boot/src/test/resources/org/springframework/boot/web/server/reactive/netty/1.crt
rename to spring-boot-project/spring-boot-all/src/test/resources/org/springframework/boot/web/server/reactive/netty/1.crt
diff --git a/spring-boot-project/spring-boot/src/test/resources/org/springframework/boot/web/server/reactive/netty/1.key b/spring-boot-project/spring-boot-all/src/test/resources/org/springframework/boot/web/server/reactive/netty/1.key
similarity index 100%
rename from spring-boot-project/spring-boot/src/test/resources/org/springframework/boot/web/server/reactive/netty/1.key
rename to spring-boot-project/spring-boot-all/src/test/resources/org/springframework/boot/web/server/reactive/netty/1.key
diff --git a/spring-boot-project/spring-boot/src/test/resources/org/springframework/boot/web/server/reactive/netty/2.crt b/spring-boot-project/spring-boot-all/src/test/resources/org/springframework/boot/web/server/reactive/netty/2.crt
similarity index 100%
rename from spring-boot-project/spring-boot/src/test/resources/org/springframework/boot/web/server/reactive/netty/2.crt
rename to spring-boot-project/spring-boot-all/src/test/resources/org/springframework/boot/web/server/reactive/netty/2.crt
diff --git a/spring-boot-project/spring-boot/src/test/resources/org/springframework/boot/web/server/reactive/netty/2.key b/spring-boot-project/spring-boot-all/src/test/resources/org/springframework/boot/web/server/reactive/netty/2.key
similarity index 100%
rename from spring-boot-project/spring-boot/src/test/resources/org/springframework/boot/web/server/reactive/netty/2.key
rename to spring-boot-project/spring-boot-all/src/test/resources/org/springframework/boot/web/server/reactive/netty/2.key
diff --git a/spring-boot-project/spring-boot/src/test/resources/org/springframework/boot/web/server/reactive/netty/test.jks b/spring-boot-project/spring-boot-all/src/test/resources/org/springframework/boot/web/server/reactive/netty/test.jks
similarity index 100%
rename from spring-boot-project/spring-boot/src/test/resources/org/springframework/boot/web/server/reactive/netty/test.jks
rename to spring-boot-project/spring-boot-all/src/test/resources/org/springframework/boot/web/server/reactive/netty/test.jks
diff --git a/spring-boot-project/spring-boot/src/test/resources/org/springframework/boot/web/server/reactive/test.jks b/spring-boot-project/spring-boot-all/src/test/resources/org/springframework/boot/web/server/servlet/jetty/test.jks
similarity index 100%
rename from spring-boot-project/spring-boot/src/test/resources/org/springframework/boot/web/server/reactive/test.jks
rename to spring-boot-project/spring-boot-all/src/test/resources/org/springframework/boot/web/server/servlet/jetty/test.jks
diff --git a/spring-boot-project/spring-boot/src/test/resources/org/springframework/boot/web/server/servlet/tomcat/1.crt b/spring-boot-project/spring-boot-all/src/test/resources/org/springframework/boot/web/server/servlet/tomcat/1.crt
similarity index 100%
rename from spring-boot-project/spring-boot/src/test/resources/org/springframework/boot/web/server/servlet/tomcat/1.crt
rename to spring-boot-project/spring-boot-all/src/test/resources/org/springframework/boot/web/server/servlet/tomcat/1.crt
diff --git a/spring-boot-project/spring-boot/src/test/resources/org/springframework/boot/web/server/servlet/tomcat/1.key b/spring-boot-project/spring-boot-all/src/test/resources/org/springframework/boot/web/server/servlet/tomcat/1.key
similarity index 100%
rename from spring-boot-project/spring-boot/src/test/resources/org/springframework/boot/web/server/servlet/tomcat/1.key
rename to spring-boot-project/spring-boot-all/src/test/resources/org/springframework/boot/web/server/servlet/tomcat/1.key
diff --git a/spring-boot-project/spring-boot/src/test/resources/org/springframework/boot/web/server/servlet/tomcat/2.crt b/spring-boot-project/spring-boot-all/src/test/resources/org/springframework/boot/web/server/servlet/tomcat/2.crt
similarity index 100%
rename from spring-boot-project/spring-boot/src/test/resources/org/springframework/boot/web/server/servlet/tomcat/2.crt
rename to spring-boot-project/spring-boot-all/src/test/resources/org/springframework/boot/web/server/servlet/tomcat/2.crt
diff --git a/spring-boot-project/spring-boot/src/test/resources/org/springframework/boot/web/server/servlet/tomcat/2.key b/spring-boot-project/spring-boot-all/src/test/resources/org/springframework/boot/web/server/servlet/tomcat/2.key
similarity index 100%
rename from spring-boot-project/spring-boot/src/test/resources/org/springframework/boot/web/server/servlet/tomcat/2.key
rename to spring-boot-project/spring-boot-all/src/test/resources/org/springframework/boot/web/server/servlet/tomcat/2.key
diff --git a/spring-boot-project/spring-boot/src/test/resources/org/springframework/boot/web/server/servlet/jetty/test.jks b/spring-boot-project/spring-boot-all/src/test/resources/org/springframework/boot/web/server/servlet/tomcat/test.jks
similarity index 100%
rename from spring-boot-project/spring-boot/src/test/resources/org/springframework/boot/web/server/servlet/jetty/test.jks
rename to spring-boot-project/spring-boot-all/src/test/resources/org/springframework/boot/web/server/servlet/tomcat/test.jks
diff --git a/spring-boot-project/spring-boot/src/test/resources/org/springframework/boot/web/server/servlet/undertow/restricted.jks b/spring-boot-project/spring-boot-all/src/test/resources/org/springframework/boot/web/server/servlet/undertow/restricted.jks
similarity index 100%
rename from spring-boot-project/spring-boot/src/test/resources/org/springframework/boot/web/server/servlet/undertow/restricted.jks
rename to spring-boot-project/spring-boot-all/src/test/resources/org/springframework/boot/web/server/servlet/undertow/restricted.jks
diff --git a/spring-boot-project/spring-boot/src/test/resources/org/springframework/boot/web/server/servlet/test.jks b/spring-boot-project/spring-boot-all/src/test/resources/org/springframework/boot/web/server/servlet/undertow/test.jks
similarity index 100%
rename from spring-boot-project/spring-boot/src/test/resources/org/springframework/boot/web/server/servlet/test.jks
rename to spring-boot-project/spring-boot-all/src/test/resources/org/springframework/boot/web/server/servlet/undertow/test.jks
diff --git a/spring-boot-project/spring-boot/src/test/resources/org/springframework/boot/web/server/servlet/tomcat/test.jks b/spring-boot-project/spring-boot-all/src/test/resources/org/springframework/boot/web/server/tomcat/test.jks
similarity index 100%
rename from spring-boot-project/spring-boot/src/test/resources/org/springframework/boot/web/server/servlet/tomcat/test.jks
rename to spring-boot-project/spring-boot-all/src/test/resources/org/springframework/boot/web/server/tomcat/test.jks
diff --git a/spring-boot-project/spring-boot/src/test/resources/org/springframework/boot/web/server/servlet/undertow/test.jks b/spring-boot-project/spring-boot-all/src/test/resources/org/springframework/boot/web/server/undertow/test.jks
similarity index 100%
rename from spring-boot-project/spring-boot/src/test/resources/org/springframework/boot/web/server/servlet/undertow/test.jks
rename to spring-boot-project/spring-boot-all/src/test/resources/org/springframework/boot/web/server/undertow/test.jks
diff --git a/spring-boot-project/spring-boot-autoconfigure/build.gradle b/spring-boot-project/spring-boot-autoconfigure/build.gradle
index 6af38186909..3f910f01e02 100644
--- a/spring-boot-project/spring-boot-autoconfigure/build.gradle
+++ b/spring-boot-project/spring-boot-autoconfigure/build.gradle
@@ -36,7 +36,7 @@ configurations.all {
}
dependencies {
- api(project(":spring-boot-project:spring-boot"))
+ api(project(":spring-boot-project:spring-boot-all"))
dockerTestImplementation(project(":spring-boot-project:spring-boot-test"))
dockerTestImplementation(project(":spring-boot-project:spring-boot-tools:spring-boot-test-support-docker"))
diff --git a/spring-boot-project/spring-boot-devtools/build.gradle b/spring-boot-project/spring-boot-devtools/build.gradle
index 8a29d4ed75c..e45ae6b0405 100644
--- a/spring-boot-project/spring-boot-devtools/build.gradle
+++ b/spring-boot-project/spring-boot-devtools/build.gradle
@@ -39,7 +39,7 @@ artifacts {
}
dependencies {
- api(project(":spring-boot-project:spring-boot"))
+ api(project(":spring-boot-project:spring-boot-all"))
api(project(":spring-boot-project:spring-boot-autoconfigure"))
intTestDependencies(project(":spring-boot-project:spring-boot-starters:spring-boot-starter-web"))
diff --git a/spring-boot-project/spring-boot-docker-compose/build.gradle b/spring-boot-project/spring-boot-docker-compose/build.gradle
index 9cca5701c23..25b315f27a0 100644
--- a/spring-boot-project/spring-boot-docker-compose/build.gradle
+++ b/spring-boot-project/spring-boot-docker-compose/build.gradle
@@ -25,7 +25,7 @@ plugins {
description = "Spring Boot Docker Compose Support"
dependencies {
- api(project(":spring-boot-project:spring-boot"))
+ api(project(":spring-boot-project:spring-boot-all"))
dockerTestImplementation(project(":spring-boot-project:spring-boot-tools:spring-boot-test-support-docker"))
dockerTestImplementation("com.hazelcast:hazelcast")
diff --git a/spring-boot-project/spring-boot-docs/build.gradle b/spring-boot-project/spring-boot-docs/build.gradle
index ef07f842371..240e766d332 100644
--- a/spring-boot-project/spring-boot-docs/build.gradle
+++ b/spring-boot-project/spring-boot-docs/build.gradle
@@ -89,7 +89,7 @@ dependencies {
configurationProperties(project(path: ":spring-boot-project:spring-boot-test-autoconfigure", configuration: "configurationPropertiesMetadata"))
configurationProperties(project(path: ":spring-boot-project:spring-boot-testcontainers", configuration: "configurationPropertiesMetadata"))
- dokkatoo(project(path: ":spring-boot-project:spring-boot"))
+ dokkatoo(project(path: ":spring-boot-project:spring-boot-all"))
dokkatoo(project(path: ":spring-boot-project:spring-boot-test"))
implementation(project(path: ":spring-boot-project:spring-boot-actuator"))
diff --git a/spring-boot-project/spring-boot-starters/spring-boot-starter/build.gradle b/spring-boot-project/spring-boot-starters/spring-boot-starter/build.gradle
index e48dcc0f31f..5bed23d4424 100644
--- a/spring-boot-project/spring-boot-starters/spring-boot-starter/build.gradle
+++ b/spring-boot-project/spring-boot-starters/spring-boot-starter/build.gradle
@@ -21,7 +21,7 @@ plugins {
description = "Core starter, including auto-configuration support, logging and YAML"
dependencies {
- api(project(":spring-boot-project:spring-boot"))
+ api(project(":spring-boot-project:spring-boot-all"))
api(project(":spring-boot-project:spring-boot-autoconfigure"))
api(project(":spring-boot-project:spring-boot-starters:spring-boot-starter-logging"))
api("jakarta.annotation:jakarta.annotation-api")
diff --git a/spring-boot-project/spring-boot-test-autoconfigure/build.gradle b/spring-boot-project/spring-boot-test-autoconfigure/build.gradle
index be06b784698..f1024d8cfa9 100644
--- a/spring-boot-project/spring-boot-test-autoconfigure/build.gradle
+++ b/spring-boot-project/spring-boot-test-autoconfigure/build.gradle
@@ -24,7 +24,7 @@ plugins {
description = "Spring Boot Test AutoConfigure"
dependencies {
- api(project(":spring-boot-project:spring-boot"))
+ api(project(":spring-boot-project:spring-boot-all"))
api(project(":spring-boot-project:spring-boot-test"))
api(project(":spring-boot-project:spring-boot-autoconfigure"))
diff --git a/spring-boot-project/spring-boot-test/build.gradle b/spring-boot-project/spring-boot-test/build.gradle
index aa2906e538b..7cb56fbedfd 100644
--- a/spring-boot-project/spring-boot-test/build.gradle
+++ b/spring-boot-project/spring-boot-test/build.gradle
@@ -25,7 +25,7 @@ plugins {
description = "Spring Boot Test"
dependencies {
- api(project(":spring-boot-project:spring-boot"))
+ api(project(":spring-boot-project:spring-boot-all"))
api("org.springframework:spring-test")
optional("com.fasterxml.jackson.core:jackson-databind")
diff --git a/spring-boot-project/spring-boot-tools/spring-boot-cli/build.gradle b/spring-boot-project/spring-boot-tools/spring-boot-cli/build.gradle
index 4d63fb72f8c..5fb8d115c5a 100644
--- a/spring-boot-project/spring-boot-tools/spring-boot-cli/build.gradle
+++ b/spring-boot-project/spring-boot-tools/spring-boot-cli/build.gradle
@@ -34,7 +34,7 @@ configurations {
}
dependencies {
- compileOnlyProject(project(":spring-boot-project:spring-boot"))
+ compileOnlyProject(project(":spring-boot-project:spring-boot-all"))
implementation(project(":spring-boot-project:spring-boot-tools:spring-boot-loader-tools"))
implementation("com.vaadin.external.google:android-json")
@@ -49,7 +49,7 @@ dependencies {
loader(project(":spring-boot-project:spring-boot-tools:spring-boot-loader"))
- testImplementation(project(":spring-boot-project:spring-boot"))
+ testImplementation(project(":spring-boot-project:spring-boot-all"))
testImplementation(project(":spring-boot-project:spring-boot-tools:spring-boot-test-support"))
testImplementation(project(":spring-boot-project:spring-boot-test"))
}
diff --git a/spring-boot-project/spring-boot-tools/spring-boot-maven-plugin/build.gradle b/spring-boot-project/spring-boot-tools/spring-boot-maven-plugin/build.gradle
index 331ec66ed76..d940de3b2e5 100644
--- a/spring-boot-project/spring-boot-tools/spring-boot-maven-plugin/build.gradle
+++ b/spring-boot-project/spring-boot-tools/spring-boot-maven-plugin/build.gradle
@@ -89,7 +89,7 @@ dependencies {
intTestImplementation("org.assertj:assertj-core")
intTestImplementation("org.junit.jupiter:junit-jupiter")
- mavenRepository(project(path: ":spring-boot-project:spring-boot", configuration: "mavenRepository"))
+ mavenRepository(project(path: ":spring-boot-project:spring-boot-all", configuration: "mavenRepository"))
mavenRepository(project(path: ":spring-boot-project:spring-boot-dependencies", configuration: "mavenRepository"))
mavenRepository(project(path: ":spring-boot-project:spring-boot-test", configuration: "mavenRepository"))
mavenRepository(project(path: ":spring-boot-project:spring-boot-devtools", configuration: "mavenRepository"))
diff --git a/spring-boot-project/spring-boot-tools/spring-boot-maven-plugin/src/intTest/projects/aot-module-info/src/main/java/module-info.java b/spring-boot-project/spring-boot-tools/spring-boot-maven-plugin/src/intTest/projects/aot-module-info/src/main/java/module-info.java
index 88171fda266..b5ad64d79bb 100644
--- a/spring-boot-project/spring-boot-tools/spring-boot-maven-plugin/src/intTest/projects/aot-module-info/src/main/java/module-info.java
+++ b/spring-boot-project/spring-boot-tools/spring-boot-maven-plugin/src/intTest/projects/aot-module-info/src/main/java/module-info.java
@@ -15,6 +15,6 @@
*/
module sampleApp {
- requires spring.context;
requires spring.boot;
+ requires spring.context;
}
diff --git a/spring-boot-project/spring-boot-tools/spring-boot-properties-migrator/build.gradle b/spring-boot-project/spring-boot-tools/spring-boot-properties-migrator/build.gradle
index 294d381bc2d..f534276ad06 100644
--- a/spring-boot-project/spring-boot-tools/spring-boot-properties-migrator/build.gradle
+++ b/spring-boot-project/spring-boot-tools/spring-boot-properties-migrator/build.gradle
@@ -22,7 +22,7 @@ plugins {
description = "Spring Boot Properties Migrator"
dependencies {
- implementation(project(":spring-boot-project:spring-boot"))
+ implementation(project(":spring-boot-project:spring-boot-all"))
implementation(project(":spring-boot-project:spring-boot-tools:spring-boot-configuration-metadata"))
testImplementation(project(":spring-boot-project:spring-boot-test"))
diff --git a/spring-boot-project/spring-boot-tools/spring-boot-test-support/src/main/java/org/springframework/boot/testsupport/classpath/resources/Resources.java b/spring-boot-project/spring-boot-tools/spring-boot-test-support/src/main/java/org/springframework/boot/testsupport/classpath/resources/Resources.java
index d5e5677ab79..dbb0b1cf4b3 100644
--- a/spring-boot-project/spring-boot-tools/spring-boot-test-support/src/main/java/org/springframework/boot/testsupport/classpath/resources/Resources.java
+++ b/spring-boot-project/spring-boot-tools/spring-boot-test-support/src/main/java/org/springframework/boot/testsupport/classpath/resources/Resources.java
@@ -54,8 +54,7 @@ class Resources {
this.root = root;
}
- Resources addPackage(Package root, String[] resourceNames) {
- String packageName = root.getName();
+ Resources addPackage(String packageName, String[] resourceNames) {
Set unmatchedNames = new HashSet<>(Arrays.asList(resourceNames));
withPathsForPackage(packageName, (packagePath) -> {
for (String resourceName : resourceNames) {
diff --git a/spring-boot-project/spring-boot-tools/spring-boot-test-support/src/main/java/org/springframework/boot/testsupport/classpath/resources/ResourcesExtension.java b/spring-boot-project/spring-boot-tools/spring-boot-test-support/src/main/java/org/springframework/boot/testsupport/classpath/resources/ResourcesExtension.java
index c6c70ff26a1..3b153d00e2f 100644
--- a/spring-boot-project/spring-boot-tools/spring-boot-test-support/src/main/java/org/springframework/boot/testsupport/classpath/resources/ResourcesExtension.java
+++ b/spring-boot-project/spring-boot-tools/spring-boot-test-support/src/main/java/org/springframework/boot/testsupport/classpath/resources/ResourcesExtension.java
@@ -66,7 +66,7 @@ class ResourcesExtension implements BeforeEachCallback, AfterEachCallback, Param
.forEach((resource) -> resources.addResource(resource.name(), resource.content(), resource.additional()));
resourceDirectoriesOf(testMethod).forEach((directory) -> resources.addDirectory(directory.value()));
packageResourcesOf(testMethod, context).forEach((withPackageResources) -> resources
- .addPackage(testMethod.getDeclaringClass().getPackage(), withPackageResources.value()));
+ .addPackage(testMethod.getDeclaringClass().getPackage().getName(), withPackageResources.value()));
ResourcesClassLoader classLoader = new ResourcesClassLoader(context.getRequiredTestClass().getClassLoader(),
resources);
store.put(TCCL_KEY, new Tccl());
diff --git a/spring-boot-project/spring-boot-tools/spring-boot-test-support/src/test/java/org/springframework/boot/testsupport/classpath/resources/ResourcesTests.java b/spring-boot-project/spring-boot-tools/spring-boot-test-support/src/test/java/org/springframework/boot/testsupport/classpath/resources/ResourcesTests.java
index f2010d81b40..72b464c8dc2 100644
--- a/spring-boot-project/spring-boot-tools/spring-boot-test-support/src/test/java/org/springframework/boot/testsupport/classpath/resources/ResourcesTests.java
+++ b/spring-boot-project/spring-boot-tools/spring-boot-test-support/src/test/java/org/springframework/boot/testsupport/classpath/resources/ResourcesTests.java
@@ -74,7 +74,8 @@ class ResourcesTests {
@Test
void whenAddPackageThenNamedResourcesFromPackageAreCreatedAndCanBeFound() {
- this.resources.addPackage(getClass().getPackage(), new String[] { "resource-1.txt", "sub/resource-3.txt" });
+ this.resources.addPackage(getClass().getPackage().getName(),
+ new String[] { "resource-1.txt", "sub/resource-3.txt" });
assertThat(this.root.resolve("resource-1.txt")).hasContent("one");
assertThat(this.root.resolve("resource-2.txt")).doesNotExist();
assertThat(this.root.resolve("sub/resource-3.txt")).hasContent("three");
@@ -96,7 +97,7 @@ class ResourcesTests {
@Test
void whenAddPackageAndDeleteThenResourcesDoNotExistAndCannotBeFound() {
- this.resources.addPackage(getClass().getPackage(),
+ this.resources.addPackage(getClass().getPackage().getName(),
new String[] { "resource-1.txt", "resource-2.txt", "sub/resource-3.txt" });
assertThat(this.root.resolve("resource-1.txt")).hasContent("one");
assertThat(this.root.resolve("resource-2.txt")).hasContent("two");
diff --git a/spring-boot-project/spring-boot/build.gradle b/spring-boot-project/spring-boot/build.gradle
index 39f70a005fe..9d2b9d6f62a 100644
--- a/spring-boot-project/spring-boot/build.gradle
+++ b/spring-boot-project/spring-boot/build.gradle
@@ -26,12 +26,6 @@ plugins {
description = "Spring Boot"
-def tomcatConfigProperties = layout.buildDirectory.dir("tomcat-config-properties")
-
-configurations {
- tomcatDistribution
-}
-
dependencies {
annotationProcessor("org.apache.logging.log4j:log4j-core")
@@ -39,130 +33,51 @@ dependencies {
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")
- optional("org.apache.httpcomponents.client5:httpclient5")
- optional("org.apache.httpcomponents.core5:httpcore5-reactive")
+ optional("jakarta.validation:jakarta.validation-api")
+ optional("org.apache.groovy:groovy")
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-reactive-httpclient")
- 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")
- 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.jetbrains.kotlin:kotlin-reflect")
+ optional("org.jetbrains.kotlin:kotlin-stdlib")
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")
+ testFixturesImplementation(project(":spring-boot-project:spring-boot-tools:spring-boot-test-support"))
+ testFixturesImplementation("io.projectreactor:reactor-test")
+ testFixturesImplementation("io.projectreactor.netty:reactor-netty-http")
+ testFixturesImplementation("org.apache.httpcomponents.client5:httpclient5")
+ testFixturesImplementation("org.apache.tomcat.embed:tomcat-embed-jasper")
+ testFixturesImplementation("org.eclipse.jetty.http2:jetty-http2-client")
+ testFixturesImplementation("org.eclipse.jetty.http2:jetty-http2-client-transport")
testFixturesCompileOnly("jakarta.servlet:jakarta.servlet-api")
testFixturesCompileOnly("org.mockito:mockito-core")
testFixturesCompileOnly("org.springframework:spring-web")
testImplementation(project(":spring-boot-project:spring-boot-tools:spring-boot-test-support"))
- testImplementation("com.ibm.db2:jcc")
- 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("io.projectreactor.netty:reactor-netty-http")
+ testImplementation("jakarta.annotation:jakarta.annotation-api")
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.apache.groovy:groovy-xml")
+ testImplementation("org.apache.httpcomponents.client5:httpclient5")
+ testImplementation("org.apache.tomcat:tomcat-jdbc")
+ testImplementation("org.apache.tomcat.embed:tomcat-embed-core")
+ testImplementation("org.apache.tomcat.embed:tomcat-embed-jasper")
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.mariadb.jdbc:mariadb-java-client") {
- exclude group: "org.slf4j", module: "jcl-over-slf4j"
- }
- testImplementation("org.springframework:spring-context-support")
- testImplementation("org.springframework.data:spring-data-redis")
+ testImplementation("org.hibernate.validator:hibernate-validator")
+ testImplementation("org.jboss.logging:jboss-logging")
testImplementation("org.springframework.data:spring-data-r2dbc")
- testImplementation("org.xerial:sqlite-jdbc")
-
- testRuntimeOnly("org.testcontainers:jdbc") {
- exclude group: "javax.annotation", module: "javax.annotation-api"
- }
-
- tomcatDistribution("org.apache.tomcat:tomcat:${tomcatVersion}@zip")
-}
-
-tasks.register("extractTomcatConfigProperties", Sync) {
- destinationDir = file(tomcatConfigProperties)
- from {
- zipTree(configurations.tomcatDistribution.incoming.files.singleFile).matching {
- include '**/conf/catalina.properties'
- }.singleFile
- }
}
def syncJavaTemplates = tasks.register("syncJavaTemplates", Sync) {
@@ -193,11 +108,4 @@ sourceSets {
srcDirs syncJavaTemplates
}
}
- test {
- output.dir(tomcatConfigProperties, builtBy: "extractTomcatConfigProperties")
- }
-}
-
-test {
- jvmArgs += "--add-opens=java.base/java.net=ALL-UNNAMED"
}
diff --git a/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/logging/structured/StructuredLogFormatter.java b/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/logging/structured/StructuredLogFormatter.java
index d8c7849508b..0bde5f83c24 100644
--- a/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/logging/structured/StructuredLogFormatter.java
+++ b/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/logging/structured/StructuredLogFormatter.java
@@ -18,8 +18,6 @@ package org.springframework.boot.logging.structured;
import java.nio.charset.Charset;
-import ch.qos.logback.classic.pattern.ThrowableProxyConverter;
-
import org.springframework.boot.logging.StackTracePrinter;
import org.springframework.core.env.Environment;
@@ -36,7 +34,7 @@ import org.springframework.core.env.Environment;
* When using Logback, implementing classes can also use the following parameter types in
* the constructor:
*
- * - {@link ThrowableProxyConverter}
+ * - {@code ch.qos.logback.classic.pattern.ThrowableProxyConverter}
*
*
* @param the log event type
diff --git a/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/logging/structured/StructuredLoggingJsonMembersCustomizer.java b/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/logging/structured/StructuredLoggingJsonMembersCustomizer.java
index 69c3bee1ee2..897a8d7b72b 100644
--- a/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/logging/structured/StructuredLoggingJsonMembersCustomizer.java
+++ b/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/logging/structured/StructuredLoggingJsonMembersCustomizer.java
@@ -16,8 +16,6 @@
package org.springframework.boot.logging.structured;
-import ch.qos.logback.classic.pattern.ThrowableProxyConverter;
-
import org.springframework.boot.json.JsonWriter;
import org.springframework.boot.json.JsonWriter.Members;
import org.springframework.core.env.Environment;
@@ -38,7 +36,7 @@ import org.springframework.core.env.Environment;
* When using Logback, implementing classes can also use the following parameter types in
* the constructor:
*
- * - {@link ThrowableProxyConverter}
+ * - {@code ch.qos.logback.classic.pattern.ThrowableProxyConverter}
*
*
* @param the type being written
diff --git a/spring-boot-project/spring-boot/src/main/resources/META-INF/spring.factories b/spring-boot-project/spring-boot/src/main/resources/META-INF/spring.factories
index b47204f480c..3ac98695711 100644
--- a/spring-boot-project/spring-boot/src/main/resources/META-INF/spring.factories
+++ b/spring-boot-project/spring-boot/src/main/resources/META-INF/spring.factories
@@ -39,7 +39,6 @@ org.springframework.context.ApplicationContextInitializer=\
org.springframework.boot.context.ConfigurationWarningsApplicationContextInitializer,\
org.springframework.boot.context.ContextIdApplicationContextInitializer,\
org.springframework.boot.io.ProtocolResolverApplicationContextInitializer,\
-org.springframework.boot.rsocket.context.RSocketPortInfoApplicationContextInitializer,\
org.springframework.boot.web.context.ServerPortInfoApplicationContextInitializer
# Application Listeners
@@ -57,8 +56,7 @@ org.springframework.boot.cloud.CloudFoundryVcapEnvironmentPostProcessor,\
org.springframework.boot.context.config.ConfigDataEnvironmentPostProcessor,\
org.springframework.boot.env.RandomValuePropertySourceEnvironmentPostProcessor,\
org.springframework.boot.env.SpringApplicationJsonEnvironmentPostProcessor,\
-org.springframework.boot.env.SystemEnvironmentPropertySourceEnvironmentPostProcessor,\
-org.springframework.boot.reactor.ReactorEnvironmentPostProcessor
+org.springframework.boot.env.SystemEnvironmentPropertySourceEnvironmentPostProcessor
# Failure Analyzers
org.springframework.boot.diagnostics.FailureAnalyzer=\
@@ -80,30 +78,12 @@ org.springframework.boot.diagnostics.analyzer.NoUniqueBeanDefinitionFailureAnaly
org.springframework.boot.diagnostics.analyzer.PatternParseFailureAnalyzer,\
org.springframework.boot.diagnostics.analyzer.UnboundConfigurationPropertyFailureAnalyzer,\
org.springframework.boot.diagnostics.analyzer.ValidationExceptionFailureAnalyzer,\
-org.springframework.boot.liquibase.LiquibaseChangelogMissingFailureAnalyzer,\
-org.springframework.boot.web.context.MissingWebServerFactoryBeanFailureAnalyzer,\
-org.springframework.boot.web.server.tomcat.ConnectorStartFailureAnalyzer
-org.springframework.boot.web.server.PortInUseFailureAnalyzer
+org.springframework.boot.web.context.MissingWebServerFactoryBeanFailureAnalyzer
# Failure Analysis Reporters
org.springframework.boot.diagnostics.FailureAnalysisReporter=\
org.springframework.boot.diagnostics.LoggingFailureAnalysisReporter
-# 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.jdbc.SpringJdbcDependsOnDatabaseInitializationDetector,\
-org.springframework.boot.jooq.JooqDependsOnDatabaseInitializationDetector,\
-org.springframework.boot.orm.jpa.JpaDependsOnDatabaseInitializationDetector,\
-org.springframework.boot.sql.init.dependency.AnnotationDependsOnDatabaseInitializationDetector
-
# Resource Locator Protocol Resolvers
org.springframework.core.io.ProtocolResolver=\
org.springframework.boot.io.Base64ProtocolResolver
diff --git a/spring-boot-project/spring-boot/src/main/resources/META-INF/spring/aot.factories b/spring-boot-project/spring-boot/src/main/resources/META-INF/spring/aot.factories
index 7f012debcb2..5213e850947 100644
--- a/spring-boot-project/spring-boot/src/main/resources/META-INF/spring/aot.factories
+++ b/spring-boot-project/spring-boot/src/main/resources/META-INF/spring/aot.factories
@@ -5,23 +5,18 @@ org.springframework.boot.WebApplicationType$WebApplicationTypeRuntimeHints,\
org.springframework.boot.context.config.ConfigDataLocationRuntimeHints,\
org.springframework.boot.context.config.ConfigDataPropertiesRuntimeHints,\
org.springframework.boot.env.PropertySourceRuntimeHints,\
-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.logging.structured.ElasticCommonSchemaProperties$ElasticCommonSchemaPropertiesRuntimeHints,\
org.springframework.boot.logging.structured.GraylogExtendedLogFormatProperties$GraylogExtendedLogFormatPropertiesRuntimeHints,\
-org.springframework.boot.logging.structured.StructuredLoggingJsonProperties$StructuredLoggingJsonPropertiesRuntimeHints
-org.springframework.boot.web.server.MimeMappings$MimeMappingsRuntimeHints,\
-org.springframework.boot.web.server.undertow.UndertowWebServer$UndertowWebServerRuntimeHints
+org.springframework.boot.logging.structured.StructuredLoggingJsonProperties$StructuredLoggingJsonPropertiesRuntimeHints,\
+org.springframework.boot.web.server.MimeMappings$MimeMappingsRuntimeHints
org.springframework.beans.factory.aot.BeanFactoryInitializationAotProcessor=\
org.springframework.boot.context.properties.ConfigurationPropertiesBeanFactoryInitializationAotProcessor,\
org.springframework.boot.env.EnvironmentPostProcessorApplicationListener$EnvironmentBeanFactoryInitializationAotProcessor,\
-org.springframework.boot.jackson.JsonComponentModule$JsonComponentBeanFactoryInitializationAotProcessor,\
org.springframework.boot.logging.structured.StructuredLoggingJsonPropertiesBeanFactoryInitializationAotProcessor
org.springframework.beans.factory.aot.BeanRegistrationAotProcessor=\
-org.springframework.boot.context.properties.ConfigurationPropertiesBeanRegistrationAotProcessor,\
-org.springframework.boot.jackson.JsonMixinModuleEntriesBeanRegistrationAotProcessor
+org.springframework.boot.context.properties.ConfigurationPropertiesBeanRegistrationAotProcessor
diff --git a/spring-boot-project/spring-boot/src/test/java/org/springframework/boot/SpringApplicationTests.java b/spring-boot-project/spring-boot/src/test/java/org/springframework/boot/SpringApplicationTests.java
index 2c4ba53a872..088475e38a5 100644
--- a/spring-boot-project/spring-boot/src/test/java/org/springframework/boot/SpringApplicationTests.java
+++ b/spring-boot-project/spring-boot/src/test/java/org/springframework/boot/SpringApplicationTests.java
@@ -79,8 +79,8 @@ import org.springframework.boot.testsupport.system.OutputCaptureExtension;
import org.springframework.boot.web.reactive.context.AnnotationConfigReactiveWebServerApplicationContext;
import org.springframework.boot.web.reactive.context.ReactiveWebApplicationContext;
import org.springframework.boot.web.reactive.context.StandardReactiveWebEnvironment;
-import org.springframework.boot.web.server.reactive.netty.NettyReactiveWebServerFactory;
-import org.springframework.boot.web.server.servlet.tomcat.TomcatServletWebServerFactory;
+import org.springframework.boot.web.server.reactive.MockReactiveWebServerFactory;
+import org.springframework.boot.web.server.servlet.MockServletWebServerFactory;
import org.springframework.boot.web.servlet.context.AnnotationConfigServletWebServerApplicationContext;
import org.springframework.context.ApplicationContext;
import org.springframework.context.ApplicationContextAware;
@@ -1739,8 +1739,8 @@ class SpringApplicationTests {
static class ExampleWebConfig {
@Bean
- TomcatServletWebServerFactory webServer() {
- return new TomcatServletWebServerFactory(0);
+ MockServletWebServerFactory webServer() {
+ return new MockServletWebServerFactory();
}
}
@@ -1749,8 +1749,8 @@ class SpringApplicationTests {
static class ExampleReactiveWebConfig {
@Bean
- NettyReactiveWebServerFactory webServerFactory() {
- return new NettyReactiveWebServerFactory(0);
+ MockReactiveWebServerFactory webServerFactory() {
+ return new MockReactiveWebServerFactory();
}
@Bean
diff --git a/spring-boot-project/spring-boot/src/test/java/org/springframework/boot/builder/SpringApplicationBuilderTests.java b/spring-boot-project/spring-boot/src/test/java/org/springframework/boot/builder/SpringApplicationBuilderTests.java
index 52bc87aa957..82e97c993c6 100644
--- a/spring-boot-project/spring-boot/src/test/java/org/springframework/boot/builder/SpringApplicationBuilderTests.java
+++ b/spring-boot-project/spring-boot/src/test/java/org/springframework/boot/builder/SpringApplicationBuilderTests.java
@@ -274,7 +274,7 @@ class SpringApplicationBuilderTests {
SpringApplicationBuilder application = new SpringApplicationBuilder(ExampleConfig.class)
.web(WebApplicationType.NONE);
this.context = application.run();
- assertThat(application.application().getInitializers()).hasSize(5);
+ assertThat(application.application().getInitializers()).hasSize(4);
}
@Test
@@ -283,7 +283,7 @@ class SpringApplicationBuilderTests {
.child(ChildConfig.class)
.web(WebApplicationType.NONE);
this.context = application.run();
- assertThat(application.application().getInitializers()).hasSize(6);
+ assertThat(application.application().getInitializers()).hasSize(5);
}
@Test
@@ -293,7 +293,7 @@ class SpringApplicationBuilderTests {
.initializers((ConfigurableApplicationContext applicationContext) -> {
});
this.context = application.run();
- assertThat(application.application().getInitializers()).hasSize(6);
+ assertThat(application.application().getInitializers()).hasSize(5);
}
@Test
diff --git a/spring-boot-project/spring-boot/src/test/java/org/springframework/boot/context/logging/LoggingApplicationListenerIntegrationTests.java b/spring-boot-project/spring-boot/src/test/java/org/springframework/boot/context/logging/LoggingApplicationListenerIntegrationTests.java
index 3feaa086b2c..890a0d3a6d2 100644
--- a/spring-boot-project/spring-boot/src/test/java/org/springframework/boot/context/logging/LoggingApplicationListenerIntegrationTests.java
+++ b/spring-boot-project/spring-boot/src/test/java/org/springframework/boot/context/logging/LoggingApplicationListenerIntegrationTests.java
@@ -30,7 +30,9 @@ import org.springframework.boot.builder.SpringApplicationBuilder;
import org.springframework.boot.context.event.ApplicationStartingEvent;
import org.springframework.boot.logging.LogFile;
import org.springframework.boot.logging.LoggingSystem;
+import org.springframework.boot.logging.LoggingSystemFactory;
import org.springframework.boot.logging.LoggingSystemProperty;
+import org.springframework.boot.testsupport.classpath.resources.WithResource;
import org.springframework.boot.testsupport.system.CapturedOutput;
import org.springframework.boot.testsupport.system.OutputCaptureExtension;
import org.springframework.context.ApplicationListener;
@@ -44,6 +46,10 @@ import static org.assertj.core.api.Assertions.assertThat;
*
* @author Stephane Nicoll
*/
+@WithResource(name = "META-INF/spring.factories",
+ content = """
+ org.springframework.boot.logging.LoggingSystemFactory=org.springframework.boot.context.logging.LoggingApplicationListenerIntegrationTests$MockLoggingSystemFactory
+ """)
@ExtendWith(OutputCaptureExtension.class)
class LoggingApplicationListenerIntegrationTests {
@@ -110,4 +116,22 @@ class LoggingApplicationListenerIntegrationTests {
}
+ static class MockLoggingSystemFactory implements LoggingSystemFactory {
+
+ @Override
+ public LoggingSystem getLoggingSystem(ClassLoader classLoader) {
+ return new MockLoggingSystem();
+ }
+
+ }
+
+ static class MockLoggingSystem extends LoggingSystem {
+
+ @Override
+ public void beforeInitialize() {
+
+ }
+
+ }
+
}
diff --git a/spring-boot-project/spring-boot/src/test/java/org/springframework/boot/web/servlet/FilterRegistrationIntegrationTests.java b/spring-boot-project/spring-boot/src/test/java/org/springframework/boot/web/servlet/FilterRegistrationIntegrationTests.java
index 5828687e6a5..e4b2aeed1d2 100644
--- a/spring-boot-project/spring-boot/src/test/java/org/springframework/boot/web/servlet/FilterRegistrationIntegrationTests.java
+++ b/spring-boot-project/spring-boot/src/test/java/org/springframework/boot/web/servlet/FilterRegistrationIntegrationTests.java
@@ -20,7 +20,7 @@ import jakarta.servlet.Filter;
import org.junit.jupiter.api.AfterEach;
import org.junit.jupiter.api.Test;
-import org.springframework.boot.web.server.servlet.tomcat.TomcatServletWebServerFactory;
+import org.springframework.boot.web.server.servlet.MockServletWebServerFactory;
import org.springframework.boot.web.servlet.context.AnnotationConfigServletWebServerApplicationContext;
import org.springframework.boot.web.servlet.mock.MockFilter;
import org.springframework.context.annotation.Bean;
@@ -65,8 +65,8 @@ class FilterRegistrationIntegrationTests {
static class ContainerConfiguration {
@Bean
- TomcatServletWebServerFactory webServerFactory() {
- return new TomcatServletWebServerFactory(0);
+ MockServletWebServerFactory webServerFactory() {
+ return new MockServletWebServerFactory();
}
}
diff --git a/spring-boot-project/spring-boot/src/test/java/org/springframework/boot/web/servlet/ServletComponentScanIntegrationTests.java b/spring-boot-project/spring-boot/src/test/java/org/springframework/boot/web/servlet/ServletComponentScanIntegrationTests.java
index 90b344bd3cb..c3f00ff1f32 100644
--- a/spring-boot-project/spring-boot/src/test/java/org/springframework/boot/web/servlet/ServletComponentScanIntegrationTests.java
+++ b/spring-boot-project/spring-boot/src/test/java/org/springframework/boot/web/servlet/ServletComponentScanIntegrationTests.java
@@ -23,35 +23,25 @@ import java.net.URL;
import java.net.URLClassLoader;
import java.util.Map;
import java.util.Properties;
-import java.util.stream.Stream;
import jakarta.servlet.MultipartConfigElement;
import jakarta.servlet.annotation.WebFilter;
import jakarta.servlet.annotation.WebListener;
import jakarta.servlet.annotation.WebServlet;
import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.io.TempDir;
-import org.junit.jupiter.params.ParameterizedTest;
-import org.junit.jupiter.params.provider.Arguments;
-import org.junit.jupiter.params.provider.MethodSource;
import org.springframework.beans.factory.ObjectProvider;
-import org.springframework.boot.testsupport.classpath.ForkedClassPath;
-import org.springframework.boot.testsupport.web.servlet.DirtiesUrlFactories;
-import org.springframework.boot.web.context.ServerPortInfoApplicationContextInitializer;
import org.springframework.boot.web.server.servlet.ConfigurableServletWebServerFactory;
+import org.springframework.boot.web.server.servlet.MockServletWebServerFactory;
import org.springframework.boot.web.server.servlet.ServletWebServerFactory;
-import org.springframework.boot.web.server.servlet.jetty.JettyServletWebServerFactory;
-import org.springframework.boot.web.server.servlet.tomcat.TomcatServletWebServerFactory;
-import org.springframework.boot.web.server.servlet.undertow.UndertowServletWebServerFactory;
import org.springframework.boot.web.servlet.context.AnnotationConfigServletWebServerApplicationContext;
import org.springframework.boot.web.servlet.testcomponents.filter.TestFilter;
import org.springframework.boot.web.servlet.testcomponents.listener.TestListener;
import org.springframework.boot.web.servlet.testcomponents.servlet.TestMultipartServlet;
import org.springframework.boot.web.servlet.testcomponents.servlet.TestServlet;
import org.springframework.context.annotation.Bean;
-import org.springframework.context.annotation.Configuration;
-import org.springframework.web.client.RestTemplate;
import static org.assertj.core.api.Assertions.assertThat;
@@ -60,7 +50,6 @@ import static org.assertj.core.api.Assertions.assertThat;
*
* @author Andy Wilkinson
*/
-@DirtiesUrlFactories
class ServletComponentScanIntegrationTests {
private AnnotationConfigServletWebServerApplicationContext context;
@@ -75,44 +64,41 @@ class ServletComponentScanIntegrationTests {
}
}
- @ParameterizedTest(name = "{0}")
- @MethodSource("testConfiguration")
- @ForkedClassPath
- void componentsAreRegistered(String serverName, Class> configuration) {
+ @Test
+ void componentsAreRegistered() {
this.context = new AnnotationConfigServletWebServerApplicationContext();
- this.context.register(configuration);
- new ServerPortInfoApplicationContextInitializer().initialize(this.context);
+ this.context.register(TestConfiguration.class);
this.context.refresh();
- String port = this.context.getEnvironment().getProperty("local.server.port");
- String response = new RestTemplate().getForObject("http://localhost:" + port + "/test", String.class);
- assertThat(response).isEqualTo("alpha bravo charlie");
+ assertThat(this.context.getServletContext().getFilterRegistrations()).hasSize(1)
+ .containsKey(TestFilter.class.getName());
+ assertThat(this.context.getServletContext().getServletRegistrations()).hasSize(2)
+ .containsKeys(TestServlet.class.getName(), TestMultipartServlet.class.getName());
+ assertThat(this.context.getBean(MockServletWebServerFactory.class).getSettings().getWebListenerClassNames())
+ .containsExactly(TestListener.class.getName());
}
- @ParameterizedTest(name = "{0}")
- @MethodSource("testConfiguration")
- @ForkedClassPath
- void indexedComponentsAreRegistered(String serverName, Class> configuration) throws IOException {
+ @Test
+ void indexedComponentsAreRegistered() throws IOException {
writeIndex(this.temp);
this.context = new AnnotationConfigServletWebServerApplicationContext();
try (URLClassLoader classLoader = new URLClassLoader(new URL[] { this.temp.toURI().toURL() },
getClass().getClassLoader())) {
this.context.setClassLoader(classLoader);
- this.context.register(configuration);
- new ServerPortInfoApplicationContextInitializer().initialize(this.context);
+ this.context.register(TestConfiguration.class);
this.context.refresh();
- String port = this.context.getEnvironment().getProperty("local.server.port");
- String response = new RestTemplate().getForObject("http://localhost:" + port + "/test", String.class);
- assertThat(response).isEqualTo("alpha bravo charlie");
+ assertThat(this.context.getServletContext().getFilterRegistrations()).hasSize(1)
+ .containsKey(TestFilter.class.getName());
+ assertThat(this.context.getServletContext().getServletRegistrations()).hasSize(1)
+ .containsKeys(TestServlet.class.getName());
+ assertThat(this.context.getBean(MockServletWebServerFactory.class).getSettings().getWebListenerClassNames())
+ .containsExactly(TestListener.class.getName());
}
}
- @ParameterizedTest(name = "{0}")
- @MethodSource("testConfiguration")
- @ForkedClassPath
- void multipartConfigIsHonoured(String serverName, Class> configuration) {
+ @Test
+ void multipartConfigIsHonoured() {
this.context = new AnnotationConfigServletWebServerApplicationContext();
- this.context.register(configuration);
- new ServerPortInfoApplicationContextInitializer().initialize(this.context);
+ this.context.register(TestConfiguration.class);
this.context.refresh();
@SuppressWarnings("rawtypes")
Map beans = this.context.getBeansOfType(ServletRegistrationBean.class);
@@ -138,54 +124,16 @@ class ServletComponentScanIntegrationTests {
}
}
- static Stream testConfiguration() {
- return Stream.of(Arguments.of("Jetty", JettyTestConfiguration.class),
- Arguments.of("Tomcat", TomcatTestConfiguration.class),
- Arguments.of("Undertow", UndertowTestConfiguration.class));
- }
-
@ServletComponentScan(basePackages = "org.springframework.boot.web.servlet.testcomponents")
- abstract static class AbstractTestConfiguration {
+ static class TestConfiguration {
@Bean
protected ServletWebServerFactory webServerFactory(ObjectProvider webListenerRegistrars) {
- ConfigurableServletWebServerFactory factory = createWebServerFactory();
+ ConfigurableServletWebServerFactory factory = new MockServletWebServerFactory();
webListenerRegistrars.orderedStream().forEach((registrar) -> registrar.register(factory));
return factory;
}
- abstract ConfigurableServletWebServerFactory createWebServerFactory();
-
- }
-
- @Configuration(proxyBeanMethods = false)
- static class JettyTestConfiguration extends AbstractTestConfiguration {
-
- @Override
- ConfigurableServletWebServerFactory createWebServerFactory() {
- return new JettyServletWebServerFactory(0);
- }
-
- }
-
- @Configuration(proxyBeanMethods = false)
- static class TomcatTestConfiguration extends AbstractTestConfiguration {
-
- @Override
- ConfigurableServletWebServerFactory createWebServerFactory() {
- return new TomcatServletWebServerFactory(0);
- }
-
- }
-
- @Configuration(proxyBeanMethods = false)
- static class UndertowTestConfiguration extends AbstractTestConfiguration {
-
- @Override
- ConfigurableServletWebServerFactory createWebServerFactory() {
- return new UndertowServletWebServerFactory(0);
- }
-
}
}
diff --git a/spring-boot-project/spring-boot/src/test/java/org/springframework/boot/web/servlet/support/SpringBootServletInitializerTests.java b/spring-boot-project/spring-boot/src/test/java/org/springframework/boot/web/servlet/support/SpringBootServletInitializerTests.java
index 5a4259dff78..6f529522898 100644
--- a/spring-boot-project/spring-boot/src/test/java/org/springframework/boot/web/servlet/support/SpringBootServletInitializerTests.java
+++ b/spring-boot-project/spring-boot/src/test/java/org/springframework/boot/web/servlet/support/SpringBootServletInitializerTests.java
@@ -21,6 +21,7 @@ import java.util.EnumSet;
import java.util.Map;
import java.util.Vector;
import java.util.concurrent.atomic.AtomicBoolean;
+import java.util.concurrent.atomic.AtomicReference;
import jakarta.servlet.DispatcherType;
import jakarta.servlet.Filter;
@@ -41,8 +42,8 @@ import org.springframework.boot.context.logging.LoggingApplicationListener;
import org.springframework.boot.testsupport.system.CapturedOutput;
import org.springframework.boot.testsupport.system.OutputCaptureExtension;
import org.springframework.boot.web.server.WebServer;
+import org.springframework.boot.web.server.servlet.MockServletWebServerFactory;
import org.springframework.boot.web.server.servlet.ServletWebServerFactory;
-import org.springframework.boot.web.server.servlet.undertow.UndertowServletWebServerFactory;
import org.springframework.boot.web.servlet.FilterRegistrationBean;
import org.springframework.context.ApplicationListener;
import org.springframework.context.ConfigurableApplicationContext;
@@ -126,14 +127,16 @@ class SpringBootServletInitializerTests {
@Test
void errorPageFilterRegistrationCanBeDisabled() {
- WebServer webServer = new UndertowServletWebServerFactory(0).getWebServer((servletContext) -> {
+ AtomicReference