Remove no-longer-needed spring-boot-all module

See gh-46071

settings.gradle

@@ -59,8 +59,6 @@ include "spring-boot-project:spring-boot"
 include "spring-boot-project:spring-boot-activemq"
 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-all-integration-tests"
 include "spring-boot-project:spring-boot-amqp"
 include "spring-boot-project:spring-boot-artemis"
 include "spring-boot-project:spring-boot-autoconfigure"
@@ -97,6 +95,7 @@ include "spring-boot-project:spring-boot-hazelcast"
 include "spring-boot-project:spring-boot-http"
 include "spring-boot-project:spring-boot-http-codec"
 include "spring-boot-project:spring-boot-integration"
+include "spring-boot-project:spring-boot-integration-tests"
 include "spring-boot-project:spring-boot-jackson"
 include "spring-boot-project:spring-boot-jdbc"
 include "spring-boot-project:spring-boot-jersey"

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

@@ -35,7 +35,6 @@ configurations.all {
 
 dependencies {
 	api(project(":spring-boot-project:spring-boot-actuator"))
-	api(project(":spring-boot-project:spring-boot-all"))
 	api(project(":spring-boot-project:spring-boot-autoconfigure-all"))
 
 	implementation("com.fasterxml.jackson.core:jackson-databind")

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-all"))
+	api(project(":spring-boot-project:spring-boot"))
 
 	dockerTestImplementation(project(":spring-boot-project:spring-boot-autoconfigure-all"))
 	dockerTestImplementation(project(":spring-boot-project:spring-boot-cache"))

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

@@ -1,152 +0,0 @@
-/*
- * 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"
-
-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.fasterxml.jackson.core:jackson-databind")
-	optional("com.h2database:h2")
-	optional("com.google.code.gson:gson")
-	optional("com.oracle.database.jdbc:ucp11")
-	optional("com.oracle.database.jdbc:ojdbc11")
-	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.undertow:undertow-servlet")
-	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-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.hamcrest:hamcrest-library")
-	optional("org.hibernate.orm:hibernate-core")
-	optional("org.hibernate.validator:hibernate-validator")
-	optional("org.jooq:jooq")
-	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-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("com.ibm.db2:jcc")
-	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("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.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")
-
-	testRuntimeOnly("org.testcontainers:jdbc") {
-		exclude group: "javax.annotation", module: "javax.annotation-api"
-	}
-}
-
-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 {
-	jvmArgs += "--add-opens=java.base/java.net=ALL-UNNAMED"
-}

spring-boot-project/spring-boot-all/src/test/java/org/springframework/boot/http/client/reactive/ClientHttpConnectorBuilderTests.java

@@ -1,158 +0,0 @@
-/*
- * 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.
- */
-
-package org.springframework.boot.http.client.reactive;
-
-import java.net.URI;
-import java.time.Duration;
-import java.util.List;
-import java.util.function.Function;
-
-import org.junit.jupiter.api.Test;
-import reactor.core.publisher.Mono;
-
-import org.springframework.boot.testsupport.classpath.ClassPathExclusions;
-import org.springframework.http.HttpMethod;
-import org.springframework.http.client.reactive.ClientHttpConnector;
-import org.springframework.http.client.reactive.ClientHttpRequest;
-import org.springframework.http.client.reactive.ClientHttpResponse;
-import org.springframework.http.client.reactive.HttpComponentsClientHttpConnector;
-import org.springframework.http.client.reactive.JdkClientHttpConnector;
-import org.springframework.http.client.reactive.JettyClientHttpConnector;
-import org.springframework.http.client.reactive.ReactorClientHttpConnector;
-
-import static org.assertj.core.api.Assertions.assertThat;
-import static org.assertj.core.api.Assertions.assertThatIllegalArgumentException;
-
-/**
- * Tests for {@link ClientHttpConnectorBuilder}.
- *
- * @author Phillip Webb
- */
-class ClientHttpConnectorBuilderTests {
-
-	@Test
-	void withCustomizerAppliesCustomizers() {
-		ClientHttpConnectorBuilder<JdkClientHttpConnector> builder = (settings) -> new JdkClientHttpConnector();
-		builder = builder.withCustomizer(this::setJdkReadTimeout);
-		JdkClientHttpConnector connector = builder.build(null);
-		assertThat(connector).extracting("readTimeout").isEqualTo(Duration.ofSeconds(5));
-	}
-
-	@Test
-	void withCustomizersAppliesCustomizers() {
-		ClientHttpConnectorBuilder<JdkClientHttpConnector> builder = (settings) -> new JdkClientHttpConnector();
-		builder = builder.withCustomizers(List.of(this::setJdkReadTimeout));
-		JdkClientHttpConnector connector = builder.build(null);
-		assertThat(connector).extracting("readTimeout").isEqualTo(Duration.ofSeconds(5));
-	}
-
-	@Test
-	void reactorReturnsReactorFactoryBuilder() {
-		assertThat(ClientHttpConnectorBuilder.reactor()).isInstanceOf(ReactorClientHttpConnectorBuilder.class);
-	}
-
-	@Test
-	void jettyReturnsJettyFactoryBuilder() {
-		assertThat(ClientHttpConnectorBuilder.jetty()).isInstanceOf(JettyClientHttpConnectorBuilder.class);
-	}
-
-	@Test
-	void httpComponentsReturnsHttpComponentsFactoryBuilder() {
-		assertThat(ClientHttpConnectorBuilder.httpComponents())
-			.isInstanceOf(HttpComponentsClientHttpConnectorBuilder.class);
-	}
-
-	@Test
-	void jdkReturnsJdkFactoryBuilder() {
-		assertThat(ClientHttpConnectorBuilder.jdk()).isInstanceOf(JdkClientHttpConnectorBuilder.class);
-	}
-
-	@Test
-	void ofWhenExactlyClientHttpRequestFactoryTypeThrowsException() {
-		assertThatIllegalArgumentException().isThrownBy(() -> ClientHttpConnectorBuilder.of(ClientHttpConnector.class))
-			.withMessage("'clientHttpConnectorType' must be an implementation of ClientHttpConnector");
-	}
-
-	@Test
-	void ofWhenReactorFactoryReturnsReactorFactoryBuilder() {
-		assertThat(ClientHttpConnectorBuilder.of(ReactorClientHttpConnector.class))
-			.isInstanceOf(ReactorClientHttpConnectorBuilder.class);
-	}
-
-	@Test
-	void ofWhenJettyFactoryReturnsReactorFactoryBuilder() {
-		assertThat(ClientHttpConnectorBuilder.of(JettyClientHttpConnector.class))
-			.isInstanceOf(JettyClientHttpConnectorBuilder.class);
-	}
-
-	@Test
-	void ofWhenHttpComponentsFactoryReturnsHttpComponentsFactoryBuilder() {
-		assertThat(ClientHttpConnectorBuilder.of(HttpComponentsClientHttpConnector.class))
-			.isInstanceOf(HttpComponentsClientHttpConnectorBuilder.class);
-	}
-
-	@Test
-	void ofWhenJdkFactoryReturnsJdkFactoryBuilder() {
-		assertThat(ClientHttpConnectorBuilder.of(JdkClientHttpConnector.class))
-			.isInstanceOf(JdkClientHttpConnectorBuilder.class);
-	}
-
-	@Test
-	void ofWhenUnknownTypeThrowsException() {
-		assertThatIllegalArgumentException()
-			.isThrownBy(() -> ClientHttpConnectorBuilder.of(TestClientHttpConnector.class))
-			.withMessage("'clientHttpConnectorType' " + TestClientHttpConnector.class.getName() + " is not supported");
-	}
-
-	@Test
-	void detectWhenReactor() {
-		assertThat(ClientHttpConnectorBuilder.detect()).isInstanceOf(ReactorClientHttpConnectorBuilder.class);
-	}
-
-	@Test
-	@ClassPathExclusions({ "reactor-netty-http-*.jar" })
-	void detectWhenJetty() {
-		assertThat(ClientHttpConnectorBuilder.detect()).isInstanceOf(JettyClientHttpConnectorBuilder.class);
-	}
-
-	@Test
-	@ClassPathExclusions({ "reactor-netty-http-*.jar", "jetty-client-*.jar" })
-	void detectWhenHttpComponents() {
-		assertThat(ClientHttpConnectorBuilder.detect()).isInstanceOf(HttpComponentsClientHttpConnectorBuilder.class);
-	}
-
-	@Test
-	@ClassPathExclusions({ "reactor-netty-http-*.jar", "jetty-client-*.jar", "httpclient5-*.jar" })
-	void detectWhenJdk() {
-		assertThat(ClientHttpConnectorBuilder.detect()).isInstanceOf(JdkClientHttpConnectorBuilder.class);
-	}
-
-	private void setJdkReadTimeout(JdkClientHttpConnector factory) {
-		factory.setReadTimeout(Duration.ofSeconds(5));
-	}
-
-	public static class TestClientHttpConnector implements ClientHttpConnector {
-
-		@Override
-		public Mono<ClientHttpResponse> connect(HttpMethod method, URI uri,
-				Function<? super ClientHttpRequest, Mono<Void>> requestCallback) {
-			return null;
-		}
-
-	}
-
-}

spring-boot-project/spring-boot-all/src/test/resources/log4j2-test.xml

@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<Configuration status="warn" name="test">
-	<Properties>
-		<Property name="LOG_EXCEPTION_CONVERSION_WORD">%xwEx</Property>
-		<Property name="LOG_LEVEL_PATTERN">%5p</Property>
-	</Properties>
-	<Appenders>
-		<Console name="STDOUT" target="SYSTEM_OUT" follow="true">
-			<PatternLayout pattern="%clr{%d{yyyy-MM-dd HH:mm:ss.SSS}}{faint} %clr{${LOG_LEVEL_PATTERN}} %clr{${sys:PID}}{magenta} %clr{---}{faint} %clr{[%15.15t]}{faint} %clr{%-40.40c{1.}}{cyan} %clr{:}{faint} %m%n${sys:LOG_EXCEPTION_CONVERSION_WORD}"/>
-		</Console>
-	</Appenders>
-	<Loggers>
-		<Root level="info">
-			<AppenderRef ref="STDOUT"/>
-		</Root>
-	</Loggers>
-</Configuration>

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

@@ -36,7 +36,7 @@ configurations.all {
 }
 
 dependencies {
-	api(project(":spring-boot-project:spring-boot-all"))
+	api(project(":spring-boot-project:spring-boot"))
 	api(project(":spring-boot-project:spring-boot-autoconfigure"))
 
 	optional(project(":spring-boot-project:spring-boot-activemq"))

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

@@ -39,7 +39,7 @@ artifacts {
 }
 
 dependencies {
-	api(project(":spring-boot-project:spring-boot-all"))
+	api(project(":spring-boot-project:spring-boot"))
 	api(project(":spring-boot-project:spring-boot-autoconfigure-all"))
 
 	intTestDependencies(project(":spring-boot-project:spring-boot-starters:spring-boot-starter-web"))

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-all"))
+	api(project(":spring-boot-project:spring-boot"))
 
 	dockerTestImplementation(project(":spring-boot-project:spring-boot-jdbc"))
 	dockerTestImplementation(project(":spring-boot-project:spring-boot-flyway"))

spring-boot-project/spring-boot-integration-tests/build.gradle

@@ -22,7 +22,7 @@ plugins {
 description = "Spring Boot Integration Tests"
 
 dependencies {
-	testImplementation(project(":spring-boot-project:spring-boot-all"))
+	testImplementation(project(":spring-boot-project:spring-boot"))
 	testImplementation(project(":spring-boot-project:spring-boot-jetty"))
 	testImplementation(project(":spring-boot-project:spring-boot-tomcat"))
 	testImplementation(project(":spring-boot-project:spring-boot-tools:spring-boot-test-support"))

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-all"))
+	api(project(":spring-boot-project:spring-boot"))
 	api(project(":spring-boot-project:spring-boot-autoconfigure-all"))
 	api(project(":spring-boot-project:spring-boot-starters:spring-boot-starter-logging"))
 	api("jakarta.annotation:jakarta.annotation-api")

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

@@ -32,7 +32,7 @@ configurations.all {
 }
 
 dependencies {
-	api(project(":spring-boot-project:spring-boot-all"))
+	api(project(":spring-boot-project:spring-boot"))
 	api(project(":spring-boot-project:spring-boot-test"))
 	api(project(":spring-boot-project:spring-boot-autoconfigure-all"))
 

spring-boot-project/spring-boot-tools/spring-boot-cli/build.gradle

@@ -34,7 +34,7 @@ configurations {
 }
 
 dependencies {
-	compileOnlyProject(project(":spring-boot-project:spring-boot-all"))
+	compileOnlyProject(project(":spring-boot-project:spring-boot"))
 
 	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-all"))
+	testImplementation(project(":spring-boot-project:spring-boot"))
 	testImplementation(project(":spring-boot-project:spring-boot-tools:spring-boot-test-support"))
 	testImplementation(project(":spring-boot-project:spring-boot-test"))
 }

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-all", configuration: "mavenRepository"))
+	mavenRepository(project(path: ":spring-boot-project:spring-boot", 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"))

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-all"))
+	implementation(project(":spring-boot-project:spring-boot"))
 	implementation(project(":spring-boot-project:spring-boot-tools:spring-boot-configuration-metadata"))
 
 	testImplementation(project(":spring-boot-project:spring-boot-test"))