diff --git a/settings.gradle b/settings.gradle index e14bf5422af..b4d7bcfc551 100644 --- a/settings.gradle +++ b/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" diff --git a/spring-boot-project/spring-boot-actuator-autoconfigure/build.gradle b/spring-boot-project/spring-boot-actuator-autoconfigure/build.gradle index 8714a2071f5..0d2f05ae751 100644 --- a/spring-boot-project/spring-boot-actuator-autoconfigure/build.gradle +++ b/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") diff --git a/spring-boot-project/spring-boot-actuator/build.gradle b/spring-boot-project/spring-boot-actuator/build.gradle index 807132b257a..eef3ab2e163 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-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")) diff --git a/spring-boot-project/spring-boot-all/build.gradle b/spring-boot-project/spring-boot-all/build.gradle deleted file mode 100644 index a55d12a3438..00000000000 --- a/spring-boot-project/spring-boot-all/build.gradle +++ /dev/null @@ -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" -} diff --git a/spring-boot-project/spring-boot-all/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 deleted file mode 100644 index cb60e06760a..00000000000 --- a/spring-boot-project/spring-boot-all/src/test/java/org/springframework/boot/http/client/reactive/ClientHttpConnectorBuilderTests.java +++ /dev/null @@ -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 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 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 connect(HttpMethod method, URI uri, - Function> requestCallback) { - return null; - } - - } - -} 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 deleted file mode 100644 index 66496afcd8a..00000000000 --- a/spring-boot-project/spring-boot-all/src/test/resources/log4j2-test.xml +++ /dev/null @@ -1,17 +0,0 @@ - - - - %xwEx - %5p - - - - - - - - - - - - diff --git a/spring-boot-project/spring-boot-all/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 deleted file mode 100644 index 74279d80fba..00000000000 Binary files a/spring-boot-project/spring-boot-all/src/test/resources/org/springframework/boot/http/client/test.jks and /dev/null differ diff --git a/spring-boot-project/spring-boot-all/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 deleted file mode 100644 index 74279d80fba..00000000000 Binary files a/spring-boot-project/spring-boot-all/src/test/resources/org/springframework/boot/web/client/test.jks and /dev/null differ diff --git a/spring-boot-project/spring-boot-autoconfigure-all/build.gradle b/spring-boot-project/spring-boot-autoconfigure-all/build.gradle index c4ea4ee0223..fd1b5c48cfd 100644 --- a/spring-boot-project/spring-boot-autoconfigure-all/build.gradle +++ b/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")) diff --git a/spring-boot-project/spring-boot-devtools/build.gradle b/spring-boot-project/spring-boot-devtools/build.gradle index 505622255e7..bc2fb152d01 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-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")) diff --git a/spring-boot-project/spring-boot-docker-compose/build.gradle b/spring-boot-project/spring-boot-docker-compose/build.gradle index 3ff1879fa94..4df682fddfd 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-all")) + api(project(":spring-boot-project:spring-boot")) dockerTestImplementation(project(":spring-boot-project:spring-boot-jdbc")) dockerTestImplementation(project(":spring-boot-project:spring-boot-flyway")) diff --git a/spring-boot-project/spring-boot-all-integration-tests/build.gradle b/spring-boot-project/spring-boot-integration-tests/build.gradle similarity index 96% rename from spring-boot-project/spring-boot-all-integration-tests/build.gradle rename to spring-boot-project/spring-boot-integration-tests/build.gradle index a2b864f38dc..0e7d91cc7c0 100644 --- a/spring-boot-project/spring-boot-all-integration-tests/build.gradle +++ b/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")) diff --git a/spring-boot-project/spring-boot-all-integration-tests/src/test/java/org/springframework/boot/http/client/AbstractClientHttpRequestFactoryBuilderTests.java b/spring-boot-project/spring-boot-integration-tests/src/test/java/org/springframework/boot/http/client/AbstractClientHttpRequestFactoryBuilderTests.java similarity index 100% rename from spring-boot-project/spring-boot-all-integration-tests/src/test/java/org/springframework/boot/http/client/AbstractClientHttpRequestFactoryBuilderTests.java rename to spring-boot-project/spring-boot-integration-tests/src/test/java/org/springframework/boot/http/client/AbstractClientHttpRequestFactoryBuilderTests.java diff --git a/spring-boot-project/spring-boot-all-integration-tests/src/test/java/org/springframework/boot/http/client/HttpComponentsClientHttpRequestFactoryBuilderTests.java b/spring-boot-project/spring-boot-integration-tests/src/test/java/org/springframework/boot/http/client/HttpComponentsClientHttpRequestFactoryBuilderTests.java similarity index 100% rename from spring-boot-project/spring-boot-all-integration-tests/src/test/java/org/springframework/boot/http/client/HttpComponentsClientHttpRequestFactoryBuilderTests.java rename to spring-boot-project/spring-boot-integration-tests/src/test/java/org/springframework/boot/http/client/HttpComponentsClientHttpRequestFactoryBuilderTests.java diff --git a/spring-boot-project/spring-boot-all-integration-tests/src/test/java/org/springframework/boot/http/client/JdkClientHttpRequestFactoryBuilderTests.java b/spring-boot-project/spring-boot-integration-tests/src/test/java/org/springframework/boot/http/client/JdkClientHttpRequestFactoryBuilderTests.java similarity index 100% rename from spring-boot-project/spring-boot-all-integration-tests/src/test/java/org/springframework/boot/http/client/JdkClientHttpRequestFactoryBuilderTests.java rename to spring-boot-project/spring-boot-integration-tests/src/test/java/org/springframework/boot/http/client/JdkClientHttpRequestFactoryBuilderTests.java diff --git a/spring-boot-project/spring-boot-all-integration-tests/src/test/java/org/springframework/boot/http/client/JettyClientHttpRequestFactoryBuilderTests.java b/spring-boot-project/spring-boot-integration-tests/src/test/java/org/springframework/boot/http/client/JettyClientHttpRequestFactoryBuilderTests.java similarity index 100% rename from spring-boot-project/spring-boot-all-integration-tests/src/test/java/org/springframework/boot/http/client/JettyClientHttpRequestFactoryBuilderTests.java rename to spring-boot-project/spring-boot-integration-tests/src/test/java/org/springframework/boot/http/client/JettyClientHttpRequestFactoryBuilderTests.java diff --git a/spring-boot-project/spring-boot-all-integration-tests/src/test/java/org/springframework/boot/http/client/ReactorClientHttpRequestFactoryBuilderTests.java b/spring-boot-project/spring-boot-integration-tests/src/test/java/org/springframework/boot/http/client/ReactorClientHttpRequestFactoryBuilderTests.java similarity index 100% rename from spring-boot-project/spring-boot-all-integration-tests/src/test/java/org/springframework/boot/http/client/ReactorClientHttpRequestFactoryBuilderTests.java rename to spring-boot-project/spring-boot-integration-tests/src/test/java/org/springframework/boot/http/client/ReactorClientHttpRequestFactoryBuilderTests.java diff --git a/spring-boot-project/spring-boot-all-integration-tests/src/test/java/org/springframework/boot/http/client/ReflectiveComponentsClientHttpRequestFactoryBuilderTests.java b/spring-boot-project/spring-boot-integration-tests/src/test/java/org/springframework/boot/http/client/ReflectiveComponentsClientHttpRequestFactoryBuilderTests.java similarity index 100% rename from spring-boot-project/spring-boot-all-integration-tests/src/test/java/org/springframework/boot/http/client/ReflectiveComponentsClientHttpRequestFactoryBuilderTests.java rename to spring-boot-project/spring-boot-integration-tests/src/test/java/org/springframework/boot/http/client/ReflectiveComponentsClientHttpRequestFactoryBuilderTests.java diff --git a/spring-boot-project/spring-boot-all-integration-tests/src/test/java/org/springframework/boot/http/client/SimpleClientHttpRequestFactoryBuilderTests.java b/spring-boot-project/spring-boot-integration-tests/src/test/java/org/springframework/boot/http/client/SimpleClientHttpRequestFactoryBuilderTests.java similarity index 100% rename from spring-boot-project/spring-boot-all-integration-tests/src/test/java/org/springframework/boot/http/client/SimpleClientHttpRequestFactoryBuilderTests.java rename to spring-boot-project/spring-boot-integration-tests/src/test/java/org/springframework/boot/http/client/SimpleClientHttpRequestFactoryBuilderTests.java diff --git a/spring-boot-project/spring-boot-all-integration-tests/src/test/java/org/springframework/boot/http/client/TestCustomizer.java b/spring-boot-project/spring-boot-integration-tests/src/test/java/org/springframework/boot/http/client/TestCustomizer.java similarity index 100% rename from spring-boot-project/spring-boot-all-integration-tests/src/test/java/org/springframework/boot/http/client/TestCustomizer.java rename to spring-boot-project/spring-boot-integration-tests/src/test/java/org/springframework/boot/http/client/TestCustomizer.java diff --git a/spring-boot-project/spring-boot-all-integration-tests/src/test/java/org/springframework/boot/http/client/reactive/AbstractClientHttpConnectorBuilderTests.java b/spring-boot-project/spring-boot-integration-tests/src/test/java/org/springframework/boot/http/client/reactive/AbstractClientHttpConnectorBuilderTests.java similarity index 100% rename from spring-boot-project/spring-boot-all-integration-tests/src/test/java/org/springframework/boot/http/client/reactive/AbstractClientHttpConnectorBuilderTests.java rename to spring-boot-project/spring-boot-integration-tests/src/test/java/org/springframework/boot/http/client/reactive/AbstractClientHttpConnectorBuilderTests.java diff --git a/spring-boot-project/spring-boot-all-integration-tests/src/test/java/org/springframework/boot/http/client/reactive/HttpComponentsClientHttpConnectorBuilderTests.java b/spring-boot-project/spring-boot-integration-tests/src/test/java/org/springframework/boot/http/client/reactive/HttpComponentsClientHttpConnectorBuilderTests.java similarity index 100% rename from spring-boot-project/spring-boot-all-integration-tests/src/test/java/org/springframework/boot/http/client/reactive/HttpComponentsClientHttpConnectorBuilderTests.java rename to spring-boot-project/spring-boot-integration-tests/src/test/java/org/springframework/boot/http/client/reactive/HttpComponentsClientHttpConnectorBuilderTests.java diff --git a/spring-boot-project/spring-boot-all-integration-tests/src/test/java/org/springframework/boot/http/client/reactive/JdkClientHttpConnectorBuilderTests.java b/spring-boot-project/spring-boot-integration-tests/src/test/java/org/springframework/boot/http/client/reactive/JdkClientHttpConnectorBuilderTests.java similarity index 100% rename from spring-boot-project/spring-boot-all-integration-tests/src/test/java/org/springframework/boot/http/client/reactive/JdkClientHttpConnectorBuilderTests.java rename to spring-boot-project/spring-boot-integration-tests/src/test/java/org/springframework/boot/http/client/reactive/JdkClientHttpConnectorBuilderTests.java diff --git a/spring-boot-project/spring-boot-all-integration-tests/src/test/java/org/springframework/boot/http/client/reactive/JettyClientHttpConnectorBuilderTests.java b/spring-boot-project/spring-boot-integration-tests/src/test/java/org/springframework/boot/http/client/reactive/JettyClientHttpConnectorBuilderTests.java similarity index 100% rename from spring-boot-project/spring-boot-all-integration-tests/src/test/java/org/springframework/boot/http/client/reactive/JettyClientHttpConnectorBuilderTests.java rename to spring-boot-project/spring-boot-integration-tests/src/test/java/org/springframework/boot/http/client/reactive/JettyClientHttpConnectorBuilderTests.java diff --git a/spring-boot-project/spring-boot-all-integration-tests/src/test/java/org/springframework/boot/http/client/reactive/ReactorClientHttpConnectorBuilderTests.java b/spring-boot-project/spring-boot-integration-tests/src/test/java/org/springframework/boot/http/client/reactive/ReactorClientHttpConnectorBuilderTests.java similarity index 100% rename from spring-boot-project/spring-boot-all-integration-tests/src/test/java/org/springframework/boot/http/client/reactive/ReactorClientHttpConnectorBuilderTests.java rename to spring-boot-project/spring-boot-integration-tests/src/test/java/org/springframework/boot/http/client/reactive/ReactorClientHttpConnectorBuilderTests.java diff --git a/spring-boot-project/spring-boot-all-integration-tests/src/test/java/org/springframework/boot/http/client/reactive/TestCustomizer.java b/spring-boot-project/spring-boot-integration-tests/src/test/java/org/springframework/boot/http/client/reactive/TestCustomizer.java similarity index 100% rename from spring-boot-project/spring-boot-all-integration-tests/src/test/java/org/springframework/boot/http/client/reactive/TestCustomizer.java rename to spring-boot-project/spring-boot-integration-tests/src/test/java/org/springframework/boot/http/client/reactive/TestCustomizer.java diff --git a/spring-boot-project/spring-boot-all-integration-tests/src/test/java/org/springframework/boot/web/client/AbstractClientHttpRequestFactoriesTests.java b/spring-boot-project/spring-boot-integration-tests/src/test/java/org/springframework/boot/web/client/AbstractClientHttpRequestFactoriesTests.java similarity index 100% rename from spring-boot-project/spring-boot-all-integration-tests/src/test/java/org/springframework/boot/web/client/AbstractClientHttpRequestFactoriesTests.java rename to spring-boot-project/spring-boot-integration-tests/src/test/java/org/springframework/boot/web/client/AbstractClientHttpRequestFactoriesTests.java diff --git a/spring-boot-project/spring-boot-all-integration-tests/src/test/java/org/springframework/boot/web/client/ClientHttpRequestFactoriesHttpComponentsTests.java b/spring-boot-project/spring-boot-integration-tests/src/test/java/org/springframework/boot/web/client/ClientHttpRequestFactoriesHttpComponentsTests.java similarity index 100% rename from spring-boot-project/spring-boot-all-integration-tests/src/test/java/org/springframework/boot/web/client/ClientHttpRequestFactoriesHttpComponentsTests.java rename to spring-boot-project/spring-boot-integration-tests/src/test/java/org/springframework/boot/web/client/ClientHttpRequestFactoriesHttpComponentsTests.java diff --git a/spring-boot-project/spring-boot-all-integration-tests/src/test/java/org/springframework/boot/web/client/ClientHttpRequestFactoriesJettyTests.java b/spring-boot-project/spring-boot-integration-tests/src/test/java/org/springframework/boot/web/client/ClientHttpRequestFactoriesJettyTests.java similarity index 100% rename from spring-boot-project/spring-boot-all-integration-tests/src/test/java/org/springframework/boot/web/client/ClientHttpRequestFactoriesJettyTests.java rename to spring-boot-project/spring-boot-integration-tests/src/test/java/org/springframework/boot/web/client/ClientHttpRequestFactoriesJettyTests.java diff --git a/spring-boot-project/spring-boot-all-integration-tests/src/test/java/org/springframework/boot/web/client/ClientHttpRequestFactoriesReactorTests.java b/spring-boot-project/spring-boot-integration-tests/src/test/java/org/springframework/boot/web/client/ClientHttpRequestFactoriesReactorTests.java similarity index 100% rename from spring-boot-project/spring-boot-all-integration-tests/src/test/java/org/springframework/boot/web/client/ClientHttpRequestFactoriesReactorTests.java rename to spring-boot-project/spring-boot-integration-tests/src/test/java/org/springframework/boot/web/client/ClientHttpRequestFactoriesReactorTests.java diff --git a/spring-boot-project/spring-boot-all-integration-tests/src/test/java/org/springframework/boot/web/client/ClientHttpRequestFactoriesSimpleTests.java b/spring-boot-project/spring-boot-integration-tests/src/test/java/org/springframework/boot/web/client/ClientHttpRequestFactoriesSimpleTests.java similarity index 100% rename from spring-boot-project/spring-boot-all-integration-tests/src/test/java/org/springframework/boot/web/client/ClientHttpRequestFactoriesSimpleTests.java rename to spring-boot-project/spring-boot-integration-tests/src/test/java/org/springframework/boot/web/client/ClientHttpRequestFactoriesSimpleTests.java diff --git a/spring-boot-project/spring-boot-all-integration-tests/src/test/java/org/springframework/boot/web/servlet/context/ServletWebServerMvcIntegrationTests.java b/spring-boot-project/spring-boot-integration-tests/src/test/java/org/springframework/boot/web/servlet/context/ServletWebServerMvcIntegrationTests.java similarity index 100% rename from spring-boot-project/spring-boot-all-integration-tests/src/test/java/org/springframework/boot/web/servlet/context/ServletWebServerMvcIntegrationTests.java rename to spring-boot-project/spring-boot-integration-tests/src/test/java/org/springframework/boot/web/servlet/context/ServletWebServerMvcIntegrationTests.java diff --git a/spring-boot-project/spring-boot-all-integration-tests/src/test/java/org/springframework/boot/web/servlet/support/ErrorPageFilterIntegrationTests.java b/spring-boot-project/spring-boot-integration-tests/src/test/java/org/springframework/boot/web/servlet/support/ErrorPageFilterIntegrationTests.java similarity index 100% rename from spring-boot-project/spring-boot-all-integration-tests/src/test/java/org/springframework/boot/web/servlet/support/ErrorPageFilterIntegrationTests.java rename to spring-boot-project/spring-boot-integration-tests/src/test/java/org/springframework/boot/web/servlet/support/ErrorPageFilterIntegrationTests.java diff --git a/spring-boot-project/spring-boot-all-integration-tests/src/test/resources/org/springframework/boot/http/client/reactive/test.jks b/spring-boot-project/spring-boot-integration-tests/src/test/resources/org/springframework/boot/http/client/reactive/test.jks similarity index 100% rename from spring-boot-project/spring-boot-all-integration-tests/src/test/resources/org/springframework/boot/http/client/reactive/test.jks rename to spring-boot-project/spring-boot-integration-tests/src/test/resources/org/springframework/boot/http/client/reactive/test.jks diff --git a/spring-boot-project/spring-boot-all-integration-tests/src/test/resources/org/springframework/boot/http/client/test.jks b/spring-boot-project/spring-boot-integration-tests/src/test/resources/org/springframework/boot/http/client/test.jks similarity index 100% rename from spring-boot-project/spring-boot-all-integration-tests/src/test/resources/org/springframework/boot/http/client/test.jks rename to spring-boot-project/spring-boot-integration-tests/src/test/resources/org/springframework/boot/http/client/test.jks diff --git a/spring-boot-project/spring-boot-all-integration-tests/src/test/resources/org/springframework/boot/web/client/test.jks b/spring-boot-project/spring-boot-integration-tests/src/test/resources/org/springframework/boot/web/client/test.jks similarity index 100% rename from spring-boot-project/spring-boot-all-integration-tests/src/test/resources/org/springframework/boot/web/client/test.jks rename to spring-boot-project/spring-boot-integration-tests/src/test/resources/org/springframework/boot/web/client/test.jks 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 342e2de32ea..cd6ddb5faf5 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-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") diff --git a/spring-boot-project/spring-boot-test-autoconfigure/build.gradle b/spring-boot-project/spring-boot-test-autoconfigure/build.gradle index 5edbd253e32..40fe2dc524f 100644 --- a/spring-boot-project/spring-boot-test-autoconfigure/build.gradle +++ b/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")) 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 5fb8d115c5a..4d63fb72f8c 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-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")) } 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 d940de3b2e5..331ec66ed76 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-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")) 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 f534276ad06..294d381bc2d 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-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")) diff --git a/spring-boot-project/spring-boot-all/src/main/java/org/springframework/boot/web/reactive/function/client/WebClientCustomizer.java b/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/web/reactive/function/client/WebClientCustomizer.java similarity index 100% rename from spring-boot-project/spring-boot-all/src/main/java/org/springframework/boot/web/reactive/function/client/WebClientCustomizer.java rename to spring-boot-project/spring-boot/src/main/java/org/springframework/boot/web/reactive/function/client/WebClientCustomizer.java diff --git a/spring-boot-project/spring-boot-all/src/main/java/org/springframework/boot/web/reactive/function/client/package-info.java b/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/web/reactive/function/client/package-info.java similarity index 100% rename from spring-boot-project/spring-boot-all/src/main/java/org/springframework/boot/web/reactive/function/client/package-info.java rename to spring-boot-project/spring-boot/src/main/java/org/springframework/boot/web/reactive/function/client/package-info.java