From d78c7b541a8dec9abe17869eda2b7038b5699fca Mon Sep 17 00:00:00 2001 From: Andy Wilkinson Date: Tue, 25 Jun 2024 10:50:29 +0100 Subject: [PATCH 01/28] Introduce docker-test plugin for running tests that require Docker See gh-41228 --- buildSrc/build.gradle | 4 + .../build/mavenplugin/MavenPluginPlugin.java | 9 +- .../build/test/DockerTestBuildService.java | 38 ++++++ .../boot/build/test/DockerTestPlugin.java | 112 ++++++++++++++++++ src/checkstyle/checkstyle-suppressions.xml | 2 + 5 files changed, 163 insertions(+), 2 deletions(-) create mode 100644 buildSrc/src/main/java/org/springframework/boot/build/test/DockerTestBuildService.java create mode 100644 buildSrc/src/main/java/org/springframework/boot/build/test/DockerTestPlugin.java diff --git a/buildSrc/build.gradle b/buildSrc/build.gradle index 9aaeb426df6..c3c02b1ac80 100644 --- a/buildSrc/build.gradle +++ b/buildSrc/build.gradle @@ -93,6 +93,10 @@ gradlePlugin { id = "org.springframework.boot.deployed" implementationClass = "org.springframework.boot.build.DeployedPlugin" } + dockerTestPlugin { + id = "org.springframework.boot.docker-test" + implementationClass = "org.springframework.boot.build.test.DockerTestPlugin" + } integrationTestPlugin { id = "org.springframework.boot.integration-test" implementationClass = "org.springframework.boot.build.test.IntegrationTestPlugin" diff --git a/buildSrc/src/main/java/org/springframework/boot/build/mavenplugin/MavenPluginPlugin.java b/buildSrc/src/main/java/org/springframework/boot/build/mavenplugin/MavenPluginPlugin.java index 6301deb2b4b..15e4450c012 100644 --- a/buildSrc/src/main/java/org/springframework/boot/build/mavenplugin/MavenPluginPlugin.java +++ b/buildSrc/src/main/java/org/springframework/boot/build/mavenplugin/MavenPluginPlugin.java @@ -87,6 +87,7 @@ import org.xml.sax.SAXException; import org.springframework.boot.build.DeployedPlugin; import org.springframework.boot.build.MavenRepositoryPlugin; +import org.springframework.boot.build.test.DockerTestPlugin; import org.springframework.boot.build.test.IntegrationTestPlugin; import org.springframework.core.CollectionFactory; import org.springframework.util.Assert; @@ -138,11 +139,15 @@ public class MavenPluginPlugin implements Plugin { .set(new File(project.getBuildDir(), "runtime-classpath-repository")); project.getDependencies() .components((components) -> components.all(MavenRepositoryComponentMetadataRule.class)); - Sync task = project.getTasks().create("populateIntTestMavenRepository", Sync.class); - task.setDestinationDir(new File(project.getBuildDir(), "int-test-maven-repository")); + Sync task = project.getTasks().create("populateTestMavenRepository", Sync.class); + task.setDestinationDir(new File(project.getBuildDir(), "test-maven-repository")); task.with(copyIntTestMavenRepositoryFiles(project, runtimeClasspathMavenRepository)); task.dependsOn(project.getTasks().getByName(MavenRepositoryPlugin.PUBLISH_TO_PROJECT_REPOSITORY_TASK_NAME)); project.getTasks().getByName(IntegrationTestPlugin.INT_TEST_TASK_NAME).dependsOn(task); + project.getPlugins() + .withType(DockerTestPlugin.class) + .all((dockerTestPlugin) -> project.getTasks() + .named(DockerTestPlugin.DOCKER_TEST_TASK_NAME, (dockerTest) -> dockerTest.dependsOn(task))); } private CopySpec copyIntTestMavenRepositoryFiles(Project project, diff --git a/buildSrc/src/main/java/org/springframework/boot/build/test/DockerTestBuildService.java b/buildSrc/src/main/java/org/springframework/boot/build/test/DockerTestBuildService.java new file mode 100644 index 00000000000..2f70a735513 --- /dev/null +++ b/buildSrc/src/main/java/org/springframework/boot/build/test/DockerTestBuildService.java @@ -0,0 +1,38 @@ +/* + * Copyright 2012-2024 the original author or authors. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * https://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package org.springframework.boot.build.test; + +import org.gradle.api.Project; +import org.gradle.api.provider.Provider; +import org.gradle.api.services.BuildService; +import org.gradle.api.services.BuildServiceParameters; + +/** + * Build service for Docker-based tests. Configured to only allow serial execution, + * thereby ensuring that Docker-based tests do not run in parallel. + * + * @author Andy Wilkinson + */ +abstract class DockerTestBuildService implements BuildService { + + static Provider registerIfNecessary(Project project) { + return project.getGradle() + .getSharedServices() + .registerIfAbsent("dockerTest", DockerTestBuildService.class, (spec) -> spec.getMaxParallelUsages().set(1)); + } + +} diff --git a/buildSrc/src/main/java/org/springframework/boot/build/test/DockerTestPlugin.java b/buildSrc/src/main/java/org/springframework/boot/build/test/DockerTestPlugin.java new file mode 100644 index 00000000000..017ca001a43 --- /dev/null +++ b/buildSrc/src/main/java/org/springframework/boot/build/test/DockerTestPlugin.java @@ -0,0 +1,112 @@ +/* + * Copyright 2012-2024 the original author or authors. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * https://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package org.springframework.boot.build.test; + +import org.gradle.api.Plugin; +import org.gradle.api.Project; +import org.gradle.api.plugins.JavaPlugin; +import org.gradle.api.plugins.JavaPluginExtension; +import org.gradle.api.provider.Provider; +import org.gradle.api.services.BuildService; +import org.gradle.api.tasks.SourceSet; +import org.gradle.api.tasks.SourceSetContainer; +import org.gradle.api.tasks.testing.Test; +import org.gradle.language.base.plugins.LifecycleBasePlugin; +import org.gradle.plugins.ide.eclipse.EclipsePlugin; +import org.gradle.plugins.ide.eclipse.model.EclipseModel; + +/** + * Plugin for Docker-based tests. Creates a {@link SourceSet source set}, {@link Test + * test} task, and {@link BuildService shared service} named {@code dockerTest}. The build + * service is configured to only allow serial usage and the {@code dockerTest} task is + * configured to use the build service. In a parallel build, this ensures that only a + * single {@code dockerTest} task can run at any given time. + * + * @author Andy Wilkinson + */ +public class DockerTestPlugin implements Plugin { + + /** + * Name of the {@code dockerTest} task. + */ + public static String DOCKER_TEST_TASK_NAME = "dockerTest"; + + /** + * Name of the {@code dockerTest} source set. + */ + public static String DOCKER_TEST_SOURCE_SET_NAME = "dockerTest"; + + /** + * Name of the {@code dockerTest} shared service. + */ + public static String DOCKER_TEST_SERVICE_NAME = "dockerTest"; + + @Override + public void apply(Project project) { + project.getPlugins().withType(JavaPlugin.class, (javaPlugin) -> configureDockerTesting(project)); + } + + private void configureDockerTesting(Project project) { + Provider buildService = DockerTestBuildService.registerIfNecessary(project); + SourceSet dockerTestSourceSet = createSourceSet(project); + Provider dockerTest = createTestTask(project, dockerTestSourceSet, buildService); + project.getTasks().getByName(LifecycleBasePlugin.CHECK_TASK_NAME).dependsOn(dockerTest); + project.getPlugins().withType(EclipsePlugin.class, (eclipsePlugin) -> { + EclipseModel eclipse = project.getExtensions().getByType(EclipseModel.class); + eclipse.classpath((classpath) -> classpath.getPlusConfigurations() + .add(project.getConfigurations() + .getByName(dockerTestSourceSet.getRuntimeClasspathConfigurationName()))); + }); + } + + private SourceSet createSourceSet(Project project) { + SourceSetContainer sourceSets = project.getExtensions().getByType(JavaPluginExtension.class).getSourceSets(); + SourceSet dockerTestSourceSet = sourceSets.create(DOCKER_TEST_SOURCE_SET_NAME); + SourceSet main = sourceSets.getByName(SourceSet.MAIN_SOURCE_SET_NAME); + SourceSet test = sourceSets.getByName(SourceSet.TEST_SOURCE_SET_NAME); + dockerTestSourceSet.setCompileClasspath(dockerTestSourceSet.getCompileClasspath() + .plus(main.getOutput()) + .plus(main.getCompileClasspath()) + .plus(test.getOutput())); + dockerTestSourceSet.setRuntimeClasspath(dockerTestSourceSet.getRuntimeClasspath() + .plus(main.getOutput()) + .plus(main.getRuntimeClasspath()) + .plus(test.getOutput())); + project.getPlugins().withType(IntegrationTestPlugin.class, (integrationTestPlugin) -> { + SourceSet intTest = sourceSets.getByName(IntegrationTestPlugin.INT_TEST_SOURCE_SET_NAME); + dockerTestSourceSet + .setCompileClasspath(dockerTestSourceSet.getCompileClasspath().plus(intTest.getOutput())); + dockerTestSourceSet + .setRuntimeClasspath(dockerTestSourceSet.getRuntimeClasspath().plus(intTest.getOutput())); + }); + return dockerTestSourceSet; + } + + private Provider createTestTask(Project project, SourceSet dockerTestSourceSet, + Provider buildService) { + Provider dockerTest = project.getTasks().register(DOCKER_TEST_TASK_NAME, Test.class, (task) -> { + task.usesService(buildService); + task.setGroup(LifecycleBasePlugin.VERIFICATION_GROUP); + task.setDescription("Runs Docker-based tests."); + task.setTestClassesDirs(dockerTestSourceSet.getOutput().getClassesDirs()); + task.setClasspath(dockerTestSourceSet.getRuntimeClasspath()); + task.shouldRunAfter(JavaPlugin.TEST_TASK_NAME); + }); + return dockerTest; + } + +} diff --git a/src/checkstyle/checkstyle-suppressions.xml b/src/checkstyle/checkstyle-suppressions.xml index 5707daeb89d..cfc49fb4392 100644 --- a/src/checkstyle/checkstyle-suppressions.xml +++ b/src/checkstyle/checkstyle-suppressions.xml @@ -59,6 +59,8 @@ + + From 3f1f801461c1f2e523a32923203c5653da99edc4 Mon Sep 17 00:00:00 2001 From: Andy Wilkinson Date: Tue, 25 Jun 2024 10:51:33 +0100 Subject: [PATCH 02/28] Update spring-boot-testcontainers to use docker-test plugin See gh-41228 --- .../spring-boot-testcontainers/build.gradle | 75 ++++++++++--------- .../ImportTestcontainersTests.java | 0 ...LoadTimeWeaverAwareConsumerContainers.java | 0 ...wareConsumerImportTestcontainersTests.java | 0 ...ainersParallelStartupIntegrationTests.java | 0 ...hImportTestcontainersIntegrationTests.java | 0 ...adTimeWeaverAwareBeanIntegrationTests.java | 3 + ...tainersLifecycleOrderIntegrationTests.java | 0 ...fecycleOrderWithScopeIntegrationTests.java | 0 ...nectionDetailsFactoryIntegrationTests.java | 0 ...nectionDetailsFactoryIntegrationTests.java | 0 ...ontainerConnectionDetailsFactoryTests.java | 0 ...ontainerConnectionDetailsFactoryTests.java | 0 ...ontainerConnectionDetailsFactoryTests.java | 0 ...ontainerConnectionDetailsFactoryTests.java | 0 ...ontainerConnectionDetailsFactoryTests.java | 0 ...nectionDetailsFactoryIntegrationTests.java | 0 ...ontainerConnectionDetailsFactoryTests.java | 0 ...nectionDetailsFactoryIntegrationTests.java | 0 ...nectionDetailsFactoryIntegrationTests.java | 0 ...nectionDetailsFactoryIntegrationTests.java | 0 ...nectionDetailsFactoryIntegrationTests.java | 75 +++++++++++++++++++ ...nectionDetailsFactoryIntegrationTests.java | 75 +++++++++++++++++++ ...ontainerConnectionDetailsFactoryTests.java | 0 ...nectionDetailsFactoryIntegrationTests.java | 0 ...nectionDetailsFactoryIntegrationTests.java | 0 .../resources/collector-config.yml | 0 .../db/changelog/db.changelog-master.yaml | 0 .../src/dockerTest/resources/logback-test.xml | 4 + .../dockerTest/resources/spring.properties | 1 + ...ontainerConnectionDetailsFactoryTests.java | 44 ----------- ...ontainerConnectionDetailsFactoryTests.java | 44 ----------- 32 files changed, 197 insertions(+), 124 deletions(-) rename spring-boot-project/spring-boot-testcontainers/src/{test => dockerTest}/java/org/springframework/boot/testcontainers/ImportTestcontainersTests.java (100%) rename spring-boot-project/spring-boot-testcontainers/src/{test => dockerTest}/java/org/springframework/boot/testcontainers/LoadTimeWeaverAwareConsumerContainers.java (100%) rename spring-boot-project/spring-boot-testcontainers/src/{test => dockerTest}/java/org/springframework/boot/testcontainers/LoadTimeWeaverAwareConsumerImportTestcontainersTests.java (100%) rename spring-boot-project/spring-boot-testcontainers/src/{test => dockerTest}/java/org/springframework/boot/testcontainers/lifecycle/TestContainersParallelStartupIntegrationTests.java (100%) rename spring-boot-project/spring-boot-testcontainers/src/{test => dockerTest}/java/org/springframework/boot/testcontainers/lifecycle/TestContainersParallelStartupWithImportTestcontainersIntegrationTests.java (100%) rename spring-boot-project/spring-boot-testcontainers/src/{test => dockerTest}/java/org/springframework/boot/testcontainers/lifecycle/TestcontainersImportWithPropertiesInjectedIntoLoadTimeWeaverAwareBeanIntegrationTests.java (96%) rename spring-boot-project/spring-boot-testcontainers/src/{test => dockerTest}/java/org/springframework/boot/testcontainers/lifecycle/TestcontainersLifecycleOrderIntegrationTests.java (100%) rename spring-boot-project/spring-boot-testcontainers/src/{test => dockerTest}/java/org/springframework/boot/testcontainers/lifecycle/TestcontainersLifecycleOrderWithScopeIntegrationTests.java (100%) rename spring-boot-project/spring-boot-testcontainers/src/{test => dockerTest}/java/org/springframework/boot/testcontainers/service/connection/activemq/ActiveMQContainerConnectionDetailsFactoryIntegrationTests.java (100%) rename spring-boot-project/spring-boot-testcontainers/src/{test => dockerTest}/java/org/springframework/boot/testcontainers/service/connection/amqp/RabbitContainerConnectionDetailsFactoryIntegrationTests.java (100%) rename spring-boot-project/spring-boot-testcontainers/src/{test => dockerTest}/java/org/springframework/boot/testcontainers/service/connection/cassandra/CassandraContainerConnectionDetailsFactoryTests.java (100%) rename spring-boot-project/spring-boot-testcontainers/src/{test => dockerTest}/java/org/springframework/boot/testcontainers/service/connection/couchbase/CouchbaseContainerConnectionDetailsFactoryTests.java (100%) rename spring-boot-project/spring-boot-testcontainers/src/{test => dockerTest}/java/org/springframework/boot/testcontainers/service/connection/elasticsearch/ElasticsearchContainerConnectionDetailsFactoryTests.java (100%) rename spring-boot-project/spring-boot-testcontainers/src/{test => dockerTest}/java/org/springframework/boot/testcontainers/service/connection/flyway/FlywayContainerConnectionDetailsFactoryTests.java (100%) rename spring-boot-project/spring-boot-testcontainers/src/{test => dockerTest}/java/org/springframework/boot/testcontainers/service/connection/jdbc/JdbcContainerConnectionDetailsFactoryTests.java (100%) rename spring-boot-project/spring-boot-testcontainers/src/{test => dockerTest}/java/org/springframework/boot/testcontainers/service/connection/kafka/KafkaContainerConnectionDetailsFactoryIntegrationTests.java (100%) rename spring-boot-project/spring-boot-testcontainers/src/{test => dockerTest}/java/org/springframework/boot/testcontainers/service/connection/liquibase/LiquibaseContainerConnectionDetailsFactoryTests.java (100%) rename spring-boot-project/spring-boot-testcontainers/src/{test => dockerTest}/java/org/springframework/boot/testcontainers/service/connection/otlp/OpenTelemetryMetricsContainerConnectionDetailsFactoryIntegrationTests.java (100%) rename spring-boot-project/spring-boot-testcontainers/src/{test => dockerTest}/java/org/springframework/boot/testcontainers/service/connection/otlp/OpenTelemetryTracingContainerConnectionDetailsFactoryIntegrationTests.java (100%) rename spring-boot-project/spring-boot-testcontainers/src/{test => dockerTest}/java/org/springframework/boot/testcontainers/service/connection/pulsar/PulsarContainerConnectionDetailsFactoryIntegrationTests.java (100%) create mode 100644 spring-boot-project/spring-boot-testcontainers/src/dockerTest/java/org/springframework/boot/testcontainers/service/connection/r2dbc/OracleFreeR2dbcContainerConnectionDetailsFactoryIntegrationTests.java create mode 100644 spring-boot-project/spring-boot-testcontainers/src/dockerTest/java/org/springframework/boot/testcontainers/service/connection/r2dbc/OracleXeR2dbcContainerConnectionDetailsFactoryIntegrationTests.java rename spring-boot-project/spring-boot-testcontainers/src/{test => dockerTest}/java/org/springframework/boot/testcontainers/service/connection/redis/RedisContainerConnectionDetailsFactoryTests.java (100%) rename spring-boot-project/spring-boot-testcontainers/src/{test => dockerTest}/java/org/springframework/boot/testcontainers/service/connection/redpanda/RedpandaContainerConnectionDetailsFactoryIntegrationTests.java (100%) rename spring-boot-project/spring-boot-testcontainers/src/{test => dockerTest}/java/org/springframework/boot/testcontainers/service/connection/zipkin/ZipkinContainerConnectionDetailsFactoryIntegrationTests.java (100%) rename spring-boot-project/spring-boot-testcontainers/src/{test => dockerTest}/resources/collector-config.yml (100%) rename spring-boot-project/spring-boot-testcontainers/src/{test => dockerTest}/resources/db/changelog/db.changelog-master.yaml (100%) create mode 100644 spring-boot-project/spring-boot-testcontainers/src/dockerTest/resources/logback-test.xml create mode 100644 spring-boot-project/spring-boot-testcontainers/src/dockerTest/resources/spring.properties diff --git a/spring-boot-project/spring-boot-testcontainers/build.gradle b/spring-boot-project/spring-boot-testcontainers/build.gradle index 524f785c754..ecaf9121789 100644 --- a/spring-boot-project/spring-boot-testcontainers/build.gradle +++ b/spring-boot-project/spring-boot-testcontainers/build.gradle @@ -4,6 +4,7 @@ plugins { id "org.springframework.boot.configuration-properties" id "org.springframework.boot.conventions" id "org.springframework.boot.deployed" + id "org.springframework.boot.docker-test" id "org.springframework.boot.optional-dependencies" } @@ -13,6 +14,43 @@ dependencies { api(project(":spring-boot-project:spring-boot-autoconfigure")) api("org.testcontainers:testcontainers") + dockerTestImplementation(project(":spring-boot-project:spring-boot-test")) + dockerTestImplementation(project(":spring-boot-project:spring-boot-tools:spring-boot-test-support")) + dockerTestImplementation("ch.qos.logback:logback-classic") + dockerTestImplementation("co.elastic.clients:elasticsearch-java") { + exclude group: "commons-logging", module: "commons-logging" + } + dockerTestImplementation("com.couchbase.client:java-client") + dockerTestImplementation("com.datastax.oss:java-driver-core") + dockerTestImplementation("io.micrometer:micrometer-registry-otlp") + dockerTestImplementation("io.rest-assured:rest-assured") { + exclude group: "commons-logging", module: "commons-logging" + } + dockerTestImplementation("org.apache.activemq:activemq-client-jakarta") + dockerTestImplementation("org.assertj:assertj-core") + dockerTestImplementation("org.awaitility:awaitility") + dockerTestImplementation("org.flywaydb:flyway-core") + dockerTestImplementation("org.junit.jupiter:junit-jupiter") + dockerTestImplementation("org.junit.platform:junit-platform-launcher") + dockerTestImplementation("org.liquibase:liquibase-core") { + exclude(group: "javax.xml.bind", module: "jaxb-api") + } + dockerTestImplementation("org.mockito:mockito-core") + dockerTestImplementation("org.springframework:spring-core-test") + dockerTestImplementation("org.springframework:spring-jdbc") + dockerTestImplementation("org.springframework:spring-jms") + dockerTestImplementation("org.springframework:spring-r2dbc") + dockerTestImplementation("org.springframework.amqp:spring-rabbit") + dockerTestImplementation("org.springframework.data:spring-data-redis") + dockerTestImplementation("org.springframework.kafka:spring-kafka") + dockerTestImplementation("org.springframework.pulsar:spring-pulsar") + dockerTestImplementation("org.testcontainers:junit-jupiter") + + dockerTestRuntimeOnly("com.oracle.database.r2dbc:oracle-r2dbc") + dockerTestRuntimeOnly("com.zaxxer:HikariCP") + dockerTestRuntimeOnly("io.lettuce:lettuce-core") + dockerTestRuntimeOnly("org.postgresql:postgresql") + optional(project(":spring-boot-project:spring-boot-actuator-autoconfigure")) optional("org.springframework:spring-test") optional("org.springframework.data:spring-data-mongodb") @@ -20,7 +58,6 @@ dependencies { optional("org.testcontainers:cassandra") optional("org.testcontainers:couchbase") optional("org.testcontainers:elasticsearch") - optional("org.testcontainers:influxdb") optional("org.testcontainers:jdbc") optional("org.testcontainers:kafka") optional("org.testcontainers:mariadb") @@ -36,43 +73,9 @@ dependencies { optional("org.testcontainers:redpanda") optional("org.testcontainers:r2dbc") - testImplementation(project(":spring-boot-project:spring-boot-tools:spring-boot-test-support")) testImplementation(project(":spring-boot-project:spring-boot-test")) - testImplementation("ch.qos.logback:logback-classic") - testImplementation("co.elastic.clients:elasticsearch-java") { - exclude group: "commons-logging", module: "commons-logging" - } - testImplementation("com.couchbase.client:java-client") - testImplementation("com.datastax.oss:java-driver-core") - testImplementation("io.micrometer:micrometer-registry-otlp") - testImplementation("io.rest-assured:rest-assured") { - exclude group: "commons-logging", module: "commons-logging" - } - testImplementation("org.apache.activemq:activemq-client-jakarta") + testImplementation(project(":spring-boot-project:spring-boot-tools:spring-boot-test-support")) testImplementation("org.assertj:assertj-core") - testImplementation("org.awaitility:awaitility") - testImplementation("org.flywaydb:flyway-core") - testImplementation("org.influxdb:influxdb-java") testImplementation("org.junit.jupiter:junit-jupiter") - testImplementation("org.junit.platform:junit-platform-engine") - testImplementation("org.junit.platform:junit-platform-launcher") - testImplementation("org.liquibase:liquibase-core") { - exclude(group: "javax.xml.bind", module: "jaxb-api") - } testImplementation("org.mockito:mockito-core") - testImplementation("org.mockito:mockito-junit-jupiter") - testImplementation("org.springframework:spring-core-test") - testImplementation("org.springframework:spring-jdbc") - testImplementation("org.springframework:spring-jms") - testImplementation("org.springframework:spring-r2dbc") - testImplementation("org.springframework.amqp:spring-rabbit") - testImplementation("org.springframework.data:spring-data-redis") - testImplementation("org.springframework.kafka:spring-kafka") - testImplementation("org.springframework.pulsar:spring-pulsar") - testImplementation("org.testcontainers:junit-jupiter") - - testRuntimeOnly("com.oracle.database.r2dbc:oracle-r2dbc") - testRuntimeOnly("com.zaxxer:HikariCP") - testRuntimeOnly("io.lettuce:lettuce-core") - testRuntimeOnly("org.postgresql:postgresql") } diff --git a/spring-boot-project/spring-boot-testcontainers/src/test/java/org/springframework/boot/testcontainers/ImportTestcontainersTests.java b/spring-boot-project/spring-boot-testcontainers/src/dockerTest/java/org/springframework/boot/testcontainers/ImportTestcontainersTests.java similarity index 100% rename from spring-boot-project/spring-boot-testcontainers/src/test/java/org/springframework/boot/testcontainers/ImportTestcontainersTests.java rename to spring-boot-project/spring-boot-testcontainers/src/dockerTest/java/org/springframework/boot/testcontainers/ImportTestcontainersTests.java diff --git a/spring-boot-project/spring-boot-testcontainers/src/test/java/org/springframework/boot/testcontainers/LoadTimeWeaverAwareConsumerContainers.java b/spring-boot-project/spring-boot-testcontainers/src/dockerTest/java/org/springframework/boot/testcontainers/LoadTimeWeaverAwareConsumerContainers.java similarity index 100% rename from spring-boot-project/spring-boot-testcontainers/src/test/java/org/springframework/boot/testcontainers/LoadTimeWeaverAwareConsumerContainers.java rename to spring-boot-project/spring-boot-testcontainers/src/dockerTest/java/org/springframework/boot/testcontainers/LoadTimeWeaverAwareConsumerContainers.java diff --git a/spring-boot-project/spring-boot-testcontainers/src/test/java/org/springframework/boot/testcontainers/LoadTimeWeaverAwareConsumerImportTestcontainersTests.java b/spring-boot-project/spring-boot-testcontainers/src/dockerTest/java/org/springframework/boot/testcontainers/LoadTimeWeaverAwareConsumerImportTestcontainersTests.java similarity index 100% rename from spring-boot-project/spring-boot-testcontainers/src/test/java/org/springframework/boot/testcontainers/LoadTimeWeaverAwareConsumerImportTestcontainersTests.java rename to spring-boot-project/spring-boot-testcontainers/src/dockerTest/java/org/springframework/boot/testcontainers/LoadTimeWeaverAwareConsumerImportTestcontainersTests.java diff --git a/spring-boot-project/spring-boot-testcontainers/src/test/java/org/springframework/boot/testcontainers/lifecycle/TestContainersParallelStartupIntegrationTests.java b/spring-boot-project/spring-boot-testcontainers/src/dockerTest/java/org/springframework/boot/testcontainers/lifecycle/TestContainersParallelStartupIntegrationTests.java similarity index 100% rename from spring-boot-project/spring-boot-testcontainers/src/test/java/org/springframework/boot/testcontainers/lifecycle/TestContainersParallelStartupIntegrationTests.java rename to spring-boot-project/spring-boot-testcontainers/src/dockerTest/java/org/springframework/boot/testcontainers/lifecycle/TestContainersParallelStartupIntegrationTests.java diff --git a/spring-boot-project/spring-boot-testcontainers/src/test/java/org/springframework/boot/testcontainers/lifecycle/TestContainersParallelStartupWithImportTestcontainersIntegrationTests.java b/spring-boot-project/spring-boot-testcontainers/src/dockerTest/java/org/springframework/boot/testcontainers/lifecycle/TestContainersParallelStartupWithImportTestcontainersIntegrationTests.java similarity index 100% rename from spring-boot-project/spring-boot-testcontainers/src/test/java/org/springframework/boot/testcontainers/lifecycle/TestContainersParallelStartupWithImportTestcontainersIntegrationTests.java rename to spring-boot-project/spring-boot-testcontainers/src/dockerTest/java/org/springframework/boot/testcontainers/lifecycle/TestContainersParallelStartupWithImportTestcontainersIntegrationTests.java diff --git a/spring-boot-project/spring-boot-testcontainers/src/test/java/org/springframework/boot/testcontainers/lifecycle/TestcontainersImportWithPropertiesInjectedIntoLoadTimeWeaverAwareBeanIntegrationTests.java b/spring-boot-project/spring-boot-testcontainers/src/dockerTest/java/org/springframework/boot/testcontainers/lifecycle/TestcontainersImportWithPropertiesInjectedIntoLoadTimeWeaverAwareBeanIntegrationTests.java similarity index 96% rename from spring-boot-project/spring-boot-testcontainers/src/test/java/org/springframework/boot/testcontainers/lifecycle/TestcontainersImportWithPropertiesInjectedIntoLoadTimeWeaverAwareBeanIntegrationTests.java rename to spring-boot-project/spring-boot-testcontainers/src/dockerTest/java/org/springframework/boot/testcontainers/lifecycle/TestcontainersImportWithPropertiesInjectedIntoLoadTimeWeaverAwareBeanIntegrationTests.java index cf56eb8c04d..192752927b1 100644 --- a/spring-boot-project/spring-boot-testcontainers/src/test/java/org/springframework/boot/testcontainers/lifecycle/TestcontainersImportWithPropertiesInjectedIntoLoadTimeWeaverAwareBeanIntegrationTests.java +++ b/spring-boot-project/spring-boot-testcontainers/src/dockerTest/java/org/springframework/boot/testcontainers/lifecycle/TestcontainersImportWithPropertiesInjectedIntoLoadTimeWeaverAwareBeanIntegrationTests.java @@ -36,6 +36,9 @@ import org.springframework.test.context.DynamicPropertySource; import org.springframework.test.context.junit.jupiter.SpringExtension; /** + * Tests for {@link ImportTestcontainers} when properties are being injected into a + * {@link LoadTimeWeaverAware} bean. + * * @author Phillip Webb */ @ExtendWith(SpringExtension.class) diff --git a/spring-boot-project/spring-boot-testcontainers/src/test/java/org/springframework/boot/testcontainers/lifecycle/TestcontainersLifecycleOrderIntegrationTests.java b/spring-boot-project/spring-boot-testcontainers/src/dockerTest/java/org/springframework/boot/testcontainers/lifecycle/TestcontainersLifecycleOrderIntegrationTests.java similarity index 100% rename from spring-boot-project/spring-boot-testcontainers/src/test/java/org/springframework/boot/testcontainers/lifecycle/TestcontainersLifecycleOrderIntegrationTests.java rename to spring-boot-project/spring-boot-testcontainers/src/dockerTest/java/org/springframework/boot/testcontainers/lifecycle/TestcontainersLifecycleOrderIntegrationTests.java diff --git a/spring-boot-project/spring-boot-testcontainers/src/test/java/org/springframework/boot/testcontainers/lifecycle/TestcontainersLifecycleOrderWithScopeIntegrationTests.java b/spring-boot-project/spring-boot-testcontainers/src/dockerTest/java/org/springframework/boot/testcontainers/lifecycle/TestcontainersLifecycleOrderWithScopeIntegrationTests.java similarity index 100% rename from spring-boot-project/spring-boot-testcontainers/src/test/java/org/springframework/boot/testcontainers/lifecycle/TestcontainersLifecycleOrderWithScopeIntegrationTests.java rename to spring-boot-project/spring-boot-testcontainers/src/dockerTest/java/org/springframework/boot/testcontainers/lifecycle/TestcontainersLifecycleOrderWithScopeIntegrationTests.java diff --git a/spring-boot-project/spring-boot-testcontainers/src/test/java/org/springframework/boot/testcontainers/service/connection/activemq/ActiveMQContainerConnectionDetailsFactoryIntegrationTests.java b/spring-boot-project/spring-boot-testcontainers/src/dockerTest/java/org/springframework/boot/testcontainers/service/connection/activemq/ActiveMQContainerConnectionDetailsFactoryIntegrationTests.java similarity index 100% rename from spring-boot-project/spring-boot-testcontainers/src/test/java/org/springframework/boot/testcontainers/service/connection/activemq/ActiveMQContainerConnectionDetailsFactoryIntegrationTests.java rename to spring-boot-project/spring-boot-testcontainers/src/dockerTest/java/org/springframework/boot/testcontainers/service/connection/activemq/ActiveMQContainerConnectionDetailsFactoryIntegrationTests.java diff --git a/spring-boot-project/spring-boot-testcontainers/src/test/java/org/springframework/boot/testcontainers/service/connection/amqp/RabbitContainerConnectionDetailsFactoryIntegrationTests.java b/spring-boot-project/spring-boot-testcontainers/src/dockerTest/java/org/springframework/boot/testcontainers/service/connection/amqp/RabbitContainerConnectionDetailsFactoryIntegrationTests.java similarity index 100% rename from spring-boot-project/spring-boot-testcontainers/src/test/java/org/springframework/boot/testcontainers/service/connection/amqp/RabbitContainerConnectionDetailsFactoryIntegrationTests.java rename to spring-boot-project/spring-boot-testcontainers/src/dockerTest/java/org/springframework/boot/testcontainers/service/connection/amqp/RabbitContainerConnectionDetailsFactoryIntegrationTests.java diff --git a/spring-boot-project/spring-boot-testcontainers/src/test/java/org/springframework/boot/testcontainers/service/connection/cassandra/CassandraContainerConnectionDetailsFactoryTests.java b/spring-boot-project/spring-boot-testcontainers/src/dockerTest/java/org/springframework/boot/testcontainers/service/connection/cassandra/CassandraContainerConnectionDetailsFactoryTests.java similarity index 100% rename from spring-boot-project/spring-boot-testcontainers/src/test/java/org/springframework/boot/testcontainers/service/connection/cassandra/CassandraContainerConnectionDetailsFactoryTests.java rename to spring-boot-project/spring-boot-testcontainers/src/dockerTest/java/org/springframework/boot/testcontainers/service/connection/cassandra/CassandraContainerConnectionDetailsFactoryTests.java diff --git a/spring-boot-project/spring-boot-testcontainers/src/test/java/org/springframework/boot/testcontainers/service/connection/couchbase/CouchbaseContainerConnectionDetailsFactoryTests.java b/spring-boot-project/spring-boot-testcontainers/src/dockerTest/java/org/springframework/boot/testcontainers/service/connection/couchbase/CouchbaseContainerConnectionDetailsFactoryTests.java similarity index 100% rename from spring-boot-project/spring-boot-testcontainers/src/test/java/org/springframework/boot/testcontainers/service/connection/couchbase/CouchbaseContainerConnectionDetailsFactoryTests.java rename to spring-boot-project/spring-boot-testcontainers/src/dockerTest/java/org/springframework/boot/testcontainers/service/connection/couchbase/CouchbaseContainerConnectionDetailsFactoryTests.java diff --git a/spring-boot-project/spring-boot-testcontainers/src/test/java/org/springframework/boot/testcontainers/service/connection/elasticsearch/ElasticsearchContainerConnectionDetailsFactoryTests.java b/spring-boot-project/spring-boot-testcontainers/src/dockerTest/java/org/springframework/boot/testcontainers/service/connection/elasticsearch/ElasticsearchContainerConnectionDetailsFactoryTests.java similarity index 100% rename from spring-boot-project/spring-boot-testcontainers/src/test/java/org/springframework/boot/testcontainers/service/connection/elasticsearch/ElasticsearchContainerConnectionDetailsFactoryTests.java rename to spring-boot-project/spring-boot-testcontainers/src/dockerTest/java/org/springframework/boot/testcontainers/service/connection/elasticsearch/ElasticsearchContainerConnectionDetailsFactoryTests.java diff --git a/spring-boot-project/spring-boot-testcontainers/src/test/java/org/springframework/boot/testcontainers/service/connection/flyway/FlywayContainerConnectionDetailsFactoryTests.java b/spring-boot-project/spring-boot-testcontainers/src/dockerTest/java/org/springframework/boot/testcontainers/service/connection/flyway/FlywayContainerConnectionDetailsFactoryTests.java similarity index 100% rename from spring-boot-project/spring-boot-testcontainers/src/test/java/org/springframework/boot/testcontainers/service/connection/flyway/FlywayContainerConnectionDetailsFactoryTests.java rename to spring-boot-project/spring-boot-testcontainers/src/dockerTest/java/org/springframework/boot/testcontainers/service/connection/flyway/FlywayContainerConnectionDetailsFactoryTests.java diff --git a/spring-boot-project/spring-boot-testcontainers/src/test/java/org/springframework/boot/testcontainers/service/connection/jdbc/JdbcContainerConnectionDetailsFactoryTests.java b/spring-boot-project/spring-boot-testcontainers/src/dockerTest/java/org/springframework/boot/testcontainers/service/connection/jdbc/JdbcContainerConnectionDetailsFactoryTests.java similarity index 100% rename from spring-boot-project/spring-boot-testcontainers/src/test/java/org/springframework/boot/testcontainers/service/connection/jdbc/JdbcContainerConnectionDetailsFactoryTests.java rename to spring-boot-project/spring-boot-testcontainers/src/dockerTest/java/org/springframework/boot/testcontainers/service/connection/jdbc/JdbcContainerConnectionDetailsFactoryTests.java diff --git a/spring-boot-project/spring-boot-testcontainers/src/test/java/org/springframework/boot/testcontainers/service/connection/kafka/KafkaContainerConnectionDetailsFactoryIntegrationTests.java b/spring-boot-project/spring-boot-testcontainers/src/dockerTest/java/org/springframework/boot/testcontainers/service/connection/kafka/KafkaContainerConnectionDetailsFactoryIntegrationTests.java similarity index 100% rename from spring-boot-project/spring-boot-testcontainers/src/test/java/org/springframework/boot/testcontainers/service/connection/kafka/KafkaContainerConnectionDetailsFactoryIntegrationTests.java rename to spring-boot-project/spring-boot-testcontainers/src/dockerTest/java/org/springframework/boot/testcontainers/service/connection/kafka/KafkaContainerConnectionDetailsFactoryIntegrationTests.java diff --git a/spring-boot-project/spring-boot-testcontainers/src/test/java/org/springframework/boot/testcontainers/service/connection/liquibase/LiquibaseContainerConnectionDetailsFactoryTests.java b/spring-boot-project/spring-boot-testcontainers/src/dockerTest/java/org/springframework/boot/testcontainers/service/connection/liquibase/LiquibaseContainerConnectionDetailsFactoryTests.java similarity index 100% rename from spring-boot-project/spring-boot-testcontainers/src/test/java/org/springframework/boot/testcontainers/service/connection/liquibase/LiquibaseContainerConnectionDetailsFactoryTests.java rename to spring-boot-project/spring-boot-testcontainers/src/dockerTest/java/org/springframework/boot/testcontainers/service/connection/liquibase/LiquibaseContainerConnectionDetailsFactoryTests.java diff --git a/spring-boot-project/spring-boot-testcontainers/src/test/java/org/springframework/boot/testcontainers/service/connection/otlp/OpenTelemetryMetricsContainerConnectionDetailsFactoryIntegrationTests.java b/spring-boot-project/spring-boot-testcontainers/src/dockerTest/java/org/springframework/boot/testcontainers/service/connection/otlp/OpenTelemetryMetricsContainerConnectionDetailsFactoryIntegrationTests.java similarity index 100% rename from spring-boot-project/spring-boot-testcontainers/src/test/java/org/springframework/boot/testcontainers/service/connection/otlp/OpenTelemetryMetricsContainerConnectionDetailsFactoryIntegrationTests.java rename to spring-boot-project/spring-boot-testcontainers/src/dockerTest/java/org/springframework/boot/testcontainers/service/connection/otlp/OpenTelemetryMetricsContainerConnectionDetailsFactoryIntegrationTests.java diff --git a/spring-boot-project/spring-boot-testcontainers/src/test/java/org/springframework/boot/testcontainers/service/connection/otlp/OpenTelemetryTracingContainerConnectionDetailsFactoryIntegrationTests.java b/spring-boot-project/spring-boot-testcontainers/src/dockerTest/java/org/springframework/boot/testcontainers/service/connection/otlp/OpenTelemetryTracingContainerConnectionDetailsFactoryIntegrationTests.java similarity index 100% rename from spring-boot-project/spring-boot-testcontainers/src/test/java/org/springframework/boot/testcontainers/service/connection/otlp/OpenTelemetryTracingContainerConnectionDetailsFactoryIntegrationTests.java rename to spring-boot-project/spring-boot-testcontainers/src/dockerTest/java/org/springframework/boot/testcontainers/service/connection/otlp/OpenTelemetryTracingContainerConnectionDetailsFactoryIntegrationTests.java diff --git a/spring-boot-project/spring-boot-testcontainers/src/test/java/org/springframework/boot/testcontainers/service/connection/pulsar/PulsarContainerConnectionDetailsFactoryIntegrationTests.java b/spring-boot-project/spring-boot-testcontainers/src/dockerTest/java/org/springframework/boot/testcontainers/service/connection/pulsar/PulsarContainerConnectionDetailsFactoryIntegrationTests.java similarity index 100% rename from spring-boot-project/spring-boot-testcontainers/src/test/java/org/springframework/boot/testcontainers/service/connection/pulsar/PulsarContainerConnectionDetailsFactoryIntegrationTests.java rename to spring-boot-project/spring-boot-testcontainers/src/dockerTest/java/org/springframework/boot/testcontainers/service/connection/pulsar/PulsarContainerConnectionDetailsFactoryIntegrationTests.java diff --git a/spring-boot-project/spring-boot-testcontainers/src/dockerTest/java/org/springframework/boot/testcontainers/service/connection/r2dbc/OracleFreeR2dbcContainerConnectionDetailsFactoryIntegrationTests.java b/spring-boot-project/spring-boot-testcontainers/src/dockerTest/java/org/springframework/boot/testcontainers/service/connection/r2dbc/OracleFreeR2dbcContainerConnectionDetailsFactoryIntegrationTests.java new file mode 100644 index 00000000000..2294e087797 --- /dev/null +++ b/spring-boot-project/spring-boot-testcontainers/src/dockerTest/java/org/springframework/boot/testcontainers/service/connection/r2dbc/OracleFreeR2dbcContainerConnectionDetailsFactoryIntegrationTests.java @@ -0,0 +1,75 @@ +/* + * Copyright 2012-2024 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.testcontainers.service.connection.r2dbc; + +import java.time.Duration; + +import io.r2dbc.spi.ConnectionFactory; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.condition.OS; +import org.testcontainers.junit.jupiter.Container; +import org.testcontainers.junit.jupiter.Testcontainers; +import org.testcontainers.oracle.OracleContainer; + +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.boot.autoconfigure.ImportAutoConfiguration; +import org.springframework.boot.autoconfigure.r2dbc.R2dbcAutoConfiguration; +import org.springframework.boot.jdbc.DatabaseDriver; +import org.springframework.boot.testcontainers.service.connection.ServiceConnection; +import org.springframework.boot.testsupport.container.TestImage; +import org.springframework.boot.testsupport.junit.DisabledOnOs; +import org.springframework.context.annotation.Configuration; +import org.springframework.r2dbc.core.DatabaseClient; +import org.springframework.test.context.junit.jupiter.SpringJUnitConfig; + +import static org.assertj.core.api.Assertions.assertThat; + +/** + * Tests for {@link OracleFreeR2dbcContainerConnectionDetailsFactory}. + * + * @author Andy Wilkinson + */ +@SpringJUnitConfig +@Testcontainers(disabledWithoutDocker = true) +@DisabledOnOs(os = { OS.LINUX, OS.MAC }, architecture = "aarch64", + disabledReason = "The Oracle image has no ARM support") +class OracleFreeR2dbcContainerConnectionDetailsFactoryIntegrationTests { + + @Container + @ServiceConnection + static final OracleContainer oracle = TestImage.container(OracleContainer.class); + + @Autowired + ConnectionFactory connectionFactory; + + @Test + void connectionCanBeMadeToOracleContainer() { + Object result = DatabaseClient.create(this.connectionFactory) + .sql(DatabaseDriver.ORACLE.getValidationQuery()) + .map((row, metadata) -> row.get(0)) + .first() + .block(Duration.ofSeconds(30)); + assertThat(result).isEqualTo("Hello"); + } + + @Configuration(proxyBeanMethods = false) + @ImportAutoConfiguration(R2dbcAutoConfiguration.class) + static class TestConfiguration { + + } + +} diff --git a/spring-boot-project/spring-boot-testcontainers/src/dockerTest/java/org/springframework/boot/testcontainers/service/connection/r2dbc/OracleXeR2dbcContainerConnectionDetailsFactoryIntegrationTests.java b/spring-boot-project/spring-boot-testcontainers/src/dockerTest/java/org/springframework/boot/testcontainers/service/connection/r2dbc/OracleXeR2dbcContainerConnectionDetailsFactoryIntegrationTests.java new file mode 100644 index 00000000000..5f94aa689c0 --- /dev/null +++ b/spring-boot-project/spring-boot-testcontainers/src/dockerTest/java/org/springframework/boot/testcontainers/service/connection/r2dbc/OracleXeR2dbcContainerConnectionDetailsFactoryIntegrationTests.java @@ -0,0 +1,75 @@ +/* + * Copyright 2012-2024 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.testcontainers.service.connection.r2dbc; + +import java.time.Duration; + +import io.r2dbc.spi.ConnectionFactory; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.condition.OS; +import org.testcontainers.containers.OracleContainer; +import org.testcontainers.junit.jupiter.Container; +import org.testcontainers.junit.jupiter.Testcontainers; + +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.boot.autoconfigure.ImportAutoConfiguration; +import org.springframework.boot.autoconfigure.r2dbc.R2dbcAutoConfiguration; +import org.springframework.boot.jdbc.DatabaseDriver; +import org.springframework.boot.testcontainers.service.connection.ServiceConnection; +import org.springframework.boot.testsupport.container.TestImage; +import org.springframework.boot.testsupport.junit.DisabledOnOs; +import org.springframework.context.annotation.Configuration; +import org.springframework.r2dbc.core.DatabaseClient; +import org.springframework.test.context.junit.jupiter.SpringJUnitConfig; + +import static org.assertj.core.api.Assertions.assertThat; + +/** + * Tests for {@link OracleXeR2dbcContainerConnectionDetailsFactory}. + * + * @author Andy Wilkinson + */ +@SpringJUnitConfig +@Testcontainers(disabledWithoutDocker = true) +@DisabledOnOs(os = { OS.LINUX, OS.MAC }, architecture = "aarch64", + disabledReason = "The Oracle image has no ARM support") +class OracleXeR2dbcContainerConnectionDetailsFactoryIntegrationTests { + + @Container + @ServiceConnection + static final OracleContainer oracle = TestImage.container(OracleContainer.class); + + @Autowired + ConnectionFactory connectionFactory; + + @Test + void connectionCanBeMadeToOracleContainer() { + Object result = DatabaseClient.create(this.connectionFactory) + .sql(DatabaseDriver.ORACLE.getValidationQuery()) + .map((row, metadata) -> row.get(0)) + .first() + .block(Duration.ofSeconds(30)); + assertThat(result).isEqualTo("Hello"); + } + + @Configuration(proxyBeanMethods = false) + @ImportAutoConfiguration(R2dbcAutoConfiguration.class) + static class TestConfiguration { + + } + +} diff --git a/spring-boot-project/spring-boot-testcontainers/src/test/java/org/springframework/boot/testcontainers/service/connection/redis/RedisContainerConnectionDetailsFactoryTests.java b/spring-boot-project/spring-boot-testcontainers/src/dockerTest/java/org/springframework/boot/testcontainers/service/connection/redis/RedisContainerConnectionDetailsFactoryTests.java similarity index 100% rename from spring-boot-project/spring-boot-testcontainers/src/test/java/org/springframework/boot/testcontainers/service/connection/redis/RedisContainerConnectionDetailsFactoryTests.java rename to spring-boot-project/spring-boot-testcontainers/src/dockerTest/java/org/springframework/boot/testcontainers/service/connection/redis/RedisContainerConnectionDetailsFactoryTests.java diff --git a/spring-boot-project/spring-boot-testcontainers/src/test/java/org/springframework/boot/testcontainers/service/connection/redpanda/RedpandaContainerConnectionDetailsFactoryIntegrationTests.java b/spring-boot-project/spring-boot-testcontainers/src/dockerTest/java/org/springframework/boot/testcontainers/service/connection/redpanda/RedpandaContainerConnectionDetailsFactoryIntegrationTests.java similarity index 100% rename from spring-boot-project/spring-boot-testcontainers/src/test/java/org/springframework/boot/testcontainers/service/connection/redpanda/RedpandaContainerConnectionDetailsFactoryIntegrationTests.java rename to spring-boot-project/spring-boot-testcontainers/src/dockerTest/java/org/springframework/boot/testcontainers/service/connection/redpanda/RedpandaContainerConnectionDetailsFactoryIntegrationTests.java diff --git a/spring-boot-project/spring-boot-testcontainers/src/test/java/org/springframework/boot/testcontainers/service/connection/zipkin/ZipkinContainerConnectionDetailsFactoryIntegrationTests.java b/spring-boot-project/spring-boot-testcontainers/src/dockerTest/java/org/springframework/boot/testcontainers/service/connection/zipkin/ZipkinContainerConnectionDetailsFactoryIntegrationTests.java similarity index 100% rename from spring-boot-project/spring-boot-testcontainers/src/test/java/org/springframework/boot/testcontainers/service/connection/zipkin/ZipkinContainerConnectionDetailsFactoryIntegrationTests.java rename to spring-boot-project/spring-boot-testcontainers/src/dockerTest/java/org/springframework/boot/testcontainers/service/connection/zipkin/ZipkinContainerConnectionDetailsFactoryIntegrationTests.java diff --git a/spring-boot-project/spring-boot-testcontainers/src/test/resources/collector-config.yml b/spring-boot-project/spring-boot-testcontainers/src/dockerTest/resources/collector-config.yml similarity index 100% rename from spring-boot-project/spring-boot-testcontainers/src/test/resources/collector-config.yml rename to spring-boot-project/spring-boot-testcontainers/src/dockerTest/resources/collector-config.yml diff --git a/spring-boot-project/spring-boot-testcontainers/src/test/resources/db/changelog/db.changelog-master.yaml b/spring-boot-project/spring-boot-testcontainers/src/dockerTest/resources/db/changelog/db.changelog-master.yaml similarity index 100% rename from spring-boot-project/spring-boot-testcontainers/src/test/resources/db/changelog/db.changelog-master.yaml rename to spring-boot-project/spring-boot-testcontainers/src/dockerTest/resources/db/changelog/db.changelog-master.yaml diff --git a/spring-boot-project/spring-boot-testcontainers/src/dockerTest/resources/logback-test.xml b/spring-boot-project/spring-boot-testcontainers/src/dockerTest/resources/logback-test.xml new file mode 100644 index 00000000000..b8a41480d7d --- /dev/null +++ b/spring-boot-project/spring-boot-testcontainers/src/dockerTest/resources/logback-test.xml @@ -0,0 +1,4 @@ + + + + diff --git a/spring-boot-project/spring-boot-testcontainers/src/dockerTest/resources/spring.properties b/spring-boot-project/spring-boot-testcontainers/src/dockerTest/resources/spring.properties new file mode 100644 index 00000000000..47dff33f0bb --- /dev/null +++ b/spring-boot-project/spring-boot-testcontainers/src/dockerTest/resources/spring.properties @@ -0,0 +1 @@ +spring.test.context.cache.maxSize=1 \ No newline at end of file diff --git a/spring-boot-project/spring-boot-testcontainers/src/test/java/org/springframework/boot/testcontainers/service/connection/r2dbc/OracleFreeR2dbcContainerConnectionDetailsFactoryTests.java b/spring-boot-project/spring-boot-testcontainers/src/test/java/org/springframework/boot/testcontainers/service/connection/r2dbc/OracleFreeR2dbcContainerConnectionDetailsFactoryTests.java index 6e38d71f03f..5cbcb4c1f7a 100644 --- a/spring-boot-project/spring-boot-testcontainers/src/test/java/org/springframework/boot/testcontainers/service/connection/r2dbc/OracleFreeR2dbcContainerConnectionDetailsFactoryTests.java +++ b/spring-boot-project/spring-boot-testcontainers/src/test/java/org/springframework/boot/testcontainers/service/connection/r2dbc/OracleFreeR2dbcContainerConnectionDetailsFactoryTests.java @@ -16,29 +16,12 @@ package org.springframework.boot.testcontainers.service.connection.r2dbc; -import java.time.Duration; - -import io.r2dbc.spi.ConnectionFactory; import io.r2dbc.spi.ConnectionFactoryOptions; import org.junit.jupiter.api.Test; -import org.junit.jupiter.api.condition.OS; -import org.testcontainers.junit.jupiter.Container; -import org.testcontainers.junit.jupiter.Testcontainers; -import org.testcontainers.oracle.OracleContainer; import org.springframework.aot.hint.RuntimeHints; import org.springframework.aot.hint.predicate.RuntimeHintsPredicates; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.boot.autoconfigure.ImportAutoConfiguration; -import org.springframework.boot.autoconfigure.r2dbc.R2dbcAutoConfiguration; -import org.springframework.boot.jdbc.DatabaseDriver; import org.springframework.boot.testcontainers.service.connection.ContainerConnectionDetailsFactoryHints; -import org.springframework.boot.testcontainers.service.connection.ServiceConnection; -import org.springframework.boot.testsupport.container.TestImage; -import org.springframework.boot.testsupport.junit.DisabledOnOs; -import org.springframework.context.annotation.Configuration; -import org.springframework.r2dbc.core.DatabaseClient; -import org.springframework.test.context.junit.jupiter.SpringJUnitConfig; import static org.assertj.core.api.Assertions.assertThat; @@ -47,39 +30,12 @@ import static org.assertj.core.api.Assertions.assertThat; * * @author Andy Wilkinson */ -@SpringJUnitConfig -@Testcontainers(disabledWithoutDocker = true) -@DisabledOnOs(os = { OS.LINUX, OS.MAC }, architecture = "aarch64", - disabledReason = "The Oracle image has no ARM support") class OracleFreeR2dbcContainerConnectionDetailsFactoryTests { - @Container - @ServiceConnection - static final OracleContainer oracle = TestImage.container(OracleContainer.class); - - @Autowired - ConnectionFactory connectionFactory; - - @Test - void connectionCanBeMadeToOracleContainer() { - Object result = DatabaseClient.create(this.connectionFactory) - .sql(DatabaseDriver.ORACLE.getValidationQuery()) - .map((row, metadata) -> row.get(0)) - .first() - .block(Duration.ofSeconds(30)); - assertThat(result).isEqualTo("Hello"); - } - @Test void shouldRegisterHints() { RuntimeHints hints = ContainerConnectionDetailsFactoryHints.getRegisteredHints(getClass().getClassLoader()); assertThat(RuntimeHintsPredicates.reflection().onType(ConnectionFactoryOptions.class)).accepts(hints); } - @Configuration(proxyBeanMethods = false) - @ImportAutoConfiguration(R2dbcAutoConfiguration.class) - static class TestConfiguration { - - } - } diff --git a/spring-boot-project/spring-boot-testcontainers/src/test/java/org/springframework/boot/testcontainers/service/connection/r2dbc/OracleXeR2dbcContainerConnectionDetailsFactoryTests.java b/spring-boot-project/spring-boot-testcontainers/src/test/java/org/springframework/boot/testcontainers/service/connection/r2dbc/OracleXeR2dbcContainerConnectionDetailsFactoryTests.java index 0c9bbff05ae..392f44aa87b 100644 --- a/spring-boot-project/spring-boot-testcontainers/src/test/java/org/springframework/boot/testcontainers/service/connection/r2dbc/OracleXeR2dbcContainerConnectionDetailsFactoryTests.java +++ b/spring-boot-project/spring-boot-testcontainers/src/test/java/org/springframework/boot/testcontainers/service/connection/r2dbc/OracleXeR2dbcContainerConnectionDetailsFactoryTests.java @@ -16,29 +16,12 @@ package org.springframework.boot.testcontainers.service.connection.r2dbc; -import java.time.Duration; - -import io.r2dbc.spi.ConnectionFactory; import io.r2dbc.spi.ConnectionFactoryOptions; import org.junit.jupiter.api.Test; -import org.junit.jupiter.api.condition.OS; -import org.testcontainers.containers.OracleContainer; -import org.testcontainers.junit.jupiter.Container; -import org.testcontainers.junit.jupiter.Testcontainers; import org.springframework.aot.hint.RuntimeHints; import org.springframework.aot.hint.predicate.RuntimeHintsPredicates; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.boot.autoconfigure.ImportAutoConfiguration; -import org.springframework.boot.autoconfigure.r2dbc.R2dbcAutoConfiguration; -import org.springframework.boot.jdbc.DatabaseDriver; import org.springframework.boot.testcontainers.service.connection.ContainerConnectionDetailsFactoryHints; -import org.springframework.boot.testcontainers.service.connection.ServiceConnection; -import org.springframework.boot.testsupport.container.TestImage; -import org.springframework.boot.testsupport.junit.DisabledOnOs; -import org.springframework.context.annotation.Configuration; -import org.springframework.r2dbc.core.DatabaseClient; -import org.springframework.test.context.junit.jupiter.SpringJUnitConfig; import static org.assertj.core.api.Assertions.assertThat; @@ -47,39 +30,12 @@ import static org.assertj.core.api.Assertions.assertThat; * * @author Andy Wilkinson */ -@SpringJUnitConfig -@Testcontainers(disabledWithoutDocker = true) -@DisabledOnOs(os = { OS.LINUX, OS.MAC }, architecture = "aarch64", - disabledReason = "The Oracle image has no ARM support") class OracleXeR2dbcContainerConnectionDetailsFactoryTests { - @Container - @ServiceConnection - static final OracleContainer oracle = TestImage.container(OracleContainer.class); - - @Autowired - ConnectionFactory connectionFactory; - - @Test - void connectionCanBeMadeToOracleContainer() { - Object result = DatabaseClient.create(this.connectionFactory) - .sql(DatabaseDriver.ORACLE.getValidationQuery()) - .map((row, metadata) -> row.get(0)) - .first() - .block(Duration.ofSeconds(30)); - assertThat(result).isEqualTo("Hello"); - } - @Test void shouldRegisterHints() { RuntimeHints hints = ContainerConnectionDetailsFactoryHints.getRegisteredHints(getClass().getClassLoader()); assertThat(RuntimeHintsPredicates.reflection().onType(ConnectionFactoryOptions.class)).accepts(hints); } - @Configuration(proxyBeanMethods = false) - @ImportAutoConfiguration(R2dbcAutoConfiguration.class) - static class TestConfiguration { - - } - } From 6fbf08fa9adbb5367ca56e5764ec7ca67d708324 Mon Sep 17 00:00:00 2001 From: Andy Wilkinson Date: Tue, 25 Jun 2024 11:32:53 +0100 Subject: [PATCH 03/28] Update spring-boot-docker-compose to use docker-test plugin See gh-41228 --- .../spring-boot-docker-compose/build.gradle | 17 +++++++++++------ .../compose/core/DockerCliIntegrationTests.java | 0 ...onnectionDetailsFactoryIntegrationTests.java | 0 ...onnectionDetailsFactoryIntegrationTests.java | 0 ...onnectionDetailsFactoryIntegrationTests.java | 0 ...onnectionDetailsFactoryIntegrationTests.java | 0 ...onnectionDetailsFactoryIntegrationTests.java | 0 ...onnectionDetailsFactoryIntegrationTests.java | 2 +- ...onnectionDetailsFactoryIntegrationTests.java | 2 +- ...onnectionDetailsFactoryIntegrationTests.java | 0 ...onnectionDetailsFactoryIntegrationTests.java | 2 +- ...onnectionDetailsFactoryIntegrationTests.java | 2 +- ...onnectionDetailsFactoryIntegrationTests.java | 0 ...onnectionDetailsFactoryIntegrationTests.java | 2 +- ...onnectionDetailsFactoryIntegrationTests.java | 2 +- ...onnectionDetailsFactoryIntegrationTests.java | 2 +- ...onnectionDetailsFactoryIntegrationTests.java | 2 +- ...onnectionDetailsFactoryIntegrationTests.java | 0 ...onnectionDetailsFactoryIntegrationTests.java | 0 ...onnectionDetailsFactoryIntegrationTests.java | 0 ...onnectionDetailsFactoryIntegrationTests.java | 0 ...onnectionDetailsFactoryIntegrationTests.java | 0 ...onnectionDetailsFactoryIntegrationTests.java | 0 ...onnectionDetailsFactoryIntegrationTests.java | 0 ...onnectionDetailsFactoryIntegrationTests.java | 2 +- ...onnectionDetailsFactoryIntegrationTests.java | 2 +- .../connection/test/DockerComposeTest.java | 0 .../test/DockerComposeTestExtension.java | 0 ...onnectionDetailsFactoryIntegrationTests.java | 0 .../boot/docker/compose/core/redis-compose.yaml | 0 .../connection/activemq/activemq-compose.yaml | 0 .../connection/cassandra/cassandra-compose.yaml | 0 .../elasticsearch/elasticsearch-compose.yaml | 0 .../connection/flyway/flyway-compose.yaml | 0 .../connection/liquibase/liquibase-compose.yaml | 0 .../connection/mariadb/mariadb-compose.yaml | 0 .../service/connection/mongo/mongo-compose.yaml | 0 .../service/connection/mysql/mysql-compose.yaml | 0 .../service/connection/neo4j/neo4j-compose.yaml | 0 .../connection/oracle/oracle-compose.yaml | 0 .../service/connection/otlp/otlp-compose.yaml | 0 .../connection/postgres/postgres-compose.yaml | 0 .../connection/pulsar/pulsar-compose.yaml | 0 .../connection/rabbit/rabbit-compose.yaml | 0 .../service/connection/redis/redis-compose.yaml | 0 .../sqlserver/mssqlserver-compose.yaml | 0 ...ssqlserver-with-jdbc-parameters-compose.yaml | 0 .../connection/zipkin/zipkin-compose.yaml | 0 ...ersPropertySourceAutoConfigurationTests.java | 0 ...ServiceConnectionAutoConfigurationTests.java | 0 50 files changed, 21 insertions(+), 16 deletions(-) rename spring-boot-project/spring-boot-docker-compose/src/{test => dockerTest}/java/org/springframework/boot/docker/compose/core/DockerCliIntegrationTests.java (100%) rename spring-boot-project/spring-boot-docker-compose/src/{test => dockerTest}/java/org/springframework/boot/docker/compose/service/connection/activemq/ActiveMQDockerComposeConnectionDetailsFactoryIntegrationTests.java (100%) rename spring-boot-project/spring-boot-docker-compose/src/{test => dockerTest}/java/org/springframework/boot/docker/compose/service/connection/cassandra/CassandraDockerComposeConnectionDetailsFactoryIntegrationTests.java (100%) rename spring-boot-project/spring-boot-docker-compose/src/{test => dockerTest}/java/org/springframework/boot/docker/compose/service/connection/elasticsearch/ElasticsearchDockerComposeConnectionDetailsFactoryIntegrationTests.java (100%) rename spring-boot-project/spring-boot-docker-compose/src/{test => dockerTest}/java/org/springframework/boot/docker/compose/service/connection/flyway/JdbcAdaptingFlywayConnectionDetailsFactoryIntegrationTests.java (100%) rename spring-boot-project/spring-boot-docker-compose/src/{test => dockerTest}/java/org/springframework/boot/docker/compose/service/connection/liquibase/JdbcAdaptingLiquibaseConnectionDetailsFactoryIntegrationTests.java (100%) rename spring-boot-project/spring-boot-docker-compose/src/{test => dockerTest}/java/org/springframework/boot/docker/compose/service/connection/mariadb/MariaDbJdbcDockerComposeConnectionDetailsFactoryIntegrationTests.java (98%) rename spring-boot-project/spring-boot-docker-compose/src/{test => dockerTest}/java/org/springframework/boot/docker/compose/service/connection/mariadb/MariaDbR2dbcDockerComposeConnectionDetailsFactoryIntegrationTests.java (98%) rename spring-boot-project/spring-boot-docker-compose/src/{test => dockerTest}/java/org/springframework/boot/docker/compose/service/connection/mongo/MongoDockerComposeConnectionDetailsFactoryIntegrationTests.java (100%) rename spring-boot-project/spring-boot-docker-compose/src/{test => dockerTest}/java/org/springframework/boot/docker/compose/service/connection/mysql/MySqlJdbcDockerComposeConnectionDetailsFactoryIntegrationTests.java (98%) rename spring-boot-project/spring-boot-docker-compose/src/{test => dockerTest}/java/org/springframework/boot/docker/compose/service/connection/mysql/MySqlR2dbcDockerComposeConnectionDetailsFactoryIntegrationTests.java (99%) rename spring-boot-project/spring-boot-docker-compose/src/{test => dockerTest}/java/org/springframework/boot/docker/compose/service/connection/neo4j/Neo4jDockerComposeConnectionDetailsFactoryIntegrationTests.java (100%) rename spring-boot-project/spring-boot-docker-compose/src/{test => dockerTest}/java/org/springframework/boot/docker/compose/service/connection/oracle/OracleFreeJdbcDockerComposeConnectionDetailsFactoryIntegrationTests.java (99%) rename spring-boot-project/spring-boot-docker-compose/src/{test => dockerTest}/java/org/springframework/boot/docker/compose/service/connection/oracle/OracleFreeR2dbcDockerComposeConnectionDetailsFactoryIntegrationTests.java (99%) rename spring-boot-project/spring-boot-docker-compose/src/{test => dockerTest}/java/org/springframework/boot/docker/compose/service/connection/oracle/OracleXeJdbcDockerComposeConnectionDetailsFactoryIntegrationTests.java (99%) rename spring-boot-project/spring-boot-docker-compose/src/{test => dockerTest}/java/org/springframework/boot/docker/compose/service/connection/oracle/OracleXeR2dbcDockerComposeConnectionDetailsFactoryIntegrationTests.java (99%) rename spring-boot-project/spring-boot-docker-compose/src/{test => dockerTest}/java/org/springframework/boot/docker/compose/service/connection/otlp/OpenTelemetryMetricsDockerComposeConnectionDetailsFactoryIntegrationTests.java (100%) rename spring-boot-project/spring-boot-docker-compose/src/{test => dockerTest}/java/org/springframework/boot/docker/compose/service/connection/otlp/OpenTelemetryTracingDockerComposeConnectionDetailsFactoryIntegrationTests.java (100%) rename spring-boot-project/spring-boot-docker-compose/src/{test => dockerTest}/java/org/springframework/boot/docker/compose/service/connection/postgres/PostgresJdbcDockerComposeConnectionDetailsFactoryIntegrationTests.java (100%) rename spring-boot-project/spring-boot-docker-compose/src/{test => dockerTest}/java/org/springframework/boot/docker/compose/service/connection/postgres/PostgresR2dbcDockerComposeConnectionDetailsFactoryIntegrationTests.java (100%) rename spring-boot-project/spring-boot-docker-compose/src/{test => dockerTest}/java/org/springframework/boot/docker/compose/service/connection/pulsar/PulsarDockerComposeConnectionDetailsFactoryIntegrationTests.java (100%) rename spring-boot-project/spring-boot-docker-compose/src/{test => dockerTest}/java/org/springframework/boot/docker/compose/service/connection/rabbit/RabbitDockerComposeConnectionDetailsFactoryIntegrationTests.java (100%) rename spring-boot-project/spring-boot-docker-compose/src/{test => dockerTest}/java/org/springframework/boot/docker/compose/service/connection/redis/RedisDockerComposeConnectionDetailsFactoryIntegrationTests.java (100%) rename spring-boot-project/spring-boot-docker-compose/src/{test => dockerTest}/java/org/springframework/boot/docker/compose/service/connection/sqlserver/SqlServerJdbcDockerComposeConnectionDetailsFactoryIntegrationTests.java (99%) rename spring-boot-project/spring-boot-docker-compose/src/{test => dockerTest}/java/org/springframework/boot/docker/compose/service/connection/sqlserver/SqlServerR2dbcDockerComposeConnectionDetailsFactoryIntegrationTests.java (99%) rename spring-boot-project/spring-boot-docker-compose/src/{test => dockerTest}/java/org/springframework/boot/docker/compose/service/connection/test/DockerComposeTest.java (100%) rename spring-boot-project/spring-boot-docker-compose/src/{test => dockerTest}/java/org/springframework/boot/docker/compose/service/connection/test/DockerComposeTestExtension.java (100%) rename spring-boot-project/spring-boot-docker-compose/src/{test => dockerTest}/java/org/springframework/boot/docker/compose/service/connection/zipkin/ZipkinDockerComposeConnectionDetailsFactoryIntegrationTests.java (100%) rename spring-boot-project/spring-boot-docker-compose/src/{test => dockerTest}/resources/org/springframework/boot/docker/compose/core/redis-compose.yaml (100%) rename spring-boot-project/spring-boot-docker-compose/src/{test => dockerTest}/resources/org/springframework/boot/docker/compose/service/connection/activemq/activemq-compose.yaml (100%) rename spring-boot-project/spring-boot-docker-compose/src/{test => dockerTest}/resources/org/springframework/boot/docker/compose/service/connection/cassandra/cassandra-compose.yaml (100%) rename spring-boot-project/spring-boot-docker-compose/src/{test => dockerTest}/resources/org/springframework/boot/docker/compose/service/connection/elasticsearch/elasticsearch-compose.yaml (100%) rename spring-boot-project/spring-boot-docker-compose/src/{test => dockerTest}/resources/org/springframework/boot/docker/compose/service/connection/flyway/flyway-compose.yaml (100%) rename spring-boot-project/spring-boot-docker-compose/src/{test => dockerTest}/resources/org/springframework/boot/docker/compose/service/connection/liquibase/liquibase-compose.yaml (100%) rename spring-boot-project/spring-boot-docker-compose/src/{test => dockerTest}/resources/org/springframework/boot/docker/compose/service/connection/mariadb/mariadb-compose.yaml (100%) rename spring-boot-project/spring-boot-docker-compose/src/{test => dockerTest}/resources/org/springframework/boot/docker/compose/service/connection/mongo/mongo-compose.yaml (100%) rename spring-boot-project/spring-boot-docker-compose/src/{test => dockerTest}/resources/org/springframework/boot/docker/compose/service/connection/mysql/mysql-compose.yaml (100%) rename spring-boot-project/spring-boot-docker-compose/src/{test => dockerTest}/resources/org/springframework/boot/docker/compose/service/connection/neo4j/neo4j-compose.yaml (100%) rename spring-boot-project/spring-boot-docker-compose/src/{test => dockerTest}/resources/org/springframework/boot/docker/compose/service/connection/oracle/oracle-compose.yaml (100%) rename spring-boot-project/spring-boot-docker-compose/src/{test => dockerTest}/resources/org/springframework/boot/docker/compose/service/connection/otlp/otlp-compose.yaml (100%) rename spring-boot-project/spring-boot-docker-compose/src/{test => dockerTest}/resources/org/springframework/boot/docker/compose/service/connection/postgres/postgres-compose.yaml (100%) rename spring-boot-project/spring-boot-docker-compose/src/{test => dockerTest}/resources/org/springframework/boot/docker/compose/service/connection/pulsar/pulsar-compose.yaml (100%) rename spring-boot-project/spring-boot-docker-compose/src/{test => dockerTest}/resources/org/springframework/boot/docker/compose/service/connection/rabbit/rabbit-compose.yaml (100%) rename spring-boot-project/spring-boot-docker-compose/src/{test => dockerTest}/resources/org/springframework/boot/docker/compose/service/connection/redis/redis-compose.yaml (100%) rename spring-boot-project/spring-boot-docker-compose/src/{test => dockerTest}/resources/org/springframework/boot/docker/compose/service/connection/sqlserver/mssqlserver-compose.yaml (100%) rename spring-boot-project/spring-boot-docker-compose/src/{test => dockerTest}/resources/org/springframework/boot/docker/compose/service/connection/sqlserver/mssqlserver-with-jdbc-parameters-compose.yaml (100%) rename spring-boot-project/spring-boot-docker-compose/src/{test => dockerTest}/resources/org/springframework/boot/docker/compose/service/connection/zipkin/zipkin-compose.yaml (100%) rename spring-boot-project/spring-boot-testcontainers/src/{test => dockerTest}/java/org/springframework/boot/testcontainers/properties/TestcontainersPropertySourceAutoConfigurationTests.java (100%) rename spring-boot-project/spring-boot-testcontainers/src/{test => dockerTest}/java/org/springframework/boot/testcontainers/service/connection/ServiceConnectionAutoConfigurationTests.java (100%) diff --git a/spring-boot-project/spring-boot-docker-compose/build.gradle b/spring-boot-project/spring-boot-docker-compose/build.gradle index ec1665712de..98d251ec695 100644 --- a/spring-boot-project/spring-boot-docker-compose/build.gradle +++ b/spring-boot-project/spring-boot-docker-compose/build.gradle @@ -3,6 +3,7 @@ plugins { id "org.springframework.boot.configuration-properties" id "org.springframework.boot.conventions" id "org.springframework.boot.deployed" + id "org.springframework.boot.docker-test" id "org.springframework.boot.optional-dependencies" } @@ -11,6 +12,16 @@ description = "Spring Boot Docker Compose Support" dependencies { api(project(":spring-boot-project:spring-boot")) + dockerTestImplementation(project(":spring-boot-project:spring-boot-tools:spring-boot-test-support")) + dockerTestImplementation("org.assertj:assertj-core") + dockerTestImplementation("org.awaitility:awaitility") + dockerTestImplementation("org.junit.jupiter:junit-jupiter") + dockerTestImplementation("org.testcontainers:testcontainers") + + dockerTestRuntimeOnly("com.microsoft.sqlserver:mssql-jdbc") + dockerTestRuntimeOnly("com.oracle.database.r2dbc:oracle-r2dbc") + dockerTestRuntimeOnly("io.r2dbc:r2dbc-mssql") + implementation("com.fasterxml.jackson.core:jackson-databind") implementation("com.fasterxml.jackson.module:jackson-module-parameter-names") @@ -25,14 +36,8 @@ dependencies { testImplementation(project(":spring-boot-project:spring-boot-test")) testImplementation("ch.qos.logback:logback-classic") testImplementation("org.assertj:assertj-core") - testImplementation("org.awaitility:awaitility") testImplementation("org.junit.jupiter:junit-jupiter") testImplementation("org.mockito:mockito-core") testImplementation("org.springframework:spring-core-test") testImplementation("org.springframework:spring-test") - testImplementation("org.testcontainers:testcontainers") - - testRuntimeOnly("com.microsoft.sqlserver:mssql-jdbc") - testRuntimeOnly("com.oracle.database.r2dbc:oracle-r2dbc") - testRuntimeOnly("io.r2dbc:r2dbc-mssql") } diff --git a/spring-boot-project/spring-boot-docker-compose/src/test/java/org/springframework/boot/docker/compose/core/DockerCliIntegrationTests.java b/spring-boot-project/spring-boot-docker-compose/src/dockerTest/java/org/springframework/boot/docker/compose/core/DockerCliIntegrationTests.java similarity index 100% rename from spring-boot-project/spring-boot-docker-compose/src/test/java/org/springframework/boot/docker/compose/core/DockerCliIntegrationTests.java rename to spring-boot-project/spring-boot-docker-compose/src/dockerTest/java/org/springframework/boot/docker/compose/core/DockerCliIntegrationTests.java diff --git a/spring-boot-project/spring-boot-docker-compose/src/test/java/org/springframework/boot/docker/compose/service/connection/activemq/ActiveMQDockerComposeConnectionDetailsFactoryIntegrationTests.java b/spring-boot-project/spring-boot-docker-compose/src/dockerTest/java/org/springframework/boot/docker/compose/service/connection/activemq/ActiveMQDockerComposeConnectionDetailsFactoryIntegrationTests.java similarity index 100% rename from spring-boot-project/spring-boot-docker-compose/src/test/java/org/springframework/boot/docker/compose/service/connection/activemq/ActiveMQDockerComposeConnectionDetailsFactoryIntegrationTests.java rename to spring-boot-project/spring-boot-docker-compose/src/dockerTest/java/org/springframework/boot/docker/compose/service/connection/activemq/ActiveMQDockerComposeConnectionDetailsFactoryIntegrationTests.java diff --git a/spring-boot-project/spring-boot-docker-compose/src/test/java/org/springframework/boot/docker/compose/service/connection/cassandra/CassandraDockerComposeConnectionDetailsFactoryIntegrationTests.java b/spring-boot-project/spring-boot-docker-compose/src/dockerTest/java/org/springframework/boot/docker/compose/service/connection/cassandra/CassandraDockerComposeConnectionDetailsFactoryIntegrationTests.java similarity index 100% rename from spring-boot-project/spring-boot-docker-compose/src/test/java/org/springframework/boot/docker/compose/service/connection/cassandra/CassandraDockerComposeConnectionDetailsFactoryIntegrationTests.java rename to spring-boot-project/spring-boot-docker-compose/src/dockerTest/java/org/springframework/boot/docker/compose/service/connection/cassandra/CassandraDockerComposeConnectionDetailsFactoryIntegrationTests.java diff --git a/spring-boot-project/spring-boot-docker-compose/src/test/java/org/springframework/boot/docker/compose/service/connection/elasticsearch/ElasticsearchDockerComposeConnectionDetailsFactoryIntegrationTests.java b/spring-boot-project/spring-boot-docker-compose/src/dockerTest/java/org/springframework/boot/docker/compose/service/connection/elasticsearch/ElasticsearchDockerComposeConnectionDetailsFactoryIntegrationTests.java similarity index 100% rename from spring-boot-project/spring-boot-docker-compose/src/test/java/org/springframework/boot/docker/compose/service/connection/elasticsearch/ElasticsearchDockerComposeConnectionDetailsFactoryIntegrationTests.java rename to spring-boot-project/spring-boot-docker-compose/src/dockerTest/java/org/springframework/boot/docker/compose/service/connection/elasticsearch/ElasticsearchDockerComposeConnectionDetailsFactoryIntegrationTests.java diff --git a/spring-boot-project/spring-boot-docker-compose/src/test/java/org/springframework/boot/docker/compose/service/connection/flyway/JdbcAdaptingFlywayConnectionDetailsFactoryIntegrationTests.java b/spring-boot-project/spring-boot-docker-compose/src/dockerTest/java/org/springframework/boot/docker/compose/service/connection/flyway/JdbcAdaptingFlywayConnectionDetailsFactoryIntegrationTests.java similarity index 100% rename from spring-boot-project/spring-boot-docker-compose/src/test/java/org/springframework/boot/docker/compose/service/connection/flyway/JdbcAdaptingFlywayConnectionDetailsFactoryIntegrationTests.java rename to spring-boot-project/spring-boot-docker-compose/src/dockerTest/java/org/springframework/boot/docker/compose/service/connection/flyway/JdbcAdaptingFlywayConnectionDetailsFactoryIntegrationTests.java diff --git a/spring-boot-project/spring-boot-docker-compose/src/test/java/org/springframework/boot/docker/compose/service/connection/liquibase/JdbcAdaptingLiquibaseConnectionDetailsFactoryIntegrationTests.java b/spring-boot-project/spring-boot-docker-compose/src/dockerTest/java/org/springframework/boot/docker/compose/service/connection/liquibase/JdbcAdaptingLiquibaseConnectionDetailsFactoryIntegrationTests.java similarity index 100% rename from spring-boot-project/spring-boot-docker-compose/src/test/java/org/springframework/boot/docker/compose/service/connection/liquibase/JdbcAdaptingLiquibaseConnectionDetailsFactoryIntegrationTests.java rename to spring-boot-project/spring-boot-docker-compose/src/dockerTest/java/org/springframework/boot/docker/compose/service/connection/liquibase/JdbcAdaptingLiquibaseConnectionDetailsFactoryIntegrationTests.java diff --git a/spring-boot-project/spring-boot-docker-compose/src/test/java/org/springframework/boot/docker/compose/service/connection/mariadb/MariaDbJdbcDockerComposeConnectionDetailsFactoryIntegrationTests.java b/spring-boot-project/spring-boot-docker-compose/src/dockerTest/java/org/springframework/boot/docker/compose/service/connection/mariadb/MariaDbJdbcDockerComposeConnectionDetailsFactoryIntegrationTests.java similarity index 98% rename from spring-boot-project/spring-boot-docker-compose/src/test/java/org/springframework/boot/docker/compose/service/connection/mariadb/MariaDbJdbcDockerComposeConnectionDetailsFactoryIntegrationTests.java rename to spring-boot-project/spring-boot-docker-compose/src/dockerTest/java/org/springframework/boot/docker/compose/service/connection/mariadb/MariaDbJdbcDockerComposeConnectionDetailsFactoryIntegrationTests.java index a5c926a9aef..289f7d9dcba 100644 --- a/spring-boot-project/spring-boot-docker-compose/src/test/java/org/springframework/boot/docker/compose/service/connection/mariadb/MariaDbJdbcDockerComposeConnectionDetailsFactoryIntegrationTests.java +++ b/spring-boot-project/spring-boot-docker-compose/src/dockerTest/java/org/springframework/boot/docker/compose/service/connection/mariadb/MariaDbJdbcDockerComposeConnectionDetailsFactoryIntegrationTests.java @@ -23,7 +23,7 @@ import org.springframework.boot.testsupport.container.TestImage; import static org.assertj.core.api.Assertions.assertThat; /** - * Integration tests for {@link MariaDbJdbcDockerComposeConnectionDetailsFactory} + * Integration tests for {@link MariaDbJdbcDockerComposeConnectionDetailsFactory}. * * @author Moritz Halbritter * @author Andy Wilkinson diff --git a/spring-boot-project/spring-boot-docker-compose/src/test/java/org/springframework/boot/docker/compose/service/connection/mariadb/MariaDbR2dbcDockerComposeConnectionDetailsFactoryIntegrationTests.java b/spring-boot-project/spring-boot-docker-compose/src/dockerTest/java/org/springframework/boot/docker/compose/service/connection/mariadb/MariaDbR2dbcDockerComposeConnectionDetailsFactoryIntegrationTests.java similarity index 98% rename from spring-boot-project/spring-boot-docker-compose/src/test/java/org/springframework/boot/docker/compose/service/connection/mariadb/MariaDbR2dbcDockerComposeConnectionDetailsFactoryIntegrationTests.java rename to spring-boot-project/spring-boot-docker-compose/src/dockerTest/java/org/springframework/boot/docker/compose/service/connection/mariadb/MariaDbR2dbcDockerComposeConnectionDetailsFactoryIntegrationTests.java index dd5bacd134b..fc1a29a6101 100644 --- a/spring-boot-project/spring-boot-docker-compose/src/test/java/org/springframework/boot/docker/compose/service/connection/mariadb/MariaDbR2dbcDockerComposeConnectionDetailsFactoryIntegrationTests.java +++ b/spring-boot-project/spring-boot-docker-compose/src/dockerTest/java/org/springframework/boot/docker/compose/service/connection/mariadb/MariaDbR2dbcDockerComposeConnectionDetailsFactoryIntegrationTests.java @@ -25,7 +25,7 @@ import org.springframework.boot.testsupport.container.TestImage; import static org.assertj.core.api.Assertions.assertThat; /** - * Integration tests for {@link MariaDbR2dbcDockerComposeConnectionDetailsFactory} + * Integration tests for {@link MariaDbR2dbcDockerComposeConnectionDetailsFactory}. * * @author Moritz Halbritter * @author Andy Wilkinson diff --git a/spring-boot-project/spring-boot-docker-compose/src/test/java/org/springframework/boot/docker/compose/service/connection/mongo/MongoDockerComposeConnectionDetailsFactoryIntegrationTests.java b/spring-boot-project/spring-boot-docker-compose/src/dockerTest/java/org/springframework/boot/docker/compose/service/connection/mongo/MongoDockerComposeConnectionDetailsFactoryIntegrationTests.java similarity index 100% rename from spring-boot-project/spring-boot-docker-compose/src/test/java/org/springframework/boot/docker/compose/service/connection/mongo/MongoDockerComposeConnectionDetailsFactoryIntegrationTests.java rename to spring-boot-project/spring-boot-docker-compose/src/dockerTest/java/org/springframework/boot/docker/compose/service/connection/mongo/MongoDockerComposeConnectionDetailsFactoryIntegrationTests.java diff --git a/spring-boot-project/spring-boot-docker-compose/src/test/java/org/springframework/boot/docker/compose/service/connection/mysql/MySqlJdbcDockerComposeConnectionDetailsFactoryIntegrationTests.java b/spring-boot-project/spring-boot-docker-compose/src/dockerTest/java/org/springframework/boot/docker/compose/service/connection/mysql/MySqlJdbcDockerComposeConnectionDetailsFactoryIntegrationTests.java similarity index 98% rename from spring-boot-project/spring-boot-docker-compose/src/test/java/org/springframework/boot/docker/compose/service/connection/mysql/MySqlJdbcDockerComposeConnectionDetailsFactoryIntegrationTests.java rename to spring-boot-project/spring-boot-docker-compose/src/dockerTest/java/org/springframework/boot/docker/compose/service/connection/mysql/MySqlJdbcDockerComposeConnectionDetailsFactoryIntegrationTests.java index a42095f16f3..b88b06b5d7a 100644 --- a/spring-boot-project/spring-boot-docker-compose/src/test/java/org/springframework/boot/docker/compose/service/connection/mysql/MySqlJdbcDockerComposeConnectionDetailsFactoryIntegrationTests.java +++ b/spring-boot-project/spring-boot-docker-compose/src/dockerTest/java/org/springframework/boot/docker/compose/service/connection/mysql/MySqlJdbcDockerComposeConnectionDetailsFactoryIntegrationTests.java @@ -23,7 +23,7 @@ import org.springframework.boot.testsupport.container.TestImage; import static org.assertj.core.api.Assertions.assertThat; /** - * Integration tests for {@link MySqlJdbcDockerComposeConnectionDetailsFactory} + * Integration tests for {@link MySqlJdbcDockerComposeConnectionDetailsFactory}. * * @author Moritz Halbritter * @author Andy Wilkinson diff --git a/spring-boot-project/spring-boot-docker-compose/src/test/java/org/springframework/boot/docker/compose/service/connection/mysql/MySqlR2dbcDockerComposeConnectionDetailsFactoryIntegrationTests.java b/spring-boot-project/spring-boot-docker-compose/src/dockerTest/java/org/springframework/boot/docker/compose/service/connection/mysql/MySqlR2dbcDockerComposeConnectionDetailsFactoryIntegrationTests.java similarity index 99% rename from spring-boot-project/spring-boot-docker-compose/src/test/java/org/springframework/boot/docker/compose/service/connection/mysql/MySqlR2dbcDockerComposeConnectionDetailsFactoryIntegrationTests.java rename to spring-boot-project/spring-boot-docker-compose/src/dockerTest/java/org/springframework/boot/docker/compose/service/connection/mysql/MySqlR2dbcDockerComposeConnectionDetailsFactoryIntegrationTests.java index b8489b52d89..9c4db72615c 100644 --- a/spring-boot-project/spring-boot-docker-compose/src/test/java/org/springframework/boot/docker/compose/service/connection/mysql/MySqlR2dbcDockerComposeConnectionDetailsFactoryIntegrationTests.java +++ b/spring-boot-project/spring-boot-docker-compose/src/dockerTest/java/org/springframework/boot/docker/compose/service/connection/mysql/MySqlR2dbcDockerComposeConnectionDetailsFactoryIntegrationTests.java @@ -25,7 +25,7 @@ import org.springframework.boot.testsupport.container.TestImage; import static org.assertj.core.api.Assertions.assertThat; /** - * Integration tests for {@link MySqlR2dbcDockerComposeConnectionDetailsFactory} + * Integration tests for {@link MySqlR2dbcDockerComposeConnectionDetailsFactory}. * * @author Moritz Halbritter * @author Andy Wilkinson diff --git a/spring-boot-project/spring-boot-docker-compose/src/test/java/org/springframework/boot/docker/compose/service/connection/neo4j/Neo4jDockerComposeConnectionDetailsFactoryIntegrationTests.java b/spring-boot-project/spring-boot-docker-compose/src/dockerTest/java/org/springframework/boot/docker/compose/service/connection/neo4j/Neo4jDockerComposeConnectionDetailsFactoryIntegrationTests.java similarity index 100% rename from spring-boot-project/spring-boot-docker-compose/src/test/java/org/springframework/boot/docker/compose/service/connection/neo4j/Neo4jDockerComposeConnectionDetailsFactoryIntegrationTests.java rename to spring-boot-project/spring-boot-docker-compose/src/dockerTest/java/org/springframework/boot/docker/compose/service/connection/neo4j/Neo4jDockerComposeConnectionDetailsFactoryIntegrationTests.java diff --git a/spring-boot-project/spring-boot-docker-compose/src/test/java/org/springframework/boot/docker/compose/service/connection/oracle/OracleFreeJdbcDockerComposeConnectionDetailsFactoryIntegrationTests.java b/spring-boot-project/spring-boot-docker-compose/src/dockerTest/java/org/springframework/boot/docker/compose/service/connection/oracle/OracleFreeJdbcDockerComposeConnectionDetailsFactoryIntegrationTests.java similarity index 99% rename from spring-boot-project/spring-boot-docker-compose/src/test/java/org/springframework/boot/docker/compose/service/connection/oracle/OracleFreeJdbcDockerComposeConnectionDetailsFactoryIntegrationTests.java rename to spring-boot-project/spring-boot-docker-compose/src/dockerTest/java/org/springframework/boot/docker/compose/service/connection/oracle/OracleFreeJdbcDockerComposeConnectionDetailsFactoryIntegrationTests.java index b8bbc33e3a3..1ce41420130 100644 --- a/spring-boot-project/spring-boot-docker-compose/src/test/java/org/springframework/boot/docker/compose/service/connection/oracle/OracleFreeJdbcDockerComposeConnectionDetailsFactoryIntegrationTests.java +++ b/spring-boot-project/spring-boot-docker-compose/src/dockerTest/java/org/springframework/boot/docker/compose/service/connection/oracle/OracleFreeJdbcDockerComposeConnectionDetailsFactoryIntegrationTests.java @@ -34,7 +34,7 @@ import org.springframework.util.ClassUtils; import static org.assertj.core.api.Assertions.assertThat; /** - * Integration tests for {@link OracleFreeJdbcDockerComposeConnectionDetailsFactory} + * Integration tests for {@link OracleFreeJdbcDockerComposeConnectionDetailsFactory}. * * @author Andy Wilkinson */ diff --git a/spring-boot-project/spring-boot-docker-compose/src/test/java/org/springframework/boot/docker/compose/service/connection/oracle/OracleFreeR2dbcDockerComposeConnectionDetailsFactoryIntegrationTests.java b/spring-boot-project/spring-boot-docker-compose/src/dockerTest/java/org/springframework/boot/docker/compose/service/connection/oracle/OracleFreeR2dbcDockerComposeConnectionDetailsFactoryIntegrationTests.java similarity index 99% rename from spring-boot-project/spring-boot-docker-compose/src/test/java/org/springframework/boot/docker/compose/service/connection/oracle/OracleFreeR2dbcDockerComposeConnectionDetailsFactoryIntegrationTests.java rename to spring-boot-project/spring-boot-docker-compose/src/dockerTest/java/org/springframework/boot/docker/compose/service/connection/oracle/OracleFreeR2dbcDockerComposeConnectionDetailsFactoryIntegrationTests.java index 2076fdaabf8..3f9e80cf655 100644 --- a/spring-boot-project/spring-boot-docker-compose/src/test/java/org/springframework/boot/docker/compose/service/connection/oracle/OracleFreeR2dbcDockerComposeConnectionDetailsFactoryIntegrationTests.java +++ b/spring-boot-project/spring-boot-docker-compose/src/dockerTest/java/org/springframework/boot/docker/compose/service/connection/oracle/OracleFreeR2dbcDockerComposeConnectionDetailsFactoryIntegrationTests.java @@ -33,7 +33,7 @@ import org.springframework.r2dbc.core.DatabaseClient; import static org.assertj.core.api.Assertions.assertThat; /** - * Integration tests for {@link OracleFreeR2dbcDockerComposeConnectionDetailsFactory} + * Integration tests for {@link OracleFreeR2dbcDockerComposeConnectionDetailsFactory}. * * @author Andy Wilkinson */ diff --git a/spring-boot-project/spring-boot-docker-compose/src/test/java/org/springframework/boot/docker/compose/service/connection/oracle/OracleXeJdbcDockerComposeConnectionDetailsFactoryIntegrationTests.java b/spring-boot-project/spring-boot-docker-compose/src/dockerTest/java/org/springframework/boot/docker/compose/service/connection/oracle/OracleXeJdbcDockerComposeConnectionDetailsFactoryIntegrationTests.java similarity index 99% rename from spring-boot-project/spring-boot-docker-compose/src/test/java/org/springframework/boot/docker/compose/service/connection/oracle/OracleXeJdbcDockerComposeConnectionDetailsFactoryIntegrationTests.java rename to spring-boot-project/spring-boot-docker-compose/src/dockerTest/java/org/springframework/boot/docker/compose/service/connection/oracle/OracleXeJdbcDockerComposeConnectionDetailsFactoryIntegrationTests.java index 7d5e19914e3..f9e96d74712 100644 --- a/spring-boot-project/spring-boot-docker-compose/src/test/java/org/springframework/boot/docker/compose/service/connection/oracle/OracleXeJdbcDockerComposeConnectionDetailsFactoryIntegrationTests.java +++ b/spring-boot-project/spring-boot-docker-compose/src/dockerTest/java/org/springframework/boot/docker/compose/service/connection/oracle/OracleXeJdbcDockerComposeConnectionDetailsFactoryIntegrationTests.java @@ -34,7 +34,7 @@ import org.springframework.util.ClassUtils; import static org.assertj.core.api.Assertions.assertThat; /** - * Integration tests for {@link OracleXeJdbcDockerComposeConnectionDetailsFactory} + * Integration tests for {@link OracleXeJdbcDockerComposeConnectionDetailsFactory}. * * @author Andy Wilkinson */ diff --git a/spring-boot-project/spring-boot-docker-compose/src/test/java/org/springframework/boot/docker/compose/service/connection/oracle/OracleXeR2dbcDockerComposeConnectionDetailsFactoryIntegrationTests.java b/spring-boot-project/spring-boot-docker-compose/src/dockerTest/java/org/springframework/boot/docker/compose/service/connection/oracle/OracleXeR2dbcDockerComposeConnectionDetailsFactoryIntegrationTests.java similarity index 99% rename from spring-boot-project/spring-boot-docker-compose/src/test/java/org/springframework/boot/docker/compose/service/connection/oracle/OracleXeR2dbcDockerComposeConnectionDetailsFactoryIntegrationTests.java rename to spring-boot-project/spring-boot-docker-compose/src/dockerTest/java/org/springframework/boot/docker/compose/service/connection/oracle/OracleXeR2dbcDockerComposeConnectionDetailsFactoryIntegrationTests.java index eee17f6106b..88a80c887b5 100644 --- a/spring-boot-project/spring-boot-docker-compose/src/test/java/org/springframework/boot/docker/compose/service/connection/oracle/OracleXeR2dbcDockerComposeConnectionDetailsFactoryIntegrationTests.java +++ b/spring-boot-project/spring-boot-docker-compose/src/dockerTest/java/org/springframework/boot/docker/compose/service/connection/oracle/OracleXeR2dbcDockerComposeConnectionDetailsFactoryIntegrationTests.java @@ -33,7 +33,7 @@ import org.springframework.r2dbc.core.DatabaseClient; import static org.assertj.core.api.Assertions.assertThat; /** - * Integration tests for {@link OracleXeR2dbcDockerComposeConnectionDetailsFactory} + * Integration tests for {@link OracleXeR2dbcDockerComposeConnectionDetailsFactory}. * * @author Andy Wilkinson */ diff --git a/spring-boot-project/spring-boot-docker-compose/src/test/java/org/springframework/boot/docker/compose/service/connection/otlp/OpenTelemetryMetricsDockerComposeConnectionDetailsFactoryIntegrationTests.java b/spring-boot-project/spring-boot-docker-compose/src/dockerTest/java/org/springframework/boot/docker/compose/service/connection/otlp/OpenTelemetryMetricsDockerComposeConnectionDetailsFactoryIntegrationTests.java similarity index 100% rename from spring-boot-project/spring-boot-docker-compose/src/test/java/org/springframework/boot/docker/compose/service/connection/otlp/OpenTelemetryMetricsDockerComposeConnectionDetailsFactoryIntegrationTests.java rename to spring-boot-project/spring-boot-docker-compose/src/dockerTest/java/org/springframework/boot/docker/compose/service/connection/otlp/OpenTelemetryMetricsDockerComposeConnectionDetailsFactoryIntegrationTests.java diff --git a/spring-boot-project/spring-boot-docker-compose/src/test/java/org/springframework/boot/docker/compose/service/connection/otlp/OpenTelemetryTracingDockerComposeConnectionDetailsFactoryIntegrationTests.java b/spring-boot-project/spring-boot-docker-compose/src/dockerTest/java/org/springframework/boot/docker/compose/service/connection/otlp/OpenTelemetryTracingDockerComposeConnectionDetailsFactoryIntegrationTests.java similarity index 100% rename from spring-boot-project/spring-boot-docker-compose/src/test/java/org/springframework/boot/docker/compose/service/connection/otlp/OpenTelemetryTracingDockerComposeConnectionDetailsFactoryIntegrationTests.java rename to spring-boot-project/spring-boot-docker-compose/src/dockerTest/java/org/springframework/boot/docker/compose/service/connection/otlp/OpenTelemetryTracingDockerComposeConnectionDetailsFactoryIntegrationTests.java diff --git a/spring-boot-project/spring-boot-docker-compose/src/test/java/org/springframework/boot/docker/compose/service/connection/postgres/PostgresJdbcDockerComposeConnectionDetailsFactoryIntegrationTests.java b/spring-boot-project/spring-boot-docker-compose/src/dockerTest/java/org/springframework/boot/docker/compose/service/connection/postgres/PostgresJdbcDockerComposeConnectionDetailsFactoryIntegrationTests.java similarity index 100% rename from spring-boot-project/spring-boot-docker-compose/src/test/java/org/springframework/boot/docker/compose/service/connection/postgres/PostgresJdbcDockerComposeConnectionDetailsFactoryIntegrationTests.java rename to spring-boot-project/spring-boot-docker-compose/src/dockerTest/java/org/springframework/boot/docker/compose/service/connection/postgres/PostgresJdbcDockerComposeConnectionDetailsFactoryIntegrationTests.java diff --git a/spring-boot-project/spring-boot-docker-compose/src/test/java/org/springframework/boot/docker/compose/service/connection/postgres/PostgresR2dbcDockerComposeConnectionDetailsFactoryIntegrationTests.java b/spring-boot-project/spring-boot-docker-compose/src/dockerTest/java/org/springframework/boot/docker/compose/service/connection/postgres/PostgresR2dbcDockerComposeConnectionDetailsFactoryIntegrationTests.java similarity index 100% rename from spring-boot-project/spring-boot-docker-compose/src/test/java/org/springframework/boot/docker/compose/service/connection/postgres/PostgresR2dbcDockerComposeConnectionDetailsFactoryIntegrationTests.java rename to spring-boot-project/spring-boot-docker-compose/src/dockerTest/java/org/springframework/boot/docker/compose/service/connection/postgres/PostgresR2dbcDockerComposeConnectionDetailsFactoryIntegrationTests.java diff --git a/spring-boot-project/spring-boot-docker-compose/src/test/java/org/springframework/boot/docker/compose/service/connection/pulsar/PulsarDockerComposeConnectionDetailsFactoryIntegrationTests.java b/spring-boot-project/spring-boot-docker-compose/src/dockerTest/java/org/springframework/boot/docker/compose/service/connection/pulsar/PulsarDockerComposeConnectionDetailsFactoryIntegrationTests.java similarity index 100% rename from spring-boot-project/spring-boot-docker-compose/src/test/java/org/springframework/boot/docker/compose/service/connection/pulsar/PulsarDockerComposeConnectionDetailsFactoryIntegrationTests.java rename to spring-boot-project/spring-boot-docker-compose/src/dockerTest/java/org/springframework/boot/docker/compose/service/connection/pulsar/PulsarDockerComposeConnectionDetailsFactoryIntegrationTests.java diff --git a/spring-boot-project/spring-boot-docker-compose/src/test/java/org/springframework/boot/docker/compose/service/connection/rabbit/RabbitDockerComposeConnectionDetailsFactoryIntegrationTests.java b/spring-boot-project/spring-boot-docker-compose/src/dockerTest/java/org/springframework/boot/docker/compose/service/connection/rabbit/RabbitDockerComposeConnectionDetailsFactoryIntegrationTests.java similarity index 100% rename from spring-boot-project/spring-boot-docker-compose/src/test/java/org/springframework/boot/docker/compose/service/connection/rabbit/RabbitDockerComposeConnectionDetailsFactoryIntegrationTests.java rename to spring-boot-project/spring-boot-docker-compose/src/dockerTest/java/org/springframework/boot/docker/compose/service/connection/rabbit/RabbitDockerComposeConnectionDetailsFactoryIntegrationTests.java diff --git a/spring-boot-project/spring-boot-docker-compose/src/test/java/org/springframework/boot/docker/compose/service/connection/redis/RedisDockerComposeConnectionDetailsFactoryIntegrationTests.java b/spring-boot-project/spring-boot-docker-compose/src/dockerTest/java/org/springframework/boot/docker/compose/service/connection/redis/RedisDockerComposeConnectionDetailsFactoryIntegrationTests.java similarity index 100% rename from spring-boot-project/spring-boot-docker-compose/src/test/java/org/springframework/boot/docker/compose/service/connection/redis/RedisDockerComposeConnectionDetailsFactoryIntegrationTests.java rename to spring-boot-project/spring-boot-docker-compose/src/dockerTest/java/org/springframework/boot/docker/compose/service/connection/redis/RedisDockerComposeConnectionDetailsFactoryIntegrationTests.java diff --git a/spring-boot-project/spring-boot-docker-compose/src/test/java/org/springframework/boot/docker/compose/service/connection/sqlserver/SqlServerJdbcDockerComposeConnectionDetailsFactoryIntegrationTests.java b/spring-boot-project/spring-boot-docker-compose/src/dockerTest/java/org/springframework/boot/docker/compose/service/connection/sqlserver/SqlServerJdbcDockerComposeConnectionDetailsFactoryIntegrationTests.java similarity index 99% rename from spring-boot-project/spring-boot-docker-compose/src/test/java/org/springframework/boot/docker/compose/service/connection/sqlserver/SqlServerJdbcDockerComposeConnectionDetailsFactoryIntegrationTests.java rename to spring-boot-project/spring-boot-docker-compose/src/dockerTest/java/org/springframework/boot/docker/compose/service/connection/sqlserver/SqlServerJdbcDockerComposeConnectionDetailsFactoryIntegrationTests.java index f4983cf3501..51215181fbd 100644 --- a/spring-boot-project/spring-boot-docker-compose/src/test/java/org/springframework/boot/docker/compose/service/connection/sqlserver/SqlServerJdbcDockerComposeConnectionDetailsFactoryIntegrationTests.java +++ b/spring-boot-project/spring-boot-docker-compose/src/dockerTest/java/org/springframework/boot/docker/compose/service/connection/sqlserver/SqlServerJdbcDockerComposeConnectionDetailsFactoryIntegrationTests.java @@ -32,7 +32,7 @@ import org.springframework.util.ClassUtils; import static org.assertj.core.api.Assertions.assertThat; /** - * Integration tests for {@link SqlServerJdbcDockerComposeConnectionDetailsFactory} + * Integration tests for {@link SqlServerJdbcDockerComposeConnectionDetailsFactory}. * * @author Andy Wilkinson */ diff --git a/spring-boot-project/spring-boot-docker-compose/src/test/java/org/springframework/boot/docker/compose/service/connection/sqlserver/SqlServerR2dbcDockerComposeConnectionDetailsFactoryIntegrationTests.java b/spring-boot-project/spring-boot-docker-compose/src/dockerTest/java/org/springframework/boot/docker/compose/service/connection/sqlserver/SqlServerR2dbcDockerComposeConnectionDetailsFactoryIntegrationTests.java similarity index 99% rename from spring-boot-project/spring-boot-docker-compose/src/test/java/org/springframework/boot/docker/compose/service/connection/sqlserver/SqlServerR2dbcDockerComposeConnectionDetailsFactoryIntegrationTests.java rename to spring-boot-project/spring-boot-docker-compose/src/dockerTest/java/org/springframework/boot/docker/compose/service/connection/sqlserver/SqlServerR2dbcDockerComposeConnectionDetailsFactoryIntegrationTests.java index d1936fb5b87..1e297c48b73 100644 --- a/spring-boot-project/spring-boot-docker-compose/src/test/java/org/springframework/boot/docker/compose/service/connection/sqlserver/SqlServerR2dbcDockerComposeConnectionDetailsFactoryIntegrationTests.java +++ b/spring-boot-project/spring-boot-docker-compose/src/dockerTest/java/org/springframework/boot/docker/compose/service/connection/sqlserver/SqlServerR2dbcDockerComposeConnectionDetailsFactoryIntegrationTests.java @@ -32,7 +32,7 @@ import org.springframework.r2dbc.core.DatabaseClient; import static org.assertj.core.api.Assertions.assertThat; /** - * Integration tests for {@link SqlServerR2dbcDockerComposeConnectionDetailsFactory} + * Integration tests for {@link SqlServerR2dbcDockerComposeConnectionDetailsFactory}. * * @author Andy Wilkinson */ diff --git a/spring-boot-project/spring-boot-docker-compose/src/test/java/org/springframework/boot/docker/compose/service/connection/test/DockerComposeTest.java b/spring-boot-project/spring-boot-docker-compose/src/dockerTest/java/org/springframework/boot/docker/compose/service/connection/test/DockerComposeTest.java similarity index 100% rename from spring-boot-project/spring-boot-docker-compose/src/test/java/org/springframework/boot/docker/compose/service/connection/test/DockerComposeTest.java rename to spring-boot-project/spring-boot-docker-compose/src/dockerTest/java/org/springframework/boot/docker/compose/service/connection/test/DockerComposeTest.java diff --git a/spring-boot-project/spring-boot-docker-compose/src/test/java/org/springframework/boot/docker/compose/service/connection/test/DockerComposeTestExtension.java b/spring-boot-project/spring-boot-docker-compose/src/dockerTest/java/org/springframework/boot/docker/compose/service/connection/test/DockerComposeTestExtension.java similarity index 100% rename from spring-boot-project/spring-boot-docker-compose/src/test/java/org/springframework/boot/docker/compose/service/connection/test/DockerComposeTestExtension.java rename to spring-boot-project/spring-boot-docker-compose/src/dockerTest/java/org/springframework/boot/docker/compose/service/connection/test/DockerComposeTestExtension.java diff --git a/spring-boot-project/spring-boot-docker-compose/src/test/java/org/springframework/boot/docker/compose/service/connection/zipkin/ZipkinDockerComposeConnectionDetailsFactoryIntegrationTests.java b/spring-boot-project/spring-boot-docker-compose/src/dockerTest/java/org/springframework/boot/docker/compose/service/connection/zipkin/ZipkinDockerComposeConnectionDetailsFactoryIntegrationTests.java similarity index 100% rename from spring-boot-project/spring-boot-docker-compose/src/test/java/org/springframework/boot/docker/compose/service/connection/zipkin/ZipkinDockerComposeConnectionDetailsFactoryIntegrationTests.java rename to spring-boot-project/spring-boot-docker-compose/src/dockerTest/java/org/springframework/boot/docker/compose/service/connection/zipkin/ZipkinDockerComposeConnectionDetailsFactoryIntegrationTests.java diff --git a/spring-boot-project/spring-boot-docker-compose/src/test/resources/org/springframework/boot/docker/compose/core/redis-compose.yaml b/spring-boot-project/spring-boot-docker-compose/src/dockerTest/resources/org/springframework/boot/docker/compose/core/redis-compose.yaml similarity index 100% rename from spring-boot-project/spring-boot-docker-compose/src/test/resources/org/springframework/boot/docker/compose/core/redis-compose.yaml rename to spring-boot-project/spring-boot-docker-compose/src/dockerTest/resources/org/springframework/boot/docker/compose/core/redis-compose.yaml diff --git a/spring-boot-project/spring-boot-docker-compose/src/test/resources/org/springframework/boot/docker/compose/service/connection/activemq/activemq-compose.yaml b/spring-boot-project/spring-boot-docker-compose/src/dockerTest/resources/org/springframework/boot/docker/compose/service/connection/activemq/activemq-compose.yaml similarity index 100% rename from spring-boot-project/spring-boot-docker-compose/src/test/resources/org/springframework/boot/docker/compose/service/connection/activemq/activemq-compose.yaml rename to spring-boot-project/spring-boot-docker-compose/src/dockerTest/resources/org/springframework/boot/docker/compose/service/connection/activemq/activemq-compose.yaml diff --git a/spring-boot-project/spring-boot-docker-compose/src/test/resources/org/springframework/boot/docker/compose/service/connection/cassandra/cassandra-compose.yaml b/spring-boot-project/spring-boot-docker-compose/src/dockerTest/resources/org/springframework/boot/docker/compose/service/connection/cassandra/cassandra-compose.yaml similarity index 100% rename from spring-boot-project/spring-boot-docker-compose/src/test/resources/org/springframework/boot/docker/compose/service/connection/cassandra/cassandra-compose.yaml rename to spring-boot-project/spring-boot-docker-compose/src/dockerTest/resources/org/springframework/boot/docker/compose/service/connection/cassandra/cassandra-compose.yaml diff --git a/spring-boot-project/spring-boot-docker-compose/src/test/resources/org/springframework/boot/docker/compose/service/connection/elasticsearch/elasticsearch-compose.yaml b/spring-boot-project/spring-boot-docker-compose/src/dockerTest/resources/org/springframework/boot/docker/compose/service/connection/elasticsearch/elasticsearch-compose.yaml similarity index 100% rename from spring-boot-project/spring-boot-docker-compose/src/test/resources/org/springframework/boot/docker/compose/service/connection/elasticsearch/elasticsearch-compose.yaml rename to spring-boot-project/spring-boot-docker-compose/src/dockerTest/resources/org/springframework/boot/docker/compose/service/connection/elasticsearch/elasticsearch-compose.yaml diff --git a/spring-boot-project/spring-boot-docker-compose/src/test/resources/org/springframework/boot/docker/compose/service/connection/flyway/flyway-compose.yaml b/spring-boot-project/spring-boot-docker-compose/src/dockerTest/resources/org/springframework/boot/docker/compose/service/connection/flyway/flyway-compose.yaml similarity index 100% rename from spring-boot-project/spring-boot-docker-compose/src/test/resources/org/springframework/boot/docker/compose/service/connection/flyway/flyway-compose.yaml rename to spring-boot-project/spring-boot-docker-compose/src/dockerTest/resources/org/springframework/boot/docker/compose/service/connection/flyway/flyway-compose.yaml diff --git a/spring-boot-project/spring-boot-docker-compose/src/test/resources/org/springframework/boot/docker/compose/service/connection/liquibase/liquibase-compose.yaml b/spring-boot-project/spring-boot-docker-compose/src/dockerTest/resources/org/springframework/boot/docker/compose/service/connection/liquibase/liquibase-compose.yaml similarity index 100% rename from spring-boot-project/spring-boot-docker-compose/src/test/resources/org/springframework/boot/docker/compose/service/connection/liquibase/liquibase-compose.yaml rename to spring-boot-project/spring-boot-docker-compose/src/dockerTest/resources/org/springframework/boot/docker/compose/service/connection/liquibase/liquibase-compose.yaml diff --git a/spring-boot-project/spring-boot-docker-compose/src/test/resources/org/springframework/boot/docker/compose/service/connection/mariadb/mariadb-compose.yaml b/spring-boot-project/spring-boot-docker-compose/src/dockerTest/resources/org/springframework/boot/docker/compose/service/connection/mariadb/mariadb-compose.yaml similarity index 100% rename from spring-boot-project/spring-boot-docker-compose/src/test/resources/org/springframework/boot/docker/compose/service/connection/mariadb/mariadb-compose.yaml rename to spring-boot-project/spring-boot-docker-compose/src/dockerTest/resources/org/springframework/boot/docker/compose/service/connection/mariadb/mariadb-compose.yaml diff --git a/spring-boot-project/spring-boot-docker-compose/src/test/resources/org/springframework/boot/docker/compose/service/connection/mongo/mongo-compose.yaml b/spring-boot-project/spring-boot-docker-compose/src/dockerTest/resources/org/springframework/boot/docker/compose/service/connection/mongo/mongo-compose.yaml similarity index 100% rename from spring-boot-project/spring-boot-docker-compose/src/test/resources/org/springframework/boot/docker/compose/service/connection/mongo/mongo-compose.yaml rename to spring-boot-project/spring-boot-docker-compose/src/dockerTest/resources/org/springframework/boot/docker/compose/service/connection/mongo/mongo-compose.yaml diff --git a/spring-boot-project/spring-boot-docker-compose/src/test/resources/org/springframework/boot/docker/compose/service/connection/mysql/mysql-compose.yaml b/spring-boot-project/spring-boot-docker-compose/src/dockerTest/resources/org/springframework/boot/docker/compose/service/connection/mysql/mysql-compose.yaml similarity index 100% rename from spring-boot-project/spring-boot-docker-compose/src/test/resources/org/springframework/boot/docker/compose/service/connection/mysql/mysql-compose.yaml rename to spring-boot-project/spring-boot-docker-compose/src/dockerTest/resources/org/springframework/boot/docker/compose/service/connection/mysql/mysql-compose.yaml diff --git a/spring-boot-project/spring-boot-docker-compose/src/test/resources/org/springframework/boot/docker/compose/service/connection/neo4j/neo4j-compose.yaml b/spring-boot-project/spring-boot-docker-compose/src/dockerTest/resources/org/springframework/boot/docker/compose/service/connection/neo4j/neo4j-compose.yaml similarity index 100% rename from spring-boot-project/spring-boot-docker-compose/src/test/resources/org/springframework/boot/docker/compose/service/connection/neo4j/neo4j-compose.yaml rename to spring-boot-project/spring-boot-docker-compose/src/dockerTest/resources/org/springframework/boot/docker/compose/service/connection/neo4j/neo4j-compose.yaml diff --git a/spring-boot-project/spring-boot-docker-compose/src/test/resources/org/springframework/boot/docker/compose/service/connection/oracle/oracle-compose.yaml b/spring-boot-project/spring-boot-docker-compose/src/dockerTest/resources/org/springframework/boot/docker/compose/service/connection/oracle/oracle-compose.yaml similarity index 100% rename from spring-boot-project/spring-boot-docker-compose/src/test/resources/org/springframework/boot/docker/compose/service/connection/oracle/oracle-compose.yaml rename to spring-boot-project/spring-boot-docker-compose/src/dockerTest/resources/org/springframework/boot/docker/compose/service/connection/oracle/oracle-compose.yaml diff --git a/spring-boot-project/spring-boot-docker-compose/src/test/resources/org/springframework/boot/docker/compose/service/connection/otlp/otlp-compose.yaml b/spring-boot-project/spring-boot-docker-compose/src/dockerTest/resources/org/springframework/boot/docker/compose/service/connection/otlp/otlp-compose.yaml similarity index 100% rename from spring-boot-project/spring-boot-docker-compose/src/test/resources/org/springframework/boot/docker/compose/service/connection/otlp/otlp-compose.yaml rename to spring-boot-project/spring-boot-docker-compose/src/dockerTest/resources/org/springframework/boot/docker/compose/service/connection/otlp/otlp-compose.yaml diff --git a/spring-boot-project/spring-boot-docker-compose/src/test/resources/org/springframework/boot/docker/compose/service/connection/postgres/postgres-compose.yaml b/spring-boot-project/spring-boot-docker-compose/src/dockerTest/resources/org/springframework/boot/docker/compose/service/connection/postgres/postgres-compose.yaml similarity index 100% rename from spring-boot-project/spring-boot-docker-compose/src/test/resources/org/springframework/boot/docker/compose/service/connection/postgres/postgres-compose.yaml rename to spring-boot-project/spring-boot-docker-compose/src/dockerTest/resources/org/springframework/boot/docker/compose/service/connection/postgres/postgres-compose.yaml diff --git a/spring-boot-project/spring-boot-docker-compose/src/test/resources/org/springframework/boot/docker/compose/service/connection/pulsar/pulsar-compose.yaml b/spring-boot-project/spring-boot-docker-compose/src/dockerTest/resources/org/springframework/boot/docker/compose/service/connection/pulsar/pulsar-compose.yaml similarity index 100% rename from spring-boot-project/spring-boot-docker-compose/src/test/resources/org/springframework/boot/docker/compose/service/connection/pulsar/pulsar-compose.yaml rename to spring-boot-project/spring-boot-docker-compose/src/dockerTest/resources/org/springframework/boot/docker/compose/service/connection/pulsar/pulsar-compose.yaml diff --git a/spring-boot-project/spring-boot-docker-compose/src/test/resources/org/springframework/boot/docker/compose/service/connection/rabbit/rabbit-compose.yaml b/spring-boot-project/spring-boot-docker-compose/src/dockerTest/resources/org/springframework/boot/docker/compose/service/connection/rabbit/rabbit-compose.yaml similarity index 100% rename from spring-boot-project/spring-boot-docker-compose/src/test/resources/org/springframework/boot/docker/compose/service/connection/rabbit/rabbit-compose.yaml rename to spring-boot-project/spring-boot-docker-compose/src/dockerTest/resources/org/springframework/boot/docker/compose/service/connection/rabbit/rabbit-compose.yaml diff --git a/spring-boot-project/spring-boot-docker-compose/src/test/resources/org/springframework/boot/docker/compose/service/connection/redis/redis-compose.yaml b/spring-boot-project/spring-boot-docker-compose/src/dockerTest/resources/org/springframework/boot/docker/compose/service/connection/redis/redis-compose.yaml similarity index 100% rename from spring-boot-project/spring-boot-docker-compose/src/test/resources/org/springframework/boot/docker/compose/service/connection/redis/redis-compose.yaml rename to spring-boot-project/spring-boot-docker-compose/src/dockerTest/resources/org/springframework/boot/docker/compose/service/connection/redis/redis-compose.yaml diff --git a/spring-boot-project/spring-boot-docker-compose/src/test/resources/org/springframework/boot/docker/compose/service/connection/sqlserver/mssqlserver-compose.yaml b/spring-boot-project/spring-boot-docker-compose/src/dockerTest/resources/org/springframework/boot/docker/compose/service/connection/sqlserver/mssqlserver-compose.yaml similarity index 100% rename from spring-boot-project/spring-boot-docker-compose/src/test/resources/org/springframework/boot/docker/compose/service/connection/sqlserver/mssqlserver-compose.yaml rename to spring-boot-project/spring-boot-docker-compose/src/dockerTest/resources/org/springframework/boot/docker/compose/service/connection/sqlserver/mssqlserver-compose.yaml diff --git a/spring-boot-project/spring-boot-docker-compose/src/test/resources/org/springframework/boot/docker/compose/service/connection/sqlserver/mssqlserver-with-jdbc-parameters-compose.yaml b/spring-boot-project/spring-boot-docker-compose/src/dockerTest/resources/org/springframework/boot/docker/compose/service/connection/sqlserver/mssqlserver-with-jdbc-parameters-compose.yaml similarity index 100% rename from spring-boot-project/spring-boot-docker-compose/src/test/resources/org/springframework/boot/docker/compose/service/connection/sqlserver/mssqlserver-with-jdbc-parameters-compose.yaml rename to spring-boot-project/spring-boot-docker-compose/src/dockerTest/resources/org/springframework/boot/docker/compose/service/connection/sqlserver/mssqlserver-with-jdbc-parameters-compose.yaml diff --git a/spring-boot-project/spring-boot-docker-compose/src/test/resources/org/springframework/boot/docker/compose/service/connection/zipkin/zipkin-compose.yaml b/spring-boot-project/spring-boot-docker-compose/src/dockerTest/resources/org/springframework/boot/docker/compose/service/connection/zipkin/zipkin-compose.yaml similarity index 100% rename from spring-boot-project/spring-boot-docker-compose/src/test/resources/org/springframework/boot/docker/compose/service/connection/zipkin/zipkin-compose.yaml rename to spring-boot-project/spring-boot-docker-compose/src/dockerTest/resources/org/springframework/boot/docker/compose/service/connection/zipkin/zipkin-compose.yaml diff --git a/spring-boot-project/spring-boot-testcontainers/src/test/java/org/springframework/boot/testcontainers/properties/TestcontainersPropertySourceAutoConfigurationTests.java b/spring-boot-project/spring-boot-testcontainers/src/dockerTest/java/org/springframework/boot/testcontainers/properties/TestcontainersPropertySourceAutoConfigurationTests.java similarity index 100% rename from spring-boot-project/spring-boot-testcontainers/src/test/java/org/springframework/boot/testcontainers/properties/TestcontainersPropertySourceAutoConfigurationTests.java rename to spring-boot-project/spring-boot-testcontainers/src/dockerTest/java/org/springframework/boot/testcontainers/properties/TestcontainersPropertySourceAutoConfigurationTests.java diff --git a/spring-boot-project/spring-boot-testcontainers/src/test/java/org/springframework/boot/testcontainers/service/connection/ServiceConnectionAutoConfigurationTests.java b/spring-boot-project/spring-boot-testcontainers/src/dockerTest/java/org/springframework/boot/testcontainers/service/connection/ServiceConnectionAutoConfigurationTests.java similarity index 100% rename from spring-boot-project/spring-boot-testcontainers/src/test/java/org/springframework/boot/testcontainers/service/connection/ServiceConnectionAutoConfigurationTests.java rename to spring-boot-project/spring-boot-testcontainers/src/dockerTest/java/org/springframework/boot/testcontainers/service/connection/ServiceConnectionAutoConfigurationTests.java From d5ef5e9c9d6a109c315a5829a4d4a9574197cc27 Mon Sep 17 00:00:00 2001 From: Andy Wilkinson Date: Tue, 25 Jun 2024 11:41:36 +0100 Subject: [PATCH 04/28] Update spring-boot-buildpack-platform to use docker-test plugin See gh-41228 --- .../spring-boot-buildpack-platform/build.gradle | 9 +++++++-- .../platform/docker/DockerApiIntegrationTests.java | 0 2 files changed, 7 insertions(+), 2 deletions(-) rename spring-boot-project/spring-boot-tools/spring-boot-buildpack-platform/src/{test => dockerTest}/java/org/springframework/boot/buildpack/platform/docker/DockerApiIntegrationTests.java (100%) diff --git a/spring-boot-project/spring-boot-tools/spring-boot-buildpack-platform/build.gradle b/spring-boot-project/spring-boot-tools/spring-boot-buildpack-platform/build.gradle index 10e41123cbf..ca3e6644fb8 100644 --- a/spring-boot-project/spring-boot-tools/spring-boot-buildpack-platform/build.gradle +++ b/spring-boot-project/spring-boot-tools/spring-boot-buildpack-platform/build.gradle @@ -2,6 +2,7 @@ plugins { id "java-library" id "org.springframework.boot.conventions" id "org.springframework.boot.deployed" + id "org.springframework.boot.docker-test" } description = "Spring Boot Buildpack Platform" @@ -42,11 +43,15 @@ dependencies { api("org.apache.httpcomponents.client5:httpclient5") api("org.springframework:spring-core") api("org.tomlj:tomlj:1.0.0") - + + dockerTestImplementation(project(":spring-boot-project:spring-boot-tools:spring-boot-test-support")) + dockerTestImplementation("org.junit.jupiter:junit-jupiter") + + dockerTestRuntimeOnly("org.testcontainers:testcontainers") + testImplementation(project(":spring-boot-project:spring-boot-tools:spring-boot-test-support")) testImplementation("com.jayway.jsonpath:json-path") testImplementation("org.assertj:assertj-core") - testImplementation("org.testcontainers:testcontainers") testImplementation("org.hamcrest:hamcrest") testImplementation("org.junit.jupiter:junit-jupiter") testImplementation("org.mockito:mockito-core") diff --git a/spring-boot-project/spring-boot-tools/spring-boot-buildpack-platform/src/test/java/org/springframework/boot/buildpack/platform/docker/DockerApiIntegrationTests.java b/spring-boot-project/spring-boot-tools/spring-boot-buildpack-platform/src/dockerTest/java/org/springframework/boot/buildpack/platform/docker/DockerApiIntegrationTests.java similarity index 100% rename from spring-boot-project/spring-boot-tools/spring-boot-buildpack-platform/src/test/java/org/springframework/boot/buildpack/platform/docker/DockerApiIntegrationTests.java rename to spring-boot-project/spring-boot-tools/spring-boot-buildpack-platform/src/dockerTest/java/org/springframework/boot/buildpack/platform/docker/DockerApiIntegrationTests.java From edc582800beb1b9f96ea83cc328538ff70810022 Mon Sep 17 00:00:00 2001 From: Andy Wilkinson Date: Tue, 25 Jun 2024 12:04:40 +0100 Subject: [PATCH 05/28] Update spring-boot-loader-tests to use docker-test plugin See gh-41228 --- .../spring-boot-loader-tests/build.gradle | 17 ++++++++--------- .../spring-boot-loader-tests-app/build.gradle | 4 +--- .../settings.gradle | 2 +- .../build.gradle | 2 +- .../settings.gradle | 2 +- .../boot/loader/LoaderIntegrationTests.java | 2 +- .../resources/conf/oracle-jdk-17/Dockerfile | 0 .../resources/conf/oracle-jdk-17/README.adoc | 0 .../resources/logback.xml | 0 9 files changed, 13 insertions(+), 16 deletions(-) rename spring-boot-tests/spring-boot-integration-tests/spring-boot-loader-tests/src/{intTest => dockerTest}/java/org/springframework/boot/loader/LoaderIntegrationTests.java (98%) rename spring-boot-tests/spring-boot-integration-tests/spring-boot-loader-tests/src/{intTest => dockerTest}/resources/conf/oracle-jdk-17/Dockerfile (100%) rename spring-boot-tests/spring-boot-integration-tests/spring-boot-loader-tests/src/{intTest => dockerTest}/resources/conf/oracle-jdk-17/README.adoc (100%) rename spring-boot-tests/spring-boot-integration-tests/spring-boot-loader-tests/src/{intTest => dockerTest}/resources/logback.xml (100%) diff --git a/spring-boot-tests/spring-boot-integration-tests/spring-boot-loader-tests/build.gradle b/spring-boot-tests/spring-boot-integration-tests/spring-boot-loader-tests/build.gradle index 2dde25c0a5f..5e4e6642c84 100644 --- a/spring-boot-tests/spring-boot-integration-tests/spring-boot-loader-tests/build.gradle +++ b/spring-boot-tests/spring-boot-integration-tests/spring-boot-loader-tests/build.gradle @@ -1,7 +1,7 @@ plugins { id "java" id "org.springframework.boot.conventions" - id "org.springframework.boot.integration-test" + id "org.springframework.boot.docker-test" id "de.undercouch.download" } @@ -21,16 +21,15 @@ dependencies { app project(path: ":spring-boot-project:spring-boot-starters:spring-boot-starter", configuration: "mavenRepository") app("org.bouncycastle:bcprov-jdk18on:1.78.1") - intTestImplementation(enforcedPlatform(project(":spring-boot-project:spring-boot-parent"))) - intTestImplementation(project(":spring-boot-project:spring-boot-tools:spring-boot-test-support")) - intTestImplementation(project(":spring-boot-project:spring-boot-starters:spring-boot-starter-test")) - intTestImplementation("org.testcontainers:junit-jupiter") - intTestImplementation("org.testcontainers:testcontainers") + dockerTestImplementation(project(":spring-boot-project:spring-boot-tools:spring-boot-test-support")) + dockerTestImplementation(project(":spring-boot-project:spring-boot-starters:spring-boot-starter-test")) + dockerTestImplementation("org.testcontainers:junit-jupiter") + dockerTestImplementation("org.testcontainers:testcontainers") } task syncMavenRepository(type: Sync) { from configurations.app - into "${buildDir}/int-test-maven-repository" + into "${buildDir}/docker-test-maven-repository" } task syncAppSource(type: org.springframework.boot.build.SyncAppSource) { @@ -74,10 +73,10 @@ task syncJdkDownloads(type: Sync) { into "${project.buildDir}/downloads/jdk/oracle/" } -processIntTestResources { +tasks.named("processDockerTestResources").configure { dependsOn syncJdkDownloads } -intTest { +tasks.named("dockerTest").configure { dependsOn buildApp, buildSignedJarApp } diff --git a/spring-boot-tests/spring-boot-integration-tests/spring-boot-loader-tests/spring-boot-loader-tests-app/build.gradle b/spring-boot-tests/spring-boot-integration-tests/spring-boot-loader-tests/spring-boot-loader-tests-app/build.gradle index 8f8cf37e3aa..209479c32ca 100644 --- a/spring-boot-tests/spring-boot-integration-tests/spring-boot-loader-tests/spring-boot-loader-tests-app/build.gradle +++ b/spring-boot-tests/spring-boot-integration-tests/spring-boot-loader-tests/spring-boot-loader-tests-app/build.gradle @@ -1,14 +1,12 @@ plugins { id "java" id "org.springframework.boot" -// id 'org.springframework.boot' version '3.1.4' -// id 'io.spring.dependency-management' version '1.1.3' } apply plugin: "io.spring.dependency-management" repositories { - maven { url "file:${rootDir}/../int-test-maven-repository"} + maven { url "file:${rootDir}/../docker-test-maven-repository"} mavenCentral() maven { url "https://repo.spring.io/snapshot" } maven { url "https://repo.spring.io/milestone" } diff --git a/spring-boot-tests/spring-boot-integration-tests/spring-boot-loader-tests/spring-boot-loader-tests-app/settings.gradle b/spring-boot-tests/spring-boot-integration-tests/spring-boot-loader-tests/spring-boot-loader-tests-app/settings.gradle index 06d9554ad0d..40b46b93926 100644 --- a/spring-boot-tests/spring-boot-integration-tests/spring-boot-loader-tests/spring-boot-loader-tests-app/settings.gradle +++ b/spring-boot-tests/spring-boot-integration-tests/spring-boot-loader-tests/spring-boot-loader-tests-app/settings.gradle @@ -1,6 +1,6 @@ pluginManagement { repositories { - maven { url "file:${rootDir}/../int-test-maven-repository"} + maven { url "file:${rootDir}/../docker-test-maven-repository"} mavenCentral() maven { url "https://repo.spring.io/snapshot" } maven { url "https://repo.spring.io/milestone" } diff --git a/spring-boot-tests/spring-boot-integration-tests/spring-boot-loader-tests/spring-boot-loader-tests-signed-jar/build.gradle b/spring-boot-tests/spring-boot-integration-tests/spring-boot-loader-tests/spring-boot-loader-tests-signed-jar/build.gradle index 321d867c338..e3554106e64 100644 --- a/spring-boot-tests/spring-boot-integration-tests/spring-boot-loader-tests/spring-boot-loader-tests-signed-jar/build.gradle +++ b/spring-boot-tests/spring-boot-integration-tests/spring-boot-loader-tests/spring-boot-loader-tests-signed-jar/build.gradle @@ -8,7 +8,7 @@ plugins { apply plugin: "io.spring.dependency-management" repositories { - maven { url "file:${rootDir}/../int-test-maven-repository"} + maven { url "file:${rootDir}/../docker-test-maven-repository"} mavenCentral() maven { url "https://repo.spring.io/snapshot" } maven { url "https://repo.spring.io/milestone" } diff --git a/spring-boot-tests/spring-boot-integration-tests/spring-boot-loader-tests/spring-boot-loader-tests-signed-jar/settings.gradle b/spring-boot-tests/spring-boot-integration-tests/spring-boot-loader-tests/spring-boot-loader-tests-signed-jar/settings.gradle index 06d9554ad0d..40b46b93926 100644 --- a/spring-boot-tests/spring-boot-integration-tests/spring-boot-loader-tests/spring-boot-loader-tests-signed-jar/settings.gradle +++ b/spring-boot-tests/spring-boot-integration-tests/spring-boot-loader-tests/spring-boot-loader-tests-signed-jar/settings.gradle @@ -1,6 +1,6 @@ pluginManagement { repositories { - maven { url "file:${rootDir}/../int-test-maven-repository"} + maven { url "file:${rootDir}/../docker-test-maven-repository"} mavenCentral() maven { url "https://repo.spring.io/snapshot" } maven { url "https://repo.spring.io/milestone" } diff --git a/spring-boot-tests/spring-boot-integration-tests/spring-boot-loader-tests/src/intTest/java/org/springframework/boot/loader/LoaderIntegrationTests.java b/spring-boot-tests/spring-boot-integration-tests/spring-boot-loader-tests/src/dockerTest/java/org/springframework/boot/loader/LoaderIntegrationTests.java similarity index 98% rename from spring-boot-tests/spring-boot-integration-tests/spring-boot-loader-tests/src/intTest/java/org/springframework/boot/loader/LoaderIntegrationTests.java rename to spring-boot-tests/spring-boot-integration-tests/spring-boot-loader-tests/src/dockerTest/java/org/springframework/boot/loader/LoaderIntegrationTests.java index 6a33a39fe2b..82d386566c4 100644 --- a/spring-boot-tests/spring-boot-integration-tests/spring-boot-loader-tests/src/intTest/java/org/springframework/boot/loader/LoaderIntegrationTests.java +++ b/spring-boot-tests/spring-boot-integration-tests/spring-boot-loader-tests/src/dockerTest/java/org/springframework/boot/loader/LoaderIntegrationTests.java @@ -156,7 +156,7 @@ class LoaderIntegrationTests { static JavaRuntime oracleJdk17() { ImageFromDockerfile image = new ImageFromDockerfile("spring-boot-loader/oracle-jdk"); - image.withFileFromFile("Dockerfile", new File("src/intTest/resources/conf/oracle-jdk-17/Dockerfile")); + image.withFileFromFile("Dockerfile", new File("src/dockerTest/resources/conf/oracle-jdk-17/Dockerfile")); for (File file : new File("build/downloads/jdk/oracle").listFiles()) { image.withFileFromFile("downloads/" + file.getName(), file); } diff --git a/spring-boot-tests/spring-boot-integration-tests/spring-boot-loader-tests/src/intTest/resources/conf/oracle-jdk-17/Dockerfile b/spring-boot-tests/spring-boot-integration-tests/spring-boot-loader-tests/src/dockerTest/resources/conf/oracle-jdk-17/Dockerfile similarity index 100% rename from spring-boot-tests/spring-boot-integration-tests/spring-boot-loader-tests/src/intTest/resources/conf/oracle-jdk-17/Dockerfile rename to spring-boot-tests/spring-boot-integration-tests/spring-boot-loader-tests/src/dockerTest/resources/conf/oracle-jdk-17/Dockerfile diff --git a/spring-boot-tests/spring-boot-integration-tests/spring-boot-loader-tests/src/intTest/resources/conf/oracle-jdk-17/README.adoc b/spring-boot-tests/spring-boot-integration-tests/spring-boot-loader-tests/src/dockerTest/resources/conf/oracle-jdk-17/README.adoc similarity index 100% rename from spring-boot-tests/spring-boot-integration-tests/spring-boot-loader-tests/src/intTest/resources/conf/oracle-jdk-17/README.adoc rename to spring-boot-tests/spring-boot-integration-tests/spring-boot-loader-tests/src/dockerTest/resources/conf/oracle-jdk-17/README.adoc diff --git a/spring-boot-tests/spring-boot-integration-tests/spring-boot-loader-tests/src/intTest/resources/logback.xml b/spring-boot-tests/spring-boot-integration-tests/spring-boot-loader-tests/src/dockerTest/resources/logback.xml similarity index 100% rename from spring-boot-tests/spring-boot-integration-tests/spring-boot-loader-tests/src/intTest/resources/logback.xml rename to spring-boot-tests/spring-boot-integration-tests/spring-boot-loader-tests/src/dockerTest/resources/logback.xml From 6564abb12ac26733633389c35900170d937ed8ee Mon Sep 17 00:00:00 2001 From: Andy Wilkinson Date: Tue, 25 Jun 2024 12:17:54 +0100 Subject: [PATCH 06/28] Update spring-boot-loader-classic-tests to use docker-test plugin See gh-41228 --- .../build.gradle | 18 +++++++++--------- .../build.gradle | 2 +- .../settings.gradle | 2 +- .../boot/loader/LoaderIntegrationTests.java | 2 +- .../resources/conf/oracle-jdk-17/Dockerfile | 0 .../conf/oracle-jdk-17/Dockerfile-aarch64 | 0 .../resources/conf/oracle-jdk-17/README.adoc | 0 .../resources/logback.xml | 0 8 files changed, 12 insertions(+), 12 deletions(-) rename spring-boot-tests/spring-boot-integration-tests/spring-boot-loader-classic-tests/src/{intTest => dockerTest}/java/org/springframework/boot/loader/LoaderIntegrationTests.java (97%) rename spring-boot-tests/spring-boot-integration-tests/spring-boot-loader-classic-tests/src/{intTest => dockerTest}/resources/conf/oracle-jdk-17/Dockerfile (100%) rename spring-boot-tests/spring-boot-integration-tests/spring-boot-loader-classic-tests/src/{intTest => dockerTest}/resources/conf/oracle-jdk-17/Dockerfile-aarch64 (100%) rename spring-boot-tests/spring-boot-integration-tests/spring-boot-loader-classic-tests/src/{intTest => dockerTest}/resources/conf/oracle-jdk-17/README.adoc (100%) rename spring-boot-tests/spring-boot-integration-tests/spring-boot-loader-classic-tests/src/{intTest => dockerTest}/resources/logback.xml (100%) diff --git a/spring-boot-tests/spring-boot-integration-tests/spring-boot-loader-classic-tests/build.gradle b/spring-boot-tests/spring-boot-integration-tests/spring-boot-loader-classic-tests/build.gradle index d05a3d6c9e0..994565eb550 100644 --- a/spring-boot-tests/spring-boot-integration-tests/spring-boot-loader-classic-tests/build.gradle +++ b/spring-boot-tests/spring-boot-integration-tests/spring-boot-loader-classic-tests/build.gradle @@ -1,7 +1,7 @@ plugins { id "java" id "org.springframework.boot.conventions" - id "org.springframework.boot.integration-test" + id "org.springframework.boot.docker-test" } description = "Spring Boot Classic Loader Integration Tests" @@ -15,16 +15,16 @@ dependencies { app project(path: ":spring-boot-project:spring-boot-tools:spring-boot-gradle-plugin", configuration: "mavenRepository") app project(path: ":spring-boot-project:spring-boot-starters:spring-boot-starter-web", configuration: "mavenRepository") - intTestImplementation(enforcedPlatform(project(":spring-boot-project:spring-boot-parent"))) - intTestImplementation(project(":spring-boot-project:spring-boot-tools:spring-boot-test-support")) - intTestImplementation(project(":spring-boot-project:spring-boot-starters:spring-boot-starter-test")) - intTestImplementation("org.testcontainers:junit-jupiter") - intTestImplementation("org.testcontainers:testcontainers") + dockerTestImplementation(enforcedPlatform(project(":spring-boot-project:spring-boot-parent"))) + dockerTestImplementation(project(":spring-boot-project:spring-boot-tools:spring-boot-test-support")) + dockerTestImplementation(project(":spring-boot-project:spring-boot-starters:spring-boot-starter-test")) + dockerTestImplementation("org.testcontainers:junit-jupiter") + dockerTestImplementation("org.testcontainers:testcontainers") } task syncMavenRepository(type: Sync) { from configurations.app - into "${buildDir}/int-test-maven-repository" + into "${buildDir}/docker-test-maven-repository" } task syncAppSource(type: org.springframework.boot.build.SyncAppSource) { @@ -39,6 +39,6 @@ task buildApp(type: GradleBuild) { tasks = ["build"] } -intTest { +tasks.named("dockerTest").configure { dependsOn buildApp -} \ No newline at end of file +} diff --git a/spring-boot-tests/spring-boot-integration-tests/spring-boot-loader-classic-tests/spring-boot-loader-classic-tests-app/build.gradle b/spring-boot-tests/spring-boot-integration-tests/spring-boot-loader-classic-tests/spring-boot-loader-classic-tests-app/build.gradle index 16f7a57ebe5..e7b3725dbbf 100644 --- a/spring-boot-tests/spring-boot-integration-tests/spring-boot-loader-classic-tests/spring-boot-loader-classic-tests-app/build.gradle +++ b/spring-boot-tests/spring-boot-integration-tests/spring-boot-loader-classic-tests/spring-boot-loader-classic-tests-app/build.gradle @@ -6,7 +6,7 @@ plugins { apply plugin: "io.spring.dependency-management" repositories { - maven { url "file:${rootDir}/../int-test-maven-repository"} + maven { url "file:${rootDir}/../docker-test-maven-repository"} mavenCentral() maven { url "https://repo.spring.io/snapshot" } maven { url "https://repo.spring.io/milestone" } diff --git a/spring-boot-tests/spring-boot-integration-tests/spring-boot-loader-classic-tests/spring-boot-loader-classic-tests-app/settings.gradle b/spring-boot-tests/spring-boot-integration-tests/spring-boot-loader-classic-tests/spring-boot-loader-classic-tests-app/settings.gradle index 06d9554ad0d..40b46b93926 100644 --- a/spring-boot-tests/spring-boot-integration-tests/spring-boot-loader-classic-tests/spring-boot-loader-classic-tests-app/settings.gradle +++ b/spring-boot-tests/spring-boot-integration-tests/spring-boot-loader-classic-tests/spring-boot-loader-classic-tests-app/settings.gradle @@ -1,6 +1,6 @@ pluginManagement { repositories { - maven { url "file:${rootDir}/../int-test-maven-repository"} + maven { url "file:${rootDir}/../docker-test-maven-repository"} mavenCentral() maven { url "https://repo.spring.io/snapshot" } maven { url "https://repo.spring.io/milestone" } diff --git a/spring-boot-tests/spring-boot-integration-tests/spring-boot-loader-classic-tests/src/intTest/java/org/springframework/boot/loader/LoaderIntegrationTests.java b/spring-boot-tests/spring-boot-integration-tests/spring-boot-loader-classic-tests/src/dockerTest/java/org/springframework/boot/loader/LoaderIntegrationTests.java similarity index 97% rename from spring-boot-tests/spring-boot-integration-tests/spring-boot-loader-classic-tests/src/intTest/java/org/springframework/boot/loader/LoaderIntegrationTests.java rename to spring-boot-tests/spring-boot-integration-tests/spring-boot-loader-classic-tests/src/dockerTest/java/org/springframework/boot/loader/LoaderIntegrationTests.java index f5d8d3010e4..f6f3a259a65 100644 --- a/spring-boot-tests/spring-boot-integration-tests/spring-boot-loader-classic-tests/src/intTest/java/org/springframework/boot/loader/LoaderIntegrationTests.java +++ b/spring-boot-tests/spring-boot-integration-tests/spring-boot-loader-classic-tests/src/dockerTest/java/org/springframework/boot/loader/LoaderIntegrationTests.java @@ -130,7 +130,7 @@ class LoaderIntegrationTests { String arch = System.getProperty("os.arch"); String dockerFile = ("aarch64".equals(arch)) ? "Dockerfile-aarch64" : "Dockerfile"; ImageFromDockerfile image = new ImageFromDockerfile("spring-boot-loader/oracle-jdk-17") - .withFileFromFile("Dockerfile", new File("src/intTest/resources/conf/oracle-jdk-17/" + dockerFile)); + .withFileFromFile("Dockerfile", new File("src/dockerTest/resources/conf/oracle-jdk-17/" + dockerFile)); return new JavaRuntime("Oracle JDK 17", JavaVersion.SEVENTEEN, () -> new GenericContainer<>(image)); } diff --git a/spring-boot-tests/spring-boot-integration-tests/spring-boot-loader-classic-tests/src/intTest/resources/conf/oracle-jdk-17/Dockerfile b/spring-boot-tests/spring-boot-integration-tests/spring-boot-loader-classic-tests/src/dockerTest/resources/conf/oracle-jdk-17/Dockerfile similarity index 100% rename from spring-boot-tests/spring-boot-integration-tests/spring-boot-loader-classic-tests/src/intTest/resources/conf/oracle-jdk-17/Dockerfile rename to spring-boot-tests/spring-boot-integration-tests/spring-boot-loader-classic-tests/src/dockerTest/resources/conf/oracle-jdk-17/Dockerfile diff --git a/spring-boot-tests/spring-boot-integration-tests/spring-boot-loader-classic-tests/src/intTest/resources/conf/oracle-jdk-17/Dockerfile-aarch64 b/spring-boot-tests/spring-boot-integration-tests/spring-boot-loader-classic-tests/src/dockerTest/resources/conf/oracle-jdk-17/Dockerfile-aarch64 similarity index 100% rename from spring-boot-tests/spring-boot-integration-tests/spring-boot-loader-classic-tests/src/intTest/resources/conf/oracle-jdk-17/Dockerfile-aarch64 rename to spring-boot-tests/spring-boot-integration-tests/spring-boot-loader-classic-tests/src/dockerTest/resources/conf/oracle-jdk-17/Dockerfile-aarch64 diff --git a/spring-boot-tests/spring-boot-integration-tests/spring-boot-loader-classic-tests/src/intTest/resources/conf/oracle-jdk-17/README.adoc b/spring-boot-tests/spring-boot-integration-tests/spring-boot-loader-classic-tests/src/dockerTest/resources/conf/oracle-jdk-17/README.adoc similarity index 100% rename from spring-boot-tests/spring-boot-integration-tests/spring-boot-loader-classic-tests/src/intTest/resources/conf/oracle-jdk-17/README.adoc rename to spring-boot-tests/spring-boot-integration-tests/spring-boot-loader-classic-tests/src/dockerTest/resources/conf/oracle-jdk-17/README.adoc diff --git a/spring-boot-tests/spring-boot-integration-tests/spring-boot-loader-classic-tests/src/intTest/resources/logback.xml b/spring-boot-tests/spring-boot-integration-tests/spring-boot-loader-classic-tests/src/dockerTest/resources/logback.xml similarity index 100% rename from spring-boot-tests/spring-boot-integration-tests/spring-boot-loader-classic-tests/src/intTest/resources/logback.xml rename to spring-boot-tests/spring-boot-integration-tests/spring-boot-loader-classic-tests/src/dockerTest/resources/logback.xml From 7e4d60e07fbed303846a9f608eb13baf56a6d567 Mon Sep 17 00:00:00 2001 From: Andy Wilkinson Date: Tue, 25 Jun 2024 12:50:41 +0100 Subject: [PATCH 07/28] Update spring-boot-launch-script-tests to use docker-test plugin See gh-41228 --- .../spring-boot-launch-script-tests/build.gradle | 16 ++++++++-------- .../build.gradle | 2 +- .../settings.gradle | 2 +- .../AbstractLaunchScriptIntegrationTests.java | 10 +++++----- .../JarLaunchScriptIntegrationTests.java | 0 .../SysVinitLaunchScriptIntegrationTests.java | 0 .../conf/RedHat/ubi9-9.3-1476/Dockerfile | 0 .../conf/Ubuntu/jammy-20240227/Dockerfile | 0 .../resources/logback.xml | 0 .../resources/scripts/init.d/basic-launch.sh | 0 .../scripts/init.d/force-stop-when-stopped.sh | 0 .../launch-with-double-link-single-java-opt.sh | 0 .../init.d/launch-with-missing-log-folder.sh | 0 .../init.d/launch-with-missing-pid-folder.sh | 0 ...aunch-with-multiple-command-line-arguments.sh | 0 .../init.d/launch-with-multiple-java-opts.sh | 0 .../init.d/launch-with-multiple-run-args.sh | 0 .../init.d/launch-with-relative-log-folder.sh | 0 .../init.d/launch-with-relative-pid-folder.sh | 0 .../init.d/launch-with-run-as-invalid-user.sh | 0 ...ch-with-run-as-user-preferred-to-jar-owner.sh | 0 .../launch-with-run-as-user-root-required.sh | 0 .../scripts/init.d/launch-with-run-as-user.sh | 0 .../launch-with-single-command-line-argument.sh | 0 .../init.d/launch-with-single-java-opt.sh | 0 .../scripts/init.d/launch-with-single-run-arg.sh | 0 ...nch-with-use-of-start-stop-daemon-disabled.sh | 0 ...log-file-ownership-is-changed-when-created.sh | 0 ...og-file-ownership-is-unchanged-when-exists.sh | 0 .../scripts/init.d/log-file-ownership.sh | 0 .../scripts/init.d/pid-file-ownership.sh | 0 .../scripts/init.d/pid-folder-ownership.sh | 0 .../scripts/init.d/restart-when-started.sh | 0 .../scripts/init.d/restart-when-stopped.sh | 0 .../scripts/init.d/start-when-started.sh | 0 .../scripts/init.d/start-when-stopped.sh | 0 .../scripts/init.d/status-when-killed.sh | 0 .../scripts/init.d/status-when-started.sh | 0 .../scripts/init.d/status-when-stopped.sh | 0 .../scripts/init.d/stop-when-stopped.sh | 0 .../resources/scripts/init.d/test-functions.sh | 0 .../resources/scripts/jar/basic-launch.sh | 0 .../resources/scripts/jar/launch-with-debug.sh | 0 .../resources/scripts/jar/launch-with-jarfile.sh | 0 ...aunch-with-multiple-command-line-arguments.sh | 0 .../jar/launch-with-multiple-java-opts.sh | 0 .../scripts/jar/launch-with-multiple-run-args.sh | 0 .../launch-with-single-command-line-argument.sh | 0 .../scripts/jar/launch-with-single-java-opt.sh | 0 .../scripts/jar/launch-with-single-run-arg.sh | 0 .../resources/scripts/jar/test-functions.sh | 0 51 files changed, 15 insertions(+), 15 deletions(-) rename spring-boot-tests/spring-boot-integration-tests/spring-boot-launch-script-tests/src/{intTest => dockerTest}/java/org/springframework/boot/launchscript/AbstractLaunchScriptIntegrationTests.java (91%) rename spring-boot-tests/spring-boot-integration-tests/spring-boot-launch-script-tests/src/{intTest => dockerTest}/java/org/springframework/boot/launchscript/JarLaunchScriptIntegrationTests.java (100%) rename spring-boot-tests/spring-boot-integration-tests/spring-boot-launch-script-tests/src/{intTest => dockerTest}/java/org/springframework/boot/launchscript/SysVinitLaunchScriptIntegrationTests.java (100%) rename spring-boot-tests/spring-boot-integration-tests/spring-boot-launch-script-tests/src/{intTest => dockerTest}/resources/conf/RedHat/ubi9-9.3-1476/Dockerfile (100%) rename spring-boot-tests/spring-boot-integration-tests/spring-boot-launch-script-tests/src/{intTest => dockerTest}/resources/conf/Ubuntu/jammy-20240227/Dockerfile (100%) rename spring-boot-tests/spring-boot-integration-tests/spring-boot-launch-script-tests/src/{intTest => dockerTest}/resources/logback.xml (100%) rename spring-boot-tests/spring-boot-integration-tests/spring-boot-launch-script-tests/src/{intTest => dockerTest}/resources/scripts/init.d/basic-launch.sh (100%) rename spring-boot-tests/spring-boot-integration-tests/spring-boot-launch-script-tests/src/{intTest => dockerTest}/resources/scripts/init.d/force-stop-when-stopped.sh (100%) rename spring-boot-tests/spring-boot-integration-tests/spring-boot-launch-script-tests/src/{intTest => dockerTest}/resources/scripts/init.d/launch-with-double-link-single-java-opt.sh (100%) rename spring-boot-tests/spring-boot-integration-tests/spring-boot-launch-script-tests/src/{intTest => dockerTest}/resources/scripts/init.d/launch-with-missing-log-folder.sh (100%) rename spring-boot-tests/spring-boot-integration-tests/spring-boot-launch-script-tests/src/{intTest => dockerTest}/resources/scripts/init.d/launch-with-missing-pid-folder.sh (100%) rename spring-boot-tests/spring-boot-integration-tests/spring-boot-launch-script-tests/src/{intTest => dockerTest}/resources/scripts/init.d/launch-with-multiple-command-line-arguments.sh (100%) rename spring-boot-tests/spring-boot-integration-tests/spring-boot-launch-script-tests/src/{intTest => dockerTest}/resources/scripts/init.d/launch-with-multiple-java-opts.sh (100%) rename spring-boot-tests/spring-boot-integration-tests/spring-boot-launch-script-tests/src/{intTest => dockerTest}/resources/scripts/init.d/launch-with-multiple-run-args.sh (100%) rename spring-boot-tests/spring-boot-integration-tests/spring-boot-launch-script-tests/src/{intTest => dockerTest}/resources/scripts/init.d/launch-with-relative-log-folder.sh (100%) rename spring-boot-tests/spring-boot-integration-tests/spring-boot-launch-script-tests/src/{intTest => dockerTest}/resources/scripts/init.d/launch-with-relative-pid-folder.sh (100%) rename spring-boot-tests/spring-boot-integration-tests/spring-boot-launch-script-tests/src/{intTest => dockerTest}/resources/scripts/init.d/launch-with-run-as-invalid-user.sh (100%) rename spring-boot-tests/spring-boot-integration-tests/spring-boot-launch-script-tests/src/{intTest => dockerTest}/resources/scripts/init.d/launch-with-run-as-user-preferred-to-jar-owner.sh (100%) rename spring-boot-tests/spring-boot-integration-tests/spring-boot-launch-script-tests/src/{intTest => dockerTest}/resources/scripts/init.d/launch-with-run-as-user-root-required.sh (100%) rename spring-boot-tests/spring-boot-integration-tests/spring-boot-launch-script-tests/src/{intTest => dockerTest}/resources/scripts/init.d/launch-with-run-as-user.sh (100%) rename spring-boot-tests/spring-boot-integration-tests/spring-boot-launch-script-tests/src/{intTest => dockerTest}/resources/scripts/init.d/launch-with-single-command-line-argument.sh (100%) rename spring-boot-tests/spring-boot-integration-tests/spring-boot-launch-script-tests/src/{intTest => dockerTest}/resources/scripts/init.d/launch-with-single-java-opt.sh (100%) rename spring-boot-tests/spring-boot-integration-tests/spring-boot-launch-script-tests/src/{intTest => dockerTest}/resources/scripts/init.d/launch-with-single-run-arg.sh (100%) rename spring-boot-tests/spring-boot-integration-tests/spring-boot-launch-script-tests/src/{intTest => dockerTest}/resources/scripts/init.d/launch-with-use-of-start-stop-daemon-disabled.sh (100%) rename spring-boot-tests/spring-boot-integration-tests/spring-boot-launch-script-tests/src/{intTest => dockerTest}/resources/scripts/init.d/log-file-ownership-is-changed-when-created.sh (100%) rename spring-boot-tests/spring-boot-integration-tests/spring-boot-launch-script-tests/src/{intTest => dockerTest}/resources/scripts/init.d/log-file-ownership-is-unchanged-when-exists.sh (100%) rename spring-boot-tests/spring-boot-integration-tests/spring-boot-launch-script-tests/src/{intTest => dockerTest}/resources/scripts/init.d/log-file-ownership.sh (100%) rename spring-boot-tests/spring-boot-integration-tests/spring-boot-launch-script-tests/src/{intTest => dockerTest}/resources/scripts/init.d/pid-file-ownership.sh (100%) rename spring-boot-tests/spring-boot-integration-tests/spring-boot-launch-script-tests/src/{intTest => dockerTest}/resources/scripts/init.d/pid-folder-ownership.sh (100%) rename spring-boot-tests/spring-boot-integration-tests/spring-boot-launch-script-tests/src/{intTest => dockerTest}/resources/scripts/init.d/restart-when-started.sh (100%) rename spring-boot-tests/spring-boot-integration-tests/spring-boot-launch-script-tests/src/{intTest => dockerTest}/resources/scripts/init.d/restart-when-stopped.sh (100%) rename spring-boot-tests/spring-boot-integration-tests/spring-boot-launch-script-tests/src/{intTest => dockerTest}/resources/scripts/init.d/start-when-started.sh (100%) rename spring-boot-tests/spring-boot-integration-tests/spring-boot-launch-script-tests/src/{intTest => dockerTest}/resources/scripts/init.d/start-when-stopped.sh (100%) rename spring-boot-tests/spring-boot-integration-tests/spring-boot-launch-script-tests/src/{intTest => dockerTest}/resources/scripts/init.d/status-when-killed.sh (100%) rename spring-boot-tests/spring-boot-integration-tests/spring-boot-launch-script-tests/src/{intTest => dockerTest}/resources/scripts/init.d/status-when-started.sh (100%) rename spring-boot-tests/spring-boot-integration-tests/spring-boot-launch-script-tests/src/{intTest => dockerTest}/resources/scripts/init.d/status-when-stopped.sh (100%) rename spring-boot-tests/spring-boot-integration-tests/spring-boot-launch-script-tests/src/{intTest => dockerTest}/resources/scripts/init.d/stop-when-stopped.sh (100%) rename spring-boot-tests/spring-boot-integration-tests/spring-boot-launch-script-tests/src/{intTest => dockerTest}/resources/scripts/init.d/test-functions.sh (100%) rename spring-boot-tests/spring-boot-integration-tests/spring-boot-launch-script-tests/src/{intTest => dockerTest}/resources/scripts/jar/basic-launch.sh (100%) rename spring-boot-tests/spring-boot-integration-tests/spring-boot-launch-script-tests/src/{intTest => dockerTest}/resources/scripts/jar/launch-with-debug.sh (100%) rename spring-boot-tests/spring-boot-integration-tests/spring-boot-launch-script-tests/src/{intTest => dockerTest}/resources/scripts/jar/launch-with-jarfile.sh (100%) rename spring-boot-tests/spring-boot-integration-tests/spring-boot-launch-script-tests/src/{intTest => dockerTest}/resources/scripts/jar/launch-with-multiple-command-line-arguments.sh (100%) rename spring-boot-tests/spring-boot-integration-tests/spring-boot-launch-script-tests/src/{intTest => dockerTest}/resources/scripts/jar/launch-with-multiple-java-opts.sh (100%) rename spring-boot-tests/spring-boot-integration-tests/spring-boot-launch-script-tests/src/{intTest => dockerTest}/resources/scripts/jar/launch-with-multiple-run-args.sh (100%) rename spring-boot-tests/spring-boot-integration-tests/spring-boot-launch-script-tests/src/{intTest => dockerTest}/resources/scripts/jar/launch-with-single-command-line-argument.sh (100%) rename spring-boot-tests/spring-boot-integration-tests/spring-boot-launch-script-tests/src/{intTest => dockerTest}/resources/scripts/jar/launch-with-single-java-opt.sh (100%) rename spring-boot-tests/spring-boot-integration-tests/spring-boot-launch-script-tests/src/{intTest => dockerTest}/resources/scripts/jar/launch-with-single-run-arg.sh (100%) rename spring-boot-tests/spring-boot-integration-tests/spring-boot-launch-script-tests/src/{intTest => dockerTest}/resources/scripts/jar/test-functions.sh (100%) diff --git a/spring-boot-tests/spring-boot-integration-tests/spring-boot-launch-script-tests/build.gradle b/spring-boot-tests/spring-boot-integration-tests/spring-boot-launch-script-tests/build.gradle index 62c461f2b23..db17b75713a 100644 --- a/spring-boot-tests/spring-boot-integration-tests/spring-boot-launch-script-tests/build.gradle +++ b/spring-boot-tests/spring-boot-integration-tests/spring-boot-launch-script-tests/build.gradle @@ -1,7 +1,7 @@ plugins { id "java" id "org.springframework.boot.conventions" - id "org.springframework.boot.integration-test" + id "org.springframework.boot.docker-test" id "de.undercouch.download" } @@ -19,15 +19,15 @@ dependencies { app project(path: ":spring-boot-project:spring-boot-parent", configuration: "mavenRepository") app project(path: ":spring-boot-project:spring-boot-tools:spring-boot-gradle-plugin", configuration: "mavenRepository") - intTestImplementation(enforcedPlatform(project(":spring-boot-project:spring-boot-parent"))) - intTestImplementation(project(":spring-boot-project:spring-boot-tools:spring-boot-test-support")) - intTestImplementation(project(":spring-boot-project:spring-boot-starters:spring-boot-starter-test")) - intTestImplementation("org.testcontainers:testcontainers") + dockerTestImplementation(enforcedPlatform(project(":spring-boot-project:spring-boot-parent"))) + dockerTestImplementation(project(":spring-boot-project:spring-boot-tools:spring-boot-test-support")) + dockerTestImplementation(project(":spring-boot-project:spring-boot-starters:spring-boot-starter-test")) + dockerTestImplementation("org.testcontainers:testcontainers") } task syncMavenRepository(type: Sync) { from configurations.app - into "${buildDir}/int-test-maven-repository" + into "${buildDir}/docker-test-maven-repository" } task syncAppSource(type: org.springframework.boot.build.SyncAppSource) { @@ -59,10 +59,10 @@ task syncJdkDownloads(type: Sync) { into "${project.buildDir}/downloads/jdk/bellsoft/" } -processIntTestResources { +tasks.named("processDockerTestResources").configure { dependsOn syncJdkDownloads } -intTest { +tasks.named("dockerTest").configure { dependsOn buildApp } diff --git a/spring-boot-tests/spring-boot-integration-tests/spring-boot-launch-script-tests/spring-boot-launch-script-tests-app/build.gradle b/spring-boot-tests/spring-boot-integration-tests/spring-boot-launch-script-tests/spring-boot-launch-script-tests-app/build.gradle index 4c842b1e1c6..9e9dc0d2382 100644 --- a/spring-boot-tests/spring-boot-integration-tests/spring-boot-launch-script-tests/spring-boot-launch-script-tests-app/build.gradle +++ b/spring-boot-tests/spring-boot-integration-tests/spring-boot-launch-script-tests/spring-boot-launch-script-tests-app/build.gradle @@ -6,7 +6,7 @@ plugins { apply plugin: "io.spring.dependency-management" repositories { - maven { url "file:${rootDir}/../int-test-maven-repository"} + maven { url "file:${rootDir}/../docker-test-maven-repository"} mavenCentral() maven { url "https://repo.spring.io/milestone" } maven { url "https://repo.spring.io/snapshot" } diff --git a/spring-boot-tests/spring-boot-integration-tests/spring-boot-launch-script-tests/spring-boot-launch-script-tests-app/settings.gradle b/spring-boot-tests/spring-boot-integration-tests/spring-boot-launch-script-tests/spring-boot-launch-script-tests-app/settings.gradle index 06d9554ad0d..40b46b93926 100644 --- a/spring-boot-tests/spring-boot-integration-tests/spring-boot-launch-script-tests/spring-boot-launch-script-tests-app/settings.gradle +++ b/spring-boot-tests/spring-boot-integration-tests/spring-boot-launch-script-tests/spring-boot-launch-script-tests-app/settings.gradle @@ -1,6 +1,6 @@ pluginManagement { repositories { - maven { url "file:${rootDir}/../int-test-maven-repository"} + maven { url "file:${rootDir}/../docker-test-maven-repository"} mavenCentral() maven { url "https://repo.spring.io/snapshot" } maven { url "https://repo.spring.io/milestone" } diff --git a/spring-boot-tests/spring-boot-integration-tests/spring-boot-launch-script-tests/src/intTest/java/org/springframework/boot/launchscript/AbstractLaunchScriptIntegrationTests.java b/spring-boot-tests/spring-boot-integration-tests/spring-boot-launch-script-tests/src/dockerTest/java/org/springframework/boot/launchscript/AbstractLaunchScriptIntegrationTests.java similarity index 91% rename from spring-boot-tests/spring-boot-integration-tests/spring-boot-launch-script-tests/src/intTest/java/org/springframework/boot/launchscript/AbstractLaunchScriptIntegrationTests.java rename to spring-boot-tests/spring-boot-integration-tests/spring-boot-launch-script-tests/src/dockerTest/java/org/springframework/boot/launchscript/AbstractLaunchScriptIntegrationTests.java index 621808beb92..7a2f0edee26 100644 --- a/spring-boot-tests/spring-boot-integration-tests/spring-boot-launch-script-tests/src/intTest/java/org/springframework/boot/launchscript/AbstractLaunchScriptIntegrationTests.java +++ b/spring-boot-tests/spring-boot-integration-tests/spring-boot-launch-script-tests/src/dockerTest/java/org/springframework/boot/launchscript/AbstractLaunchScriptIntegrationTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2012-2023 the original author or authors. + * Copyright 2012-2024 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. @@ -57,7 +57,7 @@ abstract class AbstractLaunchScriptIntegrationTests { static List filterParameters(Predicate osFilter) { List parameters = new ArrayList<>(); - for (File os : new File("src/intTest/resources/conf").listFiles()) { + for (File os : new File("src/dockerTest/resources/conf").listFiles()) { if (osFilter.test(os)) { for (File version : os.listFiles()) { parameters.add(new Object[] { os.getName(), version.getName() }); @@ -103,10 +103,10 @@ abstract class AbstractLaunchScriptIntegrationTests { super(createImage(os, version)); withCopyFileToContainer(MountableFile.forHostPath(findApplication().getAbsolutePath()), "/app.jar"); withCopyFileToContainer( - MountableFile.forHostPath("src/intTest/resources/scripts/" + scriptsDir + "test-functions.sh"), + MountableFile.forHostPath("src/dockerTest/resources/scripts/" + scriptsDir + "test-functions.sh"), "/test-functions.sh"); withCopyFileToContainer( - MountableFile.forHostPath("src/intTest/resources/scripts/" + scriptsDir + testScript), + MountableFile.forHostPath("src/dockerTest/resources/scripts/" + scriptsDir + testScript), "/" + testScript); withCommand("/bin/bash", "-c", "chown root:root *.sh && chown root:root *.jar && chmod +x " + testScript + " && ./" + testScript); @@ -117,7 +117,7 @@ abstract class AbstractLaunchScriptIntegrationTests { ImageFromDockerfile image = new ImageFromDockerfile( "spring-boot-launch-script/" + os.toLowerCase() + "-" + version); image.withFileFromFile("Dockerfile", - new File("src/intTest/resources/conf/" + os + "/" + version + "/Dockerfile")); + new File("src/dockerTest/resources/conf/" + os + "/" + version + "/Dockerfile")); for (File file : new File("build/downloads/jdk/bellsoft").listFiles()) { image.withFileFromFile("downloads/" + file.getName(), file); } diff --git a/spring-boot-tests/spring-boot-integration-tests/spring-boot-launch-script-tests/src/intTest/java/org/springframework/boot/launchscript/JarLaunchScriptIntegrationTests.java b/spring-boot-tests/spring-boot-integration-tests/spring-boot-launch-script-tests/src/dockerTest/java/org/springframework/boot/launchscript/JarLaunchScriptIntegrationTests.java similarity index 100% rename from spring-boot-tests/spring-boot-integration-tests/spring-boot-launch-script-tests/src/intTest/java/org/springframework/boot/launchscript/JarLaunchScriptIntegrationTests.java rename to spring-boot-tests/spring-boot-integration-tests/spring-boot-launch-script-tests/src/dockerTest/java/org/springframework/boot/launchscript/JarLaunchScriptIntegrationTests.java diff --git a/spring-boot-tests/spring-boot-integration-tests/spring-boot-launch-script-tests/src/intTest/java/org/springframework/boot/launchscript/SysVinitLaunchScriptIntegrationTests.java b/spring-boot-tests/spring-boot-integration-tests/spring-boot-launch-script-tests/src/dockerTest/java/org/springframework/boot/launchscript/SysVinitLaunchScriptIntegrationTests.java similarity index 100% rename from spring-boot-tests/spring-boot-integration-tests/spring-boot-launch-script-tests/src/intTest/java/org/springframework/boot/launchscript/SysVinitLaunchScriptIntegrationTests.java rename to spring-boot-tests/spring-boot-integration-tests/spring-boot-launch-script-tests/src/dockerTest/java/org/springframework/boot/launchscript/SysVinitLaunchScriptIntegrationTests.java diff --git a/spring-boot-tests/spring-boot-integration-tests/spring-boot-launch-script-tests/src/intTest/resources/conf/RedHat/ubi9-9.3-1476/Dockerfile b/spring-boot-tests/spring-boot-integration-tests/spring-boot-launch-script-tests/src/dockerTest/resources/conf/RedHat/ubi9-9.3-1476/Dockerfile similarity index 100% rename from spring-boot-tests/spring-boot-integration-tests/spring-boot-launch-script-tests/src/intTest/resources/conf/RedHat/ubi9-9.3-1476/Dockerfile rename to spring-boot-tests/spring-boot-integration-tests/spring-boot-launch-script-tests/src/dockerTest/resources/conf/RedHat/ubi9-9.3-1476/Dockerfile diff --git a/spring-boot-tests/spring-boot-integration-tests/spring-boot-launch-script-tests/src/intTest/resources/conf/Ubuntu/jammy-20240227/Dockerfile b/spring-boot-tests/spring-boot-integration-tests/spring-boot-launch-script-tests/src/dockerTest/resources/conf/Ubuntu/jammy-20240227/Dockerfile similarity index 100% rename from spring-boot-tests/spring-boot-integration-tests/spring-boot-launch-script-tests/src/intTest/resources/conf/Ubuntu/jammy-20240227/Dockerfile rename to spring-boot-tests/spring-boot-integration-tests/spring-boot-launch-script-tests/src/dockerTest/resources/conf/Ubuntu/jammy-20240227/Dockerfile diff --git a/spring-boot-tests/spring-boot-integration-tests/spring-boot-launch-script-tests/src/intTest/resources/logback.xml b/spring-boot-tests/spring-boot-integration-tests/spring-boot-launch-script-tests/src/dockerTest/resources/logback.xml similarity index 100% rename from spring-boot-tests/spring-boot-integration-tests/spring-boot-launch-script-tests/src/intTest/resources/logback.xml rename to spring-boot-tests/spring-boot-integration-tests/spring-boot-launch-script-tests/src/dockerTest/resources/logback.xml diff --git a/spring-boot-tests/spring-boot-integration-tests/spring-boot-launch-script-tests/src/intTest/resources/scripts/init.d/basic-launch.sh b/spring-boot-tests/spring-boot-integration-tests/spring-boot-launch-script-tests/src/dockerTest/resources/scripts/init.d/basic-launch.sh similarity index 100% rename from spring-boot-tests/spring-boot-integration-tests/spring-boot-launch-script-tests/src/intTest/resources/scripts/init.d/basic-launch.sh rename to spring-boot-tests/spring-boot-integration-tests/spring-boot-launch-script-tests/src/dockerTest/resources/scripts/init.d/basic-launch.sh diff --git a/spring-boot-tests/spring-boot-integration-tests/spring-boot-launch-script-tests/src/intTest/resources/scripts/init.d/force-stop-when-stopped.sh b/spring-boot-tests/spring-boot-integration-tests/spring-boot-launch-script-tests/src/dockerTest/resources/scripts/init.d/force-stop-when-stopped.sh similarity index 100% rename from spring-boot-tests/spring-boot-integration-tests/spring-boot-launch-script-tests/src/intTest/resources/scripts/init.d/force-stop-when-stopped.sh rename to spring-boot-tests/spring-boot-integration-tests/spring-boot-launch-script-tests/src/dockerTest/resources/scripts/init.d/force-stop-when-stopped.sh diff --git a/spring-boot-tests/spring-boot-integration-tests/spring-boot-launch-script-tests/src/intTest/resources/scripts/init.d/launch-with-double-link-single-java-opt.sh b/spring-boot-tests/spring-boot-integration-tests/spring-boot-launch-script-tests/src/dockerTest/resources/scripts/init.d/launch-with-double-link-single-java-opt.sh similarity index 100% rename from spring-boot-tests/spring-boot-integration-tests/spring-boot-launch-script-tests/src/intTest/resources/scripts/init.d/launch-with-double-link-single-java-opt.sh rename to spring-boot-tests/spring-boot-integration-tests/spring-boot-launch-script-tests/src/dockerTest/resources/scripts/init.d/launch-with-double-link-single-java-opt.sh diff --git a/spring-boot-tests/spring-boot-integration-tests/spring-boot-launch-script-tests/src/intTest/resources/scripts/init.d/launch-with-missing-log-folder.sh b/spring-boot-tests/spring-boot-integration-tests/spring-boot-launch-script-tests/src/dockerTest/resources/scripts/init.d/launch-with-missing-log-folder.sh similarity index 100% rename from spring-boot-tests/spring-boot-integration-tests/spring-boot-launch-script-tests/src/intTest/resources/scripts/init.d/launch-with-missing-log-folder.sh rename to spring-boot-tests/spring-boot-integration-tests/spring-boot-launch-script-tests/src/dockerTest/resources/scripts/init.d/launch-with-missing-log-folder.sh diff --git a/spring-boot-tests/spring-boot-integration-tests/spring-boot-launch-script-tests/src/intTest/resources/scripts/init.d/launch-with-missing-pid-folder.sh b/spring-boot-tests/spring-boot-integration-tests/spring-boot-launch-script-tests/src/dockerTest/resources/scripts/init.d/launch-with-missing-pid-folder.sh similarity index 100% rename from spring-boot-tests/spring-boot-integration-tests/spring-boot-launch-script-tests/src/intTest/resources/scripts/init.d/launch-with-missing-pid-folder.sh rename to spring-boot-tests/spring-boot-integration-tests/spring-boot-launch-script-tests/src/dockerTest/resources/scripts/init.d/launch-with-missing-pid-folder.sh diff --git a/spring-boot-tests/spring-boot-integration-tests/spring-boot-launch-script-tests/src/intTest/resources/scripts/init.d/launch-with-multiple-command-line-arguments.sh b/spring-boot-tests/spring-boot-integration-tests/spring-boot-launch-script-tests/src/dockerTest/resources/scripts/init.d/launch-with-multiple-command-line-arguments.sh similarity index 100% rename from spring-boot-tests/spring-boot-integration-tests/spring-boot-launch-script-tests/src/intTest/resources/scripts/init.d/launch-with-multiple-command-line-arguments.sh rename to spring-boot-tests/spring-boot-integration-tests/spring-boot-launch-script-tests/src/dockerTest/resources/scripts/init.d/launch-with-multiple-command-line-arguments.sh diff --git a/spring-boot-tests/spring-boot-integration-tests/spring-boot-launch-script-tests/src/intTest/resources/scripts/init.d/launch-with-multiple-java-opts.sh b/spring-boot-tests/spring-boot-integration-tests/spring-boot-launch-script-tests/src/dockerTest/resources/scripts/init.d/launch-with-multiple-java-opts.sh similarity index 100% rename from spring-boot-tests/spring-boot-integration-tests/spring-boot-launch-script-tests/src/intTest/resources/scripts/init.d/launch-with-multiple-java-opts.sh rename to spring-boot-tests/spring-boot-integration-tests/spring-boot-launch-script-tests/src/dockerTest/resources/scripts/init.d/launch-with-multiple-java-opts.sh diff --git a/spring-boot-tests/spring-boot-integration-tests/spring-boot-launch-script-tests/src/intTest/resources/scripts/init.d/launch-with-multiple-run-args.sh b/spring-boot-tests/spring-boot-integration-tests/spring-boot-launch-script-tests/src/dockerTest/resources/scripts/init.d/launch-with-multiple-run-args.sh similarity index 100% rename from spring-boot-tests/spring-boot-integration-tests/spring-boot-launch-script-tests/src/intTest/resources/scripts/init.d/launch-with-multiple-run-args.sh rename to spring-boot-tests/spring-boot-integration-tests/spring-boot-launch-script-tests/src/dockerTest/resources/scripts/init.d/launch-with-multiple-run-args.sh diff --git a/spring-boot-tests/spring-boot-integration-tests/spring-boot-launch-script-tests/src/intTest/resources/scripts/init.d/launch-with-relative-log-folder.sh b/spring-boot-tests/spring-boot-integration-tests/spring-boot-launch-script-tests/src/dockerTest/resources/scripts/init.d/launch-with-relative-log-folder.sh similarity index 100% rename from spring-boot-tests/spring-boot-integration-tests/spring-boot-launch-script-tests/src/intTest/resources/scripts/init.d/launch-with-relative-log-folder.sh rename to spring-boot-tests/spring-boot-integration-tests/spring-boot-launch-script-tests/src/dockerTest/resources/scripts/init.d/launch-with-relative-log-folder.sh diff --git a/spring-boot-tests/spring-boot-integration-tests/spring-boot-launch-script-tests/src/intTest/resources/scripts/init.d/launch-with-relative-pid-folder.sh b/spring-boot-tests/spring-boot-integration-tests/spring-boot-launch-script-tests/src/dockerTest/resources/scripts/init.d/launch-with-relative-pid-folder.sh similarity index 100% rename from spring-boot-tests/spring-boot-integration-tests/spring-boot-launch-script-tests/src/intTest/resources/scripts/init.d/launch-with-relative-pid-folder.sh rename to spring-boot-tests/spring-boot-integration-tests/spring-boot-launch-script-tests/src/dockerTest/resources/scripts/init.d/launch-with-relative-pid-folder.sh diff --git a/spring-boot-tests/spring-boot-integration-tests/spring-boot-launch-script-tests/src/intTest/resources/scripts/init.d/launch-with-run-as-invalid-user.sh b/spring-boot-tests/spring-boot-integration-tests/spring-boot-launch-script-tests/src/dockerTest/resources/scripts/init.d/launch-with-run-as-invalid-user.sh similarity index 100% rename from spring-boot-tests/spring-boot-integration-tests/spring-boot-launch-script-tests/src/intTest/resources/scripts/init.d/launch-with-run-as-invalid-user.sh rename to spring-boot-tests/spring-boot-integration-tests/spring-boot-launch-script-tests/src/dockerTest/resources/scripts/init.d/launch-with-run-as-invalid-user.sh diff --git a/spring-boot-tests/spring-boot-integration-tests/spring-boot-launch-script-tests/src/intTest/resources/scripts/init.d/launch-with-run-as-user-preferred-to-jar-owner.sh b/spring-boot-tests/spring-boot-integration-tests/spring-boot-launch-script-tests/src/dockerTest/resources/scripts/init.d/launch-with-run-as-user-preferred-to-jar-owner.sh similarity index 100% rename from spring-boot-tests/spring-boot-integration-tests/spring-boot-launch-script-tests/src/intTest/resources/scripts/init.d/launch-with-run-as-user-preferred-to-jar-owner.sh rename to spring-boot-tests/spring-boot-integration-tests/spring-boot-launch-script-tests/src/dockerTest/resources/scripts/init.d/launch-with-run-as-user-preferred-to-jar-owner.sh diff --git a/spring-boot-tests/spring-boot-integration-tests/spring-boot-launch-script-tests/src/intTest/resources/scripts/init.d/launch-with-run-as-user-root-required.sh b/spring-boot-tests/spring-boot-integration-tests/spring-boot-launch-script-tests/src/dockerTest/resources/scripts/init.d/launch-with-run-as-user-root-required.sh similarity index 100% rename from spring-boot-tests/spring-boot-integration-tests/spring-boot-launch-script-tests/src/intTest/resources/scripts/init.d/launch-with-run-as-user-root-required.sh rename to spring-boot-tests/spring-boot-integration-tests/spring-boot-launch-script-tests/src/dockerTest/resources/scripts/init.d/launch-with-run-as-user-root-required.sh diff --git a/spring-boot-tests/spring-boot-integration-tests/spring-boot-launch-script-tests/src/intTest/resources/scripts/init.d/launch-with-run-as-user.sh b/spring-boot-tests/spring-boot-integration-tests/spring-boot-launch-script-tests/src/dockerTest/resources/scripts/init.d/launch-with-run-as-user.sh similarity index 100% rename from spring-boot-tests/spring-boot-integration-tests/spring-boot-launch-script-tests/src/intTest/resources/scripts/init.d/launch-with-run-as-user.sh rename to spring-boot-tests/spring-boot-integration-tests/spring-boot-launch-script-tests/src/dockerTest/resources/scripts/init.d/launch-with-run-as-user.sh diff --git a/spring-boot-tests/spring-boot-integration-tests/spring-boot-launch-script-tests/src/intTest/resources/scripts/init.d/launch-with-single-command-line-argument.sh b/spring-boot-tests/spring-boot-integration-tests/spring-boot-launch-script-tests/src/dockerTest/resources/scripts/init.d/launch-with-single-command-line-argument.sh similarity index 100% rename from spring-boot-tests/spring-boot-integration-tests/spring-boot-launch-script-tests/src/intTest/resources/scripts/init.d/launch-with-single-command-line-argument.sh rename to spring-boot-tests/spring-boot-integration-tests/spring-boot-launch-script-tests/src/dockerTest/resources/scripts/init.d/launch-with-single-command-line-argument.sh diff --git a/spring-boot-tests/spring-boot-integration-tests/spring-boot-launch-script-tests/src/intTest/resources/scripts/init.d/launch-with-single-java-opt.sh b/spring-boot-tests/spring-boot-integration-tests/spring-boot-launch-script-tests/src/dockerTest/resources/scripts/init.d/launch-with-single-java-opt.sh similarity index 100% rename from spring-boot-tests/spring-boot-integration-tests/spring-boot-launch-script-tests/src/intTest/resources/scripts/init.d/launch-with-single-java-opt.sh rename to spring-boot-tests/spring-boot-integration-tests/spring-boot-launch-script-tests/src/dockerTest/resources/scripts/init.d/launch-with-single-java-opt.sh diff --git a/spring-boot-tests/spring-boot-integration-tests/spring-boot-launch-script-tests/src/intTest/resources/scripts/init.d/launch-with-single-run-arg.sh b/spring-boot-tests/spring-boot-integration-tests/spring-boot-launch-script-tests/src/dockerTest/resources/scripts/init.d/launch-with-single-run-arg.sh similarity index 100% rename from spring-boot-tests/spring-boot-integration-tests/spring-boot-launch-script-tests/src/intTest/resources/scripts/init.d/launch-with-single-run-arg.sh rename to spring-boot-tests/spring-boot-integration-tests/spring-boot-launch-script-tests/src/dockerTest/resources/scripts/init.d/launch-with-single-run-arg.sh diff --git a/spring-boot-tests/spring-boot-integration-tests/spring-boot-launch-script-tests/src/intTest/resources/scripts/init.d/launch-with-use-of-start-stop-daemon-disabled.sh b/spring-boot-tests/spring-boot-integration-tests/spring-boot-launch-script-tests/src/dockerTest/resources/scripts/init.d/launch-with-use-of-start-stop-daemon-disabled.sh similarity index 100% rename from spring-boot-tests/spring-boot-integration-tests/spring-boot-launch-script-tests/src/intTest/resources/scripts/init.d/launch-with-use-of-start-stop-daemon-disabled.sh rename to spring-boot-tests/spring-boot-integration-tests/spring-boot-launch-script-tests/src/dockerTest/resources/scripts/init.d/launch-with-use-of-start-stop-daemon-disabled.sh diff --git a/spring-boot-tests/spring-boot-integration-tests/spring-boot-launch-script-tests/src/intTest/resources/scripts/init.d/log-file-ownership-is-changed-when-created.sh b/spring-boot-tests/spring-boot-integration-tests/spring-boot-launch-script-tests/src/dockerTest/resources/scripts/init.d/log-file-ownership-is-changed-when-created.sh similarity index 100% rename from spring-boot-tests/spring-boot-integration-tests/spring-boot-launch-script-tests/src/intTest/resources/scripts/init.d/log-file-ownership-is-changed-when-created.sh rename to spring-boot-tests/spring-boot-integration-tests/spring-boot-launch-script-tests/src/dockerTest/resources/scripts/init.d/log-file-ownership-is-changed-when-created.sh diff --git a/spring-boot-tests/spring-boot-integration-tests/spring-boot-launch-script-tests/src/intTest/resources/scripts/init.d/log-file-ownership-is-unchanged-when-exists.sh b/spring-boot-tests/spring-boot-integration-tests/spring-boot-launch-script-tests/src/dockerTest/resources/scripts/init.d/log-file-ownership-is-unchanged-when-exists.sh similarity index 100% rename from spring-boot-tests/spring-boot-integration-tests/spring-boot-launch-script-tests/src/intTest/resources/scripts/init.d/log-file-ownership-is-unchanged-when-exists.sh rename to spring-boot-tests/spring-boot-integration-tests/spring-boot-launch-script-tests/src/dockerTest/resources/scripts/init.d/log-file-ownership-is-unchanged-when-exists.sh diff --git a/spring-boot-tests/spring-boot-integration-tests/spring-boot-launch-script-tests/src/intTest/resources/scripts/init.d/log-file-ownership.sh b/spring-boot-tests/spring-boot-integration-tests/spring-boot-launch-script-tests/src/dockerTest/resources/scripts/init.d/log-file-ownership.sh similarity index 100% rename from spring-boot-tests/spring-boot-integration-tests/spring-boot-launch-script-tests/src/intTest/resources/scripts/init.d/log-file-ownership.sh rename to spring-boot-tests/spring-boot-integration-tests/spring-boot-launch-script-tests/src/dockerTest/resources/scripts/init.d/log-file-ownership.sh diff --git a/spring-boot-tests/spring-boot-integration-tests/spring-boot-launch-script-tests/src/intTest/resources/scripts/init.d/pid-file-ownership.sh b/spring-boot-tests/spring-boot-integration-tests/spring-boot-launch-script-tests/src/dockerTest/resources/scripts/init.d/pid-file-ownership.sh similarity index 100% rename from spring-boot-tests/spring-boot-integration-tests/spring-boot-launch-script-tests/src/intTest/resources/scripts/init.d/pid-file-ownership.sh rename to spring-boot-tests/spring-boot-integration-tests/spring-boot-launch-script-tests/src/dockerTest/resources/scripts/init.d/pid-file-ownership.sh diff --git a/spring-boot-tests/spring-boot-integration-tests/spring-boot-launch-script-tests/src/intTest/resources/scripts/init.d/pid-folder-ownership.sh b/spring-boot-tests/spring-boot-integration-tests/spring-boot-launch-script-tests/src/dockerTest/resources/scripts/init.d/pid-folder-ownership.sh similarity index 100% rename from spring-boot-tests/spring-boot-integration-tests/spring-boot-launch-script-tests/src/intTest/resources/scripts/init.d/pid-folder-ownership.sh rename to spring-boot-tests/spring-boot-integration-tests/spring-boot-launch-script-tests/src/dockerTest/resources/scripts/init.d/pid-folder-ownership.sh diff --git a/spring-boot-tests/spring-boot-integration-tests/spring-boot-launch-script-tests/src/intTest/resources/scripts/init.d/restart-when-started.sh b/spring-boot-tests/spring-boot-integration-tests/spring-boot-launch-script-tests/src/dockerTest/resources/scripts/init.d/restart-when-started.sh similarity index 100% rename from spring-boot-tests/spring-boot-integration-tests/spring-boot-launch-script-tests/src/intTest/resources/scripts/init.d/restart-when-started.sh rename to spring-boot-tests/spring-boot-integration-tests/spring-boot-launch-script-tests/src/dockerTest/resources/scripts/init.d/restart-when-started.sh diff --git a/spring-boot-tests/spring-boot-integration-tests/spring-boot-launch-script-tests/src/intTest/resources/scripts/init.d/restart-when-stopped.sh b/spring-boot-tests/spring-boot-integration-tests/spring-boot-launch-script-tests/src/dockerTest/resources/scripts/init.d/restart-when-stopped.sh similarity index 100% rename from spring-boot-tests/spring-boot-integration-tests/spring-boot-launch-script-tests/src/intTest/resources/scripts/init.d/restart-when-stopped.sh rename to spring-boot-tests/spring-boot-integration-tests/spring-boot-launch-script-tests/src/dockerTest/resources/scripts/init.d/restart-when-stopped.sh diff --git a/spring-boot-tests/spring-boot-integration-tests/spring-boot-launch-script-tests/src/intTest/resources/scripts/init.d/start-when-started.sh b/spring-boot-tests/spring-boot-integration-tests/spring-boot-launch-script-tests/src/dockerTest/resources/scripts/init.d/start-when-started.sh similarity index 100% rename from spring-boot-tests/spring-boot-integration-tests/spring-boot-launch-script-tests/src/intTest/resources/scripts/init.d/start-when-started.sh rename to spring-boot-tests/spring-boot-integration-tests/spring-boot-launch-script-tests/src/dockerTest/resources/scripts/init.d/start-when-started.sh diff --git a/spring-boot-tests/spring-boot-integration-tests/spring-boot-launch-script-tests/src/intTest/resources/scripts/init.d/start-when-stopped.sh b/spring-boot-tests/spring-boot-integration-tests/spring-boot-launch-script-tests/src/dockerTest/resources/scripts/init.d/start-when-stopped.sh similarity index 100% rename from spring-boot-tests/spring-boot-integration-tests/spring-boot-launch-script-tests/src/intTest/resources/scripts/init.d/start-when-stopped.sh rename to spring-boot-tests/spring-boot-integration-tests/spring-boot-launch-script-tests/src/dockerTest/resources/scripts/init.d/start-when-stopped.sh diff --git a/spring-boot-tests/spring-boot-integration-tests/spring-boot-launch-script-tests/src/intTest/resources/scripts/init.d/status-when-killed.sh b/spring-boot-tests/spring-boot-integration-tests/spring-boot-launch-script-tests/src/dockerTest/resources/scripts/init.d/status-when-killed.sh similarity index 100% rename from spring-boot-tests/spring-boot-integration-tests/spring-boot-launch-script-tests/src/intTest/resources/scripts/init.d/status-when-killed.sh rename to spring-boot-tests/spring-boot-integration-tests/spring-boot-launch-script-tests/src/dockerTest/resources/scripts/init.d/status-when-killed.sh diff --git a/spring-boot-tests/spring-boot-integration-tests/spring-boot-launch-script-tests/src/intTest/resources/scripts/init.d/status-when-started.sh b/spring-boot-tests/spring-boot-integration-tests/spring-boot-launch-script-tests/src/dockerTest/resources/scripts/init.d/status-when-started.sh similarity index 100% rename from spring-boot-tests/spring-boot-integration-tests/spring-boot-launch-script-tests/src/intTest/resources/scripts/init.d/status-when-started.sh rename to spring-boot-tests/spring-boot-integration-tests/spring-boot-launch-script-tests/src/dockerTest/resources/scripts/init.d/status-when-started.sh diff --git a/spring-boot-tests/spring-boot-integration-tests/spring-boot-launch-script-tests/src/intTest/resources/scripts/init.d/status-when-stopped.sh b/spring-boot-tests/spring-boot-integration-tests/spring-boot-launch-script-tests/src/dockerTest/resources/scripts/init.d/status-when-stopped.sh similarity index 100% rename from spring-boot-tests/spring-boot-integration-tests/spring-boot-launch-script-tests/src/intTest/resources/scripts/init.d/status-when-stopped.sh rename to spring-boot-tests/spring-boot-integration-tests/spring-boot-launch-script-tests/src/dockerTest/resources/scripts/init.d/status-when-stopped.sh diff --git a/spring-boot-tests/spring-boot-integration-tests/spring-boot-launch-script-tests/src/intTest/resources/scripts/init.d/stop-when-stopped.sh b/spring-boot-tests/spring-boot-integration-tests/spring-boot-launch-script-tests/src/dockerTest/resources/scripts/init.d/stop-when-stopped.sh similarity index 100% rename from spring-boot-tests/spring-boot-integration-tests/spring-boot-launch-script-tests/src/intTest/resources/scripts/init.d/stop-when-stopped.sh rename to spring-boot-tests/spring-boot-integration-tests/spring-boot-launch-script-tests/src/dockerTest/resources/scripts/init.d/stop-when-stopped.sh diff --git a/spring-boot-tests/spring-boot-integration-tests/spring-boot-launch-script-tests/src/intTest/resources/scripts/init.d/test-functions.sh b/spring-boot-tests/spring-boot-integration-tests/spring-boot-launch-script-tests/src/dockerTest/resources/scripts/init.d/test-functions.sh similarity index 100% rename from spring-boot-tests/spring-boot-integration-tests/spring-boot-launch-script-tests/src/intTest/resources/scripts/init.d/test-functions.sh rename to spring-boot-tests/spring-boot-integration-tests/spring-boot-launch-script-tests/src/dockerTest/resources/scripts/init.d/test-functions.sh diff --git a/spring-boot-tests/spring-boot-integration-tests/spring-boot-launch-script-tests/src/intTest/resources/scripts/jar/basic-launch.sh b/spring-boot-tests/spring-boot-integration-tests/spring-boot-launch-script-tests/src/dockerTest/resources/scripts/jar/basic-launch.sh similarity index 100% rename from spring-boot-tests/spring-boot-integration-tests/spring-boot-launch-script-tests/src/intTest/resources/scripts/jar/basic-launch.sh rename to spring-boot-tests/spring-boot-integration-tests/spring-boot-launch-script-tests/src/dockerTest/resources/scripts/jar/basic-launch.sh diff --git a/spring-boot-tests/spring-boot-integration-tests/spring-boot-launch-script-tests/src/intTest/resources/scripts/jar/launch-with-debug.sh b/spring-boot-tests/spring-boot-integration-tests/spring-boot-launch-script-tests/src/dockerTest/resources/scripts/jar/launch-with-debug.sh similarity index 100% rename from spring-boot-tests/spring-boot-integration-tests/spring-boot-launch-script-tests/src/intTest/resources/scripts/jar/launch-with-debug.sh rename to spring-boot-tests/spring-boot-integration-tests/spring-boot-launch-script-tests/src/dockerTest/resources/scripts/jar/launch-with-debug.sh diff --git a/spring-boot-tests/spring-boot-integration-tests/spring-boot-launch-script-tests/src/intTest/resources/scripts/jar/launch-with-jarfile.sh b/spring-boot-tests/spring-boot-integration-tests/spring-boot-launch-script-tests/src/dockerTest/resources/scripts/jar/launch-with-jarfile.sh similarity index 100% rename from spring-boot-tests/spring-boot-integration-tests/spring-boot-launch-script-tests/src/intTest/resources/scripts/jar/launch-with-jarfile.sh rename to spring-boot-tests/spring-boot-integration-tests/spring-boot-launch-script-tests/src/dockerTest/resources/scripts/jar/launch-with-jarfile.sh diff --git a/spring-boot-tests/spring-boot-integration-tests/spring-boot-launch-script-tests/src/intTest/resources/scripts/jar/launch-with-multiple-command-line-arguments.sh b/spring-boot-tests/spring-boot-integration-tests/spring-boot-launch-script-tests/src/dockerTest/resources/scripts/jar/launch-with-multiple-command-line-arguments.sh similarity index 100% rename from spring-boot-tests/spring-boot-integration-tests/spring-boot-launch-script-tests/src/intTest/resources/scripts/jar/launch-with-multiple-command-line-arguments.sh rename to spring-boot-tests/spring-boot-integration-tests/spring-boot-launch-script-tests/src/dockerTest/resources/scripts/jar/launch-with-multiple-command-line-arguments.sh diff --git a/spring-boot-tests/spring-boot-integration-tests/spring-boot-launch-script-tests/src/intTest/resources/scripts/jar/launch-with-multiple-java-opts.sh b/spring-boot-tests/spring-boot-integration-tests/spring-boot-launch-script-tests/src/dockerTest/resources/scripts/jar/launch-with-multiple-java-opts.sh similarity index 100% rename from spring-boot-tests/spring-boot-integration-tests/spring-boot-launch-script-tests/src/intTest/resources/scripts/jar/launch-with-multiple-java-opts.sh rename to spring-boot-tests/spring-boot-integration-tests/spring-boot-launch-script-tests/src/dockerTest/resources/scripts/jar/launch-with-multiple-java-opts.sh diff --git a/spring-boot-tests/spring-boot-integration-tests/spring-boot-launch-script-tests/src/intTest/resources/scripts/jar/launch-with-multiple-run-args.sh b/spring-boot-tests/spring-boot-integration-tests/spring-boot-launch-script-tests/src/dockerTest/resources/scripts/jar/launch-with-multiple-run-args.sh similarity index 100% rename from spring-boot-tests/spring-boot-integration-tests/spring-boot-launch-script-tests/src/intTest/resources/scripts/jar/launch-with-multiple-run-args.sh rename to spring-boot-tests/spring-boot-integration-tests/spring-boot-launch-script-tests/src/dockerTest/resources/scripts/jar/launch-with-multiple-run-args.sh diff --git a/spring-boot-tests/spring-boot-integration-tests/spring-boot-launch-script-tests/src/intTest/resources/scripts/jar/launch-with-single-command-line-argument.sh b/spring-boot-tests/spring-boot-integration-tests/spring-boot-launch-script-tests/src/dockerTest/resources/scripts/jar/launch-with-single-command-line-argument.sh similarity index 100% rename from spring-boot-tests/spring-boot-integration-tests/spring-boot-launch-script-tests/src/intTest/resources/scripts/jar/launch-with-single-command-line-argument.sh rename to spring-boot-tests/spring-boot-integration-tests/spring-boot-launch-script-tests/src/dockerTest/resources/scripts/jar/launch-with-single-command-line-argument.sh diff --git a/spring-boot-tests/spring-boot-integration-tests/spring-boot-launch-script-tests/src/intTest/resources/scripts/jar/launch-with-single-java-opt.sh b/spring-boot-tests/spring-boot-integration-tests/spring-boot-launch-script-tests/src/dockerTest/resources/scripts/jar/launch-with-single-java-opt.sh similarity index 100% rename from spring-boot-tests/spring-boot-integration-tests/spring-boot-launch-script-tests/src/intTest/resources/scripts/jar/launch-with-single-java-opt.sh rename to spring-boot-tests/spring-boot-integration-tests/spring-boot-launch-script-tests/src/dockerTest/resources/scripts/jar/launch-with-single-java-opt.sh diff --git a/spring-boot-tests/spring-boot-integration-tests/spring-boot-launch-script-tests/src/intTest/resources/scripts/jar/launch-with-single-run-arg.sh b/spring-boot-tests/spring-boot-integration-tests/spring-boot-launch-script-tests/src/dockerTest/resources/scripts/jar/launch-with-single-run-arg.sh similarity index 100% rename from spring-boot-tests/spring-boot-integration-tests/spring-boot-launch-script-tests/src/intTest/resources/scripts/jar/launch-with-single-run-arg.sh rename to spring-boot-tests/spring-boot-integration-tests/spring-boot-launch-script-tests/src/dockerTest/resources/scripts/jar/launch-with-single-run-arg.sh diff --git a/spring-boot-tests/spring-boot-integration-tests/spring-boot-launch-script-tests/src/intTest/resources/scripts/jar/test-functions.sh b/spring-boot-tests/spring-boot-integration-tests/spring-boot-launch-script-tests/src/dockerTest/resources/scripts/jar/test-functions.sh similarity index 100% rename from spring-boot-tests/spring-boot-integration-tests/spring-boot-launch-script-tests/src/intTest/resources/scripts/jar/test-functions.sh rename to spring-boot-tests/spring-boot-integration-tests/spring-boot-launch-script-tests/src/dockerTest/resources/scripts/jar/test-functions.sh From 7d5a761d511b775ed483e685f193d267caf6ade5 Mon Sep 17 00:00:00 2001 From: Andy Wilkinson Date: Tue, 25 Jun 2024 14:21:38 +0100 Subject: [PATCH 08/28] Update spring-boot-gradle-plugin to use docker-test plugin See gh-41228 --- .../spring-boot-gradle-plugin/build.gradle | 13 ++++++++++--- .../bundling/BootBuildImageIntegrationTests.java | 0 .../BootBuildImageRegistryIntegrationTests.java | 0 ...Tests-buildsImageWithApplicationDirectory.gradle | 0 ...ntegrationTests-buildsImageWithBindCaches.gradle | 0 ...geIntegrationTests-buildsImageWithBinding.gradle | 0 ...Tests-buildsImageWithBuildpackFromBuilder.gradle | 0 ...sts-buildsImageWithBuildpackFromDirectory.gradle | 0 ...Tests-buildsImageWithBuildpackFromTarGzip.gradle | 0 ...Tests-buildsImageWithBuildpacksFromImages.gradle | 0 ...onTests-buildsImageWithCommandLineOptions.gradle | 0 ...tegrationTests-buildsImageWithCreatedDate.gradle | 0 ...onTests-buildsImageWithCurrentCreatedDate.gradle | 0 ...s-buildsImageWithCustomBuilderAndRunImage.gradle | 0 ...ntegrationTests-buildsImageWithCustomName.gradle | 0 ...Tests-buildsImageWithEmptySecurityOptions.gradle | 0 ...egrationTests-buildsImageWithLaunchScript.gradle | 0 ...ationTests-buildsImageWithNetworkModeNone.gradle | 0 ...ntegrationTests-buildsImageWithPullPolicy.gradle | 0 ...dImageIntegrationTests-buildsImageWithTag.gradle | 0 ...egrationTests-buildsImageWithVolumeCaches.gradle | 0 ...sImageWithWarPackagingAndJarConfiguration.gradle | 0 ...onTests-failsWhenCachesAreConfiguredTwice.gradle | 0 ...ageIntegrationTests-failsWithBuilderError.gradle | 0 ...ationTests-failsWithBuildpackNotInBuilder.gradle | 0 ...egrationTests-failsWithInvalidCreatedDate.gradle | 0 ...ImageIntegrationTests-failsWithInvalidTag.gradle | 0 .../bundling/BootBuildImageIntegrationTests.gradle | 0 .../BootBuildImageRegistryIntegrationTests.gradle | 0 29 files changed, 10 insertions(+), 3 deletions(-) rename spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/{test => dockerTest}/java/org/springframework/boot/gradle/tasks/bundling/BootBuildImageIntegrationTests.java (100%) rename spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/{test => dockerTest}/java/org/springframework/boot/gradle/tasks/bundling/BootBuildImageRegistryIntegrationTests.java (100%) rename spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/{test => dockerTest}/resources/org/springframework/boot/gradle/tasks/bundling/BootBuildImageIntegrationTests-buildsImageWithApplicationDirectory.gradle (100%) rename spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/{test => dockerTest}/resources/org/springframework/boot/gradle/tasks/bundling/BootBuildImageIntegrationTests-buildsImageWithBindCaches.gradle (100%) rename spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/{test => dockerTest}/resources/org/springframework/boot/gradle/tasks/bundling/BootBuildImageIntegrationTests-buildsImageWithBinding.gradle (100%) rename spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/{test => dockerTest}/resources/org/springframework/boot/gradle/tasks/bundling/BootBuildImageIntegrationTests-buildsImageWithBuildpackFromBuilder.gradle (100%) rename spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/{test => dockerTest}/resources/org/springframework/boot/gradle/tasks/bundling/BootBuildImageIntegrationTests-buildsImageWithBuildpackFromDirectory.gradle (100%) rename spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/{test => dockerTest}/resources/org/springframework/boot/gradle/tasks/bundling/BootBuildImageIntegrationTests-buildsImageWithBuildpackFromTarGzip.gradle (100%) rename spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/{test => dockerTest}/resources/org/springframework/boot/gradle/tasks/bundling/BootBuildImageIntegrationTests-buildsImageWithBuildpacksFromImages.gradle (100%) rename spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/{test => dockerTest}/resources/org/springframework/boot/gradle/tasks/bundling/BootBuildImageIntegrationTests-buildsImageWithCommandLineOptions.gradle (100%) rename spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/{test => dockerTest}/resources/org/springframework/boot/gradle/tasks/bundling/BootBuildImageIntegrationTests-buildsImageWithCreatedDate.gradle (100%) rename spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/{test => dockerTest}/resources/org/springframework/boot/gradle/tasks/bundling/BootBuildImageIntegrationTests-buildsImageWithCurrentCreatedDate.gradle (100%) rename spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/{test => dockerTest}/resources/org/springframework/boot/gradle/tasks/bundling/BootBuildImageIntegrationTests-buildsImageWithCustomBuilderAndRunImage.gradle (100%) rename spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/{test => dockerTest}/resources/org/springframework/boot/gradle/tasks/bundling/BootBuildImageIntegrationTests-buildsImageWithCustomName.gradle (100%) rename spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/{test => dockerTest}/resources/org/springframework/boot/gradle/tasks/bundling/BootBuildImageIntegrationTests-buildsImageWithEmptySecurityOptions.gradle (100%) rename spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/{test => dockerTest}/resources/org/springframework/boot/gradle/tasks/bundling/BootBuildImageIntegrationTests-buildsImageWithLaunchScript.gradle (100%) rename spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/{test => dockerTest}/resources/org/springframework/boot/gradle/tasks/bundling/BootBuildImageIntegrationTests-buildsImageWithNetworkModeNone.gradle (100%) rename spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/{test => dockerTest}/resources/org/springframework/boot/gradle/tasks/bundling/BootBuildImageIntegrationTests-buildsImageWithPullPolicy.gradle (100%) rename spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/{test => dockerTest}/resources/org/springframework/boot/gradle/tasks/bundling/BootBuildImageIntegrationTests-buildsImageWithTag.gradle (100%) rename spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/{test => dockerTest}/resources/org/springframework/boot/gradle/tasks/bundling/BootBuildImageIntegrationTests-buildsImageWithVolumeCaches.gradle (100%) rename spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/{test => dockerTest}/resources/org/springframework/boot/gradle/tasks/bundling/BootBuildImageIntegrationTests-buildsImageWithWarPackagingAndJarConfiguration.gradle (100%) rename spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/{test => dockerTest}/resources/org/springframework/boot/gradle/tasks/bundling/BootBuildImageIntegrationTests-failsWhenCachesAreConfiguredTwice.gradle (100%) rename spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/{test => dockerTest}/resources/org/springframework/boot/gradle/tasks/bundling/BootBuildImageIntegrationTests-failsWithBuilderError.gradle (100%) rename spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/{test => dockerTest}/resources/org/springframework/boot/gradle/tasks/bundling/BootBuildImageIntegrationTests-failsWithBuildpackNotInBuilder.gradle (100%) rename spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/{test => dockerTest}/resources/org/springframework/boot/gradle/tasks/bundling/BootBuildImageIntegrationTests-failsWithInvalidCreatedDate.gradle (100%) rename spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/{test => dockerTest}/resources/org/springframework/boot/gradle/tasks/bundling/BootBuildImageIntegrationTests-failsWithInvalidTag.gradle (100%) rename spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/{test => dockerTest}/resources/org/springframework/boot/gradle/tasks/bundling/BootBuildImageIntegrationTests.gradle (100%) rename spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/{test => dockerTest}/resources/org/springframework/boot/gradle/tasks/bundling/BootBuildImageRegistryIntegrationTests.gradle (100%) diff --git a/spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/build.gradle b/spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/build.gradle index 806778dd953..80b2fc9768d 100644 --- a/spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/build.gradle +++ b/spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/build.gradle @@ -3,6 +3,7 @@ plugins { id "maven-publish" id "org.asciidoctor.jvm.convert" id "org.springframework.boot.conventions" + id "org.springframework.boot.docker-test" id "org.springframework.boot.maven-repository" id "org.springframework.boot.optional-dependencies" } @@ -78,6 +79,14 @@ components.java.addVariantsFromConfiguration(configurations.modernGradleRuntimeE dependencies { asciidoctorExtensions("io.spring.asciidoctor:spring-asciidoctor-extensions-section-ids") + dockerTestImplementation(project(":spring-boot-project:spring-boot-tools:spring-boot-gradle-test-support")) + dockerTestImplementation(project(":spring-boot-project:spring-boot-tools:spring-boot-test-support")) + dockerTestImplementation(gradleTestKit()) + dockerTestImplementation("org.assertj:assertj-core") + dockerTestImplementation("org.junit.jupiter:junit-jupiter") + dockerTestImplementation("org.testcontainers:junit-jupiter") + dockerTestImplementation("org.testcontainers:testcontainers") + implementation(project(":spring-boot-project:spring-boot-tools:spring-boot-buildpack-platform")) implementation(project(":spring-boot-project:spring-boot-tools:spring-boot-loader-tools")) implementation("io.spring.gradle:dependency-management-plugin") @@ -89,14 +98,12 @@ dependencies { exclude(group: "commons-logging", module: "commons-logging") } - testImplementation(project(":spring-boot-project:spring-boot-tools:spring-boot-test-support")) testImplementation(project(":spring-boot-project:spring-boot-tools:spring-boot-gradle-test-support")) + testImplementation(project(":spring-boot-project:spring-boot-tools:spring-boot-test-support")) testImplementation("com.tngtech.archunit:archunit-junit5:0.22.0") testImplementation("org.assertj:assertj-core") testImplementation("org.junit.jupiter:junit-jupiter") testImplementation("org.mockito:mockito-core") - testImplementation("org.testcontainers:junit-jupiter") - testImplementation("org.testcontainers:testcontainers") } gradlePlugin { diff --git a/spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/test/java/org/springframework/boot/gradle/tasks/bundling/BootBuildImageIntegrationTests.java b/spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/dockerTest/java/org/springframework/boot/gradle/tasks/bundling/BootBuildImageIntegrationTests.java similarity index 100% rename from spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/test/java/org/springframework/boot/gradle/tasks/bundling/BootBuildImageIntegrationTests.java rename to spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/dockerTest/java/org/springframework/boot/gradle/tasks/bundling/BootBuildImageIntegrationTests.java diff --git a/spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/test/java/org/springframework/boot/gradle/tasks/bundling/BootBuildImageRegistryIntegrationTests.java b/spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/dockerTest/java/org/springframework/boot/gradle/tasks/bundling/BootBuildImageRegistryIntegrationTests.java similarity index 100% rename from spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/test/java/org/springframework/boot/gradle/tasks/bundling/BootBuildImageRegistryIntegrationTests.java rename to spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/dockerTest/java/org/springframework/boot/gradle/tasks/bundling/BootBuildImageRegistryIntegrationTests.java diff --git a/spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/test/resources/org/springframework/boot/gradle/tasks/bundling/BootBuildImageIntegrationTests-buildsImageWithApplicationDirectory.gradle b/spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/dockerTest/resources/org/springframework/boot/gradle/tasks/bundling/BootBuildImageIntegrationTests-buildsImageWithApplicationDirectory.gradle similarity index 100% rename from spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/test/resources/org/springframework/boot/gradle/tasks/bundling/BootBuildImageIntegrationTests-buildsImageWithApplicationDirectory.gradle rename to spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/dockerTest/resources/org/springframework/boot/gradle/tasks/bundling/BootBuildImageIntegrationTests-buildsImageWithApplicationDirectory.gradle diff --git a/spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/test/resources/org/springframework/boot/gradle/tasks/bundling/BootBuildImageIntegrationTests-buildsImageWithBindCaches.gradle b/spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/dockerTest/resources/org/springframework/boot/gradle/tasks/bundling/BootBuildImageIntegrationTests-buildsImageWithBindCaches.gradle similarity index 100% rename from spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/test/resources/org/springframework/boot/gradle/tasks/bundling/BootBuildImageIntegrationTests-buildsImageWithBindCaches.gradle rename to spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/dockerTest/resources/org/springframework/boot/gradle/tasks/bundling/BootBuildImageIntegrationTests-buildsImageWithBindCaches.gradle diff --git a/spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/test/resources/org/springframework/boot/gradle/tasks/bundling/BootBuildImageIntegrationTests-buildsImageWithBinding.gradle b/spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/dockerTest/resources/org/springframework/boot/gradle/tasks/bundling/BootBuildImageIntegrationTests-buildsImageWithBinding.gradle similarity index 100% rename from spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/test/resources/org/springframework/boot/gradle/tasks/bundling/BootBuildImageIntegrationTests-buildsImageWithBinding.gradle rename to spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/dockerTest/resources/org/springframework/boot/gradle/tasks/bundling/BootBuildImageIntegrationTests-buildsImageWithBinding.gradle diff --git a/spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/test/resources/org/springframework/boot/gradle/tasks/bundling/BootBuildImageIntegrationTests-buildsImageWithBuildpackFromBuilder.gradle b/spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/dockerTest/resources/org/springframework/boot/gradle/tasks/bundling/BootBuildImageIntegrationTests-buildsImageWithBuildpackFromBuilder.gradle similarity index 100% rename from spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/test/resources/org/springframework/boot/gradle/tasks/bundling/BootBuildImageIntegrationTests-buildsImageWithBuildpackFromBuilder.gradle rename to spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/dockerTest/resources/org/springframework/boot/gradle/tasks/bundling/BootBuildImageIntegrationTests-buildsImageWithBuildpackFromBuilder.gradle diff --git a/spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/test/resources/org/springframework/boot/gradle/tasks/bundling/BootBuildImageIntegrationTests-buildsImageWithBuildpackFromDirectory.gradle b/spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/dockerTest/resources/org/springframework/boot/gradle/tasks/bundling/BootBuildImageIntegrationTests-buildsImageWithBuildpackFromDirectory.gradle similarity index 100% rename from spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/test/resources/org/springframework/boot/gradle/tasks/bundling/BootBuildImageIntegrationTests-buildsImageWithBuildpackFromDirectory.gradle rename to spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/dockerTest/resources/org/springframework/boot/gradle/tasks/bundling/BootBuildImageIntegrationTests-buildsImageWithBuildpackFromDirectory.gradle diff --git a/spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/test/resources/org/springframework/boot/gradle/tasks/bundling/BootBuildImageIntegrationTests-buildsImageWithBuildpackFromTarGzip.gradle b/spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/dockerTest/resources/org/springframework/boot/gradle/tasks/bundling/BootBuildImageIntegrationTests-buildsImageWithBuildpackFromTarGzip.gradle similarity index 100% rename from spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/test/resources/org/springframework/boot/gradle/tasks/bundling/BootBuildImageIntegrationTests-buildsImageWithBuildpackFromTarGzip.gradle rename to spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/dockerTest/resources/org/springframework/boot/gradle/tasks/bundling/BootBuildImageIntegrationTests-buildsImageWithBuildpackFromTarGzip.gradle diff --git a/spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/test/resources/org/springframework/boot/gradle/tasks/bundling/BootBuildImageIntegrationTests-buildsImageWithBuildpacksFromImages.gradle b/spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/dockerTest/resources/org/springframework/boot/gradle/tasks/bundling/BootBuildImageIntegrationTests-buildsImageWithBuildpacksFromImages.gradle similarity index 100% rename from spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/test/resources/org/springframework/boot/gradle/tasks/bundling/BootBuildImageIntegrationTests-buildsImageWithBuildpacksFromImages.gradle rename to spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/dockerTest/resources/org/springframework/boot/gradle/tasks/bundling/BootBuildImageIntegrationTests-buildsImageWithBuildpacksFromImages.gradle diff --git a/spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/test/resources/org/springframework/boot/gradle/tasks/bundling/BootBuildImageIntegrationTests-buildsImageWithCommandLineOptions.gradle b/spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/dockerTest/resources/org/springframework/boot/gradle/tasks/bundling/BootBuildImageIntegrationTests-buildsImageWithCommandLineOptions.gradle similarity index 100% rename from spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/test/resources/org/springframework/boot/gradle/tasks/bundling/BootBuildImageIntegrationTests-buildsImageWithCommandLineOptions.gradle rename to spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/dockerTest/resources/org/springframework/boot/gradle/tasks/bundling/BootBuildImageIntegrationTests-buildsImageWithCommandLineOptions.gradle diff --git a/spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/test/resources/org/springframework/boot/gradle/tasks/bundling/BootBuildImageIntegrationTests-buildsImageWithCreatedDate.gradle b/spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/dockerTest/resources/org/springframework/boot/gradle/tasks/bundling/BootBuildImageIntegrationTests-buildsImageWithCreatedDate.gradle similarity index 100% rename from spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/test/resources/org/springframework/boot/gradle/tasks/bundling/BootBuildImageIntegrationTests-buildsImageWithCreatedDate.gradle rename to spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/dockerTest/resources/org/springframework/boot/gradle/tasks/bundling/BootBuildImageIntegrationTests-buildsImageWithCreatedDate.gradle diff --git a/spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/test/resources/org/springframework/boot/gradle/tasks/bundling/BootBuildImageIntegrationTests-buildsImageWithCurrentCreatedDate.gradle b/spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/dockerTest/resources/org/springframework/boot/gradle/tasks/bundling/BootBuildImageIntegrationTests-buildsImageWithCurrentCreatedDate.gradle similarity index 100% rename from spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/test/resources/org/springframework/boot/gradle/tasks/bundling/BootBuildImageIntegrationTests-buildsImageWithCurrentCreatedDate.gradle rename to spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/dockerTest/resources/org/springframework/boot/gradle/tasks/bundling/BootBuildImageIntegrationTests-buildsImageWithCurrentCreatedDate.gradle diff --git a/spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/test/resources/org/springframework/boot/gradle/tasks/bundling/BootBuildImageIntegrationTests-buildsImageWithCustomBuilderAndRunImage.gradle b/spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/dockerTest/resources/org/springframework/boot/gradle/tasks/bundling/BootBuildImageIntegrationTests-buildsImageWithCustomBuilderAndRunImage.gradle similarity index 100% rename from spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/test/resources/org/springframework/boot/gradle/tasks/bundling/BootBuildImageIntegrationTests-buildsImageWithCustomBuilderAndRunImage.gradle rename to spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/dockerTest/resources/org/springframework/boot/gradle/tasks/bundling/BootBuildImageIntegrationTests-buildsImageWithCustomBuilderAndRunImage.gradle diff --git a/spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/test/resources/org/springframework/boot/gradle/tasks/bundling/BootBuildImageIntegrationTests-buildsImageWithCustomName.gradle b/spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/dockerTest/resources/org/springframework/boot/gradle/tasks/bundling/BootBuildImageIntegrationTests-buildsImageWithCustomName.gradle similarity index 100% rename from spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/test/resources/org/springframework/boot/gradle/tasks/bundling/BootBuildImageIntegrationTests-buildsImageWithCustomName.gradle rename to spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/dockerTest/resources/org/springframework/boot/gradle/tasks/bundling/BootBuildImageIntegrationTests-buildsImageWithCustomName.gradle diff --git a/spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/test/resources/org/springframework/boot/gradle/tasks/bundling/BootBuildImageIntegrationTests-buildsImageWithEmptySecurityOptions.gradle b/spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/dockerTest/resources/org/springframework/boot/gradle/tasks/bundling/BootBuildImageIntegrationTests-buildsImageWithEmptySecurityOptions.gradle similarity index 100% rename from spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/test/resources/org/springframework/boot/gradle/tasks/bundling/BootBuildImageIntegrationTests-buildsImageWithEmptySecurityOptions.gradle rename to spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/dockerTest/resources/org/springframework/boot/gradle/tasks/bundling/BootBuildImageIntegrationTests-buildsImageWithEmptySecurityOptions.gradle diff --git a/spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/test/resources/org/springframework/boot/gradle/tasks/bundling/BootBuildImageIntegrationTests-buildsImageWithLaunchScript.gradle b/spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/dockerTest/resources/org/springframework/boot/gradle/tasks/bundling/BootBuildImageIntegrationTests-buildsImageWithLaunchScript.gradle similarity index 100% rename from spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/test/resources/org/springframework/boot/gradle/tasks/bundling/BootBuildImageIntegrationTests-buildsImageWithLaunchScript.gradle rename to spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/dockerTest/resources/org/springframework/boot/gradle/tasks/bundling/BootBuildImageIntegrationTests-buildsImageWithLaunchScript.gradle diff --git a/spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/test/resources/org/springframework/boot/gradle/tasks/bundling/BootBuildImageIntegrationTests-buildsImageWithNetworkModeNone.gradle b/spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/dockerTest/resources/org/springframework/boot/gradle/tasks/bundling/BootBuildImageIntegrationTests-buildsImageWithNetworkModeNone.gradle similarity index 100% rename from spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/test/resources/org/springframework/boot/gradle/tasks/bundling/BootBuildImageIntegrationTests-buildsImageWithNetworkModeNone.gradle rename to spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/dockerTest/resources/org/springframework/boot/gradle/tasks/bundling/BootBuildImageIntegrationTests-buildsImageWithNetworkModeNone.gradle diff --git a/spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/test/resources/org/springframework/boot/gradle/tasks/bundling/BootBuildImageIntegrationTests-buildsImageWithPullPolicy.gradle b/spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/dockerTest/resources/org/springframework/boot/gradle/tasks/bundling/BootBuildImageIntegrationTests-buildsImageWithPullPolicy.gradle similarity index 100% rename from spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/test/resources/org/springframework/boot/gradle/tasks/bundling/BootBuildImageIntegrationTests-buildsImageWithPullPolicy.gradle rename to spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/dockerTest/resources/org/springframework/boot/gradle/tasks/bundling/BootBuildImageIntegrationTests-buildsImageWithPullPolicy.gradle diff --git a/spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/test/resources/org/springframework/boot/gradle/tasks/bundling/BootBuildImageIntegrationTests-buildsImageWithTag.gradle b/spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/dockerTest/resources/org/springframework/boot/gradle/tasks/bundling/BootBuildImageIntegrationTests-buildsImageWithTag.gradle similarity index 100% rename from spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/test/resources/org/springframework/boot/gradle/tasks/bundling/BootBuildImageIntegrationTests-buildsImageWithTag.gradle rename to spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/dockerTest/resources/org/springframework/boot/gradle/tasks/bundling/BootBuildImageIntegrationTests-buildsImageWithTag.gradle diff --git a/spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/test/resources/org/springframework/boot/gradle/tasks/bundling/BootBuildImageIntegrationTests-buildsImageWithVolumeCaches.gradle b/spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/dockerTest/resources/org/springframework/boot/gradle/tasks/bundling/BootBuildImageIntegrationTests-buildsImageWithVolumeCaches.gradle similarity index 100% rename from spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/test/resources/org/springframework/boot/gradle/tasks/bundling/BootBuildImageIntegrationTests-buildsImageWithVolumeCaches.gradle rename to spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/dockerTest/resources/org/springframework/boot/gradle/tasks/bundling/BootBuildImageIntegrationTests-buildsImageWithVolumeCaches.gradle diff --git a/spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/test/resources/org/springframework/boot/gradle/tasks/bundling/BootBuildImageIntegrationTests-buildsImageWithWarPackagingAndJarConfiguration.gradle b/spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/dockerTest/resources/org/springframework/boot/gradle/tasks/bundling/BootBuildImageIntegrationTests-buildsImageWithWarPackagingAndJarConfiguration.gradle similarity index 100% rename from spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/test/resources/org/springframework/boot/gradle/tasks/bundling/BootBuildImageIntegrationTests-buildsImageWithWarPackagingAndJarConfiguration.gradle rename to spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/dockerTest/resources/org/springframework/boot/gradle/tasks/bundling/BootBuildImageIntegrationTests-buildsImageWithWarPackagingAndJarConfiguration.gradle diff --git a/spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/test/resources/org/springframework/boot/gradle/tasks/bundling/BootBuildImageIntegrationTests-failsWhenCachesAreConfiguredTwice.gradle b/spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/dockerTest/resources/org/springframework/boot/gradle/tasks/bundling/BootBuildImageIntegrationTests-failsWhenCachesAreConfiguredTwice.gradle similarity index 100% rename from spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/test/resources/org/springframework/boot/gradle/tasks/bundling/BootBuildImageIntegrationTests-failsWhenCachesAreConfiguredTwice.gradle rename to spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/dockerTest/resources/org/springframework/boot/gradle/tasks/bundling/BootBuildImageIntegrationTests-failsWhenCachesAreConfiguredTwice.gradle diff --git a/spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/test/resources/org/springframework/boot/gradle/tasks/bundling/BootBuildImageIntegrationTests-failsWithBuilderError.gradle b/spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/dockerTest/resources/org/springframework/boot/gradle/tasks/bundling/BootBuildImageIntegrationTests-failsWithBuilderError.gradle similarity index 100% rename from spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/test/resources/org/springframework/boot/gradle/tasks/bundling/BootBuildImageIntegrationTests-failsWithBuilderError.gradle rename to spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/dockerTest/resources/org/springframework/boot/gradle/tasks/bundling/BootBuildImageIntegrationTests-failsWithBuilderError.gradle diff --git a/spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/test/resources/org/springframework/boot/gradle/tasks/bundling/BootBuildImageIntegrationTests-failsWithBuildpackNotInBuilder.gradle b/spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/dockerTest/resources/org/springframework/boot/gradle/tasks/bundling/BootBuildImageIntegrationTests-failsWithBuildpackNotInBuilder.gradle similarity index 100% rename from spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/test/resources/org/springframework/boot/gradle/tasks/bundling/BootBuildImageIntegrationTests-failsWithBuildpackNotInBuilder.gradle rename to spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/dockerTest/resources/org/springframework/boot/gradle/tasks/bundling/BootBuildImageIntegrationTests-failsWithBuildpackNotInBuilder.gradle diff --git a/spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/test/resources/org/springframework/boot/gradle/tasks/bundling/BootBuildImageIntegrationTests-failsWithInvalidCreatedDate.gradle b/spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/dockerTest/resources/org/springframework/boot/gradle/tasks/bundling/BootBuildImageIntegrationTests-failsWithInvalidCreatedDate.gradle similarity index 100% rename from spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/test/resources/org/springframework/boot/gradle/tasks/bundling/BootBuildImageIntegrationTests-failsWithInvalidCreatedDate.gradle rename to spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/dockerTest/resources/org/springframework/boot/gradle/tasks/bundling/BootBuildImageIntegrationTests-failsWithInvalidCreatedDate.gradle diff --git a/spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/test/resources/org/springframework/boot/gradle/tasks/bundling/BootBuildImageIntegrationTests-failsWithInvalidTag.gradle b/spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/dockerTest/resources/org/springframework/boot/gradle/tasks/bundling/BootBuildImageIntegrationTests-failsWithInvalidTag.gradle similarity index 100% rename from spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/test/resources/org/springframework/boot/gradle/tasks/bundling/BootBuildImageIntegrationTests-failsWithInvalidTag.gradle rename to spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/dockerTest/resources/org/springframework/boot/gradle/tasks/bundling/BootBuildImageIntegrationTests-failsWithInvalidTag.gradle diff --git a/spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/test/resources/org/springframework/boot/gradle/tasks/bundling/BootBuildImageIntegrationTests.gradle b/spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/dockerTest/resources/org/springframework/boot/gradle/tasks/bundling/BootBuildImageIntegrationTests.gradle similarity index 100% rename from spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/test/resources/org/springframework/boot/gradle/tasks/bundling/BootBuildImageIntegrationTests.gradle rename to spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/dockerTest/resources/org/springframework/boot/gradle/tasks/bundling/BootBuildImageIntegrationTests.gradle diff --git a/spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/test/resources/org/springframework/boot/gradle/tasks/bundling/BootBuildImageRegistryIntegrationTests.gradle b/spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/dockerTest/resources/org/springframework/boot/gradle/tasks/bundling/BootBuildImageRegistryIntegrationTests.gradle similarity index 100% rename from spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/test/resources/org/springframework/boot/gradle/tasks/bundling/BootBuildImageRegistryIntegrationTests.gradle rename to spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/dockerTest/resources/org/springframework/boot/gradle/tasks/bundling/BootBuildImageRegistryIntegrationTests.gradle From 89a06608d2998a7d22882022ffd60dee18998530 Mon Sep 17 00:00:00 2001 From: Andy Wilkinson Date: Tue, 25 Jun 2024 16:28:33 +0100 Subject: [PATCH 09/28] Update spring-boot-maven-plugin to use docker-test plugin See gh-41228 --- .../spring-boot-maven-plugin/build.gradle | 19 +++++- .../BuildImageRegistryIntegrationTests.java | 2 +- .../boot/maven/BuildImageTests.java | 58 +++++++++---------- .../projects/build-image-app-dir/pom.xml | 0 .../main/java/org/test/SampleApplication.java | 0 .../build-image-bad-buildpack/pom.xml | 0 .../main/java/org/test/SampleApplication.java | 0 .../projects/build-image-bind-caches/pom.xml | 0 .../main/java/org/test/SampleApplication.java | 0 .../bindings/ca-certificates/test.crt | 0 .../bindings/ca-certificates/type | 0 .../projects/build-image-bindings/pom.xml | 0 .../main/java/org/test/SampleApplication.java | 0 .../build-image-builder-error/pom.xml | 0 .../main/java/org/test/SampleApplication.java | 0 .../build-image-caches-multiple/pom.xml | 0 .../main/java/org/test/SampleApplication.java | 0 .../pom.xml | 0 .../main/java/org/test/SampleApplication.java | 0 .../build-image-classifier-source/pom.xml | 0 .../main/java/org/test/SampleApplication.java | 0 .../pom.xml | 0 .../main/java/org/test/SampleApplication.java | 0 .../projects/build-image-classifier/pom.xml | 0 .../main/java/org/test/SampleApplication.java | 0 .../projects/build-image-cmd-line/pom.xml | 0 .../main/java/org/test/SampleApplication.java | 0 .../projects/build-image-created-date/pom.xml | 0 .../main/java/org/test/SampleApplication.java | 0 .../build-image-current-created-date/pom.xml | 0 .../main/java/org/test/SampleApplication.java | 0 .../build-image-custom-builder/pom.xml | 0 .../main/java/org/test/SampleApplication.java | 0 .../build-image-custom-buildpacks/pom.xml | 0 .../main/java/org/test/SampleApplication.java | 0 .../projects/build-image-custom-name/pom.xml | 0 .../main/java/org/test/SampleApplication.java | 0 .../build-image-empty-env-entry/pom.xml | 0 .../main/java/org/test/SampleApplication.java | 0 .../projects/build-image-final-name/pom.xml | 0 .../main/java/org/test/SampleApplication.java | 0 .../build-image-multi-module/app/pom.xml | 0 .../main/java/org/test/SampleApplication.java | 0 .../build-image-multi-module/library/pom.xml | 0 .../src/main/java/org/test/SampleLibrary.java | 0 .../projects/build-image-multi-module/pom.xml | 0 .../projects/build-image-network/pom.xml | 0 .../main/java/org/test/SampleApplication.java | 0 .../projects/build-image-publish/pom.xml | 0 .../main/java/org/test/SampleApplication.java | 0 .../build-image-security-opts/pom.xml | 0 .../main/java/org/test/SampleApplication.java | 0 .../projects/build-image-tags/pom.xml | 0 .../main/java/org/test/SampleApplication.java | 0 .../build-image-volume-caches/pom.xml | 0 .../main/java/org/test/SampleApplication.java | 0 .../build-image-war-packaging/pom.xml | 0 .../main/java/org/test/SampleApplication.java | 0 .../build-image-with-repackage/pom.xml | 0 .../main/java/org/test/SampleApplication.java | 0 .../build-image-zip-packaging/pom.xml | 0 .../main/java/org/test/SampleApplication.java | 0 .../projects/build-image/pom.xml | 0 .../main/java/org/test/SampleApplication.java | 0 .../maven/EclipseM2eIntegrationTests.java | 4 +- .../boot/maven/MavenBuild.java | 8 ++- 66 files changed, 55 insertions(+), 36 deletions(-) rename spring-boot-project/spring-boot-tools/spring-boot-maven-plugin/src/{intTest => dockerTest}/java/org/springframework/boot/maven/BuildImageRegistryIntegrationTests.java (98%) rename spring-boot-project/spring-boot-tools/spring-boot-maven-plugin/src/{intTest => dockerTest}/java/org/springframework/boot/maven/BuildImageTests.java (92%) rename spring-boot-project/spring-boot-tools/spring-boot-maven-plugin/src/{intTest => dockerTest}/projects/build-image-app-dir/pom.xml (100%) rename spring-boot-project/spring-boot-tools/spring-boot-maven-plugin/src/{intTest => dockerTest}/projects/build-image-app-dir/src/main/java/org/test/SampleApplication.java (100%) rename spring-boot-project/spring-boot-tools/spring-boot-maven-plugin/src/{intTest => dockerTest}/projects/build-image-bad-buildpack/pom.xml (100%) rename spring-boot-project/spring-boot-tools/spring-boot-maven-plugin/src/{intTest => dockerTest}/projects/build-image-bad-buildpack/src/main/java/org/test/SampleApplication.java (100%) rename spring-boot-project/spring-boot-tools/spring-boot-maven-plugin/src/{intTest => dockerTest}/projects/build-image-bind-caches/pom.xml (100%) rename spring-boot-project/spring-boot-tools/spring-boot-maven-plugin/src/{intTest => dockerTest}/projects/build-image-bind-caches/src/main/java/org/test/SampleApplication.java (100%) rename spring-boot-project/spring-boot-tools/spring-boot-maven-plugin/src/{intTest => dockerTest}/projects/build-image-bindings/bindings/ca-certificates/test.crt (100%) rename spring-boot-project/spring-boot-tools/spring-boot-maven-plugin/src/{intTest => dockerTest}/projects/build-image-bindings/bindings/ca-certificates/type (100%) rename spring-boot-project/spring-boot-tools/spring-boot-maven-plugin/src/{intTest => dockerTest}/projects/build-image-bindings/pom.xml (100%) rename spring-boot-project/spring-boot-tools/spring-boot-maven-plugin/src/{intTest => dockerTest}/projects/build-image-bindings/src/main/java/org/test/SampleApplication.java (100%) rename spring-boot-project/spring-boot-tools/spring-boot-maven-plugin/src/{intTest => dockerTest}/projects/build-image-builder-error/pom.xml (100%) rename spring-boot-project/spring-boot-tools/spring-boot-maven-plugin/src/{intTest => dockerTest}/projects/build-image-builder-error/src/main/java/org/test/SampleApplication.java (100%) rename spring-boot-project/spring-boot-tools/spring-boot-maven-plugin/src/{intTest => dockerTest}/projects/build-image-caches-multiple/pom.xml (100%) rename spring-boot-project/spring-boot-tools/spring-boot-maven-plugin/src/{intTest => dockerTest}/projects/build-image-caches-multiple/src/main/java/org/test/SampleApplication.java (100%) rename spring-boot-project/spring-boot-tools/spring-boot-maven-plugin/src/{intTest => dockerTest}/projects/build-image-classifier-source-with-repackage/pom.xml (100%) rename spring-boot-project/spring-boot-tools/spring-boot-maven-plugin/src/{intTest => dockerTest}/projects/build-image-classifier-source-with-repackage/src/main/java/org/test/SampleApplication.java (100%) rename spring-boot-project/spring-boot-tools/spring-boot-maven-plugin/src/{intTest => dockerTest}/projects/build-image-classifier-source/pom.xml (100%) rename spring-boot-project/spring-boot-tools/spring-boot-maven-plugin/src/{intTest => dockerTest}/projects/build-image-classifier-source/src/main/java/org/test/SampleApplication.java (100%) rename spring-boot-project/spring-boot-tools/spring-boot-maven-plugin/src/{intTest => dockerTest}/projects/build-image-classifier-with-repackage/pom.xml (100%) rename spring-boot-project/spring-boot-tools/spring-boot-maven-plugin/src/{intTest => dockerTest}/projects/build-image-classifier-with-repackage/src/main/java/org/test/SampleApplication.java (100%) rename spring-boot-project/spring-boot-tools/spring-boot-maven-plugin/src/{intTest => dockerTest}/projects/build-image-classifier/pom.xml (100%) rename spring-boot-project/spring-boot-tools/spring-boot-maven-plugin/src/{intTest => dockerTest}/projects/build-image-classifier/src/main/java/org/test/SampleApplication.java (100%) rename spring-boot-project/spring-boot-tools/spring-boot-maven-plugin/src/{intTest => dockerTest}/projects/build-image-cmd-line/pom.xml (100%) rename spring-boot-project/spring-boot-tools/spring-boot-maven-plugin/src/{intTest => dockerTest}/projects/build-image-cmd-line/src/main/java/org/test/SampleApplication.java (100%) rename spring-boot-project/spring-boot-tools/spring-boot-maven-plugin/src/{intTest => dockerTest}/projects/build-image-created-date/pom.xml (100%) rename spring-boot-project/spring-boot-tools/spring-boot-maven-plugin/src/{intTest => dockerTest}/projects/build-image-created-date/src/main/java/org/test/SampleApplication.java (100%) rename spring-boot-project/spring-boot-tools/spring-boot-maven-plugin/src/{intTest => dockerTest}/projects/build-image-current-created-date/pom.xml (100%) rename spring-boot-project/spring-boot-tools/spring-boot-maven-plugin/src/{intTest => dockerTest}/projects/build-image-current-created-date/src/main/java/org/test/SampleApplication.java (100%) rename spring-boot-project/spring-boot-tools/spring-boot-maven-plugin/src/{intTest => dockerTest}/projects/build-image-custom-builder/pom.xml (100%) rename spring-boot-project/spring-boot-tools/spring-boot-maven-plugin/src/{intTest => dockerTest}/projects/build-image-custom-builder/src/main/java/org/test/SampleApplication.java (100%) rename spring-boot-project/spring-boot-tools/spring-boot-maven-plugin/src/{intTest => dockerTest}/projects/build-image-custom-buildpacks/pom.xml (100%) rename spring-boot-project/spring-boot-tools/spring-boot-maven-plugin/src/{intTest => dockerTest}/projects/build-image-custom-buildpacks/src/main/java/org/test/SampleApplication.java (100%) rename spring-boot-project/spring-boot-tools/spring-boot-maven-plugin/src/{intTest => dockerTest}/projects/build-image-custom-name/pom.xml (100%) rename spring-boot-project/spring-boot-tools/spring-boot-maven-plugin/src/{intTest => dockerTest}/projects/build-image-custom-name/src/main/java/org/test/SampleApplication.java (100%) rename spring-boot-project/spring-boot-tools/spring-boot-maven-plugin/src/{intTest => dockerTest}/projects/build-image-empty-env-entry/pom.xml (100%) rename spring-boot-project/spring-boot-tools/spring-boot-maven-plugin/src/{intTest => dockerTest}/projects/build-image-empty-env-entry/src/main/java/org/test/SampleApplication.java (100%) rename spring-boot-project/spring-boot-tools/spring-boot-maven-plugin/src/{intTest => dockerTest}/projects/build-image-final-name/pom.xml (100%) rename spring-boot-project/spring-boot-tools/spring-boot-maven-plugin/src/{intTest => dockerTest}/projects/build-image-final-name/src/main/java/org/test/SampleApplication.java (100%) rename spring-boot-project/spring-boot-tools/spring-boot-maven-plugin/src/{intTest => dockerTest}/projects/build-image-multi-module/app/pom.xml (100%) rename spring-boot-project/spring-boot-tools/spring-boot-maven-plugin/src/{intTest => dockerTest}/projects/build-image-multi-module/app/src/main/java/org/test/SampleApplication.java (100%) rename spring-boot-project/spring-boot-tools/spring-boot-maven-plugin/src/{intTest => dockerTest}/projects/build-image-multi-module/library/pom.xml (100%) rename spring-boot-project/spring-boot-tools/spring-boot-maven-plugin/src/{intTest => dockerTest}/projects/build-image-multi-module/library/src/main/java/org/test/SampleLibrary.java (100%) rename spring-boot-project/spring-boot-tools/spring-boot-maven-plugin/src/{intTest => dockerTest}/projects/build-image-multi-module/pom.xml (100%) rename spring-boot-project/spring-boot-tools/spring-boot-maven-plugin/src/{intTest => dockerTest}/projects/build-image-network/pom.xml (100%) rename spring-boot-project/spring-boot-tools/spring-boot-maven-plugin/src/{intTest => dockerTest}/projects/build-image-network/src/main/java/org/test/SampleApplication.java (100%) rename spring-boot-project/spring-boot-tools/spring-boot-maven-plugin/src/{intTest => dockerTest}/projects/build-image-publish/pom.xml (100%) rename spring-boot-project/spring-boot-tools/spring-boot-maven-plugin/src/{intTest => dockerTest}/projects/build-image-publish/src/main/java/org/test/SampleApplication.java (100%) rename spring-boot-project/spring-boot-tools/spring-boot-maven-plugin/src/{intTest => dockerTest}/projects/build-image-security-opts/pom.xml (100%) rename spring-boot-project/spring-boot-tools/spring-boot-maven-plugin/src/{intTest => dockerTest}/projects/build-image-security-opts/src/main/java/org/test/SampleApplication.java (100%) rename spring-boot-project/spring-boot-tools/spring-boot-maven-plugin/src/{intTest => dockerTest}/projects/build-image-tags/pom.xml (100%) rename spring-boot-project/spring-boot-tools/spring-boot-maven-plugin/src/{intTest => dockerTest}/projects/build-image-tags/src/main/java/org/test/SampleApplication.java (100%) rename spring-boot-project/spring-boot-tools/spring-boot-maven-plugin/src/{intTest => dockerTest}/projects/build-image-volume-caches/pom.xml (100%) rename spring-boot-project/spring-boot-tools/spring-boot-maven-plugin/src/{intTest => dockerTest}/projects/build-image-volume-caches/src/main/java/org/test/SampleApplication.java (100%) rename spring-boot-project/spring-boot-tools/spring-boot-maven-plugin/src/{intTest => dockerTest}/projects/build-image-war-packaging/pom.xml (100%) rename spring-boot-project/spring-boot-tools/spring-boot-maven-plugin/src/{intTest => dockerTest}/projects/build-image-war-packaging/src/main/java/org/test/SampleApplication.java (100%) rename spring-boot-project/spring-boot-tools/spring-boot-maven-plugin/src/{intTest => dockerTest}/projects/build-image-with-repackage/pom.xml (100%) rename spring-boot-project/spring-boot-tools/spring-boot-maven-plugin/src/{intTest => dockerTest}/projects/build-image-with-repackage/src/main/java/org/test/SampleApplication.java (100%) rename spring-boot-project/spring-boot-tools/spring-boot-maven-plugin/src/{intTest => dockerTest}/projects/build-image-zip-packaging/pom.xml (100%) rename spring-boot-project/spring-boot-tools/spring-boot-maven-plugin/src/{intTest => dockerTest}/projects/build-image-zip-packaging/src/main/java/org/test/SampleApplication.java (100%) rename spring-boot-project/spring-boot-tools/spring-boot-maven-plugin/src/{intTest => dockerTest}/projects/build-image/pom.xml (100%) rename spring-boot-project/spring-boot-tools/spring-boot-maven-plugin/src/{intTest => dockerTest}/projects/build-image/src/main/java/org/test/SampleApplication.java (100%) 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 054d0ccb4fa..bc37953443f 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 @@ -3,6 +3,7 @@ plugins { id "org.springframework.boot.conventions" id "org.springframework.boot.maven-plugin" id "org.springframework.boot.optional-dependencies" + id "org.springframework.boot.docker-test" } description = "Spring Boot Maven Plugin" @@ -25,6 +26,15 @@ dependencies { exclude(group: "javax.enterprise", module: "cdi-api") exclude(group: "javax.inject", module: "javax.inject") } + + dockerTestImplementation(project(":spring-boot-project:spring-boot-tools:spring-boot-test-support")) + dockerTestImplementation("org.apache.maven.shared:maven-invoker") { + exclude(group: "javax.inject", module: "javax.inject") + } + dockerTestImplementation("org.assertj:assertj-core") + dockerTestImplementation("org.junit.jupiter:junit-jupiter") + dockerTestImplementation("org.testcontainers:junit-jupiter") + dockerTestImplementation("org.testcontainers:testcontainers") implementation(project(":spring-boot-project:spring-boot-tools:spring-boot-buildpack-platform")) implementation(project(":spring-boot-project:spring-boot-tools:spring-boot-loader-tools")) @@ -47,8 +57,6 @@ dependencies { } intTestImplementation("org.assertj:assertj-core") intTestImplementation("org.junit.jupiter:junit-jupiter") - intTestImplementation("org.testcontainers:testcontainers") - intTestImplementation("org.testcontainers:junit-jupiter") mavenOptionalImplementation("org.apache.maven.plugins:maven-shade-plugin") { exclude(group: "javax.annotation", module: "javax.annotation-api") @@ -97,6 +105,9 @@ sourceSets { intTest { output.dir("${buildDir}/generated-resources", builtBy: "extractVersionProperties") } + dockerTest { + output.dir("${buildDir}/generated-resources", builtBy: "extractVersionProperties") + } } tasks.withType(org.asciidoctor.gradle.jvm.AbstractAsciidoctorTask) { @@ -180,3 +191,7 @@ tasks.named("documentPluginGoals") { "test-run": "run" ] } + +tasks.named("dockerTest").configure { + dependsOn tasks.named("prepareMavenBinaries") +} diff --git a/spring-boot-project/spring-boot-tools/spring-boot-maven-plugin/src/intTest/java/org/springframework/boot/maven/BuildImageRegistryIntegrationTests.java b/spring-boot-project/spring-boot-tools/spring-boot-maven-plugin/src/dockerTest/java/org/springframework/boot/maven/BuildImageRegistryIntegrationTests.java similarity index 98% rename from spring-boot-project/spring-boot-tools/spring-boot-maven-plugin/src/intTest/java/org/springframework/boot/maven/BuildImageRegistryIntegrationTests.java rename to spring-boot-project/spring-boot-tools/spring-boot-maven-plugin/src/dockerTest/java/org/springframework/boot/maven/BuildImageRegistryIntegrationTests.java index 2be9bba79b0..707462346e5 100644 --- a/spring-boot-project/spring-boot-tools/spring-boot-maven-plugin/src/intTest/java/org/springframework/boot/maven/BuildImageRegistryIntegrationTests.java +++ b/spring-boot-project/spring-boot-tools/spring-boot-maven-plugin/src/dockerTest/java/org/springframework/boot/maven/BuildImageRegistryIntegrationTests.java @@ -61,7 +61,7 @@ class BuildImageRegistryIntegrationTests extends AbstractArchiveIntegrationTests void whenBuildImageIsInvokedWithPublish(MavenBuild mavenBuild) { String repoName = "test-image"; String imageName = this.registryAddress + "/" + repoName; - mavenBuild.project("build-image-publish") + mavenBuild.project("dockerTest", "build-image-publish") .goals("package") .systemProperty("spring-boot.build-image.imageName", imageName) .execute((project) -> { diff --git a/spring-boot-project/spring-boot-tools/spring-boot-maven-plugin/src/intTest/java/org/springframework/boot/maven/BuildImageTests.java b/spring-boot-project/spring-boot-tools/spring-boot-maven-plugin/src/dockerTest/java/org/springframework/boot/maven/BuildImageTests.java similarity index 92% rename from spring-boot-project/spring-boot-tools/spring-boot-maven-plugin/src/intTest/java/org/springframework/boot/maven/BuildImageTests.java rename to spring-boot-project/spring-boot-tools/spring-boot-maven-plugin/src/dockerTest/java/org/springframework/boot/maven/BuildImageTests.java index 6e1887a9cf5..ea58f5598d9 100644 --- a/spring-boot-project/spring-boot-tools/spring-boot-maven-plugin/src/intTest/java/org/springframework/boot/maven/BuildImageTests.java +++ b/spring-boot-project/spring-boot-tools/spring-boot-maven-plugin/src/dockerTest/java/org/springframework/boot/maven/BuildImageTests.java @@ -57,7 +57,7 @@ class BuildImageTests extends AbstractArchiveIntegrationTests { @TestTemplate void whenBuildImageIsInvokedWithoutRepackageTheArchiveIsRepackagedOnTheFly(MavenBuild mavenBuild) { - mavenBuild.project("build-image") + mavenBuild.project("dockerTest", "build-image") .goals("package") .systemProperty("spring-boot.build-image.pullPolicy", "IF_NOT_PRESENT") .prepare(this::writeLongNameResource) @@ -77,7 +77,7 @@ class BuildImageTests extends AbstractArchiveIntegrationTests { @TestTemplate void whenBuildImageIsInvokedOnTheCommandLineWithoutRepackageTheArchiveIsRepackagedOnTheFly(MavenBuild mavenBuild) { - mavenBuild.project("build-image-cmd-line") + mavenBuild.project("dockerTest", "build-image-cmd-line") .goals("spring-boot:build-image") .systemProperty("spring-boot.build-image.pullPolicy", "IF_NOT_PRESENT") .prepare(this::writeLongNameResource) @@ -97,7 +97,7 @@ class BuildImageTests extends AbstractArchiveIntegrationTests { @TestTemplate void whenBuildImageIsInvokedWithClassifierWithoutRepackageTheArchiveIsRepackagedOnTheFly(MavenBuild mavenBuild) { - mavenBuild.project("build-image-classifier") + mavenBuild.project("dockerTest", "build-image-classifier") .goals("package") .systemProperty("spring-boot.build-image.pullPolicy", "IF_NOT_PRESENT") .prepare(this::writeLongNameResource) @@ -118,7 +118,7 @@ class BuildImageTests extends AbstractArchiveIntegrationTests { @TestTemplate void whenBuildImageIsInvokedWithClassifierSourceWithoutRepackageTheArchiveIsRepackagedOnTheFly( MavenBuild mavenBuild) { - mavenBuild.project("build-image-classifier-source") + mavenBuild.project("dockerTest", "build-image-classifier-source") .goals("package") .systemProperty("spring-boot.build-image.pullPolicy", "IF_NOT_PRESENT") .prepare(this::writeLongNameResource) @@ -139,7 +139,7 @@ class BuildImageTests extends AbstractArchiveIntegrationTests { @TestTemplate void whenBuildImageIsInvokedWithRepackageTheExistingArchiveIsUsed(MavenBuild mavenBuild) { - mavenBuild.project("build-image-with-repackage") + mavenBuild.project("dockerTest", "build-image-with-repackage") .goals("package") .systemProperty("spring-boot.build-image.pullPolicy", "IF_NOT_PRESENT") .prepare(this::writeLongNameResource) @@ -160,7 +160,7 @@ class BuildImageTests extends AbstractArchiveIntegrationTests { @TestTemplate void whenBuildImageIsInvokedWithClassifierAndRepackageTheExistingArchiveIsUsed(MavenBuild mavenBuild) { - mavenBuild.project("build-image-classifier-with-repackage") + mavenBuild.project("dockerTest", "build-image-classifier-with-repackage") .goals("package") .systemProperty("spring-boot.build-image.pullPolicy", "IF_NOT_PRESENT") .prepare(this::writeLongNameResource) @@ -181,7 +181,7 @@ class BuildImageTests extends AbstractArchiveIntegrationTests { @TestTemplate void whenBuildImageIsInvokedWithClassifierSourceAndRepackageTheExistingArchiveIsUsed(MavenBuild mavenBuild) { - mavenBuild.project("build-image-classifier-source-with-repackage") + mavenBuild.project("dockerTest", "build-image-classifier-source-with-repackage") .goals("package") .systemProperty("spring-boot.build-image.pullPolicy", "IF_NOT_PRESENT") .prepare(this::writeLongNameResource) @@ -203,7 +203,7 @@ class BuildImageTests extends AbstractArchiveIntegrationTests { @TestTemplate void whenBuildImageIsInvokedWithWarPackaging(MavenBuild mavenBuild) { - mavenBuild.project("build-image-war-packaging") + mavenBuild.project("dockerTest", "build-image-war-packaging") .goals("package") .systemProperty("spring-boot.build-image.pullPolicy", "IF_NOT_PRESENT") .prepare(this::writeLongNameResource) @@ -223,7 +223,7 @@ class BuildImageTests extends AbstractArchiveIntegrationTests { @TestTemplate void whenBuildImageIsInvokedWithCustomImageName(MavenBuild mavenBuild) { - mavenBuild.project("build-image-custom-name") + mavenBuild.project("dockerTest", "build-image-custom-name") .goals("package") .systemProperty("spring-boot.build-image.pullPolicy", "IF_NOT_PRESENT") .systemProperty("spring-boot.build-image.imageName", "example.com/test/property-ignored:pom-preferred") @@ -243,7 +243,7 @@ class BuildImageTests extends AbstractArchiveIntegrationTests { @TestTemplate void whenBuildImageIsInvokedWithCommandLineParameters(MavenBuild mavenBuild) { - mavenBuild.project("build-image") + mavenBuild.project("dockerTest", "build-image") .goals("package") .systemProperty("spring-boot.build-image.pullPolicy", "IF_NOT_PRESENT") .systemProperty("spring-boot.build-image.imageName", "example.com/test/cmd-property-name:v1") @@ -266,7 +266,7 @@ class BuildImageTests extends AbstractArchiveIntegrationTests { @TestTemplate void whenBuildImageIsInvokedWithCustomBuilderImageAndRunImage(MavenBuild mavenBuild) { - mavenBuild.project("build-image-custom-builder") + mavenBuild.project("dockerTest", "build-image-custom-builder") .goals("package") .systemProperty("spring-boot.build-image.pullPolicy", "IF_NOT_PRESENT") .execute((project) -> { @@ -281,7 +281,7 @@ class BuildImageTests extends AbstractArchiveIntegrationTests { @TestTemplate void whenBuildImageIsInvokedWithEmptyEnvEntry(MavenBuild mavenBuild) { - mavenBuild.project("build-image-empty-env-entry") + mavenBuild.project("dockerTest", "build-image-empty-env-entry") .goals("package") .systemProperty("spring-boot.build-image.pullPolicy", "IF_NOT_PRESENT") .prepare(this::writeLongNameResource) @@ -297,7 +297,7 @@ class BuildImageTests extends AbstractArchiveIntegrationTests { @TestTemplate void whenBuildImageIsInvokedWithZipPackaging(MavenBuild mavenBuild) { - mavenBuild.project("build-image-zip-packaging") + mavenBuild.project("dockerTest", "build-image-zip-packaging") .goals("package") .prepare(this::writeLongNameResource) .systemProperty("spring-boot.build-image.pullPolicy", "IF_NOT_PRESENT") @@ -314,7 +314,7 @@ class BuildImageTests extends AbstractArchiveIntegrationTests { @TestTemplate void whenBuildImageIsInvokedWithBuildpacks(MavenBuild mavenBuild) { - mavenBuild.project("build-image-custom-buildpacks") + mavenBuild.project("dockerTest", "build-image-custom-buildpacks") .goals("package") .systemProperty("spring-boot.build-image.pullPolicy", "IF_NOT_PRESENT") .execute((project) -> { @@ -327,7 +327,7 @@ class BuildImageTests extends AbstractArchiveIntegrationTests { @TestTemplate void whenBuildImageIsInvokedWithBinding(MavenBuild mavenBuild) { - mavenBuild.project("build-image-bindings") + mavenBuild.project("dockerTest", "build-image-bindings") .goals("package") .systemProperty("spring-boot.build-image.pullPolicy", "IF_NOT_PRESENT") .execute((project) -> { @@ -342,7 +342,7 @@ class BuildImageTests extends AbstractArchiveIntegrationTests { @TestTemplate void whenBuildImageIsInvokedWithNetworkModeNone(MavenBuild mavenBuild) { - mavenBuild.project("build-image-network") + mavenBuild.project("dockerTest", "build-image-network") .goals("package") .systemProperty("spring-boot.build-image.pullPolicy", "IF_NOT_PRESENT") .execute((project) -> { @@ -356,7 +356,7 @@ class BuildImageTests extends AbstractArchiveIntegrationTests { @TestTemplate void whenBuildImageIsInvokedOnMultiModuleProjectWithPackageGoal(MavenBuild mavenBuild) { - mavenBuild.project("build-image-multi-module") + mavenBuild.project("dockerTest", "build-image-multi-module") .goals("package") .systemProperty("spring-boot.build-image.pullPolicy", "IF_NOT_PRESENT") .execute((project) -> { @@ -369,7 +369,7 @@ class BuildImageTests extends AbstractArchiveIntegrationTests { @TestTemplate void whenBuildImageIsInvokedWithTags(MavenBuild mavenBuild) { - mavenBuild.project("build-image-tags") + mavenBuild.project("dockerTest", "build-image-tags") .goals("package") .systemProperty("spring-boot.build-image.pullPolicy", "IF_NOT_PRESENT") .execute((project) -> { @@ -386,7 +386,7 @@ class BuildImageTests extends AbstractArchiveIntegrationTests { @TestTemplate void whenBuildImageIsInvokedWithVolumeCaches(MavenBuild mavenBuild) { String testBuildId = randomString(); - mavenBuild.project("build-image-volume-caches") + mavenBuild.project("dockerTest", "build-image-volume-caches") .goals("package") .systemProperty("spring-boot.build-image.pullPolicy", "IF_NOT_PRESENT") .systemProperty("test-build-id", testBuildId) @@ -404,7 +404,7 @@ class BuildImageTests extends AbstractArchiveIntegrationTests { + "Docker Desktop on other OSs") void whenBuildImageIsInvokedWithBindCaches(MavenBuild mavenBuild) { String testBuildId = randomString(); - mavenBuild.project("build-image-bind-caches") + mavenBuild.project("dockerTest", "build-image-bind-caches") .goals("package") .systemProperty("spring-boot.build-image.pullPolicy", "IF_NOT_PRESENT") .systemProperty("test-build-id", testBuildId) @@ -435,7 +435,7 @@ class BuildImageTests extends AbstractArchiveIntegrationTests { @TestTemplate void whenBuildImageIsInvokedWithCreatedDate(MavenBuild mavenBuild) { String testBuildId = randomString(); - mavenBuild.project("build-image-created-date") + mavenBuild.project("dockerTest", "build-image-created-date") .goals("package") .systemProperty("spring-boot.build-image.pullPolicy", "IF_NOT_PRESENT") .systemProperty("test-build-id", testBuildId) @@ -453,7 +453,7 @@ class BuildImageTests extends AbstractArchiveIntegrationTests { @TestTemplate void whenBuildImageIsInvokedWithCurrentCreatedDate(MavenBuild mavenBuild) { String testBuildId = randomString(); - mavenBuild.project("build-image-current-created-date") + mavenBuild.project("dockerTest", "build-image-current-created-date") .goals("package") .systemProperty("spring-boot.build-image.pullPolicy", "IF_NOT_PRESENT") .systemProperty("test-build-id", testBuildId) @@ -476,7 +476,7 @@ class BuildImageTests extends AbstractArchiveIntegrationTests { @TestTemplate void whenBuildImageIsInvokedWithApplicationDirectory(MavenBuild mavenBuild) { String testBuildId = randomString(); - mavenBuild.project("build-image-app-dir") + mavenBuild.project("dockerTest", "build-image-app-dir") .goals("package") .systemProperty("spring-boot.build-image.pullPolicy", "IF_NOT_PRESENT") .systemProperty("test-build-id", testBuildId) @@ -491,7 +491,7 @@ class BuildImageTests extends AbstractArchiveIntegrationTests { @TestTemplate void whenBuildImageIsInvokedWithEmptySecurityOptions(MavenBuild mavenBuild) { String testBuildId = randomString(); - mavenBuild.project("build-image-security-opts") + mavenBuild.project("dockerTest", "build-image-security-opts") .goals("package") .systemProperty("spring-boot.build-image.pullPolicy", "IF_NOT_PRESENT") .systemProperty("test-build-id", testBuildId) @@ -505,7 +505,7 @@ class BuildImageTests extends AbstractArchiveIntegrationTests { @TestTemplate void failsWhenBuildImageIsInvokedOnMultiModuleProjectWithBuildImageGoal(MavenBuild mavenBuild) { - mavenBuild.project("build-image-multi-module") + mavenBuild.project("dockerTest", "build-image-multi-module") .goals("spring-boot:build-image") .systemProperty("spring-boot.build-image.pullPolicy", "IF_NOT_PRESENT") .executeAndFail((project) -> assertThat(buildLog(project)).contains("Error packaging archive for image")); @@ -513,7 +513,7 @@ class BuildImageTests extends AbstractArchiveIntegrationTests { @TestTemplate void failsWhenBuilderFails(MavenBuild mavenBuild) { - mavenBuild.project("build-image-builder-error") + mavenBuild.project("dockerTest", "build-image-builder-error") .goals("package") .systemProperty("spring-boot.build-image.pullPolicy", "IF_NOT_PRESENT") .executeAndFail((project) -> assertThat(buildLog(project)).contains("Building image") @@ -524,7 +524,7 @@ class BuildImageTests extends AbstractArchiveIntegrationTests { @TestTemplate void failsWithBuildpackNotInBuilder(MavenBuild mavenBuild) { - mavenBuild.project("build-image-bad-buildpack") + mavenBuild.project("dockerTest", "build-image-bad-buildpack") .goals("package") .systemProperty("spring-boot.build-image.pullPolicy", "IF_NOT_PRESENT") .executeAndFail((project) -> assertThat(buildLog(project)) @@ -533,7 +533,7 @@ class BuildImageTests extends AbstractArchiveIntegrationTests { @TestTemplate void failsWhenFinalNameIsMisconfigured(MavenBuild mavenBuild) { - mavenBuild.project("build-image-final-name") + mavenBuild.project("dockerTest", "build-image-final-name") .goals("package") .executeAndFail((project) -> assertThat(buildLog(project)).contains("final-name.jar.original") .contains("is required for building an image")); @@ -541,7 +541,7 @@ class BuildImageTests extends AbstractArchiveIntegrationTests { @TestTemplate void failsWhenCachesAreConfiguredTwice(MavenBuild mavenBuild) { - mavenBuild.project("build-image-caches-multiple") + mavenBuild.project("dockerTest", "build-image-caches-multiple") .goals("package") .executeAndFail((project) -> assertThat(buildLog(project)) .contains("Each image building cache can be configured only once")); diff --git a/spring-boot-project/spring-boot-tools/spring-boot-maven-plugin/src/intTest/projects/build-image-app-dir/pom.xml b/spring-boot-project/spring-boot-tools/spring-boot-maven-plugin/src/dockerTest/projects/build-image-app-dir/pom.xml similarity index 100% rename from spring-boot-project/spring-boot-tools/spring-boot-maven-plugin/src/intTest/projects/build-image-app-dir/pom.xml rename to spring-boot-project/spring-boot-tools/spring-boot-maven-plugin/src/dockerTest/projects/build-image-app-dir/pom.xml diff --git a/spring-boot-project/spring-boot-tools/spring-boot-maven-plugin/src/intTest/projects/build-image-app-dir/src/main/java/org/test/SampleApplication.java b/spring-boot-project/spring-boot-tools/spring-boot-maven-plugin/src/dockerTest/projects/build-image-app-dir/src/main/java/org/test/SampleApplication.java similarity index 100% rename from spring-boot-project/spring-boot-tools/spring-boot-maven-plugin/src/intTest/projects/build-image-app-dir/src/main/java/org/test/SampleApplication.java rename to spring-boot-project/spring-boot-tools/spring-boot-maven-plugin/src/dockerTest/projects/build-image-app-dir/src/main/java/org/test/SampleApplication.java diff --git a/spring-boot-project/spring-boot-tools/spring-boot-maven-plugin/src/intTest/projects/build-image-bad-buildpack/pom.xml b/spring-boot-project/spring-boot-tools/spring-boot-maven-plugin/src/dockerTest/projects/build-image-bad-buildpack/pom.xml similarity index 100% rename from spring-boot-project/spring-boot-tools/spring-boot-maven-plugin/src/intTest/projects/build-image-bad-buildpack/pom.xml rename to spring-boot-project/spring-boot-tools/spring-boot-maven-plugin/src/dockerTest/projects/build-image-bad-buildpack/pom.xml diff --git a/spring-boot-project/spring-boot-tools/spring-boot-maven-plugin/src/intTest/projects/build-image-bad-buildpack/src/main/java/org/test/SampleApplication.java b/spring-boot-project/spring-boot-tools/spring-boot-maven-plugin/src/dockerTest/projects/build-image-bad-buildpack/src/main/java/org/test/SampleApplication.java similarity index 100% rename from spring-boot-project/spring-boot-tools/spring-boot-maven-plugin/src/intTest/projects/build-image-bad-buildpack/src/main/java/org/test/SampleApplication.java rename to spring-boot-project/spring-boot-tools/spring-boot-maven-plugin/src/dockerTest/projects/build-image-bad-buildpack/src/main/java/org/test/SampleApplication.java diff --git a/spring-boot-project/spring-boot-tools/spring-boot-maven-plugin/src/intTest/projects/build-image-bind-caches/pom.xml b/spring-boot-project/spring-boot-tools/spring-boot-maven-plugin/src/dockerTest/projects/build-image-bind-caches/pom.xml similarity index 100% rename from spring-boot-project/spring-boot-tools/spring-boot-maven-plugin/src/intTest/projects/build-image-bind-caches/pom.xml rename to spring-boot-project/spring-boot-tools/spring-boot-maven-plugin/src/dockerTest/projects/build-image-bind-caches/pom.xml diff --git a/spring-boot-project/spring-boot-tools/spring-boot-maven-plugin/src/intTest/projects/build-image-bind-caches/src/main/java/org/test/SampleApplication.java b/spring-boot-project/spring-boot-tools/spring-boot-maven-plugin/src/dockerTest/projects/build-image-bind-caches/src/main/java/org/test/SampleApplication.java similarity index 100% rename from spring-boot-project/spring-boot-tools/spring-boot-maven-plugin/src/intTest/projects/build-image-bind-caches/src/main/java/org/test/SampleApplication.java rename to spring-boot-project/spring-boot-tools/spring-boot-maven-plugin/src/dockerTest/projects/build-image-bind-caches/src/main/java/org/test/SampleApplication.java diff --git a/spring-boot-project/spring-boot-tools/spring-boot-maven-plugin/src/intTest/projects/build-image-bindings/bindings/ca-certificates/test.crt b/spring-boot-project/spring-boot-tools/spring-boot-maven-plugin/src/dockerTest/projects/build-image-bindings/bindings/ca-certificates/test.crt similarity index 100% rename from spring-boot-project/spring-boot-tools/spring-boot-maven-plugin/src/intTest/projects/build-image-bindings/bindings/ca-certificates/test.crt rename to spring-boot-project/spring-boot-tools/spring-boot-maven-plugin/src/dockerTest/projects/build-image-bindings/bindings/ca-certificates/test.crt diff --git a/spring-boot-project/spring-boot-tools/spring-boot-maven-plugin/src/intTest/projects/build-image-bindings/bindings/ca-certificates/type b/spring-boot-project/spring-boot-tools/spring-boot-maven-plugin/src/dockerTest/projects/build-image-bindings/bindings/ca-certificates/type similarity index 100% rename from spring-boot-project/spring-boot-tools/spring-boot-maven-plugin/src/intTest/projects/build-image-bindings/bindings/ca-certificates/type rename to spring-boot-project/spring-boot-tools/spring-boot-maven-plugin/src/dockerTest/projects/build-image-bindings/bindings/ca-certificates/type diff --git a/spring-boot-project/spring-boot-tools/spring-boot-maven-plugin/src/intTest/projects/build-image-bindings/pom.xml b/spring-boot-project/spring-boot-tools/spring-boot-maven-plugin/src/dockerTest/projects/build-image-bindings/pom.xml similarity index 100% rename from spring-boot-project/spring-boot-tools/spring-boot-maven-plugin/src/intTest/projects/build-image-bindings/pom.xml rename to spring-boot-project/spring-boot-tools/spring-boot-maven-plugin/src/dockerTest/projects/build-image-bindings/pom.xml diff --git a/spring-boot-project/spring-boot-tools/spring-boot-maven-plugin/src/intTest/projects/build-image-bindings/src/main/java/org/test/SampleApplication.java b/spring-boot-project/spring-boot-tools/spring-boot-maven-plugin/src/dockerTest/projects/build-image-bindings/src/main/java/org/test/SampleApplication.java similarity index 100% rename from spring-boot-project/spring-boot-tools/spring-boot-maven-plugin/src/intTest/projects/build-image-bindings/src/main/java/org/test/SampleApplication.java rename to spring-boot-project/spring-boot-tools/spring-boot-maven-plugin/src/dockerTest/projects/build-image-bindings/src/main/java/org/test/SampleApplication.java diff --git a/spring-boot-project/spring-boot-tools/spring-boot-maven-plugin/src/intTest/projects/build-image-builder-error/pom.xml b/spring-boot-project/spring-boot-tools/spring-boot-maven-plugin/src/dockerTest/projects/build-image-builder-error/pom.xml similarity index 100% rename from spring-boot-project/spring-boot-tools/spring-boot-maven-plugin/src/intTest/projects/build-image-builder-error/pom.xml rename to spring-boot-project/spring-boot-tools/spring-boot-maven-plugin/src/dockerTest/projects/build-image-builder-error/pom.xml diff --git a/spring-boot-project/spring-boot-tools/spring-boot-maven-plugin/src/intTest/projects/build-image-builder-error/src/main/java/org/test/SampleApplication.java b/spring-boot-project/spring-boot-tools/spring-boot-maven-plugin/src/dockerTest/projects/build-image-builder-error/src/main/java/org/test/SampleApplication.java similarity index 100% rename from spring-boot-project/spring-boot-tools/spring-boot-maven-plugin/src/intTest/projects/build-image-builder-error/src/main/java/org/test/SampleApplication.java rename to spring-boot-project/spring-boot-tools/spring-boot-maven-plugin/src/dockerTest/projects/build-image-builder-error/src/main/java/org/test/SampleApplication.java diff --git a/spring-boot-project/spring-boot-tools/spring-boot-maven-plugin/src/intTest/projects/build-image-caches-multiple/pom.xml b/spring-boot-project/spring-boot-tools/spring-boot-maven-plugin/src/dockerTest/projects/build-image-caches-multiple/pom.xml similarity index 100% rename from spring-boot-project/spring-boot-tools/spring-boot-maven-plugin/src/intTest/projects/build-image-caches-multiple/pom.xml rename to spring-boot-project/spring-boot-tools/spring-boot-maven-plugin/src/dockerTest/projects/build-image-caches-multiple/pom.xml diff --git a/spring-boot-project/spring-boot-tools/spring-boot-maven-plugin/src/intTest/projects/build-image-caches-multiple/src/main/java/org/test/SampleApplication.java b/spring-boot-project/spring-boot-tools/spring-boot-maven-plugin/src/dockerTest/projects/build-image-caches-multiple/src/main/java/org/test/SampleApplication.java similarity index 100% rename from spring-boot-project/spring-boot-tools/spring-boot-maven-plugin/src/intTest/projects/build-image-caches-multiple/src/main/java/org/test/SampleApplication.java rename to spring-boot-project/spring-boot-tools/spring-boot-maven-plugin/src/dockerTest/projects/build-image-caches-multiple/src/main/java/org/test/SampleApplication.java diff --git a/spring-boot-project/spring-boot-tools/spring-boot-maven-plugin/src/intTest/projects/build-image-classifier-source-with-repackage/pom.xml b/spring-boot-project/spring-boot-tools/spring-boot-maven-plugin/src/dockerTest/projects/build-image-classifier-source-with-repackage/pom.xml similarity index 100% rename from spring-boot-project/spring-boot-tools/spring-boot-maven-plugin/src/intTest/projects/build-image-classifier-source-with-repackage/pom.xml rename to spring-boot-project/spring-boot-tools/spring-boot-maven-plugin/src/dockerTest/projects/build-image-classifier-source-with-repackage/pom.xml diff --git a/spring-boot-project/spring-boot-tools/spring-boot-maven-plugin/src/intTest/projects/build-image-classifier-source-with-repackage/src/main/java/org/test/SampleApplication.java b/spring-boot-project/spring-boot-tools/spring-boot-maven-plugin/src/dockerTest/projects/build-image-classifier-source-with-repackage/src/main/java/org/test/SampleApplication.java similarity index 100% rename from spring-boot-project/spring-boot-tools/spring-boot-maven-plugin/src/intTest/projects/build-image-classifier-source-with-repackage/src/main/java/org/test/SampleApplication.java rename to spring-boot-project/spring-boot-tools/spring-boot-maven-plugin/src/dockerTest/projects/build-image-classifier-source-with-repackage/src/main/java/org/test/SampleApplication.java diff --git a/spring-boot-project/spring-boot-tools/spring-boot-maven-plugin/src/intTest/projects/build-image-classifier-source/pom.xml b/spring-boot-project/spring-boot-tools/spring-boot-maven-plugin/src/dockerTest/projects/build-image-classifier-source/pom.xml similarity index 100% rename from spring-boot-project/spring-boot-tools/spring-boot-maven-plugin/src/intTest/projects/build-image-classifier-source/pom.xml rename to spring-boot-project/spring-boot-tools/spring-boot-maven-plugin/src/dockerTest/projects/build-image-classifier-source/pom.xml diff --git a/spring-boot-project/spring-boot-tools/spring-boot-maven-plugin/src/intTest/projects/build-image-classifier-source/src/main/java/org/test/SampleApplication.java b/spring-boot-project/spring-boot-tools/spring-boot-maven-plugin/src/dockerTest/projects/build-image-classifier-source/src/main/java/org/test/SampleApplication.java similarity index 100% rename from spring-boot-project/spring-boot-tools/spring-boot-maven-plugin/src/intTest/projects/build-image-classifier-source/src/main/java/org/test/SampleApplication.java rename to spring-boot-project/spring-boot-tools/spring-boot-maven-plugin/src/dockerTest/projects/build-image-classifier-source/src/main/java/org/test/SampleApplication.java diff --git a/spring-boot-project/spring-boot-tools/spring-boot-maven-plugin/src/intTest/projects/build-image-classifier-with-repackage/pom.xml b/spring-boot-project/spring-boot-tools/spring-boot-maven-plugin/src/dockerTest/projects/build-image-classifier-with-repackage/pom.xml similarity index 100% rename from spring-boot-project/spring-boot-tools/spring-boot-maven-plugin/src/intTest/projects/build-image-classifier-with-repackage/pom.xml rename to spring-boot-project/spring-boot-tools/spring-boot-maven-plugin/src/dockerTest/projects/build-image-classifier-with-repackage/pom.xml diff --git a/spring-boot-project/spring-boot-tools/spring-boot-maven-plugin/src/intTest/projects/build-image-classifier-with-repackage/src/main/java/org/test/SampleApplication.java b/spring-boot-project/spring-boot-tools/spring-boot-maven-plugin/src/dockerTest/projects/build-image-classifier-with-repackage/src/main/java/org/test/SampleApplication.java similarity index 100% rename from spring-boot-project/spring-boot-tools/spring-boot-maven-plugin/src/intTest/projects/build-image-classifier-with-repackage/src/main/java/org/test/SampleApplication.java rename to spring-boot-project/spring-boot-tools/spring-boot-maven-plugin/src/dockerTest/projects/build-image-classifier-with-repackage/src/main/java/org/test/SampleApplication.java diff --git a/spring-boot-project/spring-boot-tools/spring-boot-maven-plugin/src/intTest/projects/build-image-classifier/pom.xml b/spring-boot-project/spring-boot-tools/spring-boot-maven-plugin/src/dockerTest/projects/build-image-classifier/pom.xml similarity index 100% rename from spring-boot-project/spring-boot-tools/spring-boot-maven-plugin/src/intTest/projects/build-image-classifier/pom.xml rename to spring-boot-project/spring-boot-tools/spring-boot-maven-plugin/src/dockerTest/projects/build-image-classifier/pom.xml diff --git a/spring-boot-project/spring-boot-tools/spring-boot-maven-plugin/src/intTest/projects/build-image-classifier/src/main/java/org/test/SampleApplication.java b/spring-boot-project/spring-boot-tools/spring-boot-maven-plugin/src/dockerTest/projects/build-image-classifier/src/main/java/org/test/SampleApplication.java similarity index 100% rename from spring-boot-project/spring-boot-tools/spring-boot-maven-plugin/src/intTest/projects/build-image-classifier/src/main/java/org/test/SampleApplication.java rename to spring-boot-project/spring-boot-tools/spring-boot-maven-plugin/src/dockerTest/projects/build-image-classifier/src/main/java/org/test/SampleApplication.java diff --git a/spring-boot-project/spring-boot-tools/spring-boot-maven-plugin/src/intTest/projects/build-image-cmd-line/pom.xml b/spring-boot-project/spring-boot-tools/spring-boot-maven-plugin/src/dockerTest/projects/build-image-cmd-line/pom.xml similarity index 100% rename from spring-boot-project/spring-boot-tools/spring-boot-maven-plugin/src/intTest/projects/build-image-cmd-line/pom.xml rename to spring-boot-project/spring-boot-tools/spring-boot-maven-plugin/src/dockerTest/projects/build-image-cmd-line/pom.xml diff --git a/spring-boot-project/spring-boot-tools/spring-boot-maven-plugin/src/intTest/projects/build-image-cmd-line/src/main/java/org/test/SampleApplication.java b/spring-boot-project/spring-boot-tools/spring-boot-maven-plugin/src/dockerTest/projects/build-image-cmd-line/src/main/java/org/test/SampleApplication.java similarity index 100% rename from spring-boot-project/spring-boot-tools/spring-boot-maven-plugin/src/intTest/projects/build-image-cmd-line/src/main/java/org/test/SampleApplication.java rename to spring-boot-project/spring-boot-tools/spring-boot-maven-plugin/src/dockerTest/projects/build-image-cmd-line/src/main/java/org/test/SampleApplication.java diff --git a/spring-boot-project/spring-boot-tools/spring-boot-maven-plugin/src/intTest/projects/build-image-created-date/pom.xml b/spring-boot-project/spring-boot-tools/spring-boot-maven-plugin/src/dockerTest/projects/build-image-created-date/pom.xml similarity index 100% rename from spring-boot-project/spring-boot-tools/spring-boot-maven-plugin/src/intTest/projects/build-image-created-date/pom.xml rename to spring-boot-project/spring-boot-tools/spring-boot-maven-plugin/src/dockerTest/projects/build-image-created-date/pom.xml diff --git a/spring-boot-project/spring-boot-tools/spring-boot-maven-plugin/src/intTest/projects/build-image-created-date/src/main/java/org/test/SampleApplication.java b/spring-boot-project/spring-boot-tools/spring-boot-maven-plugin/src/dockerTest/projects/build-image-created-date/src/main/java/org/test/SampleApplication.java similarity index 100% rename from spring-boot-project/spring-boot-tools/spring-boot-maven-plugin/src/intTest/projects/build-image-created-date/src/main/java/org/test/SampleApplication.java rename to spring-boot-project/spring-boot-tools/spring-boot-maven-plugin/src/dockerTest/projects/build-image-created-date/src/main/java/org/test/SampleApplication.java diff --git a/spring-boot-project/spring-boot-tools/spring-boot-maven-plugin/src/intTest/projects/build-image-current-created-date/pom.xml b/spring-boot-project/spring-boot-tools/spring-boot-maven-plugin/src/dockerTest/projects/build-image-current-created-date/pom.xml similarity index 100% rename from spring-boot-project/spring-boot-tools/spring-boot-maven-plugin/src/intTest/projects/build-image-current-created-date/pom.xml rename to spring-boot-project/spring-boot-tools/spring-boot-maven-plugin/src/dockerTest/projects/build-image-current-created-date/pom.xml diff --git a/spring-boot-project/spring-boot-tools/spring-boot-maven-plugin/src/intTest/projects/build-image-current-created-date/src/main/java/org/test/SampleApplication.java b/spring-boot-project/spring-boot-tools/spring-boot-maven-plugin/src/dockerTest/projects/build-image-current-created-date/src/main/java/org/test/SampleApplication.java similarity index 100% rename from spring-boot-project/spring-boot-tools/spring-boot-maven-plugin/src/intTest/projects/build-image-current-created-date/src/main/java/org/test/SampleApplication.java rename to spring-boot-project/spring-boot-tools/spring-boot-maven-plugin/src/dockerTest/projects/build-image-current-created-date/src/main/java/org/test/SampleApplication.java diff --git a/spring-boot-project/spring-boot-tools/spring-boot-maven-plugin/src/intTest/projects/build-image-custom-builder/pom.xml b/spring-boot-project/spring-boot-tools/spring-boot-maven-plugin/src/dockerTest/projects/build-image-custom-builder/pom.xml similarity index 100% rename from spring-boot-project/spring-boot-tools/spring-boot-maven-plugin/src/intTest/projects/build-image-custom-builder/pom.xml rename to spring-boot-project/spring-boot-tools/spring-boot-maven-plugin/src/dockerTest/projects/build-image-custom-builder/pom.xml diff --git a/spring-boot-project/spring-boot-tools/spring-boot-maven-plugin/src/intTest/projects/build-image-custom-builder/src/main/java/org/test/SampleApplication.java b/spring-boot-project/spring-boot-tools/spring-boot-maven-plugin/src/dockerTest/projects/build-image-custom-builder/src/main/java/org/test/SampleApplication.java similarity index 100% rename from spring-boot-project/spring-boot-tools/spring-boot-maven-plugin/src/intTest/projects/build-image-custom-builder/src/main/java/org/test/SampleApplication.java rename to spring-boot-project/spring-boot-tools/spring-boot-maven-plugin/src/dockerTest/projects/build-image-custom-builder/src/main/java/org/test/SampleApplication.java diff --git a/spring-boot-project/spring-boot-tools/spring-boot-maven-plugin/src/intTest/projects/build-image-custom-buildpacks/pom.xml b/spring-boot-project/spring-boot-tools/spring-boot-maven-plugin/src/dockerTest/projects/build-image-custom-buildpacks/pom.xml similarity index 100% rename from spring-boot-project/spring-boot-tools/spring-boot-maven-plugin/src/intTest/projects/build-image-custom-buildpacks/pom.xml rename to spring-boot-project/spring-boot-tools/spring-boot-maven-plugin/src/dockerTest/projects/build-image-custom-buildpacks/pom.xml diff --git a/spring-boot-project/spring-boot-tools/spring-boot-maven-plugin/src/intTest/projects/build-image-custom-buildpacks/src/main/java/org/test/SampleApplication.java b/spring-boot-project/spring-boot-tools/spring-boot-maven-plugin/src/dockerTest/projects/build-image-custom-buildpacks/src/main/java/org/test/SampleApplication.java similarity index 100% rename from spring-boot-project/spring-boot-tools/spring-boot-maven-plugin/src/intTest/projects/build-image-custom-buildpacks/src/main/java/org/test/SampleApplication.java rename to spring-boot-project/spring-boot-tools/spring-boot-maven-plugin/src/dockerTest/projects/build-image-custom-buildpacks/src/main/java/org/test/SampleApplication.java diff --git a/spring-boot-project/spring-boot-tools/spring-boot-maven-plugin/src/intTest/projects/build-image-custom-name/pom.xml b/spring-boot-project/spring-boot-tools/spring-boot-maven-plugin/src/dockerTest/projects/build-image-custom-name/pom.xml similarity index 100% rename from spring-boot-project/spring-boot-tools/spring-boot-maven-plugin/src/intTest/projects/build-image-custom-name/pom.xml rename to spring-boot-project/spring-boot-tools/spring-boot-maven-plugin/src/dockerTest/projects/build-image-custom-name/pom.xml diff --git a/spring-boot-project/spring-boot-tools/spring-boot-maven-plugin/src/intTest/projects/build-image-custom-name/src/main/java/org/test/SampleApplication.java b/spring-boot-project/spring-boot-tools/spring-boot-maven-plugin/src/dockerTest/projects/build-image-custom-name/src/main/java/org/test/SampleApplication.java similarity index 100% rename from spring-boot-project/spring-boot-tools/spring-boot-maven-plugin/src/intTest/projects/build-image-custom-name/src/main/java/org/test/SampleApplication.java rename to spring-boot-project/spring-boot-tools/spring-boot-maven-plugin/src/dockerTest/projects/build-image-custom-name/src/main/java/org/test/SampleApplication.java diff --git a/spring-boot-project/spring-boot-tools/spring-boot-maven-plugin/src/intTest/projects/build-image-empty-env-entry/pom.xml b/spring-boot-project/spring-boot-tools/spring-boot-maven-plugin/src/dockerTest/projects/build-image-empty-env-entry/pom.xml similarity index 100% rename from spring-boot-project/spring-boot-tools/spring-boot-maven-plugin/src/intTest/projects/build-image-empty-env-entry/pom.xml rename to spring-boot-project/spring-boot-tools/spring-boot-maven-plugin/src/dockerTest/projects/build-image-empty-env-entry/pom.xml diff --git a/spring-boot-project/spring-boot-tools/spring-boot-maven-plugin/src/intTest/projects/build-image-empty-env-entry/src/main/java/org/test/SampleApplication.java b/spring-boot-project/spring-boot-tools/spring-boot-maven-plugin/src/dockerTest/projects/build-image-empty-env-entry/src/main/java/org/test/SampleApplication.java similarity index 100% rename from spring-boot-project/spring-boot-tools/spring-boot-maven-plugin/src/intTest/projects/build-image-empty-env-entry/src/main/java/org/test/SampleApplication.java rename to spring-boot-project/spring-boot-tools/spring-boot-maven-plugin/src/dockerTest/projects/build-image-empty-env-entry/src/main/java/org/test/SampleApplication.java diff --git a/spring-boot-project/spring-boot-tools/spring-boot-maven-plugin/src/intTest/projects/build-image-final-name/pom.xml b/spring-boot-project/spring-boot-tools/spring-boot-maven-plugin/src/dockerTest/projects/build-image-final-name/pom.xml similarity index 100% rename from spring-boot-project/spring-boot-tools/spring-boot-maven-plugin/src/intTest/projects/build-image-final-name/pom.xml rename to spring-boot-project/spring-boot-tools/spring-boot-maven-plugin/src/dockerTest/projects/build-image-final-name/pom.xml diff --git a/spring-boot-project/spring-boot-tools/spring-boot-maven-plugin/src/intTest/projects/build-image-final-name/src/main/java/org/test/SampleApplication.java b/spring-boot-project/spring-boot-tools/spring-boot-maven-plugin/src/dockerTest/projects/build-image-final-name/src/main/java/org/test/SampleApplication.java similarity index 100% rename from spring-boot-project/spring-boot-tools/spring-boot-maven-plugin/src/intTest/projects/build-image-final-name/src/main/java/org/test/SampleApplication.java rename to spring-boot-project/spring-boot-tools/spring-boot-maven-plugin/src/dockerTest/projects/build-image-final-name/src/main/java/org/test/SampleApplication.java diff --git a/spring-boot-project/spring-boot-tools/spring-boot-maven-plugin/src/intTest/projects/build-image-multi-module/app/pom.xml b/spring-boot-project/spring-boot-tools/spring-boot-maven-plugin/src/dockerTest/projects/build-image-multi-module/app/pom.xml similarity index 100% rename from spring-boot-project/spring-boot-tools/spring-boot-maven-plugin/src/intTest/projects/build-image-multi-module/app/pom.xml rename to spring-boot-project/spring-boot-tools/spring-boot-maven-plugin/src/dockerTest/projects/build-image-multi-module/app/pom.xml diff --git a/spring-boot-project/spring-boot-tools/spring-boot-maven-plugin/src/intTest/projects/build-image-multi-module/app/src/main/java/org/test/SampleApplication.java b/spring-boot-project/spring-boot-tools/spring-boot-maven-plugin/src/dockerTest/projects/build-image-multi-module/app/src/main/java/org/test/SampleApplication.java similarity index 100% rename from spring-boot-project/spring-boot-tools/spring-boot-maven-plugin/src/intTest/projects/build-image-multi-module/app/src/main/java/org/test/SampleApplication.java rename to spring-boot-project/spring-boot-tools/spring-boot-maven-plugin/src/dockerTest/projects/build-image-multi-module/app/src/main/java/org/test/SampleApplication.java diff --git a/spring-boot-project/spring-boot-tools/spring-boot-maven-plugin/src/intTest/projects/build-image-multi-module/library/pom.xml b/spring-boot-project/spring-boot-tools/spring-boot-maven-plugin/src/dockerTest/projects/build-image-multi-module/library/pom.xml similarity index 100% rename from spring-boot-project/spring-boot-tools/spring-boot-maven-plugin/src/intTest/projects/build-image-multi-module/library/pom.xml rename to spring-boot-project/spring-boot-tools/spring-boot-maven-plugin/src/dockerTest/projects/build-image-multi-module/library/pom.xml diff --git a/spring-boot-project/spring-boot-tools/spring-boot-maven-plugin/src/intTest/projects/build-image-multi-module/library/src/main/java/org/test/SampleLibrary.java b/spring-boot-project/spring-boot-tools/spring-boot-maven-plugin/src/dockerTest/projects/build-image-multi-module/library/src/main/java/org/test/SampleLibrary.java similarity index 100% rename from spring-boot-project/spring-boot-tools/spring-boot-maven-plugin/src/intTest/projects/build-image-multi-module/library/src/main/java/org/test/SampleLibrary.java rename to spring-boot-project/spring-boot-tools/spring-boot-maven-plugin/src/dockerTest/projects/build-image-multi-module/library/src/main/java/org/test/SampleLibrary.java diff --git a/spring-boot-project/spring-boot-tools/spring-boot-maven-plugin/src/intTest/projects/build-image-multi-module/pom.xml b/spring-boot-project/spring-boot-tools/spring-boot-maven-plugin/src/dockerTest/projects/build-image-multi-module/pom.xml similarity index 100% rename from spring-boot-project/spring-boot-tools/spring-boot-maven-plugin/src/intTest/projects/build-image-multi-module/pom.xml rename to spring-boot-project/spring-boot-tools/spring-boot-maven-plugin/src/dockerTest/projects/build-image-multi-module/pom.xml diff --git a/spring-boot-project/spring-boot-tools/spring-boot-maven-plugin/src/intTest/projects/build-image-network/pom.xml b/spring-boot-project/spring-boot-tools/spring-boot-maven-plugin/src/dockerTest/projects/build-image-network/pom.xml similarity index 100% rename from spring-boot-project/spring-boot-tools/spring-boot-maven-plugin/src/intTest/projects/build-image-network/pom.xml rename to spring-boot-project/spring-boot-tools/spring-boot-maven-plugin/src/dockerTest/projects/build-image-network/pom.xml diff --git a/spring-boot-project/spring-boot-tools/spring-boot-maven-plugin/src/intTest/projects/build-image-network/src/main/java/org/test/SampleApplication.java b/spring-boot-project/spring-boot-tools/spring-boot-maven-plugin/src/dockerTest/projects/build-image-network/src/main/java/org/test/SampleApplication.java similarity index 100% rename from spring-boot-project/spring-boot-tools/spring-boot-maven-plugin/src/intTest/projects/build-image-network/src/main/java/org/test/SampleApplication.java rename to spring-boot-project/spring-boot-tools/spring-boot-maven-plugin/src/dockerTest/projects/build-image-network/src/main/java/org/test/SampleApplication.java diff --git a/spring-boot-project/spring-boot-tools/spring-boot-maven-plugin/src/intTest/projects/build-image-publish/pom.xml b/spring-boot-project/spring-boot-tools/spring-boot-maven-plugin/src/dockerTest/projects/build-image-publish/pom.xml similarity index 100% rename from spring-boot-project/spring-boot-tools/spring-boot-maven-plugin/src/intTest/projects/build-image-publish/pom.xml rename to spring-boot-project/spring-boot-tools/spring-boot-maven-plugin/src/dockerTest/projects/build-image-publish/pom.xml diff --git a/spring-boot-project/spring-boot-tools/spring-boot-maven-plugin/src/intTest/projects/build-image-publish/src/main/java/org/test/SampleApplication.java b/spring-boot-project/spring-boot-tools/spring-boot-maven-plugin/src/dockerTest/projects/build-image-publish/src/main/java/org/test/SampleApplication.java similarity index 100% rename from spring-boot-project/spring-boot-tools/spring-boot-maven-plugin/src/intTest/projects/build-image-publish/src/main/java/org/test/SampleApplication.java rename to spring-boot-project/spring-boot-tools/spring-boot-maven-plugin/src/dockerTest/projects/build-image-publish/src/main/java/org/test/SampleApplication.java diff --git a/spring-boot-project/spring-boot-tools/spring-boot-maven-plugin/src/intTest/projects/build-image-security-opts/pom.xml b/spring-boot-project/spring-boot-tools/spring-boot-maven-plugin/src/dockerTest/projects/build-image-security-opts/pom.xml similarity index 100% rename from spring-boot-project/spring-boot-tools/spring-boot-maven-plugin/src/intTest/projects/build-image-security-opts/pom.xml rename to spring-boot-project/spring-boot-tools/spring-boot-maven-plugin/src/dockerTest/projects/build-image-security-opts/pom.xml diff --git a/spring-boot-project/spring-boot-tools/spring-boot-maven-plugin/src/intTest/projects/build-image-security-opts/src/main/java/org/test/SampleApplication.java b/spring-boot-project/spring-boot-tools/spring-boot-maven-plugin/src/dockerTest/projects/build-image-security-opts/src/main/java/org/test/SampleApplication.java similarity index 100% rename from spring-boot-project/spring-boot-tools/spring-boot-maven-plugin/src/intTest/projects/build-image-security-opts/src/main/java/org/test/SampleApplication.java rename to spring-boot-project/spring-boot-tools/spring-boot-maven-plugin/src/dockerTest/projects/build-image-security-opts/src/main/java/org/test/SampleApplication.java diff --git a/spring-boot-project/spring-boot-tools/spring-boot-maven-plugin/src/intTest/projects/build-image-tags/pom.xml b/spring-boot-project/spring-boot-tools/spring-boot-maven-plugin/src/dockerTest/projects/build-image-tags/pom.xml similarity index 100% rename from spring-boot-project/spring-boot-tools/spring-boot-maven-plugin/src/intTest/projects/build-image-tags/pom.xml rename to spring-boot-project/spring-boot-tools/spring-boot-maven-plugin/src/dockerTest/projects/build-image-tags/pom.xml diff --git a/spring-boot-project/spring-boot-tools/spring-boot-maven-plugin/src/intTest/projects/build-image-tags/src/main/java/org/test/SampleApplication.java b/spring-boot-project/spring-boot-tools/spring-boot-maven-plugin/src/dockerTest/projects/build-image-tags/src/main/java/org/test/SampleApplication.java similarity index 100% rename from spring-boot-project/spring-boot-tools/spring-boot-maven-plugin/src/intTest/projects/build-image-tags/src/main/java/org/test/SampleApplication.java rename to spring-boot-project/spring-boot-tools/spring-boot-maven-plugin/src/dockerTest/projects/build-image-tags/src/main/java/org/test/SampleApplication.java diff --git a/spring-boot-project/spring-boot-tools/spring-boot-maven-plugin/src/intTest/projects/build-image-volume-caches/pom.xml b/spring-boot-project/spring-boot-tools/spring-boot-maven-plugin/src/dockerTest/projects/build-image-volume-caches/pom.xml similarity index 100% rename from spring-boot-project/spring-boot-tools/spring-boot-maven-plugin/src/intTest/projects/build-image-volume-caches/pom.xml rename to spring-boot-project/spring-boot-tools/spring-boot-maven-plugin/src/dockerTest/projects/build-image-volume-caches/pom.xml diff --git a/spring-boot-project/spring-boot-tools/spring-boot-maven-plugin/src/intTest/projects/build-image-volume-caches/src/main/java/org/test/SampleApplication.java b/spring-boot-project/spring-boot-tools/spring-boot-maven-plugin/src/dockerTest/projects/build-image-volume-caches/src/main/java/org/test/SampleApplication.java similarity index 100% rename from spring-boot-project/spring-boot-tools/spring-boot-maven-plugin/src/intTest/projects/build-image-volume-caches/src/main/java/org/test/SampleApplication.java rename to spring-boot-project/spring-boot-tools/spring-boot-maven-plugin/src/dockerTest/projects/build-image-volume-caches/src/main/java/org/test/SampleApplication.java diff --git a/spring-boot-project/spring-boot-tools/spring-boot-maven-plugin/src/intTest/projects/build-image-war-packaging/pom.xml b/spring-boot-project/spring-boot-tools/spring-boot-maven-plugin/src/dockerTest/projects/build-image-war-packaging/pom.xml similarity index 100% rename from spring-boot-project/spring-boot-tools/spring-boot-maven-plugin/src/intTest/projects/build-image-war-packaging/pom.xml rename to spring-boot-project/spring-boot-tools/spring-boot-maven-plugin/src/dockerTest/projects/build-image-war-packaging/pom.xml diff --git a/spring-boot-project/spring-boot-tools/spring-boot-maven-plugin/src/intTest/projects/build-image-war-packaging/src/main/java/org/test/SampleApplication.java b/spring-boot-project/spring-boot-tools/spring-boot-maven-plugin/src/dockerTest/projects/build-image-war-packaging/src/main/java/org/test/SampleApplication.java similarity index 100% rename from spring-boot-project/spring-boot-tools/spring-boot-maven-plugin/src/intTest/projects/build-image-war-packaging/src/main/java/org/test/SampleApplication.java rename to spring-boot-project/spring-boot-tools/spring-boot-maven-plugin/src/dockerTest/projects/build-image-war-packaging/src/main/java/org/test/SampleApplication.java diff --git a/spring-boot-project/spring-boot-tools/spring-boot-maven-plugin/src/intTest/projects/build-image-with-repackage/pom.xml b/spring-boot-project/spring-boot-tools/spring-boot-maven-plugin/src/dockerTest/projects/build-image-with-repackage/pom.xml similarity index 100% rename from spring-boot-project/spring-boot-tools/spring-boot-maven-plugin/src/intTest/projects/build-image-with-repackage/pom.xml rename to spring-boot-project/spring-boot-tools/spring-boot-maven-plugin/src/dockerTest/projects/build-image-with-repackage/pom.xml diff --git a/spring-boot-project/spring-boot-tools/spring-boot-maven-plugin/src/intTest/projects/build-image-with-repackage/src/main/java/org/test/SampleApplication.java b/spring-boot-project/spring-boot-tools/spring-boot-maven-plugin/src/dockerTest/projects/build-image-with-repackage/src/main/java/org/test/SampleApplication.java similarity index 100% rename from spring-boot-project/spring-boot-tools/spring-boot-maven-plugin/src/intTest/projects/build-image-with-repackage/src/main/java/org/test/SampleApplication.java rename to spring-boot-project/spring-boot-tools/spring-boot-maven-plugin/src/dockerTest/projects/build-image-with-repackage/src/main/java/org/test/SampleApplication.java diff --git a/spring-boot-project/spring-boot-tools/spring-boot-maven-plugin/src/intTest/projects/build-image-zip-packaging/pom.xml b/spring-boot-project/spring-boot-tools/spring-boot-maven-plugin/src/dockerTest/projects/build-image-zip-packaging/pom.xml similarity index 100% rename from spring-boot-project/spring-boot-tools/spring-boot-maven-plugin/src/intTest/projects/build-image-zip-packaging/pom.xml rename to spring-boot-project/spring-boot-tools/spring-boot-maven-plugin/src/dockerTest/projects/build-image-zip-packaging/pom.xml diff --git a/spring-boot-project/spring-boot-tools/spring-boot-maven-plugin/src/intTest/projects/build-image-zip-packaging/src/main/java/org/test/SampleApplication.java b/spring-boot-project/spring-boot-tools/spring-boot-maven-plugin/src/dockerTest/projects/build-image-zip-packaging/src/main/java/org/test/SampleApplication.java similarity index 100% rename from spring-boot-project/spring-boot-tools/spring-boot-maven-plugin/src/intTest/projects/build-image-zip-packaging/src/main/java/org/test/SampleApplication.java rename to spring-boot-project/spring-boot-tools/spring-boot-maven-plugin/src/dockerTest/projects/build-image-zip-packaging/src/main/java/org/test/SampleApplication.java diff --git a/spring-boot-project/spring-boot-tools/spring-boot-maven-plugin/src/intTest/projects/build-image/pom.xml b/spring-boot-project/spring-boot-tools/spring-boot-maven-plugin/src/dockerTest/projects/build-image/pom.xml similarity index 100% rename from spring-boot-project/spring-boot-tools/spring-boot-maven-plugin/src/intTest/projects/build-image/pom.xml rename to spring-boot-project/spring-boot-tools/spring-boot-maven-plugin/src/dockerTest/projects/build-image/pom.xml diff --git a/spring-boot-project/spring-boot-tools/spring-boot-maven-plugin/src/intTest/projects/build-image/src/main/java/org/test/SampleApplication.java b/spring-boot-project/spring-boot-tools/spring-boot-maven-plugin/src/dockerTest/projects/build-image/src/main/java/org/test/SampleApplication.java similarity index 100% rename from spring-boot-project/spring-boot-tools/spring-boot-maven-plugin/src/intTest/projects/build-image/src/main/java/org/test/SampleApplication.java rename to spring-boot-project/spring-boot-tools/spring-boot-maven-plugin/src/dockerTest/projects/build-image/src/main/java/org/test/SampleApplication.java diff --git a/spring-boot-project/spring-boot-tools/spring-boot-maven-plugin/src/intTest/java/org/springframework/boot/maven/EclipseM2eIntegrationTests.java b/spring-boot-project/spring-boot-tools/spring-boot-maven-plugin/src/intTest/java/org/springframework/boot/maven/EclipseM2eIntegrationTests.java index 255127377e7..52f80d26d59 100644 --- a/spring-boot-project/spring-boot-tools/spring-boot-maven-plugin/src/intTest/java/org/springframework/boot/maven/EclipseM2eIntegrationTests.java +++ b/spring-boot-project/spring-boot-tools/spring-boot-maven-plugin/src/intTest/java/org/springframework/boot/maven/EclipseM2eIntegrationTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2012-2022 the original author or authors. + * Copyright 2012-2024 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. @@ -37,7 +37,7 @@ class EclipseM2eIntegrationTests { @Test // gh-21992 void pluginPomIncludesOptionalShadeDependency() throws Exception { String version = new Versions().get("project.version"); - File repository = new File("build/int-test-maven-repository"); + File repository = new File("build/test-maven-repository"); File pluginDirectory = new File(repository, "org/springframework/boot/spring-boot-maven-plugin/" + version); File[] pomFiles = pluginDirectory.listFiles(this::isPomFile); Arrays.sort(pomFiles, Comparator.comparing(File::getName)); diff --git a/spring-boot-project/spring-boot-tools/spring-boot-maven-plugin/src/intTest/java/org/springframework/boot/maven/MavenBuild.java b/spring-boot-project/spring-boot-tools/spring-boot-maven-plugin/src/intTest/java/org/springframework/boot/maven/MavenBuild.java index b7257053d8c..e7391b0898e 100644 --- a/spring-boot-project/spring-boot-tools/spring-boot-maven-plugin/src/intTest/java/org/springframework/boot/maven/MavenBuild.java +++ b/spring-boot-project/spring-boot-tools/spring-boot-maven-plugin/src/intTest/java/org/springframework/boot/maven/MavenBuild.java @@ -96,7 +96,11 @@ class MavenBuild { } MavenBuild project(String project) { - this.projectDir = new File("src/intTest/projects/" + project); + return project("intTest", project); + } + + MavenBuild project(String root, String project) { + this.projectDir = new File("src/" + root + "/projects/" + project); return this; } @@ -157,7 +161,7 @@ class MavenBuild { }); String settingsXml = Files.readString(Paths.get("src", "intTest", "projects", "settings.xml")) - .replace("@localCentralUrl@", new File("build/int-test-maven-repository").toURI().toURL().toString()) + .replace("@localCentralUrl@", new File("build/test-maven-repository").toURI().toURL().toString()) .replace("@localRepositoryPath@", new File("build/local-maven-repository").getAbsolutePath()); Files.writeString(destination.resolve("settings.xml"), settingsXml, StandardOpenOption.CREATE_NEW); request.setBaseDirectory(this.temp); From 9f166f2c851ea15c989bb7618d042db5517f427b Mon Sep 17 00:00:00 2001 From: Andy Wilkinson Date: Tue, 25 Jun 2024 17:05:01 +0100 Subject: [PATCH 10/28] Update spring-boot-autoconfigure to use docker-test plugin See gh-41228 --- .../spring-boot-autoconfigure/build.gradle | 24 ++++++++++++------- ...ndraAutoConfigurationIntegrationTests.java | 0 ...asswordAuthenticationIntegrationTests.java | 0 ...baseAutoConfigurationIntegrationTests.java | 0 ...DataAutoConfigurationIntegrationTests.java | 0 ...rchRepositoriesAutoConfigurationTests.java | 0 ...rchRepositoriesAutoConfigurationTests.java | 0 ...riesAutoConfigurationIntegrationTests.java | 0 ...disRepositoriesAutoConfigurationTests.java | 0 ...ientAutoConfigurationIntegrationTests.java | 0 ...ientAutoConfigurationIntegrationTests.java | 0 ...ientAutoConfigurationIntegrationTests.java | 0 ...eo4jAutoConfigurationIntegrationTests.java | 0 ...lsarAutoConfigurationIntegrationTests.java | 0 ...iveSessionAutoConfigurationMongoTests.java | 0 ...iveSessionAutoConfigurationRedisTests.java | 0 .../SessionAutoConfigurationMongoTests.java | 0 .../SessionAutoConfigurationRedisTests.java | 0 18 files changed, 16 insertions(+), 8 deletions(-) rename spring-boot-project/spring-boot-autoconfigure/src/{test => dockerTest}/java/org/springframework/boot/autoconfigure/cassandra/CassandraAutoConfigurationIntegrationTests.java (100%) rename spring-boot-project/spring-boot-autoconfigure/src/{test => dockerTest}/java/org/springframework/boot/autoconfigure/cassandra/CassandraAutoConfigurationWithPasswordAuthenticationIntegrationTests.java (100%) rename spring-boot-project/spring-boot-autoconfigure/src/{test => dockerTest}/java/org/springframework/boot/autoconfigure/couchbase/CouchbaseAutoConfigurationIntegrationTests.java (100%) rename spring-boot-project/spring-boot-autoconfigure/src/{test => dockerTest}/java/org/springframework/boot/autoconfigure/data/cassandra/CassandraDataAutoConfigurationIntegrationTests.java (100%) rename spring-boot-project/spring-boot-autoconfigure/src/{test => dockerTest}/java/org/springframework/boot/autoconfigure/data/elasticsearch/ElasticsearchRepositoriesAutoConfigurationTests.java (100%) rename spring-boot-project/spring-boot-autoconfigure/src/{test => dockerTest}/java/org/springframework/boot/autoconfigure/data/elasticsearch/ReactiveElasticsearchRepositoriesAutoConfigurationTests.java (100%) rename spring-boot-project/spring-boot-autoconfigure/src/{test => dockerTest}/java/org/springframework/boot/autoconfigure/data/neo4j/Neo4jRepositoriesAutoConfigurationIntegrationTests.java (100%) rename spring-boot-project/spring-boot-autoconfigure/src/{test => dockerTest}/java/org/springframework/boot/autoconfigure/data/redis/RedisRepositoriesAutoConfigurationTests.java (100%) rename spring-boot-project/spring-boot-autoconfigure/src/{test => dockerTest}/java/org/springframework/boot/autoconfigure/elasticsearch/ElasticsearchClientAutoConfigurationIntegrationTests.java (100%) rename spring-boot-project/spring-boot-autoconfigure/src/{test => dockerTest}/java/org/springframework/boot/autoconfigure/elasticsearch/ElasticsearchRestClientAutoConfigurationIntegrationTests.java (100%) rename spring-boot-project/spring-boot-autoconfigure/src/{test => dockerTest}/java/org/springframework/boot/autoconfigure/elasticsearch/ReactiveElasticsearchClientAutoConfigurationIntegrationTests.java (100%) rename spring-boot-project/spring-boot-autoconfigure/src/{test => dockerTest}/java/org/springframework/boot/autoconfigure/neo4j/Neo4jAutoConfigurationIntegrationTests.java (100%) rename spring-boot-project/spring-boot-autoconfigure/src/{test => dockerTest}/java/org/springframework/boot/autoconfigure/pulsar/PulsarAutoConfigurationIntegrationTests.java (100%) rename spring-boot-project/spring-boot-autoconfigure/src/{test => dockerTest}/java/org/springframework/boot/autoconfigure/session/ReactiveSessionAutoConfigurationMongoTests.java (100%) rename spring-boot-project/spring-boot-autoconfigure/src/{test => dockerTest}/java/org/springframework/boot/autoconfigure/session/ReactiveSessionAutoConfigurationRedisTests.java (100%) rename spring-boot-project/spring-boot-autoconfigure/src/{test => dockerTest}/java/org/springframework/boot/autoconfigure/session/SessionAutoConfigurationMongoTests.java (100%) rename spring-boot-project/spring-boot-autoconfigure/src/{test => dockerTest}/java/org/springframework/boot/autoconfigure/session/SessionAutoConfigurationRedisTests.java (100%) diff --git a/spring-boot-project/spring-boot-autoconfigure/build.gradle b/spring-boot-project/spring-boot-autoconfigure/build.gradle index 8ad026ce012..a2996eccdd5 100644 --- a/spring-boot-project/spring-boot-autoconfigure/build.gradle +++ b/spring-boot-project/spring-boot-autoconfigure/build.gradle @@ -5,6 +5,7 @@ plugins { id "org.springframework.boot.configuration-properties" id "org.springframework.boot.conventions" id "org.springframework.boot.deployed" + id "org.springframework.boot.docker-test" id "org.springframework.boot.optional-dependencies" } @@ -12,6 +13,21 @@ description = "Spring Boot AutoConfigure" dependencies { api(project(":spring-boot-project:spring-boot")) + + dockerTestImplementation(project(":spring-boot-project:spring-boot-test")) + dockerTestImplementation(project(":spring-boot-project:spring-boot-tools:spring-boot-test-support")) + dockerTestImplementation("org.assertj:assertj-core") + dockerTestImplementation("org.junit.jupiter:junit-jupiter") + dockerTestImplementation("org.mockito:mockito-core") + dockerTestImplementation("org.springframework:spring-test") + dockerTestImplementation("org.testcontainers:cassandra") + dockerTestImplementation("org.testcontainers:couchbase") + dockerTestImplementation("org.testcontainers:elasticsearch") + dockerTestImplementation("org.testcontainers:junit-jupiter") + dockerTestImplementation("org.testcontainers:mongodb") + dockerTestImplementation("org.testcontainers:neo4j") + dockerTestImplementation("org.testcontainers:pulsar") + dockerTestImplementation("org.testcontainers:testcontainers") optional("co.elastic.clients:elasticsearch-java") { exclude group: "commons-logging", module: "commons-logging" @@ -245,14 +261,6 @@ dependencies { } testImplementation("org.springframework.pulsar:spring-pulsar-cache-provider-caffeine") testImplementation("org.springframework.security:spring-security-test") - testImplementation("org.testcontainers:cassandra") - testImplementation("org.testcontainers:couchbase") - testImplementation("org.testcontainers:elasticsearch") - testImplementation("org.testcontainers:junit-jupiter") - testImplementation("org.testcontainers:mongodb") - testImplementation("org.testcontainers:neo4j") - testImplementation("org.testcontainers:pulsar") - testImplementation("org.testcontainers:testcontainers") testImplementation("org.yaml:snakeyaml") testRuntimeOnly("jakarta.management.j2ee:jakarta.management.j2ee-api") diff --git a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/cassandra/CassandraAutoConfigurationIntegrationTests.java b/spring-boot-project/spring-boot-autoconfigure/src/dockerTest/java/org/springframework/boot/autoconfigure/cassandra/CassandraAutoConfigurationIntegrationTests.java similarity index 100% rename from spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/cassandra/CassandraAutoConfigurationIntegrationTests.java rename to spring-boot-project/spring-boot-autoconfigure/src/dockerTest/java/org/springframework/boot/autoconfigure/cassandra/CassandraAutoConfigurationIntegrationTests.java diff --git a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/cassandra/CassandraAutoConfigurationWithPasswordAuthenticationIntegrationTests.java b/spring-boot-project/spring-boot-autoconfigure/src/dockerTest/java/org/springframework/boot/autoconfigure/cassandra/CassandraAutoConfigurationWithPasswordAuthenticationIntegrationTests.java similarity index 100% rename from spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/cassandra/CassandraAutoConfigurationWithPasswordAuthenticationIntegrationTests.java rename to spring-boot-project/spring-boot-autoconfigure/src/dockerTest/java/org/springframework/boot/autoconfigure/cassandra/CassandraAutoConfigurationWithPasswordAuthenticationIntegrationTests.java diff --git a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/couchbase/CouchbaseAutoConfigurationIntegrationTests.java b/spring-boot-project/spring-boot-autoconfigure/src/dockerTest/java/org/springframework/boot/autoconfigure/couchbase/CouchbaseAutoConfigurationIntegrationTests.java similarity index 100% rename from spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/couchbase/CouchbaseAutoConfigurationIntegrationTests.java rename to spring-boot-project/spring-boot-autoconfigure/src/dockerTest/java/org/springframework/boot/autoconfigure/couchbase/CouchbaseAutoConfigurationIntegrationTests.java diff --git a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/data/cassandra/CassandraDataAutoConfigurationIntegrationTests.java b/spring-boot-project/spring-boot-autoconfigure/src/dockerTest/java/org/springframework/boot/autoconfigure/data/cassandra/CassandraDataAutoConfigurationIntegrationTests.java similarity index 100% rename from spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/data/cassandra/CassandraDataAutoConfigurationIntegrationTests.java rename to spring-boot-project/spring-boot-autoconfigure/src/dockerTest/java/org/springframework/boot/autoconfigure/data/cassandra/CassandraDataAutoConfigurationIntegrationTests.java diff --git a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/data/elasticsearch/ElasticsearchRepositoriesAutoConfigurationTests.java b/spring-boot-project/spring-boot-autoconfigure/src/dockerTest/java/org/springframework/boot/autoconfigure/data/elasticsearch/ElasticsearchRepositoriesAutoConfigurationTests.java similarity index 100% rename from spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/data/elasticsearch/ElasticsearchRepositoriesAutoConfigurationTests.java rename to spring-boot-project/spring-boot-autoconfigure/src/dockerTest/java/org/springframework/boot/autoconfigure/data/elasticsearch/ElasticsearchRepositoriesAutoConfigurationTests.java diff --git a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/data/elasticsearch/ReactiveElasticsearchRepositoriesAutoConfigurationTests.java b/spring-boot-project/spring-boot-autoconfigure/src/dockerTest/java/org/springframework/boot/autoconfigure/data/elasticsearch/ReactiveElasticsearchRepositoriesAutoConfigurationTests.java similarity index 100% rename from spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/data/elasticsearch/ReactiveElasticsearchRepositoriesAutoConfigurationTests.java rename to spring-boot-project/spring-boot-autoconfigure/src/dockerTest/java/org/springframework/boot/autoconfigure/data/elasticsearch/ReactiveElasticsearchRepositoriesAutoConfigurationTests.java diff --git a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/data/neo4j/Neo4jRepositoriesAutoConfigurationIntegrationTests.java b/spring-boot-project/spring-boot-autoconfigure/src/dockerTest/java/org/springframework/boot/autoconfigure/data/neo4j/Neo4jRepositoriesAutoConfigurationIntegrationTests.java similarity index 100% rename from spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/data/neo4j/Neo4jRepositoriesAutoConfigurationIntegrationTests.java rename to spring-boot-project/spring-boot-autoconfigure/src/dockerTest/java/org/springframework/boot/autoconfigure/data/neo4j/Neo4jRepositoriesAutoConfigurationIntegrationTests.java diff --git a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/data/redis/RedisRepositoriesAutoConfigurationTests.java b/spring-boot-project/spring-boot-autoconfigure/src/dockerTest/java/org/springframework/boot/autoconfigure/data/redis/RedisRepositoriesAutoConfigurationTests.java similarity index 100% rename from spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/data/redis/RedisRepositoriesAutoConfigurationTests.java rename to spring-boot-project/spring-boot-autoconfigure/src/dockerTest/java/org/springframework/boot/autoconfigure/data/redis/RedisRepositoriesAutoConfigurationTests.java diff --git a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/elasticsearch/ElasticsearchClientAutoConfigurationIntegrationTests.java b/spring-boot-project/spring-boot-autoconfigure/src/dockerTest/java/org/springframework/boot/autoconfigure/elasticsearch/ElasticsearchClientAutoConfigurationIntegrationTests.java similarity index 100% rename from spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/elasticsearch/ElasticsearchClientAutoConfigurationIntegrationTests.java rename to spring-boot-project/spring-boot-autoconfigure/src/dockerTest/java/org/springframework/boot/autoconfigure/elasticsearch/ElasticsearchClientAutoConfigurationIntegrationTests.java diff --git a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/elasticsearch/ElasticsearchRestClientAutoConfigurationIntegrationTests.java b/spring-boot-project/spring-boot-autoconfigure/src/dockerTest/java/org/springframework/boot/autoconfigure/elasticsearch/ElasticsearchRestClientAutoConfigurationIntegrationTests.java similarity index 100% rename from spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/elasticsearch/ElasticsearchRestClientAutoConfigurationIntegrationTests.java rename to spring-boot-project/spring-boot-autoconfigure/src/dockerTest/java/org/springframework/boot/autoconfigure/elasticsearch/ElasticsearchRestClientAutoConfigurationIntegrationTests.java diff --git a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/elasticsearch/ReactiveElasticsearchClientAutoConfigurationIntegrationTests.java b/spring-boot-project/spring-boot-autoconfigure/src/dockerTest/java/org/springframework/boot/autoconfigure/elasticsearch/ReactiveElasticsearchClientAutoConfigurationIntegrationTests.java similarity index 100% rename from spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/elasticsearch/ReactiveElasticsearchClientAutoConfigurationIntegrationTests.java rename to spring-boot-project/spring-boot-autoconfigure/src/dockerTest/java/org/springframework/boot/autoconfigure/elasticsearch/ReactiveElasticsearchClientAutoConfigurationIntegrationTests.java diff --git a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/neo4j/Neo4jAutoConfigurationIntegrationTests.java b/spring-boot-project/spring-boot-autoconfigure/src/dockerTest/java/org/springframework/boot/autoconfigure/neo4j/Neo4jAutoConfigurationIntegrationTests.java similarity index 100% rename from spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/neo4j/Neo4jAutoConfigurationIntegrationTests.java rename to spring-boot-project/spring-boot-autoconfigure/src/dockerTest/java/org/springframework/boot/autoconfigure/neo4j/Neo4jAutoConfigurationIntegrationTests.java diff --git a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/pulsar/PulsarAutoConfigurationIntegrationTests.java b/spring-boot-project/spring-boot-autoconfigure/src/dockerTest/java/org/springframework/boot/autoconfigure/pulsar/PulsarAutoConfigurationIntegrationTests.java similarity index 100% rename from spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/pulsar/PulsarAutoConfigurationIntegrationTests.java rename to spring-boot-project/spring-boot-autoconfigure/src/dockerTest/java/org/springframework/boot/autoconfigure/pulsar/PulsarAutoConfigurationIntegrationTests.java diff --git a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/session/ReactiveSessionAutoConfigurationMongoTests.java b/spring-boot-project/spring-boot-autoconfigure/src/dockerTest/java/org/springframework/boot/autoconfigure/session/ReactiveSessionAutoConfigurationMongoTests.java similarity index 100% rename from spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/session/ReactiveSessionAutoConfigurationMongoTests.java rename to spring-boot-project/spring-boot-autoconfigure/src/dockerTest/java/org/springframework/boot/autoconfigure/session/ReactiveSessionAutoConfigurationMongoTests.java diff --git a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/session/ReactiveSessionAutoConfigurationRedisTests.java b/spring-boot-project/spring-boot-autoconfigure/src/dockerTest/java/org/springframework/boot/autoconfigure/session/ReactiveSessionAutoConfigurationRedisTests.java similarity index 100% rename from spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/session/ReactiveSessionAutoConfigurationRedisTests.java rename to spring-boot-project/spring-boot-autoconfigure/src/dockerTest/java/org/springframework/boot/autoconfigure/session/ReactiveSessionAutoConfigurationRedisTests.java diff --git a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/session/SessionAutoConfigurationMongoTests.java b/spring-boot-project/spring-boot-autoconfigure/src/dockerTest/java/org/springframework/boot/autoconfigure/session/SessionAutoConfigurationMongoTests.java similarity index 100% rename from spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/session/SessionAutoConfigurationMongoTests.java rename to spring-boot-project/spring-boot-autoconfigure/src/dockerTest/java/org/springframework/boot/autoconfigure/session/SessionAutoConfigurationMongoTests.java diff --git a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/session/SessionAutoConfigurationRedisTests.java b/spring-boot-project/spring-boot-autoconfigure/src/dockerTest/java/org/springframework/boot/autoconfigure/session/SessionAutoConfigurationRedisTests.java similarity index 100% rename from spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/session/SessionAutoConfigurationRedisTests.java rename to spring-boot-project/spring-boot-autoconfigure/src/dockerTest/java/org/springframework/boot/autoconfigure/session/SessionAutoConfigurationRedisTests.java From ba053dbaac3c9cf4a44838a8ced4e0e0fb8d3280 Mon Sep 17 00:00:00 2001 From: Andy Wilkinson Date: Tue, 25 Jun 2024 17:22:41 +0100 Subject: [PATCH 11/28] Update spring-boot-actuator to use docker-test plugin See gh-41228 --- .../spring-boot-actuator/build.gradle | 16 ++++++++++++---- .../metrics/cache/RedisCacheMetricsTests.java | 0 .../MongoHealthIndicatorIntegrationTests.java | 0 ...oReactiveHealthIndicatorIntegrationTests.java | 0 ...jReactiveHealthIndicatorIntegrationTests.java | 0 5 files changed, 12 insertions(+), 4 deletions(-) rename spring-boot-project/spring-boot-actuator/src/{test => dockerTest}/java/org/springframework/boot/actuate/metrics/cache/RedisCacheMetricsTests.java (100%) rename spring-boot-project/spring-boot-actuator/src/{test => dockerTest}/java/org/springframework/boot/actuate/mongo/MongoHealthIndicatorIntegrationTests.java (100%) rename spring-boot-project/spring-boot-actuator/src/{test => dockerTest}/java/org/springframework/boot/actuate/mongo/MongoReactiveHealthIndicatorIntegrationTests.java (100%) rename spring-boot-project/spring-boot-actuator/src/{test => dockerTest}/java/org/springframework/boot/actuate/neo4j/Neo4jReactiveHealthIndicatorIntegrationTests.java (100%) diff --git a/spring-boot-project/spring-boot-actuator/build.gradle b/spring-boot-project/spring-boot-actuator/build.gradle index 4218edbb766..b793b0f8ab1 100644 --- a/spring-boot-project/spring-boot-actuator/build.gradle +++ b/spring-boot-project/spring-boot-actuator/build.gradle @@ -3,6 +3,7 @@ plugins { id "org.springframework.boot.conventions" id "org.springframework.boot.configuration-properties" id "org.springframework.boot.optional-dependencies" + id "org.springframework.boot.docker-test" id "org.springframework.boot.deployed" } @@ -10,6 +11,17 @@ description = "Spring Boot Actuator" dependencies { api(project(":spring-boot-project:spring-boot")) + + dockerTestImplementation(project(":spring-boot-project:spring-boot-autoconfigure")) + dockerTestImplementation(project(":spring-boot-project:spring-boot-test")) + dockerTestImplementation(project(":spring-boot-project:spring-boot-tools:spring-boot-test-support")) + dockerTestImplementation("org.assertj:assertj-core") + dockerTestImplementation("org.junit.jupiter:junit-jupiter") + dockerTestImplementation("org.springframework:spring-test") + dockerTestImplementation("org.testcontainers:junit-jupiter") + dockerTestImplementation("org.testcontainers:mongodb") + dockerTestImplementation("org.testcontainers:neo4j") + dockerTestImplementation("org.testcontainers:testcontainers") optional("com.datastax.oss:java-driver-core") { exclude group: "org.slf4j", module: "jcl-over-slf4j" @@ -98,10 +110,6 @@ dependencies { testImplementation("org.skyscreamer:jsonassert") testImplementation("org.springframework:spring-test") testImplementation("com.squareup.okhttp3:mockwebserver") - testImplementation("org.testcontainers:junit-jupiter") - testImplementation("org.testcontainers:mongodb") - testImplementation("org.testcontainers:neo4j") - testImplementation("org.testcontainers:testcontainers") testRuntimeOnly("ch.qos.logback:logback-classic") testRuntimeOnly("io.projectreactor.netty:reactor-netty-http") diff --git a/spring-boot-project/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/metrics/cache/RedisCacheMetricsTests.java b/spring-boot-project/spring-boot-actuator/src/dockerTest/java/org/springframework/boot/actuate/metrics/cache/RedisCacheMetricsTests.java similarity index 100% rename from spring-boot-project/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/metrics/cache/RedisCacheMetricsTests.java rename to spring-boot-project/spring-boot-actuator/src/dockerTest/java/org/springframework/boot/actuate/metrics/cache/RedisCacheMetricsTests.java diff --git a/spring-boot-project/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/mongo/MongoHealthIndicatorIntegrationTests.java b/spring-boot-project/spring-boot-actuator/src/dockerTest/java/org/springframework/boot/actuate/mongo/MongoHealthIndicatorIntegrationTests.java similarity index 100% rename from spring-boot-project/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/mongo/MongoHealthIndicatorIntegrationTests.java rename to spring-boot-project/spring-boot-actuator/src/dockerTest/java/org/springframework/boot/actuate/mongo/MongoHealthIndicatorIntegrationTests.java diff --git a/spring-boot-project/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/mongo/MongoReactiveHealthIndicatorIntegrationTests.java b/spring-boot-project/spring-boot-actuator/src/dockerTest/java/org/springframework/boot/actuate/mongo/MongoReactiveHealthIndicatorIntegrationTests.java similarity index 100% rename from spring-boot-project/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/mongo/MongoReactiveHealthIndicatorIntegrationTests.java rename to spring-boot-project/spring-boot-actuator/src/dockerTest/java/org/springframework/boot/actuate/mongo/MongoReactiveHealthIndicatorIntegrationTests.java diff --git a/spring-boot-project/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/neo4j/Neo4jReactiveHealthIndicatorIntegrationTests.java b/spring-boot-project/spring-boot-actuator/src/dockerTest/java/org/springframework/boot/actuate/neo4j/Neo4jReactiveHealthIndicatorIntegrationTests.java similarity index 100% rename from spring-boot-project/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/neo4j/Neo4jReactiveHealthIndicatorIntegrationTests.java rename to spring-boot-project/spring-boot-actuator/src/dockerTest/java/org/springframework/boot/actuate/neo4j/Neo4jReactiveHealthIndicatorIntegrationTests.java From 843de3adbc5a1e21fc497312c393d54a24a4e064 Mon Sep 17 00:00:00 2001 From: Andy Wilkinson Date: Tue, 25 Jun 2024 18:06:01 +0100 Subject: [PATCH 12/28] Update spring-boot-test-autoconfigure to use docker-test plugin See gh-41228 --- .../build.gradle | 27 ++++++++++++------- .../DataCassandraTestIntegrationTests.java | 0 ...TestWithIncludeFilterIntegrationTests.java | 0 .../ExampleCassandraApplication.java | 0 .../data/cassandra/ExampleEntity.java | 0 .../data/cassandra/ExampleRepository.java | 0 .../data/cassandra/ExampleService.java | 0 .../DataCouchbaseTestIntegrationTests.java | 0 ...CouchbaseTestReactiveIntegrationTests.java | 0 ...TestWithIncludeFilterIntegrationTests.java | 0 .../ExampleCouchbaseApplication.java | 0 .../data/couchbase/ExampleDocument.java | 0 .../couchbase/ExampleReactiveRepository.java | 0 .../data/couchbase/ExampleRepository.java | 0 .../data/couchbase/ExampleService.java | 0 ...DataElasticsearchTestIntegrationTests.java | 2 +- ...csearchTestPropertiesIntegrationTests.java | 0 ...ticsearchTestReactiveIntegrationTests.java | 0 ...TestWithIncludeFilterIntegrationTests.java | 0 .../data/elasticsearch/ExampleDocument.java | 0 .../ExampleElasticsearchApplication.java | 0 .../ExampleReactiveRepository.java | 0 .../data/elasticsearch/ExampleRepository.java | 0 .../data/elasticsearch/ExampleService.java | 0 .../mongo/DataMongoTestIntegrationTests.java | 2 +- ...DataMongoTestReactiveIntegrationTests.java | 0 ...TestWithIncludeFilterIntegrationTests.java | 0 .../data/mongo/ExampleDocument.java | 0 .../data/mongo/ExampleMongoApplication.java | 0 .../data/mongo/ExampleReactiveRepository.java | 0 .../data/mongo/ExampleRepository.java | 0 .../data/mongo/ExampleService.java | 0 ...actionalDataMongoTestIntegrationTests.java | 0 .../neo4j/DataNeo4jTestIntegrationTests.java | 0 ...taNeo4jTestPropertiesIntegrationTests.java | 0 ...DataNeo4jTestReactiveIntegrationTests.java | 0 ...TestWithIncludeFilterIntegrationTests.java | 0 .../data/neo4j/ExampleGraph.java | 0 .../data/neo4j/ExampleNeo4jApplication.java | 0 .../data/neo4j/ExampleReactiveRepository.java | 0 .../data/neo4j/ExampleRepository.java | 0 .../data/neo4j/ExampleService.java | 0 .../redis/DataRedisTestIntegrationTests.java | 0 ...taRedisTestPropertiesIntegrationTests.java | 0 ...DataRedisTestReactiveIntegrationTests.java | 0 ...TestWithIncludeFilterIntegrationTests.java | 0 .../data/redis/ExampleRedisApplication.java | 0 .../data/redis/ExampleRepository.java | 0 .../data/redis/ExampleService.java | 0 .../autoconfigure/data/redis/PersonHash.java | 0 50 files changed, 20 insertions(+), 11 deletions(-) rename spring-boot-project/spring-boot-test-autoconfigure/src/{test => dockerTest}/java/org/springframework/boot/test/autoconfigure/data/cassandra/DataCassandraTestIntegrationTests.java (100%) rename spring-boot-project/spring-boot-test-autoconfigure/src/{test => dockerTest}/java/org/springframework/boot/test/autoconfigure/data/cassandra/DataCassandraTestWithIncludeFilterIntegrationTests.java (100%) rename spring-boot-project/spring-boot-test-autoconfigure/src/{test => dockerTest}/java/org/springframework/boot/test/autoconfigure/data/cassandra/ExampleCassandraApplication.java (100%) rename spring-boot-project/spring-boot-test-autoconfigure/src/{test => dockerTest}/java/org/springframework/boot/test/autoconfigure/data/cassandra/ExampleEntity.java (100%) rename spring-boot-project/spring-boot-test-autoconfigure/src/{test => dockerTest}/java/org/springframework/boot/test/autoconfigure/data/cassandra/ExampleRepository.java (100%) rename spring-boot-project/spring-boot-test-autoconfigure/src/{test => dockerTest}/java/org/springframework/boot/test/autoconfigure/data/cassandra/ExampleService.java (100%) rename spring-boot-project/spring-boot-test-autoconfigure/src/{test => dockerTest}/java/org/springframework/boot/test/autoconfigure/data/couchbase/DataCouchbaseTestIntegrationTests.java (100%) rename spring-boot-project/spring-boot-test-autoconfigure/src/{test => dockerTest}/java/org/springframework/boot/test/autoconfigure/data/couchbase/DataCouchbaseTestReactiveIntegrationTests.java (100%) rename spring-boot-project/spring-boot-test-autoconfigure/src/{test => dockerTest}/java/org/springframework/boot/test/autoconfigure/data/couchbase/DataCouchbaseTestWithIncludeFilterIntegrationTests.java (100%) rename spring-boot-project/spring-boot-test-autoconfigure/src/{test => dockerTest}/java/org/springframework/boot/test/autoconfigure/data/couchbase/ExampleCouchbaseApplication.java (100%) rename spring-boot-project/spring-boot-test-autoconfigure/src/{test => dockerTest}/java/org/springframework/boot/test/autoconfigure/data/couchbase/ExampleDocument.java (100%) rename spring-boot-project/spring-boot-test-autoconfigure/src/{test => dockerTest}/java/org/springframework/boot/test/autoconfigure/data/couchbase/ExampleReactiveRepository.java (100%) rename spring-boot-project/spring-boot-test-autoconfigure/src/{test => dockerTest}/java/org/springframework/boot/test/autoconfigure/data/couchbase/ExampleRepository.java (100%) rename spring-boot-project/spring-boot-test-autoconfigure/src/{test => dockerTest}/java/org/springframework/boot/test/autoconfigure/data/couchbase/ExampleService.java (100%) rename spring-boot-project/spring-boot-test-autoconfigure/src/{test => dockerTest}/java/org/springframework/boot/test/autoconfigure/data/elasticsearch/DataElasticsearchTestIntegrationTests.java (99%) rename spring-boot-project/spring-boot-test-autoconfigure/src/{test => dockerTest}/java/org/springframework/boot/test/autoconfigure/data/elasticsearch/DataElasticsearchTestPropertiesIntegrationTests.java (100%) rename spring-boot-project/spring-boot-test-autoconfigure/src/{test => dockerTest}/java/org/springframework/boot/test/autoconfigure/data/elasticsearch/DataElasticsearchTestReactiveIntegrationTests.java (100%) rename spring-boot-project/spring-boot-test-autoconfigure/src/{test => dockerTest}/java/org/springframework/boot/test/autoconfigure/data/elasticsearch/DataElasticsearchTestWithIncludeFilterIntegrationTests.java (100%) rename spring-boot-project/spring-boot-test-autoconfigure/src/{test => dockerTest}/java/org/springframework/boot/test/autoconfigure/data/elasticsearch/ExampleDocument.java (100%) rename spring-boot-project/spring-boot-test-autoconfigure/src/{test => dockerTest}/java/org/springframework/boot/test/autoconfigure/data/elasticsearch/ExampleElasticsearchApplication.java (100%) rename spring-boot-project/spring-boot-test-autoconfigure/src/{test => dockerTest}/java/org/springframework/boot/test/autoconfigure/data/elasticsearch/ExampleReactiveRepository.java (100%) rename spring-boot-project/spring-boot-test-autoconfigure/src/{test => dockerTest}/java/org/springframework/boot/test/autoconfigure/data/elasticsearch/ExampleRepository.java (100%) rename spring-boot-project/spring-boot-test-autoconfigure/src/{test => dockerTest}/java/org/springframework/boot/test/autoconfigure/data/elasticsearch/ExampleService.java (100%) rename spring-boot-project/spring-boot-test-autoconfigure/src/{test => dockerTest}/java/org/springframework/boot/test/autoconfigure/data/mongo/DataMongoTestIntegrationTests.java (98%) rename spring-boot-project/spring-boot-test-autoconfigure/src/{test => dockerTest}/java/org/springframework/boot/test/autoconfigure/data/mongo/DataMongoTestReactiveIntegrationTests.java (100%) rename spring-boot-project/spring-boot-test-autoconfigure/src/{test => dockerTest}/java/org/springframework/boot/test/autoconfigure/data/mongo/DataMongoTestWithIncludeFilterIntegrationTests.java (100%) rename spring-boot-project/spring-boot-test-autoconfigure/src/{test => dockerTest}/java/org/springframework/boot/test/autoconfigure/data/mongo/ExampleDocument.java (100%) rename spring-boot-project/spring-boot-test-autoconfigure/src/{test => dockerTest}/java/org/springframework/boot/test/autoconfigure/data/mongo/ExampleMongoApplication.java (100%) rename spring-boot-project/spring-boot-test-autoconfigure/src/{test => dockerTest}/java/org/springframework/boot/test/autoconfigure/data/mongo/ExampleReactiveRepository.java (100%) rename spring-boot-project/spring-boot-test-autoconfigure/src/{test => dockerTest}/java/org/springframework/boot/test/autoconfigure/data/mongo/ExampleRepository.java (100%) rename spring-boot-project/spring-boot-test-autoconfigure/src/{test => dockerTest}/java/org/springframework/boot/test/autoconfigure/data/mongo/ExampleService.java (100%) rename spring-boot-project/spring-boot-test-autoconfigure/src/{test => dockerTest}/java/org/springframework/boot/test/autoconfigure/data/mongo/TransactionalDataMongoTestIntegrationTests.java (100%) rename spring-boot-project/spring-boot-test-autoconfigure/src/{test => dockerTest}/java/org/springframework/boot/test/autoconfigure/data/neo4j/DataNeo4jTestIntegrationTests.java (100%) rename spring-boot-project/spring-boot-test-autoconfigure/src/{test => dockerTest}/java/org/springframework/boot/test/autoconfigure/data/neo4j/DataNeo4jTestPropertiesIntegrationTests.java (100%) rename spring-boot-project/spring-boot-test-autoconfigure/src/{test => dockerTest}/java/org/springframework/boot/test/autoconfigure/data/neo4j/DataNeo4jTestReactiveIntegrationTests.java (100%) rename spring-boot-project/spring-boot-test-autoconfigure/src/{test => dockerTest}/java/org/springframework/boot/test/autoconfigure/data/neo4j/DataNeo4jTestWithIncludeFilterIntegrationTests.java (100%) rename spring-boot-project/spring-boot-test-autoconfigure/src/{test => dockerTest}/java/org/springframework/boot/test/autoconfigure/data/neo4j/ExampleGraph.java (100%) rename spring-boot-project/spring-boot-test-autoconfigure/src/{test => dockerTest}/java/org/springframework/boot/test/autoconfigure/data/neo4j/ExampleNeo4jApplication.java (100%) rename spring-boot-project/spring-boot-test-autoconfigure/src/{test => dockerTest}/java/org/springframework/boot/test/autoconfigure/data/neo4j/ExampleReactiveRepository.java (100%) rename spring-boot-project/spring-boot-test-autoconfigure/src/{test => dockerTest}/java/org/springframework/boot/test/autoconfigure/data/neo4j/ExampleRepository.java (100%) rename spring-boot-project/spring-boot-test-autoconfigure/src/{test => dockerTest}/java/org/springframework/boot/test/autoconfigure/data/neo4j/ExampleService.java (100%) rename spring-boot-project/spring-boot-test-autoconfigure/src/{test => dockerTest}/java/org/springframework/boot/test/autoconfigure/data/redis/DataRedisTestIntegrationTests.java (100%) rename spring-boot-project/spring-boot-test-autoconfigure/src/{test => dockerTest}/java/org/springframework/boot/test/autoconfigure/data/redis/DataRedisTestPropertiesIntegrationTests.java (100%) rename spring-boot-project/spring-boot-test-autoconfigure/src/{test => dockerTest}/java/org/springframework/boot/test/autoconfigure/data/redis/DataRedisTestReactiveIntegrationTests.java (100%) rename spring-boot-project/spring-boot-test-autoconfigure/src/{test => dockerTest}/java/org/springframework/boot/test/autoconfigure/data/redis/DataRedisTestWithIncludeFilterIntegrationTests.java (100%) rename spring-boot-project/spring-boot-test-autoconfigure/src/{test => dockerTest}/java/org/springframework/boot/test/autoconfigure/data/redis/ExampleRedisApplication.java (100%) rename spring-boot-project/spring-boot-test-autoconfigure/src/{test => dockerTest}/java/org/springframework/boot/test/autoconfigure/data/redis/ExampleRepository.java (100%) rename spring-boot-project/spring-boot-test-autoconfigure/src/{test => dockerTest}/java/org/springframework/boot/test/autoconfigure/data/redis/ExampleService.java (100%) rename spring-boot-project/spring-boot-test-autoconfigure/src/{test => dockerTest}/java/org/springframework/boot/test/autoconfigure/data/redis/PersonHash.java (100%) diff --git a/spring-boot-project/spring-boot-test-autoconfigure/build.gradle b/spring-boot-project/spring-boot-test-autoconfigure/build.gradle index 623831519c1..b2af257c6c7 100644 --- a/spring-boot-project/spring-boot-test-autoconfigure/build.gradle +++ b/spring-boot-project/spring-boot-test-autoconfigure/build.gradle @@ -2,6 +2,7 @@ plugins { id "java-library" id "org.springframework.boot.conventions" id "org.springframework.boot.deployed" + id "org.springframework.boot.docker-test" id "org.springframework.boot.optional-dependencies" } @@ -11,6 +12,22 @@ dependencies { api(project(":spring-boot-project:spring-boot")) api(project(":spring-boot-project:spring-boot-test")) api(project(":spring-boot-project:spring-boot-autoconfigure")) + + dockerTestImplementation(project(":spring-boot-project:spring-boot-testcontainers")) + dockerTestImplementation(project(":spring-boot-project:spring-boot-tools:spring-boot-test-support")) + dockerTestImplementation("io.projectreactor:reactor-test") + dockerTestImplementation("org.assertj:assertj-core") + dockerTestImplementation("org.junit.jupiter:junit-jupiter") + dockerTestImplementation("org.testcontainers:cassandra") + dockerTestImplementation("org.testcontainers:couchbase") + dockerTestImplementation("org.testcontainers:elasticsearch") + dockerTestImplementation("org.testcontainers:junit-jupiter") + dockerTestImplementation("org.testcontainers:mongodb") + dockerTestImplementation("org.testcontainers:neo4j") + dockerTestImplementation("org.testcontainers:testcontainers") + + dockerTestRuntimeOnly("io.lettuce:lettuce-core") + dockerTestRuntimeOnly("org.springframework.data:spring-data-redis") optional("jakarta.json.bind:jakarta.json.bind-api") optional("jakarta.persistence:jakarta.persistence-api") @@ -62,13 +79,12 @@ dependencies { testImplementation(project(":spring-boot-project:spring-boot-actuator")) testImplementation(project(":spring-boot-project:spring-boot-actuator-autoconfigure")) - testImplementation(project(":spring-boot-project:spring-boot-tools:spring-boot-test-support")) testImplementation(project(":spring-boot-project:spring-boot-testcontainers")) + testImplementation(project(":spring-boot-project:spring-boot-tools:spring-boot-test-support")) testImplementation("ch.qos.logback:logback-classic") testImplementation("com.fasterxml.jackson.module:jackson-module-parameter-names") testImplementation("com.h2database:h2") testImplementation("com.unboundid:unboundid-ldapsdk") - testImplementation("io.lettuce:lettuce-core") testImplementation("io.micrometer:micrometer-registry-prometheus") testImplementation("io.projectreactor.netty:reactor-netty-http") testImplementation("io.projectreactor:reactor-core") @@ -96,13 +112,6 @@ dependencies { testImplementation("org.springframework:spring-core-test") testImplementation("org.springframework.hateoas:spring-hateoas") testImplementation("org.springframework.plugin:spring-plugin-core") - testImplementation("org.testcontainers:cassandra") - testImplementation("org.testcontainers:couchbase") - testImplementation("org.testcontainers:elasticsearch") - testImplementation("org.testcontainers:junit-jupiter") - testImplementation("org.testcontainers:mongodb") - testImplementation("org.testcontainers:neo4j") - testImplementation("org.testcontainers:testcontainers") testImplementation("org.thymeleaf:thymeleaf") } diff --git a/spring-boot-project/spring-boot-test-autoconfigure/src/test/java/org/springframework/boot/test/autoconfigure/data/cassandra/DataCassandraTestIntegrationTests.java b/spring-boot-project/spring-boot-test-autoconfigure/src/dockerTest/java/org/springframework/boot/test/autoconfigure/data/cassandra/DataCassandraTestIntegrationTests.java similarity index 100% rename from spring-boot-project/spring-boot-test-autoconfigure/src/test/java/org/springframework/boot/test/autoconfigure/data/cassandra/DataCassandraTestIntegrationTests.java rename to spring-boot-project/spring-boot-test-autoconfigure/src/dockerTest/java/org/springframework/boot/test/autoconfigure/data/cassandra/DataCassandraTestIntegrationTests.java diff --git a/spring-boot-project/spring-boot-test-autoconfigure/src/test/java/org/springframework/boot/test/autoconfigure/data/cassandra/DataCassandraTestWithIncludeFilterIntegrationTests.java b/spring-boot-project/spring-boot-test-autoconfigure/src/dockerTest/java/org/springframework/boot/test/autoconfigure/data/cassandra/DataCassandraTestWithIncludeFilterIntegrationTests.java similarity index 100% rename from spring-boot-project/spring-boot-test-autoconfigure/src/test/java/org/springframework/boot/test/autoconfigure/data/cassandra/DataCassandraTestWithIncludeFilterIntegrationTests.java rename to spring-boot-project/spring-boot-test-autoconfigure/src/dockerTest/java/org/springframework/boot/test/autoconfigure/data/cassandra/DataCassandraTestWithIncludeFilterIntegrationTests.java diff --git a/spring-boot-project/spring-boot-test-autoconfigure/src/test/java/org/springframework/boot/test/autoconfigure/data/cassandra/ExampleCassandraApplication.java b/spring-boot-project/spring-boot-test-autoconfigure/src/dockerTest/java/org/springframework/boot/test/autoconfigure/data/cassandra/ExampleCassandraApplication.java similarity index 100% rename from spring-boot-project/spring-boot-test-autoconfigure/src/test/java/org/springframework/boot/test/autoconfigure/data/cassandra/ExampleCassandraApplication.java rename to spring-boot-project/spring-boot-test-autoconfigure/src/dockerTest/java/org/springframework/boot/test/autoconfigure/data/cassandra/ExampleCassandraApplication.java diff --git a/spring-boot-project/spring-boot-test-autoconfigure/src/test/java/org/springframework/boot/test/autoconfigure/data/cassandra/ExampleEntity.java b/spring-boot-project/spring-boot-test-autoconfigure/src/dockerTest/java/org/springframework/boot/test/autoconfigure/data/cassandra/ExampleEntity.java similarity index 100% rename from spring-boot-project/spring-boot-test-autoconfigure/src/test/java/org/springframework/boot/test/autoconfigure/data/cassandra/ExampleEntity.java rename to spring-boot-project/spring-boot-test-autoconfigure/src/dockerTest/java/org/springframework/boot/test/autoconfigure/data/cassandra/ExampleEntity.java diff --git a/spring-boot-project/spring-boot-test-autoconfigure/src/test/java/org/springframework/boot/test/autoconfigure/data/cassandra/ExampleRepository.java b/spring-boot-project/spring-boot-test-autoconfigure/src/dockerTest/java/org/springframework/boot/test/autoconfigure/data/cassandra/ExampleRepository.java similarity index 100% rename from spring-boot-project/spring-boot-test-autoconfigure/src/test/java/org/springframework/boot/test/autoconfigure/data/cassandra/ExampleRepository.java rename to spring-boot-project/spring-boot-test-autoconfigure/src/dockerTest/java/org/springframework/boot/test/autoconfigure/data/cassandra/ExampleRepository.java diff --git a/spring-boot-project/spring-boot-test-autoconfigure/src/test/java/org/springframework/boot/test/autoconfigure/data/cassandra/ExampleService.java b/spring-boot-project/spring-boot-test-autoconfigure/src/dockerTest/java/org/springframework/boot/test/autoconfigure/data/cassandra/ExampleService.java similarity index 100% rename from spring-boot-project/spring-boot-test-autoconfigure/src/test/java/org/springframework/boot/test/autoconfigure/data/cassandra/ExampleService.java rename to spring-boot-project/spring-boot-test-autoconfigure/src/dockerTest/java/org/springframework/boot/test/autoconfigure/data/cassandra/ExampleService.java diff --git a/spring-boot-project/spring-boot-test-autoconfigure/src/test/java/org/springframework/boot/test/autoconfigure/data/couchbase/DataCouchbaseTestIntegrationTests.java b/spring-boot-project/spring-boot-test-autoconfigure/src/dockerTest/java/org/springframework/boot/test/autoconfigure/data/couchbase/DataCouchbaseTestIntegrationTests.java similarity index 100% rename from spring-boot-project/spring-boot-test-autoconfigure/src/test/java/org/springframework/boot/test/autoconfigure/data/couchbase/DataCouchbaseTestIntegrationTests.java rename to spring-boot-project/spring-boot-test-autoconfigure/src/dockerTest/java/org/springframework/boot/test/autoconfigure/data/couchbase/DataCouchbaseTestIntegrationTests.java diff --git a/spring-boot-project/spring-boot-test-autoconfigure/src/test/java/org/springframework/boot/test/autoconfigure/data/couchbase/DataCouchbaseTestReactiveIntegrationTests.java b/spring-boot-project/spring-boot-test-autoconfigure/src/dockerTest/java/org/springframework/boot/test/autoconfigure/data/couchbase/DataCouchbaseTestReactiveIntegrationTests.java similarity index 100% rename from spring-boot-project/spring-boot-test-autoconfigure/src/test/java/org/springframework/boot/test/autoconfigure/data/couchbase/DataCouchbaseTestReactiveIntegrationTests.java rename to spring-boot-project/spring-boot-test-autoconfigure/src/dockerTest/java/org/springframework/boot/test/autoconfigure/data/couchbase/DataCouchbaseTestReactiveIntegrationTests.java diff --git a/spring-boot-project/spring-boot-test-autoconfigure/src/test/java/org/springframework/boot/test/autoconfigure/data/couchbase/DataCouchbaseTestWithIncludeFilterIntegrationTests.java b/spring-boot-project/spring-boot-test-autoconfigure/src/dockerTest/java/org/springframework/boot/test/autoconfigure/data/couchbase/DataCouchbaseTestWithIncludeFilterIntegrationTests.java similarity index 100% rename from spring-boot-project/spring-boot-test-autoconfigure/src/test/java/org/springframework/boot/test/autoconfigure/data/couchbase/DataCouchbaseTestWithIncludeFilterIntegrationTests.java rename to spring-boot-project/spring-boot-test-autoconfigure/src/dockerTest/java/org/springframework/boot/test/autoconfigure/data/couchbase/DataCouchbaseTestWithIncludeFilterIntegrationTests.java diff --git a/spring-boot-project/spring-boot-test-autoconfigure/src/test/java/org/springframework/boot/test/autoconfigure/data/couchbase/ExampleCouchbaseApplication.java b/spring-boot-project/spring-boot-test-autoconfigure/src/dockerTest/java/org/springframework/boot/test/autoconfigure/data/couchbase/ExampleCouchbaseApplication.java similarity index 100% rename from spring-boot-project/spring-boot-test-autoconfigure/src/test/java/org/springframework/boot/test/autoconfigure/data/couchbase/ExampleCouchbaseApplication.java rename to spring-boot-project/spring-boot-test-autoconfigure/src/dockerTest/java/org/springframework/boot/test/autoconfigure/data/couchbase/ExampleCouchbaseApplication.java diff --git a/spring-boot-project/spring-boot-test-autoconfigure/src/test/java/org/springframework/boot/test/autoconfigure/data/couchbase/ExampleDocument.java b/spring-boot-project/spring-boot-test-autoconfigure/src/dockerTest/java/org/springframework/boot/test/autoconfigure/data/couchbase/ExampleDocument.java similarity index 100% rename from spring-boot-project/spring-boot-test-autoconfigure/src/test/java/org/springframework/boot/test/autoconfigure/data/couchbase/ExampleDocument.java rename to spring-boot-project/spring-boot-test-autoconfigure/src/dockerTest/java/org/springframework/boot/test/autoconfigure/data/couchbase/ExampleDocument.java diff --git a/spring-boot-project/spring-boot-test-autoconfigure/src/test/java/org/springframework/boot/test/autoconfigure/data/couchbase/ExampleReactiveRepository.java b/spring-boot-project/spring-boot-test-autoconfigure/src/dockerTest/java/org/springframework/boot/test/autoconfigure/data/couchbase/ExampleReactiveRepository.java similarity index 100% rename from spring-boot-project/spring-boot-test-autoconfigure/src/test/java/org/springframework/boot/test/autoconfigure/data/couchbase/ExampleReactiveRepository.java rename to spring-boot-project/spring-boot-test-autoconfigure/src/dockerTest/java/org/springframework/boot/test/autoconfigure/data/couchbase/ExampleReactiveRepository.java diff --git a/spring-boot-project/spring-boot-test-autoconfigure/src/test/java/org/springframework/boot/test/autoconfigure/data/couchbase/ExampleRepository.java b/spring-boot-project/spring-boot-test-autoconfigure/src/dockerTest/java/org/springframework/boot/test/autoconfigure/data/couchbase/ExampleRepository.java similarity index 100% rename from spring-boot-project/spring-boot-test-autoconfigure/src/test/java/org/springframework/boot/test/autoconfigure/data/couchbase/ExampleRepository.java rename to spring-boot-project/spring-boot-test-autoconfigure/src/dockerTest/java/org/springframework/boot/test/autoconfigure/data/couchbase/ExampleRepository.java diff --git a/spring-boot-project/spring-boot-test-autoconfigure/src/test/java/org/springframework/boot/test/autoconfigure/data/couchbase/ExampleService.java b/spring-boot-project/spring-boot-test-autoconfigure/src/dockerTest/java/org/springframework/boot/test/autoconfigure/data/couchbase/ExampleService.java similarity index 100% rename from spring-boot-project/spring-boot-test-autoconfigure/src/test/java/org/springframework/boot/test/autoconfigure/data/couchbase/ExampleService.java rename to spring-boot-project/spring-boot-test-autoconfigure/src/dockerTest/java/org/springframework/boot/test/autoconfigure/data/couchbase/ExampleService.java diff --git a/spring-boot-project/spring-boot-test-autoconfigure/src/test/java/org/springframework/boot/test/autoconfigure/data/elasticsearch/DataElasticsearchTestIntegrationTests.java b/spring-boot-project/spring-boot-test-autoconfigure/src/dockerTest/java/org/springframework/boot/test/autoconfigure/data/elasticsearch/DataElasticsearchTestIntegrationTests.java similarity index 99% rename from spring-boot-project/spring-boot-test-autoconfigure/src/test/java/org/springframework/boot/test/autoconfigure/data/elasticsearch/DataElasticsearchTestIntegrationTests.java rename to spring-boot-project/spring-boot-test-autoconfigure/src/dockerTest/java/org/springframework/boot/test/autoconfigure/data/elasticsearch/DataElasticsearchTestIntegrationTests.java index 0ddff8a26e4..71afd239f63 100644 --- a/spring-boot-project/spring-boot-test-autoconfigure/src/test/java/org/springframework/boot/test/autoconfigure/data/elasticsearch/DataElasticsearchTestIntegrationTests.java +++ b/spring-boot-project/spring-boot-test-autoconfigure/src/dockerTest/java/org/springframework/boot/test/autoconfigure/data/elasticsearch/DataElasticsearchTestIntegrationTests.java @@ -36,7 +36,7 @@ import static org.assertj.core.api.Assertions.assertThatExceptionOfType; import static org.springframework.boot.test.autoconfigure.AutoConfigurationImportedCondition.importedAutoConfiguration; /** - * Sample test for {@link DataElasticsearchTest @DataElasticsearchTest} + * Sample test for {@link DataElasticsearchTest @DataElasticsearchTest}. * * @author Eddú Meléndez * @author Moritz Halbritter diff --git a/spring-boot-project/spring-boot-test-autoconfigure/src/test/java/org/springframework/boot/test/autoconfigure/data/elasticsearch/DataElasticsearchTestPropertiesIntegrationTests.java b/spring-boot-project/spring-boot-test-autoconfigure/src/dockerTest/java/org/springframework/boot/test/autoconfigure/data/elasticsearch/DataElasticsearchTestPropertiesIntegrationTests.java similarity index 100% rename from spring-boot-project/spring-boot-test-autoconfigure/src/test/java/org/springframework/boot/test/autoconfigure/data/elasticsearch/DataElasticsearchTestPropertiesIntegrationTests.java rename to spring-boot-project/spring-boot-test-autoconfigure/src/dockerTest/java/org/springframework/boot/test/autoconfigure/data/elasticsearch/DataElasticsearchTestPropertiesIntegrationTests.java diff --git a/spring-boot-project/spring-boot-test-autoconfigure/src/test/java/org/springframework/boot/test/autoconfigure/data/elasticsearch/DataElasticsearchTestReactiveIntegrationTests.java b/spring-boot-project/spring-boot-test-autoconfigure/src/dockerTest/java/org/springframework/boot/test/autoconfigure/data/elasticsearch/DataElasticsearchTestReactiveIntegrationTests.java similarity index 100% rename from spring-boot-project/spring-boot-test-autoconfigure/src/test/java/org/springframework/boot/test/autoconfigure/data/elasticsearch/DataElasticsearchTestReactiveIntegrationTests.java rename to spring-boot-project/spring-boot-test-autoconfigure/src/dockerTest/java/org/springframework/boot/test/autoconfigure/data/elasticsearch/DataElasticsearchTestReactiveIntegrationTests.java diff --git a/spring-boot-project/spring-boot-test-autoconfigure/src/test/java/org/springframework/boot/test/autoconfigure/data/elasticsearch/DataElasticsearchTestWithIncludeFilterIntegrationTests.java b/spring-boot-project/spring-boot-test-autoconfigure/src/dockerTest/java/org/springframework/boot/test/autoconfigure/data/elasticsearch/DataElasticsearchTestWithIncludeFilterIntegrationTests.java similarity index 100% rename from spring-boot-project/spring-boot-test-autoconfigure/src/test/java/org/springframework/boot/test/autoconfigure/data/elasticsearch/DataElasticsearchTestWithIncludeFilterIntegrationTests.java rename to spring-boot-project/spring-boot-test-autoconfigure/src/dockerTest/java/org/springframework/boot/test/autoconfigure/data/elasticsearch/DataElasticsearchTestWithIncludeFilterIntegrationTests.java diff --git a/spring-boot-project/spring-boot-test-autoconfigure/src/test/java/org/springframework/boot/test/autoconfigure/data/elasticsearch/ExampleDocument.java b/spring-boot-project/spring-boot-test-autoconfigure/src/dockerTest/java/org/springframework/boot/test/autoconfigure/data/elasticsearch/ExampleDocument.java similarity index 100% rename from spring-boot-project/spring-boot-test-autoconfigure/src/test/java/org/springframework/boot/test/autoconfigure/data/elasticsearch/ExampleDocument.java rename to spring-boot-project/spring-boot-test-autoconfigure/src/dockerTest/java/org/springframework/boot/test/autoconfigure/data/elasticsearch/ExampleDocument.java diff --git a/spring-boot-project/spring-boot-test-autoconfigure/src/test/java/org/springframework/boot/test/autoconfigure/data/elasticsearch/ExampleElasticsearchApplication.java b/spring-boot-project/spring-boot-test-autoconfigure/src/dockerTest/java/org/springframework/boot/test/autoconfigure/data/elasticsearch/ExampleElasticsearchApplication.java similarity index 100% rename from spring-boot-project/spring-boot-test-autoconfigure/src/test/java/org/springframework/boot/test/autoconfigure/data/elasticsearch/ExampleElasticsearchApplication.java rename to spring-boot-project/spring-boot-test-autoconfigure/src/dockerTest/java/org/springframework/boot/test/autoconfigure/data/elasticsearch/ExampleElasticsearchApplication.java diff --git a/spring-boot-project/spring-boot-test-autoconfigure/src/test/java/org/springframework/boot/test/autoconfigure/data/elasticsearch/ExampleReactiveRepository.java b/spring-boot-project/spring-boot-test-autoconfigure/src/dockerTest/java/org/springframework/boot/test/autoconfigure/data/elasticsearch/ExampleReactiveRepository.java similarity index 100% rename from spring-boot-project/spring-boot-test-autoconfigure/src/test/java/org/springframework/boot/test/autoconfigure/data/elasticsearch/ExampleReactiveRepository.java rename to spring-boot-project/spring-boot-test-autoconfigure/src/dockerTest/java/org/springframework/boot/test/autoconfigure/data/elasticsearch/ExampleReactiveRepository.java diff --git a/spring-boot-project/spring-boot-test-autoconfigure/src/test/java/org/springframework/boot/test/autoconfigure/data/elasticsearch/ExampleRepository.java b/spring-boot-project/spring-boot-test-autoconfigure/src/dockerTest/java/org/springframework/boot/test/autoconfigure/data/elasticsearch/ExampleRepository.java similarity index 100% rename from spring-boot-project/spring-boot-test-autoconfigure/src/test/java/org/springframework/boot/test/autoconfigure/data/elasticsearch/ExampleRepository.java rename to spring-boot-project/spring-boot-test-autoconfigure/src/dockerTest/java/org/springframework/boot/test/autoconfigure/data/elasticsearch/ExampleRepository.java diff --git a/spring-boot-project/spring-boot-test-autoconfigure/src/test/java/org/springframework/boot/test/autoconfigure/data/elasticsearch/ExampleService.java b/spring-boot-project/spring-boot-test-autoconfigure/src/dockerTest/java/org/springframework/boot/test/autoconfigure/data/elasticsearch/ExampleService.java similarity index 100% rename from spring-boot-project/spring-boot-test-autoconfigure/src/test/java/org/springframework/boot/test/autoconfigure/data/elasticsearch/ExampleService.java rename to spring-boot-project/spring-boot-test-autoconfigure/src/dockerTest/java/org/springframework/boot/test/autoconfigure/data/elasticsearch/ExampleService.java diff --git a/spring-boot-project/spring-boot-test-autoconfigure/src/test/java/org/springframework/boot/test/autoconfigure/data/mongo/DataMongoTestIntegrationTests.java b/spring-boot-project/spring-boot-test-autoconfigure/src/dockerTest/java/org/springframework/boot/test/autoconfigure/data/mongo/DataMongoTestIntegrationTests.java similarity index 98% rename from spring-boot-project/spring-boot-test-autoconfigure/src/test/java/org/springframework/boot/test/autoconfigure/data/mongo/DataMongoTestIntegrationTests.java rename to spring-boot-project/spring-boot-test-autoconfigure/src/dockerTest/java/org/springframework/boot/test/autoconfigure/data/mongo/DataMongoTestIntegrationTests.java index 538bdd16052..3c1da4bc5f4 100644 --- a/spring-boot-project/spring-boot-test-autoconfigure/src/test/java/org/springframework/boot/test/autoconfigure/data/mongo/DataMongoTestIntegrationTests.java +++ b/spring-boot-project/spring-boot-test-autoconfigure/src/dockerTest/java/org/springframework/boot/test/autoconfigure/data/mongo/DataMongoTestIntegrationTests.java @@ -34,7 +34,7 @@ import static org.assertj.core.api.Assertions.assertThatExceptionOfType; import static org.springframework.boot.test.autoconfigure.AutoConfigurationImportedCondition.importedAutoConfiguration; /** - * Sample test for {@link DataMongoTest @DataMongoTest} + * Sample test for {@link DataMongoTest @DataMongoTest}. * * @author Michael Simons * @author Moritz Halbritter diff --git a/spring-boot-project/spring-boot-test-autoconfigure/src/test/java/org/springframework/boot/test/autoconfigure/data/mongo/DataMongoTestReactiveIntegrationTests.java b/spring-boot-project/spring-boot-test-autoconfigure/src/dockerTest/java/org/springframework/boot/test/autoconfigure/data/mongo/DataMongoTestReactiveIntegrationTests.java similarity index 100% rename from spring-boot-project/spring-boot-test-autoconfigure/src/test/java/org/springframework/boot/test/autoconfigure/data/mongo/DataMongoTestReactiveIntegrationTests.java rename to spring-boot-project/spring-boot-test-autoconfigure/src/dockerTest/java/org/springframework/boot/test/autoconfigure/data/mongo/DataMongoTestReactiveIntegrationTests.java diff --git a/spring-boot-project/spring-boot-test-autoconfigure/src/test/java/org/springframework/boot/test/autoconfigure/data/mongo/DataMongoTestWithIncludeFilterIntegrationTests.java b/spring-boot-project/spring-boot-test-autoconfigure/src/dockerTest/java/org/springframework/boot/test/autoconfigure/data/mongo/DataMongoTestWithIncludeFilterIntegrationTests.java similarity index 100% rename from spring-boot-project/spring-boot-test-autoconfigure/src/test/java/org/springframework/boot/test/autoconfigure/data/mongo/DataMongoTestWithIncludeFilterIntegrationTests.java rename to spring-boot-project/spring-boot-test-autoconfigure/src/dockerTest/java/org/springframework/boot/test/autoconfigure/data/mongo/DataMongoTestWithIncludeFilterIntegrationTests.java diff --git a/spring-boot-project/spring-boot-test-autoconfigure/src/test/java/org/springframework/boot/test/autoconfigure/data/mongo/ExampleDocument.java b/spring-boot-project/spring-boot-test-autoconfigure/src/dockerTest/java/org/springframework/boot/test/autoconfigure/data/mongo/ExampleDocument.java similarity index 100% rename from spring-boot-project/spring-boot-test-autoconfigure/src/test/java/org/springframework/boot/test/autoconfigure/data/mongo/ExampleDocument.java rename to spring-boot-project/spring-boot-test-autoconfigure/src/dockerTest/java/org/springframework/boot/test/autoconfigure/data/mongo/ExampleDocument.java diff --git a/spring-boot-project/spring-boot-test-autoconfigure/src/test/java/org/springframework/boot/test/autoconfigure/data/mongo/ExampleMongoApplication.java b/spring-boot-project/spring-boot-test-autoconfigure/src/dockerTest/java/org/springframework/boot/test/autoconfigure/data/mongo/ExampleMongoApplication.java similarity index 100% rename from spring-boot-project/spring-boot-test-autoconfigure/src/test/java/org/springframework/boot/test/autoconfigure/data/mongo/ExampleMongoApplication.java rename to spring-boot-project/spring-boot-test-autoconfigure/src/dockerTest/java/org/springframework/boot/test/autoconfigure/data/mongo/ExampleMongoApplication.java diff --git a/spring-boot-project/spring-boot-test-autoconfigure/src/test/java/org/springframework/boot/test/autoconfigure/data/mongo/ExampleReactiveRepository.java b/spring-boot-project/spring-boot-test-autoconfigure/src/dockerTest/java/org/springframework/boot/test/autoconfigure/data/mongo/ExampleReactiveRepository.java similarity index 100% rename from spring-boot-project/spring-boot-test-autoconfigure/src/test/java/org/springframework/boot/test/autoconfigure/data/mongo/ExampleReactiveRepository.java rename to spring-boot-project/spring-boot-test-autoconfigure/src/dockerTest/java/org/springframework/boot/test/autoconfigure/data/mongo/ExampleReactiveRepository.java diff --git a/spring-boot-project/spring-boot-test-autoconfigure/src/test/java/org/springframework/boot/test/autoconfigure/data/mongo/ExampleRepository.java b/spring-boot-project/spring-boot-test-autoconfigure/src/dockerTest/java/org/springframework/boot/test/autoconfigure/data/mongo/ExampleRepository.java similarity index 100% rename from spring-boot-project/spring-boot-test-autoconfigure/src/test/java/org/springframework/boot/test/autoconfigure/data/mongo/ExampleRepository.java rename to spring-boot-project/spring-boot-test-autoconfigure/src/dockerTest/java/org/springframework/boot/test/autoconfigure/data/mongo/ExampleRepository.java diff --git a/spring-boot-project/spring-boot-test-autoconfigure/src/test/java/org/springframework/boot/test/autoconfigure/data/mongo/ExampleService.java b/spring-boot-project/spring-boot-test-autoconfigure/src/dockerTest/java/org/springframework/boot/test/autoconfigure/data/mongo/ExampleService.java similarity index 100% rename from spring-boot-project/spring-boot-test-autoconfigure/src/test/java/org/springframework/boot/test/autoconfigure/data/mongo/ExampleService.java rename to spring-boot-project/spring-boot-test-autoconfigure/src/dockerTest/java/org/springframework/boot/test/autoconfigure/data/mongo/ExampleService.java diff --git a/spring-boot-project/spring-boot-test-autoconfigure/src/test/java/org/springframework/boot/test/autoconfigure/data/mongo/TransactionalDataMongoTestIntegrationTests.java b/spring-boot-project/spring-boot-test-autoconfigure/src/dockerTest/java/org/springframework/boot/test/autoconfigure/data/mongo/TransactionalDataMongoTestIntegrationTests.java similarity index 100% rename from spring-boot-project/spring-boot-test-autoconfigure/src/test/java/org/springframework/boot/test/autoconfigure/data/mongo/TransactionalDataMongoTestIntegrationTests.java rename to spring-boot-project/spring-boot-test-autoconfigure/src/dockerTest/java/org/springframework/boot/test/autoconfigure/data/mongo/TransactionalDataMongoTestIntegrationTests.java diff --git a/spring-boot-project/spring-boot-test-autoconfigure/src/test/java/org/springframework/boot/test/autoconfigure/data/neo4j/DataNeo4jTestIntegrationTests.java b/spring-boot-project/spring-boot-test-autoconfigure/src/dockerTest/java/org/springframework/boot/test/autoconfigure/data/neo4j/DataNeo4jTestIntegrationTests.java similarity index 100% rename from spring-boot-project/spring-boot-test-autoconfigure/src/test/java/org/springframework/boot/test/autoconfigure/data/neo4j/DataNeo4jTestIntegrationTests.java rename to spring-boot-project/spring-boot-test-autoconfigure/src/dockerTest/java/org/springframework/boot/test/autoconfigure/data/neo4j/DataNeo4jTestIntegrationTests.java diff --git a/spring-boot-project/spring-boot-test-autoconfigure/src/test/java/org/springframework/boot/test/autoconfigure/data/neo4j/DataNeo4jTestPropertiesIntegrationTests.java b/spring-boot-project/spring-boot-test-autoconfigure/src/dockerTest/java/org/springframework/boot/test/autoconfigure/data/neo4j/DataNeo4jTestPropertiesIntegrationTests.java similarity index 100% rename from spring-boot-project/spring-boot-test-autoconfigure/src/test/java/org/springframework/boot/test/autoconfigure/data/neo4j/DataNeo4jTestPropertiesIntegrationTests.java rename to spring-boot-project/spring-boot-test-autoconfigure/src/dockerTest/java/org/springframework/boot/test/autoconfigure/data/neo4j/DataNeo4jTestPropertiesIntegrationTests.java diff --git a/spring-boot-project/spring-boot-test-autoconfigure/src/test/java/org/springframework/boot/test/autoconfigure/data/neo4j/DataNeo4jTestReactiveIntegrationTests.java b/spring-boot-project/spring-boot-test-autoconfigure/src/dockerTest/java/org/springframework/boot/test/autoconfigure/data/neo4j/DataNeo4jTestReactiveIntegrationTests.java similarity index 100% rename from spring-boot-project/spring-boot-test-autoconfigure/src/test/java/org/springframework/boot/test/autoconfigure/data/neo4j/DataNeo4jTestReactiveIntegrationTests.java rename to spring-boot-project/spring-boot-test-autoconfigure/src/dockerTest/java/org/springframework/boot/test/autoconfigure/data/neo4j/DataNeo4jTestReactiveIntegrationTests.java diff --git a/spring-boot-project/spring-boot-test-autoconfigure/src/test/java/org/springframework/boot/test/autoconfigure/data/neo4j/DataNeo4jTestWithIncludeFilterIntegrationTests.java b/spring-boot-project/spring-boot-test-autoconfigure/src/dockerTest/java/org/springframework/boot/test/autoconfigure/data/neo4j/DataNeo4jTestWithIncludeFilterIntegrationTests.java similarity index 100% rename from spring-boot-project/spring-boot-test-autoconfigure/src/test/java/org/springframework/boot/test/autoconfigure/data/neo4j/DataNeo4jTestWithIncludeFilterIntegrationTests.java rename to spring-boot-project/spring-boot-test-autoconfigure/src/dockerTest/java/org/springframework/boot/test/autoconfigure/data/neo4j/DataNeo4jTestWithIncludeFilterIntegrationTests.java diff --git a/spring-boot-project/spring-boot-test-autoconfigure/src/test/java/org/springframework/boot/test/autoconfigure/data/neo4j/ExampleGraph.java b/spring-boot-project/spring-boot-test-autoconfigure/src/dockerTest/java/org/springframework/boot/test/autoconfigure/data/neo4j/ExampleGraph.java similarity index 100% rename from spring-boot-project/spring-boot-test-autoconfigure/src/test/java/org/springframework/boot/test/autoconfigure/data/neo4j/ExampleGraph.java rename to spring-boot-project/spring-boot-test-autoconfigure/src/dockerTest/java/org/springframework/boot/test/autoconfigure/data/neo4j/ExampleGraph.java diff --git a/spring-boot-project/spring-boot-test-autoconfigure/src/test/java/org/springframework/boot/test/autoconfigure/data/neo4j/ExampleNeo4jApplication.java b/spring-boot-project/spring-boot-test-autoconfigure/src/dockerTest/java/org/springframework/boot/test/autoconfigure/data/neo4j/ExampleNeo4jApplication.java similarity index 100% rename from spring-boot-project/spring-boot-test-autoconfigure/src/test/java/org/springframework/boot/test/autoconfigure/data/neo4j/ExampleNeo4jApplication.java rename to spring-boot-project/spring-boot-test-autoconfigure/src/dockerTest/java/org/springframework/boot/test/autoconfigure/data/neo4j/ExampleNeo4jApplication.java diff --git a/spring-boot-project/spring-boot-test-autoconfigure/src/test/java/org/springframework/boot/test/autoconfigure/data/neo4j/ExampleReactiveRepository.java b/spring-boot-project/spring-boot-test-autoconfigure/src/dockerTest/java/org/springframework/boot/test/autoconfigure/data/neo4j/ExampleReactiveRepository.java similarity index 100% rename from spring-boot-project/spring-boot-test-autoconfigure/src/test/java/org/springframework/boot/test/autoconfigure/data/neo4j/ExampleReactiveRepository.java rename to spring-boot-project/spring-boot-test-autoconfigure/src/dockerTest/java/org/springframework/boot/test/autoconfigure/data/neo4j/ExampleReactiveRepository.java diff --git a/spring-boot-project/spring-boot-test-autoconfigure/src/test/java/org/springframework/boot/test/autoconfigure/data/neo4j/ExampleRepository.java b/spring-boot-project/spring-boot-test-autoconfigure/src/dockerTest/java/org/springframework/boot/test/autoconfigure/data/neo4j/ExampleRepository.java similarity index 100% rename from spring-boot-project/spring-boot-test-autoconfigure/src/test/java/org/springframework/boot/test/autoconfigure/data/neo4j/ExampleRepository.java rename to spring-boot-project/spring-boot-test-autoconfigure/src/dockerTest/java/org/springframework/boot/test/autoconfigure/data/neo4j/ExampleRepository.java diff --git a/spring-boot-project/spring-boot-test-autoconfigure/src/test/java/org/springframework/boot/test/autoconfigure/data/neo4j/ExampleService.java b/spring-boot-project/spring-boot-test-autoconfigure/src/dockerTest/java/org/springframework/boot/test/autoconfigure/data/neo4j/ExampleService.java similarity index 100% rename from spring-boot-project/spring-boot-test-autoconfigure/src/test/java/org/springframework/boot/test/autoconfigure/data/neo4j/ExampleService.java rename to spring-boot-project/spring-boot-test-autoconfigure/src/dockerTest/java/org/springframework/boot/test/autoconfigure/data/neo4j/ExampleService.java diff --git a/spring-boot-project/spring-boot-test-autoconfigure/src/test/java/org/springframework/boot/test/autoconfigure/data/redis/DataRedisTestIntegrationTests.java b/spring-boot-project/spring-boot-test-autoconfigure/src/dockerTest/java/org/springframework/boot/test/autoconfigure/data/redis/DataRedisTestIntegrationTests.java similarity index 100% rename from spring-boot-project/spring-boot-test-autoconfigure/src/test/java/org/springframework/boot/test/autoconfigure/data/redis/DataRedisTestIntegrationTests.java rename to spring-boot-project/spring-boot-test-autoconfigure/src/dockerTest/java/org/springframework/boot/test/autoconfigure/data/redis/DataRedisTestIntegrationTests.java diff --git a/spring-boot-project/spring-boot-test-autoconfigure/src/test/java/org/springframework/boot/test/autoconfigure/data/redis/DataRedisTestPropertiesIntegrationTests.java b/spring-boot-project/spring-boot-test-autoconfigure/src/dockerTest/java/org/springframework/boot/test/autoconfigure/data/redis/DataRedisTestPropertiesIntegrationTests.java similarity index 100% rename from spring-boot-project/spring-boot-test-autoconfigure/src/test/java/org/springframework/boot/test/autoconfigure/data/redis/DataRedisTestPropertiesIntegrationTests.java rename to spring-boot-project/spring-boot-test-autoconfigure/src/dockerTest/java/org/springframework/boot/test/autoconfigure/data/redis/DataRedisTestPropertiesIntegrationTests.java diff --git a/spring-boot-project/spring-boot-test-autoconfigure/src/test/java/org/springframework/boot/test/autoconfigure/data/redis/DataRedisTestReactiveIntegrationTests.java b/spring-boot-project/spring-boot-test-autoconfigure/src/dockerTest/java/org/springframework/boot/test/autoconfigure/data/redis/DataRedisTestReactiveIntegrationTests.java similarity index 100% rename from spring-boot-project/spring-boot-test-autoconfigure/src/test/java/org/springframework/boot/test/autoconfigure/data/redis/DataRedisTestReactiveIntegrationTests.java rename to spring-boot-project/spring-boot-test-autoconfigure/src/dockerTest/java/org/springframework/boot/test/autoconfigure/data/redis/DataRedisTestReactiveIntegrationTests.java diff --git a/spring-boot-project/spring-boot-test-autoconfigure/src/test/java/org/springframework/boot/test/autoconfigure/data/redis/DataRedisTestWithIncludeFilterIntegrationTests.java b/spring-boot-project/spring-boot-test-autoconfigure/src/dockerTest/java/org/springframework/boot/test/autoconfigure/data/redis/DataRedisTestWithIncludeFilterIntegrationTests.java similarity index 100% rename from spring-boot-project/spring-boot-test-autoconfigure/src/test/java/org/springframework/boot/test/autoconfigure/data/redis/DataRedisTestWithIncludeFilterIntegrationTests.java rename to spring-boot-project/spring-boot-test-autoconfigure/src/dockerTest/java/org/springframework/boot/test/autoconfigure/data/redis/DataRedisTestWithIncludeFilterIntegrationTests.java diff --git a/spring-boot-project/spring-boot-test-autoconfigure/src/test/java/org/springframework/boot/test/autoconfigure/data/redis/ExampleRedisApplication.java b/spring-boot-project/spring-boot-test-autoconfigure/src/dockerTest/java/org/springframework/boot/test/autoconfigure/data/redis/ExampleRedisApplication.java similarity index 100% rename from spring-boot-project/spring-boot-test-autoconfigure/src/test/java/org/springframework/boot/test/autoconfigure/data/redis/ExampleRedisApplication.java rename to spring-boot-project/spring-boot-test-autoconfigure/src/dockerTest/java/org/springframework/boot/test/autoconfigure/data/redis/ExampleRedisApplication.java diff --git a/spring-boot-project/spring-boot-test-autoconfigure/src/test/java/org/springframework/boot/test/autoconfigure/data/redis/ExampleRepository.java b/spring-boot-project/spring-boot-test-autoconfigure/src/dockerTest/java/org/springframework/boot/test/autoconfigure/data/redis/ExampleRepository.java similarity index 100% rename from spring-boot-project/spring-boot-test-autoconfigure/src/test/java/org/springframework/boot/test/autoconfigure/data/redis/ExampleRepository.java rename to spring-boot-project/spring-boot-test-autoconfigure/src/dockerTest/java/org/springframework/boot/test/autoconfigure/data/redis/ExampleRepository.java diff --git a/spring-boot-project/spring-boot-test-autoconfigure/src/test/java/org/springframework/boot/test/autoconfigure/data/redis/ExampleService.java b/spring-boot-project/spring-boot-test-autoconfigure/src/dockerTest/java/org/springframework/boot/test/autoconfigure/data/redis/ExampleService.java similarity index 100% rename from spring-boot-project/spring-boot-test-autoconfigure/src/test/java/org/springframework/boot/test/autoconfigure/data/redis/ExampleService.java rename to spring-boot-project/spring-boot-test-autoconfigure/src/dockerTest/java/org/springframework/boot/test/autoconfigure/data/redis/ExampleService.java diff --git a/spring-boot-project/spring-boot-test-autoconfigure/src/test/java/org/springframework/boot/test/autoconfigure/data/redis/PersonHash.java b/spring-boot-project/spring-boot-test-autoconfigure/src/dockerTest/java/org/springframework/boot/test/autoconfigure/data/redis/PersonHash.java similarity index 100% rename from spring-boot-project/spring-boot-test-autoconfigure/src/test/java/org/springframework/boot/test/autoconfigure/data/redis/PersonHash.java rename to spring-boot-project/spring-boot-test-autoconfigure/src/dockerTest/java/org/springframework/boot/test/autoconfigure/data/redis/PersonHash.java From 0579126c5f294697a48fa19b2553935688f10b48 Mon Sep 17 00:00:00 2001 From: Andy Wilkinson Date: Wed, 26 Jun 2024 10:45:44 +0100 Subject: [PATCH 13/28] Update spring-boot-smoke-test-activemq to use docker-test plugin See gh-41228 --- .../spring-boot-smoke-test-activemq/build.gradle | 13 +++++++------ .../smoketest/activemq/SampleActiveMqTests.java | 0 2 files changed, 7 insertions(+), 6 deletions(-) rename spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-activemq/src/{test => dockerTest}/java/smoketest/activemq/SampleActiveMqTests.java (100%) diff --git a/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-activemq/build.gradle b/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-activemq/build.gradle index 963f63814ac..518825084fb 100644 --- a/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-activemq/build.gradle +++ b/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-activemq/build.gradle @@ -1,16 +1,17 @@ plugins { id "java" id "org.springframework.boot.conventions" + id "org.springframework.boot.docker-test" } description = "Spring Boot Actuator ActiveMQ smoke test" dependencies { + dockerTestImplementation("org.awaitility:awaitility") + dockerTestImplementation("org.testcontainers:junit-jupiter") + dockerTestImplementation(project(":spring-boot-project:spring-boot-starters:spring-boot-starter-test")) + dockerTestImplementation(project(":spring-boot-project:spring-boot-testcontainers")) + dockerTestImplementation(project(":spring-boot-project:spring-boot-tools:spring-boot-test-support")) + implementation(project(":spring-boot-project:spring-boot-starters:spring-boot-starter-activemq")) - - testImplementation("org.awaitility:awaitility") - testImplementation("org.testcontainers:junit-jupiter") - testImplementation(project(":spring-boot-project:spring-boot-starters:spring-boot-starter-test")) - testImplementation(project(":spring-boot-project:spring-boot-testcontainers")) - testImplementation(project(":spring-boot-project:spring-boot-tools:spring-boot-test-support")) } \ No newline at end of file diff --git a/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-activemq/src/test/java/smoketest/activemq/SampleActiveMqTests.java b/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-activemq/src/dockerTest/java/smoketest/activemq/SampleActiveMqTests.java similarity index 100% rename from spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-activemq/src/test/java/smoketest/activemq/SampleActiveMqTests.java rename to spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-activemq/src/dockerTest/java/smoketest/activemq/SampleActiveMqTests.java From 24e797f8c20a179e8b6cfea2fc35cea3830f5ed2 Mon Sep 17 00:00:00 2001 From: Andy Wilkinson Date: Wed, 26 Jun 2024 10:46:00 +0100 Subject: [PATCH 14/28] Update spring-boot-smoke-test-amqp to use docker-test plugin See gh-41228 --- .../spring-boot-smoke-test-amqp/build.gradle | 15 ++++++++------- .../amqp/SampleAmqpSimpleApplicationSslTests.java | 0 .../amqp/SampleAmqpSimpleApplicationTests.java | 0 .../smoketest/amqp/SecureRabbitMqContainer.java | 0 4 files changed, 8 insertions(+), 7 deletions(-) rename spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-amqp/src/{test => dockerTest}/java/smoketest/amqp/SampleAmqpSimpleApplicationSslTests.java (100%) rename spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-amqp/src/{test => dockerTest}/java/smoketest/amqp/SampleAmqpSimpleApplicationTests.java (100%) rename spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-amqp/src/{test => dockerTest}/java/smoketest/amqp/SecureRabbitMqContainer.java (100%) diff --git a/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-amqp/build.gradle b/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-amqp/build.gradle index 4ef5cf07a46..10b6ac14c48 100644 --- a/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-amqp/build.gradle +++ b/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-amqp/build.gradle @@ -1,17 +1,18 @@ plugins { id "java" id "org.springframework.boot.conventions" + id "org.springframework.boot.docker-test" } description = "Spring Boot AMQP smoke test" dependencies { + dockerTestImplementation(project(":spring-boot-project:spring-boot-starters:spring-boot-starter-test")) + dockerTestImplementation(project(":spring-boot-project:spring-boot-testcontainers")) + dockerTestImplementation(project(":spring-boot-project:spring-boot-tools:spring-boot-test-support")) + dockerTestImplementation("org.awaitility:awaitility") + dockerTestImplementation("org.testcontainers:junit-jupiter") + dockerTestImplementation("org.testcontainers:rabbitmq") + implementation(project(":spring-boot-project:spring-boot-starters:spring-boot-starter-amqp")) - - testImplementation(project(":spring-boot-project:spring-boot-starters:spring-boot-starter-test")) - testImplementation(project(":spring-boot-project:spring-boot-testcontainers")) - testImplementation(project(":spring-boot-project:spring-boot-tools:spring-boot-test-support")) - testImplementation("org.awaitility:awaitility") - testImplementation("org.testcontainers:junit-jupiter") - testImplementation("org.testcontainers:rabbitmq") } \ No newline at end of file diff --git a/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-amqp/src/test/java/smoketest/amqp/SampleAmqpSimpleApplicationSslTests.java b/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-amqp/src/dockerTest/java/smoketest/amqp/SampleAmqpSimpleApplicationSslTests.java similarity index 100% rename from spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-amqp/src/test/java/smoketest/amqp/SampleAmqpSimpleApplicationSslTests.java rename to spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-amqp/src/dockerTest/java/smoketest/amqp/SampleAmqpSimpleApplicationSslTests.java diff --git a/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-amqp/src/test/java/smoketest/amqp/SampleAmqpSimpleApplicationTests.java b/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-amqp/src/dockerTest/java/smoketest/amqp/SampleAmqpSimpleApplicationTests.java similarity index 100% rename from spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-amqp/src/test/java/smoketest/amqp/SampleAmqpSimpleApplicationTests.java rename to spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-amqp/src/dockerTest/java/smoketest/amqp/SampleAmqpSimpleApplicationTests.java diff --git a/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-amqp/src/test/java/smoketest/amqp/SecureRabbitMqContainer.java b/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-amqp/src/dockerTest/java/smoketest/amqp/SecureRabbitMqContainer.java similarity index 100% rename from spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-amqp/src/test/java/smoketest/amqp/SecureRabbitMqContainer.java rename to spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-amqp/src/dockerTest/java/smoketest/amqp/SecureRabbitMqContainer.java From ccb0b2910f049f262850944fb88a037c175cd66f Mon Sep 17 00:00:00 2001 From: Andy Wilkinson Date: Wed, 26 Jun 2024 10:46:18 +0100 Subject: [PATCH 15/28] Update spring-boot-smoke-test-cache to use docker-test plugin See gh-41228 --- .../spring-boot-smoke-test-cache/build.gradle | 36 ++++++++----------- .../SampleCacheApplicationRedisTests.java | 0 .../resources/logback-test.xml | 0 3 files changed, 15 insertions(+), 21 deletions(-) rename spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-cache/src/{redisTest => dockerTest}/java/smoketest/cache/SampleCacheApplicationRedisTests.java (100%) rename spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-cache/src/{redisTest => dockerTest}/resources/logback-test.xml (100%) diff --git a/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-cache/build.gradle b/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-cache/build.gradle index d9137303b31..73d5790ff46 100644 --- a/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-cache/build.gradle +++ b/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-cache/build.gradle @@ -1,6 +1,7 @@ plugins { id "java" id "org.springframework.boot.conventions" + id "org.springframework.boot.docker-test" } description = "Spring Boot cache smoke test" @@ -21,18 +22,18 @@ configurations { } dependencies { - implementation(project(":spring-boot-project:spring-boot-starters:spring-boot-starter-actuator")) - implementation(project(":spring-boot-project:spring-boot-starters:spring-boot-starter-cache")) - implementation(project(":spring-boot-project:spring-boot-starters:spring-boot-starter-web")) - - testImplementation(project(":spring-boot-project:spring-boot-starters:spring-boot-starter-test")) - caffeine(enforcedPlatform(project(":spring-boot-project:spring-boot-dependencies"))) caffeine("com.github.ben-manes.caffeine:caffeine") couchbase(enforcedPlatform(project(":spring-boot-project:spring-boot-dependencies"))) couchbase(project(":spring-boot-project:spring-boot-starters:spring-boot-starter-data-couchbase")) - + + dockerTestImplementation(project(":spring-boot-project:spring-boot-starters:spring-boot-starter-data-redis")) + dockerTestImplementation(project(":spring-boot-project:spring-boot-starters:spring-boot-starter-test")) + dockerTestImplementation(project(":spring-boot-project:spring-boot-testcontainers")) + dockerTestImplementation(project(":spring-boot-project:spring-boot-tools:spring-boot-test-support")) + dockerTestImplementation("org.testcontainers:junit-jupiter") + ehcache(enforcedPlatform(project(":spring-boot-project:spring-boot-dependencies"))) ehcache("javax.cache:cache-api") ehcache("org.ehcache:ehcache::jakarta") @@ -40,6 +41,10 @@ dependencies { hazelcast(enforcedPlatform(project(":spring-boot-project:spring-boot-dependencies"))) hazelcast("com.hazelcast:hazelcast") hazelcast("com.hazelcast:hazelcast-spring") + + implementation(project(":spring-boot-project:spring-boot-starters:spring-boot-starter-actuator")) + implementation(project(":spring-boot-project:spring-boot-starters:spring-boot-starter-cache")) + implementation(project(":spring-boot-project:spring-boot-starters:spring-boot-starter-web")) infinispan(enforcedPlatform(project(":spring-boot-project:spring-boot-dependencies"))) infinispan("javax.cache:cache-api") @@ -55,13 +60,8 @@ dependencies { replacedBy("org.infinispan:infinispan-core-jakarta", "Java EE 9 baseline") } } - - redisTestImplementation(enforcedPlatform(project(":spring-boot-project:spring-boot-parent"))) - redisTestImplementation(project(":spring-boot-project:spring-boot-starters:spring-boot-starter-data-redis")) - redisTestImplementation(project(":spring-boot-project:spring-boot-starters:spring-boot-starter-test")) - redisTestImplementation(project(":spring-boot-project:spring-boot-testcontainers")) - redisTestImplementation(project(":spring-boot-project:spring-boot-tools:spring-boot-test-support")) - redisTestImplementation("org.testcontainers:junit-jupiter") + + testImplementation(project(":spring-boot-project:spring-boot-starters:spring-boot-starter-test")) } def testCaffeine = tasks.register("testCaffeine", Test) { @@ -91,12 +91,6 @@ def testInfinispan = tasks.register("testInfinispan", Test) { systemProperties = ["spring.cache.jcache.config" : "classpath:infinispan.xml"] } -def testRedis = tasks.register("testRedis", Test) { - description = "Runs the tests against Redis" - classpath = sourceSets.redisTest.runtimeClasspath - testClassesDirs = sourceSets.redisTest.output.classesDirs -} - tasks.named("check").configure { - dependsOn testCaffeine, testCouchbase, testEhcache, testHazelcast, testInfinispan, testRedis + dependsOn testCaffeine, testCouchbase, testEhcache, testHazelcast, testInfinispan } diff --git a/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-cache/src/redisTest/java/smoketest/cache/SampleCacheApplicationRedisTests.java b/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-cache/src/dockerTest/java/smoketest/cache/SampleCacheApplicationRedisTests.java similarity index 100% rename from spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-cache/src/redisTest/java/smoketest/cache/SampleCacheApplicationRedisTests.java rename to spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-cache/src/dockerTest/java/smoketest/cache/SampleCacheApplicationRedisTests.java diff --git a/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-cache/src/redisTest/resources/logback-test.xml b/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-cache/src/dockerTest/resources/logback-test.xml similarity index 100% rename from spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-cache/src/redisTest/resources/logback-test.xml rename to spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-cache/src/dockerTest/resources/logback-test.xml From a9be2e50e3ca7ff350e303831aa5411e13ef54f5 Mon Sep 17 00:00:00 2001 From: Andy Wilkinson Date: Wed, 26 Jun 2024 10:47:01 +0100 Subject: [PATCH 16/28] Update spring-boot-smoke-test-data-cassandra to use docker-test plugin See gh-41228 --- .../build.gradle | 23 +++++++------- ...eCassandraApplicationReactiveSslTests.java | 0 .../SampleCassandraApplicationSslTests.java | 0 .../cassandra/SecureCassandraContainer.java | 0 .../resources/ssl/cassandra.yaml | 0 .../resources/ssl/test-ca.p12 | Bin .../resources/ssl/test-client.p12 | Bin .../resources/ssl/test-server.p12 | Bin .../build.gradle | 29 +++++++++--------- 9 files changed, 27 insertions(+), 25 deletions(-) rename spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-data-cassandra/src/{test => dockerTest}/java/smoketest/data/cassandra/SampleCassandraApplicationReactiveSslTests.java (100%) rename spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-data-cassandra/src/{test => dockerTest}/java/smoketest/data/cassandra/SampleCassandraApplicationSslTests.java (100%) rename spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-data-cassandra/src/{test => dockerTest}/java/smoketest/data/cassandra/SecureCassandraContainer.java (100%) rename spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-data-cassandra/src/{test => dockerTest}/resources/ssl/cassandra.yaml (100%) rename spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-data-cassandra/src/{test => dockerTest}/resources/ssl/test-ca.p12 (100%) rename spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-data-cassandra/src/{test => dockerTest}/resources/ssl/test-client.p12 (100%) rename spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-data-cassandra/src/{test => dockerTest}/resources/ssl/test-server.p12 (100%) diff --git a/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-data-cassandra/build.gradle b/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-data-cassandra/build.gradle index 651be2c7ee7..6fb7872d303 100644 --- a/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-data-cassandra/build.gradle +++ b/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-data-cassandra/build.gradle @@ -1,22 +1,23 @@ plugins { id "java" id "org.springframework.boot.conventions" + id "org.springframework.boot.docker-test" } description = "Spring Boot Data Cassandra smoke test" dependencies { + dockerTestImplementation(project(":spring-boot-project:spring-boot-test")) + dockerTestImplementation(project(":spring-boot-project:spring-boot-starters:spring-boot-starter-test")) + dockerTestImplementation(project(":spring-boot-project:spring-boot-tools:spring-boot-test-support")) + dockerTestImplementation(project(":spring-boot-project:spring-boot-testcontainers")) + dockerTestImplementation("org.junit.jupiter:junit-jupiter") + dockerTestImplementation("org.junit.platform:junit-platform-engine") + dockerTestImplementation("org.junit.platform:junit-platform-launcher") + dockerTestImplementation("org.testcontainers:junit-jupiter") + dockerTestImplementation("org.testcontainers:testcontainers") + dockerTestImplementation("org.testcontainers:cassandra") + implementation(project(":spring-boot-project:spring-boot-starters:spring-boot-starter-data-cassandra")) implementation(project(":spring-boot-project:spring-boot-starters:spring-boot-starter-data-cassandra-reactive")) - - testImplementation(project(":spring-boot-project:spring-boot-test")) - testImplementation(project(":spring-boot-project:spring-boot-starters:spring-boot-starter-test")) - testImplementation(project(":spring-boot-project:spring-boot-tools:spring-boot-test-support")) - testImplementation(project(":spring-boot-project:spring-boot-testcontainers")) - testImplementation("org.junit.jupiter:junit-jupiter") - testImplementation("org.junit.platform:junit-platform-engine") - testImplementation("org.junit.platform:junit-platform-launcher") - testImplementation("org.testcontainers:junit-jupiter") - testImplementation("org.testcontainers:testcontainers") - testImplementation("org.testcontainers:cassandra") } diff --git a/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-data-cassandra/src/test/java/smoketest/data/cassandra/SampleCassandraApplicationReactiveSslTests.java b/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-data-cassandra/src/dockerTest/java/smoketest/data/cassandra/SampleCassandraApplicationReactiveSslTests.java similarity index 100% rename from spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-data-cassandra/src/test/java/smoketest/data/cassandra/SampleCassandraApplicationReactiveSslTests.java rename to spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-data-cassandra/src/dockerTest/java/smoketest/data/cassandra/SampleCassandraApplicationReactiveSslTests.java diff --git a/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-data-cassandra/src/test/java/smoketest/data/cassandra/SampleCassandraApplicationSslTests.java b/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-data-cassandra/src/dockerTest/java/smoketest/data/cassandra/SampleCassandraApplicationSslTests.java similarity index 100% rename from spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-data-cassandra/src/test/java/smoketest/data/cassandra/SampleCassandraApplicationSslTests.java rename to spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-data-cassandra/src/dockerTest/java/smoketest/data/cassandra/SampleCassandraApplicationSslTests.java diff --git a/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-data-cassandra/src/test/java/smoketest/data/cassandra/SecureCassandraContainer.java b/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-data-cassandra/src/dockerTest/java/smoketest/data/cassandra/SecureCassandraContainer.java similarity index 100% rename from spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-data-cassandra/src/test/java/smoketest/data/cassandra/SecureCassandraContainer.java rename to spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-data-cassandra/src/dockerTest/java/smoketest/data/cassandra/SecureCassandraContainer.java diff --git a/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-data-cassandra/src/test/resources/ssl/cassandra.yaml b/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-data-cassandra/src/dockerTest/resources/ssl/cassandra.yaml similarity index 100% rename from spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-data-cassandra/src/test/resources/ssl/cassandra.yaml rename to spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-data-cassandra/src/dockerTest/resources/ssl/cassandra.yaml diff --git a/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-data-cassandra/src/test/resources/ssl/test-ca.p12 b/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-data-cassandra/src/dockerTest/resources/ssl/test-ca.p12 similarity index 100% rename from spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-data-cassandra/src/test/resources/ssl/test-ca.p12 rename to spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-data-cassandra/src/dockerTest/resources/ssl/test-ca.p12 diff --git a/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-data-cassandra/src/test/resources/ssl/test-client.p12 b/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-data-cassandra/src/dockerTest/resources/ssl/test-client.p12 similarity index 100% rename from spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-data-cassandra/src/test/resources/ssl/test-client.p12 rename to spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-data-cassandra/src/dockerTest/resources/ssl/test-client.p12 diff --git a/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-data-cassandra/src/test/resources/ssl/test-server.p12 b/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-data-cassandra/src/dockerTest/resources/ssl/test-server.p12 similarity index 100% rename from spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-data-cassandra/src/test/resources/ssl/test-server.p12 rename to spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-data-cassandra/src/dockerTest/resources/ssl/test-server.p12 diff --git a/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-data-couchbase/build.gradle b/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-data-couchbase/build.gradle index fba550646ef..153cc49baea 100644 --- a/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-data-couchbase/build.gradle +++ b/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-data-couchbase/build.gradle @@ -1,25 +1,26 @@ plugins { id "java" id "org.springframework.boot.conventions" + id "org.springframework.boot.docker-test" } description = "Spring Boot Data Couchbase smoke test" dependencies { + dockerTestImplementation(project(":spring-boot-project:spring-boot-test")) + dockerTestImplementation(project(":spring-boot-project:spring-boot-starters:spring-boot-starter-test")) + dockerTestImplementation(project(":spring-boot-project:spring-boot-tools:spring-boot-test-support")) + dockerTestImplementation(project(":spring-boot-project:spring-boot-testcontainers")) + dockerTestImplementation("io.projectreactor:reactor-core") + dockerTestImplementation("io.projectreactor:reactor-test") + dockerTestImplementation("org.apache.httpcomponents.client5:httpclient5") + dockerTestImplementation("org.junit.jupiter:junit-jupiter") + dockerTestImplementation("org.junit.platform:junit-platform-engine") + dockerTestImplementation("org.junit.platform:junit-platform-launcher") + dockerTestImplementation("org.testcontainers:junit-jupiter") + dockerTestImplementation("org.testcontainers:testcontainers") + dockerTestImplementation("org.testcontainers:couchbase") + implementation(project(":spring-boot-project:spring-boot-starters:spring-boot-starter-data-couchbase")) implementation(project(":spring-boot-project:spring-boot-starters:spring-boot-starter-data-couchbase-reactive")) - - testImplementation(project(":spring-boot-project:spring-boot-test")) - testImplementation(project(":spring-boot-project:spring-boot-starters:spring-boot-starter-test")) - testImplementation(project(":spring-boot-project:spring-boot-tools:spring-boot-test-support")) - testImplementation(project(":spring-boot-project:spring-boot-testcontainers")) - testImplementation("io.projectreactor:reactor-core") - testImplementation("io.projectreactor:reactor-test") - testImplementation("org.apache.httpcomponents.client5:httpclient5") - testImplementation("org.junit.jupiter:junit-jupiter") - testImplementation("org.junit.platform:junit-platform-engine") - testImplementation("org.junit.platform:junit-platform-launcher") - testImplementation("org.testcontainers:junit-jupiter") - testImplementation("org.testcontainers:testcontainers") - testImplementation("org.testcontainers:couchbase") } From 28396b1ff3cfe5cae07e9d6d7d12e537a01dfaef Mon Sep 17 00:00:00 2001 From: Andy Wilkinson Date: Wed, 26 Jun 2024 10:47:35 +0100 Subject: [PATCH 17/28] Update spring-boot-smoke-test-data-couchbase to use docker-test plugin See gh-41228 --- .../couchbase/SampleCouchbaseApplicationReactiveSslTests.java | 0 .../data/couchbase/SampleCouchbaseApplicationSslTests.java | 0 .../java/smoketest/data/couchbase/SecureCouchbaseContainer.java | 0 3 files changed, 0 insertions(+), 0 deletions(-) rename spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-data-couchbase/src/{test => dockerTest}/java/smoketest/data/couchbase/SampleCouchbaseApplicationReactiveSslTests.java (100%) rename spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-data-couchbase/src/{test => dockerTest}/java/smoketest/data/couchbase/SampleCouchbaseApplicationSslTests.java (100%) rename spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-data-couchbase/src/{test => dockerTest}/java/smoketest/data/couchbase/SecureCouchbaseContainer.java (100%) diff --git a/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-data-couchbase/src/test/java/smoketest/data/couchbase/SampleCouchbaseApplicationReactiveSslTests.java b/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-data-couchbase/src/dockerTest/java/smoketest/data/couchbase/SampleCouchbaseApplicationReactiveSslTests.java similarity index 100% rename from spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-data-couchbase/src/test/java/smoketest/data/couchbase/SampleCouchbaseApplicationReactiveSslTests.java rename to spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-data-couchbase/src/dockerTest/java/smoketest/data/couchbase/SampleCouchbaseApplicationReactiveSslTests.java diff --git a/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-data-couchbase/src/test/java/smoketest/data/couchbase/SampleCouchbaseApplicationSslTests.java b/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-data-couchbase/src/dockerTest/java/smoketest/data/couchbase/SampleCouchbaseApplicationSslTests.java similarity index 100% rename from spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-data-couchbase/src/test/java/smoketest/data/couchbase/SampleCouchbaseApplicationSslTests.java rename to spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-data-couchbase/src/dockerTest/java/smoketest/data/couchbase/SampleCouchbaseApplicationSslTests.java diff --git a/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-data-couchbase/src/test/java/smoketest/data/couchbase/SecureCouchbaseContainer.java b/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-data-couchbase/src/dockerTest/java/smoketest/data/couchbase/SecureCouchbaseContainer.java similarity index 100% rename from spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-data-couchbase/src/test/java/smoketest/data/couchbase/SecureCouchbaseContainer.java rename to spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-data-couchbase/src/dockerTest/java/smoketest/data/couchbase/SecureCouchbaseContainer.java From 0d2d3e7d717a4da009eb0888adc33d3367af583f Mon Sep 17 00:00:00 2001 From: Andy Wilkinson Date: Wed, 26 Jun 2024 10:47:51 +0100 Subject: [PATCH 18/28] Update spring-boot-smoke-test-data-mongo to use docker-test plugin See gh-41228 --- .../build.gradle | 27 ++++++++++--------- ...ampleMongoApplicationReactiveSslTests.java | 0 .../mongo/SampleMongoApplicationSslTests.java | 0 .../data/mongo/SecureMongoContainer.java | 0 4 files changed, 14 insertions(+), 13 deletions(-) rename spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-data-mongo/src/{test => dockerTest}/java/smoketest/data/mongo/SampleMongoApplicationReactiveSslTests.java (100%) rename spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-data-mongo/src/{test => dockerTest}/java/smoketest/data/mongo/SampleMongoApplicationSslTests.java (100%) rename spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-data-mongo/src/{test => dockerTest}/java/smoketest/data/mongo/SecureMongoContainer.java (100%) diff --git a/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-data-mongo/build.gradle b/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-data-mongo/build.gradle index fa4f25bd973..e0f3a5fc584 100644 --- a/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-data-mongo/build.gradle +++ b/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-data-mongo/build.gradle @@ -1,24 +1,25 @@ plugins { id "java" id "org.springframework.boot.conventions" + id "org.springframework.boot.docker-test" } description = "Spring Boot Data MongoDB smoke test" dependencies { + dockerTestImplementation(project(":spring-boot-project:spring-boot-test")) + dockerTestImplementation(project(":spring-boot-project:spring-boot-starters:spring-boot-starter-test")) + dockerTestImplementation(project(":spring-boot-project:spring-boot-tools:spring-boot-test-support")) + dockerTestImplementation(project(":spring-boot-project:spring-boot-testcontainers")) + dockerTestImplementation("io.projectreactor:reactor-test") + dockerTestImplementation("org.junit.jupiter:junit-jupiter") + dockerTestImplementation("org.junit.platform:junit-platform-engine") + dockerTestImplementation("org.junit.platform:junit-platform-launcher") + dockerTestImplementation("org.testcontainers:junit-jupiter") + dockerTestImplementation("org.testcontainers:testcontainers") + dockerTestImplementation("org.testcontainers:mongodb") + implementation(project(":spring-boot-project:spring-boot-starters:spring-boot-starter-data-mongodb")) implementation(project(":spring-boot-project:spring-boot-starters:spring-boot-starter-data-mongodb-reactive")) - implementation("io.projectreactor:reactor-core") - - testImplementation(project(":spring-boot-project:spring-boot-test")) - testImplementation(project(":spring-boot-project:spring-boot-starters:spring-boot-starter-test")) - testImplementation(project(":spring-boot-project:spring-boot-tools:spring-boot-test-support")) - testImplementation(project(":spring-boot-project:spring-boot-testcontainers")) - testImplementation("io.projectreactor:reactor-test") - testImplementation("org.junit.jupiter:junit-jupiter") - testImplementation("org.junit.platform:junit-platform-engine") - testImplementation("org.junit.platform:junit-platform-launcher") - testImplementation("org.testcontainers:junit-jupiter") - testImplementation("org.testcontainers:testcontainers") - testImplementation("org.testcontainers:mongodb") + implementation("io.projectreactor:reactor-core") } \ No newline at end of file diff --git a/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-data-mongo/src/test/java/smoketest/data/mongo/SampleMongoApplicationReactiveSslTests.java b/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-data-mongo/src/dockerTest/java/smoketest/data/mongo/SampleMongoApplicationReactiveSslTests.java similarity index 100% rename from spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-data-mongo/src/test/java/smoketest/data/mongo/SampleMongoApplicationReactiveSslTests.java rename to spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-data-mongo/src/dockerTest/java/smoketest/data/mongo/SampleMongoApplicationReactiveSslTests.java diff --git a/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-data-mongo/src/test/java/smoketest/data/mongo/SampleMongoApplicationSslTests.java b/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-data-mongo/src/dockerTest/java/smoketest/data/mongo/SampleMongoApplicationSslTests.java similarity index 100% rename from spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-data-mongo/src/test/java/smoketest/data/mongo/SampleMongoApplicationSslTests.java rename to spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-data-mongo/src/dockerTest/java/smoketest/data/mongo/SampleMongoApplicationSslTests.java diff --git a/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-data-mongo/src/test/java/smoketest/data/mongo/SecureMongoContainer.java b/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-data-mongo/src/dockerTest/java/smoketest/data/mongo/SecureMongoContainer.java similarity index 100% rename from spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-data-mongo/src/test/java/smoketest/data/mongo/SecureMongoContainer.java rename to spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-data-mongo/src/dockerTest/java/smoketest/data/mongo/SecureMongoContainer.java From b52023966b758b994c3953237989cdbab250fbf4 Mon Sep 17 00:00:00 2001 From: Andy Wilkinson Date: Wed, 26 Jun 2024 10:48:13 +0100 Subject: [PATCH 19/28] Update spring-boot-smoke-test-data-r2dbc-flyway to use docker-test plugin See gh-41228 --- .../build.gradle | 17 +++++++++-------- .../data/r2dbc/CityRepositoryTests.java | 0 2 files changed, 9 insertions(+), 8 deletions(-) rename spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-data-r2dbc-flyway/src/{test => dockerTest}/java/smoketest/data/r2dbc/CityRepositoryTests.java (100%) diff --git a/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-data-r2dbc-flyway/build.gradle b/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-data-r2dbc-flyway/build.gradle index 4ac34a836d0..c1f97a58d89 100644 --- a/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-data-r2dbc-flyway/build.gradle +++ b/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-data-r2dbc-flyway/build.gradle @@ -1,23 +1,24 @@ plugins { id "java" id "org.springframework.boot.conventions" + id "org.springframework.boot.docker-test" } description = "Spring Boot Data R2DBC with Flyway smoke test" dependencies { + dockerTestImplementation(project(":spring-boot-project:spring-boot-starters:spring-boot-starter-test")) + dockerTestImplementation(project(":spring-boot-project:spring-boot-testcontainers")) + dockerTestImplementation(project(":spring-boot-project:spring-boot-tools:spring-boot-test-support")) + dockerTestImplementation("io.projectreactor:reactor-test") + dockerTestImplementation("org.testcontainers:junit-jupiter") + dockerTestImplementation("org.testcontainers:postgresql") + dockerTestImplementation("org.testcontainers:r2dbc") + implementation(project(":spring-boot-project:spring-boot-starters:spring-boot-starter-data-r2dbc")) runtimeOnly("org.flywaydb:flyway-core") runtimeOnly("org.postgresql:postgresql") runtimeOnly("org.postgresql:r2dbc-postgresql") runtimeOnly("org.springframework:spring-jdbc") - - testImplementation(project(":spring-boot-project:spring-boot-starters:spring-boot-starter-test")) - testImplementation(project(":spring-boot-project:spring-boot-testcontainers")) - testImplementation(project(":spring-boot-project:spring-boot-tools:spring-boot-test-support")) - testImplementation("io.projectreactor:reactor-test") - testImplementation("org.testcontainers:junit-jupiter") - testImplementation("org.testcontainers:postgresql") - testImplementation("org.testcontainers:r2dbc") } diff --git a/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-data-r2dbc-flyway/src/test/java/smoketest/data/r2dbc/CityRepositoryTests.java b/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-data-r2dbc-flyway/src/dockerTest/java/smoketest/data/r2dbc/CityRepositoryTests.java similarity index 100% rename from spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-data-r2dbc-flyway/src/test/java/smoketest/data/r2dbc/CityRepositoryTests.java rename to spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-data-r2dbc-flyway/src/dockerTest/java/smoketest/data/r2dbc/CityRepositoryTests.java From 9662bec9c76ed21c167f7f834af1864d50bcaa5e Mon Sep 17 00:00:00 2001 From: Andy Wilkinson Date: Wed, 26 Jun 2024 10:48:37 +0100 Subject: [PATCH 20/28] Update spring-boot-smoke-test-data-r2dbc-liquibase to use docker-test plugin See gh-41228 --- .../build.gradle | 17 +++++++++-------- .../data/r2dbc/CityRepositoryTests.java | 0 2 files changed, 9 insertions(+), 8 deletions(-) rename spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-data-r2dbc-liquibase/src/{test => dockerTest}/java/smoketest/data/r2dbc/CityRepositoryTests.java (100%) diff --git a/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-data-r2dbc-liquibase/build.gradle b/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-data-r2dbc-liquibase/build.gradle index bd8a4c685da..d256c4f5ece 100644 --- a/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-data-r2dbc-liquibase/build.gradle +++ b/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-data-r2dbc-liquibase/build.gradle @@ -1,11 +1,20 @@ plugins { id "java" id "org.springframework.boot.conventions" + id "org.springframework.boot.docker-test" } description = "Spring Boot Data R2DBC with Liquibase smoke test" dependencies { + dockerTestImplementation(project(":spring-boot-project:spring-boot-starters:spring-boot-starter-test")) + dockerTestImplementation(project(":spring-boot-project:spring-boot-testcontainers")) + dockerTestImplementation(project(":spring-boot-project:spring-boot-tools:spring-boot-test-support")) + dockerTestImplementation("io.projectreactor:reactor-test") + dockerTestImplementation("org.testcontainers:junit-jupiter") + dockerTestImplementation("org.testcontainers:postgresql") + dockerTestImplementation("org.testcontainers:r2dbc") + implementation(project(":spring-boot-project:spring-boot-starters:spring-boot-starter-data-r2dbc")) runtimeOnly("org.liquibase:liquibase-core") { @@ -14,12 +23,4 @@ dependencies { runtimeOnly("org.postgresql:postgresql") runtimeOnly("org.postgresql:r2dbc-postgresql") runtimeOnly("org.springframework:spring-jdbc") - - testImplementation(project(":spring-boot-project:spring-boot-starters:spring-boot-starter-test")) - testImplementation(project(":spring-boot-project:spring-boot-testcontainers")) - testImplementation(project(":spring-boot-project:spring-boot-tools:spring-boot-test-support")) - testImplementation("io.projectreactor:reactor-test") - testImplementation("org.testcontainers:junit-jupiter") - testImplementation("org.testcontainers:postgresql") - testImplementation("org.testcontainers:r2dbc") } diff --git a/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-data-r2dbc-liquibase/src/test/java/smoketest/data/r2dbc/CityRepositoryTests.java b/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-data-r2dbc-liquibase/src/dockerTest/java/smoketest/data/r2dbc/CityRepositoryTests.java similarity index 100% rename from spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-data-r2dbc-liquibase/src/test/java/smoketest/data/r2dbc/CityRepositoryTests.java rename to spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-data-r2dbc-liquibase/src/dockerTest/java/smoketest/data/r2dbc/CityRepositoryTests.java From 957e73044b66103834ec550af27b420a7ced70e1 Mon Sep 17 00:00:00 2001 From: Andy Wilkinson Date: Wed, 26 Jun 2024 10:49:03 +0100 Subject: [PATCH 21/28] Update spring-boot-smoke-test-data-redis to use docker-test plugin See gh-41228 --- .../build.gradle | 27 ++++++++++--------- .../SampleRedisApplicationJedisSslTests.java | 0 ...ampleRedisApplicationReactiveSslTests.java | 0 .../redis/SampleRedisApplicationSslTests.java | 0 .../data/redis/SecureRedisContainer.java | 0 5 files changed, 14 insertions(+), 13 deletions(-) rename spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-data-redis/src/{test => dockerTest}/java/smoketest/data/redis/SampleRedisApplicationJedisSslTests.java (100%) rename spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-data-redis/src/{test => dockerTest}/java/smoketest/data/redis/SampleRedisApplicationReactiveSslTests.java (100%) rename spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-data-redis/src/{test => dockerTest}/java/smoketest/data/redis/SampleRedisApplicationSslTests.java (100%) rename spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-data-redis/src/{test => dockerTest}/java/smoketest/data/redis/SecureRedisContainer.java (100%) diff --git a/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-data-redis/build.gradle b/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-data-redis/build.gradle index 6d785ff8df3..c7daa751063 100644 --- a/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-data-redis/build.gradle +++ b/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-data-redis/build.gradle @@ -1,23 +1,24 @@ plugins { id "java" id "org.springframework.boot.conventions" + id "org.springframework.boot.docker-test" } description = "Spring Boot Data Redis smoke test" dependencies { - implementation(project(":spring-boot-project:spring-boot-starters:spring-boot-starter-data-redis")) + dockerTestImplementation(project(":spring-boot-project:spring-boot-test")) + dockerTestImplementation(project(":spring-boot-project:spring-boot-starters:spring-boot-starter-test")) + dockerTestImplementation(project(":spring-boot-project:spring-boot-tools:spring-boot-test-support")) + dockerTestImplementation(project(":spring-boot-project:spring-boot-testcontainers")) + dockerTestImplementation("io.projectreactor:reactor-core") + dockerTestImplementation("io.projectreactor:reactor-test") + dockerTestImplementation("org.junit.jupiter:junit-jupiter") + dockerTestImplementation("org.junit.platform:junit-platform-engine") + dockerTestImplementation("org.junit.platform:junit-platform-launcher") + dockerTestImplementation("org.testcontainers:junit-jupiter") + dockerTestImplementation("org.testcontainers:testcontainers") + dockerTestImplementation("redis.clients:jedis") - testImplementation(project(":spring-boot-project:spring-boot-test")) - testImplementation(project(":spring-boot-project:spring-boot-starters:spring-boot-starter-test")) - testImplementation(project(":spring-boot-project:spring-boot-tools:spring-boot-test-support")) - testImplementation(project(":spring-boot-project:spring-boot-testcontainers")) - testImplementation("io.projectreactor:reactor-core") - testImplementation("io.projectreactor:reactor-test") - testImplementation("org.junit.jupiter:junit-jupiter") - testImplementation("org.junit.platform:junit-platform-engine") - testImplementation("org.junit.platform:junit-platform-launcher") - testImplementation("org.testcontainers:junit-jupiter") - testImplementation("org.testcontainers:testcontainers") - testImplementation("redis.clients:jedis") + implementation(project(":spring-boot-project:spring-boot-starters:spring-boot-starter-data-redis")) } diff --git a/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-data-redis/src/test/java/smoketest/data/redis/SampleRedisApplicationJedisSslTests.java b/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-data-redis/src/dockerTest/java/smoketest/data/redis/SampleRedisApplicationJedisSslTests.java similarity index 100% rename from spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-data-redis/src/test/java/smoketest/data/redis/SampleRedisApplicationJedisSslTests.java rename to spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-data-redis/src/dockerTest/java/smoketest/data/redis/SampleRedisApplicationJedisSslTests.java diff --git a/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-data-redis/src/test/java/smoketest/data/redis/SampleRedisApplicationReactiveSslTests.java b/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-data-redis/src/dockerTest/java/smoketest/data/redis/SampleRedisApplicationReactiveSslTests.java similarity index 100% rename from spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-data-redis/src/test/java/smoketest/data/redis/SampleRedisApplicationReactiveSslTests.java rename to spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-data-redis/src/dockerTest/java/smoketest/data/redis/SampleRedisApplicationReactiveSslTests.java diff --git a/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-data-redis/src/test/java/smoketest/data/redis/SampleRedisApplicationSslTests.java b/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-data-redis/src/dockerTest/java/smoketest/data/redis/SampleRedisApplicationSslTests.java similarity index 100% rename from spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-data-redis/src/test/java/smoketest/data/redis/SampleRedisApplicationSslTests.java rename to spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-data-redis/src/dockerTest/java/smoketest/data/redis/SampleRedisApplicationSslTests.java diff --git a/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-data-redis/src/test/java/smoketest/data/redis/SecureRedisContainer.java b/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-data-redis/src/dockerTest/java/smoketest/data/redis/SecureRedisContainer.java similarity index 100% rename from spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-data-redis/src/test/java/smoketest/data/redis/SecureRedisContainer.java rename to spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-data-redis/src/dockerTest/java/smoketest/data/redis/SecureRedisContainer.java From bc57d30a1f35769021e687980b8bbfe6d9ddad66 Mon Sep 17 00:00:00 2001 From: Andy Wilkinson Date: Wed, 26 Jun 2024 10:49:16 +0100 Subject: [PATCH 22/28] Update spring-boot-smoke-test-kafka to use docker-test plugin See gh-41228 --- .../spring-boot-smoke-test-kafka/build.gradle | 12 ++++++++---- .../kafka/ssl/SampleKafkaSslApplicationTests.java | 0 2 files changed, 8 insertions(+), 4 deletions(-) rename spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-kafka/src/{test => dockerTest}/java/smoketest/kafka/ssl/SampleKafkaSslApplicationTests.java (100%) diff --git a/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-kafka/build.gradle b/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-kafka/build.gradle index 24d8f33d79d..4e7e5f9bf0c 100644 --- a/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-kafka/build.gradle +++ b/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-kafka/build.gradle @@ -1,20 +1,24 @@ plugins { id "java" id "org.springframework.boot.conventions" + id "org.springframework.boot.docker-test" } description = "Spring Boot Kafka smoke test" dependencies { + dockerTestImplementation(project(":spring-boot-project:spring-boot-starters:spring-boot-starter-test")) + dockerTestImplementation(project(":spring-boot-project:spring-boot-tools:spring-boot-test-support")) + dockerTestImplementation("org.awaitility:awaitility") + dockerTestImplementation("org.testcontainers:junit-jupiter") + dockerTestImplementation("org.testcontainers:kafka") + implementation(project(":spring-boot-project:spring-boot-starters:spring-boot-starter-json")) implementation("org.springframework.kafka:spring-kafka") - + testImplementation(project(":spring-boot-project:spring-boot-starters:spring-boot-starter-test")) - testImplementation(project(":spring-boot-project:spring-boot-tools:spring-boot-test-support")) testImplementation("org.awaitility:awaitility") testImplementation("org.springframework.kafka:spring-kafka-test") { exclude group: "commons-logging", module: "commons-logging" } - testImplementation("org.testcontainers:junit-jupiter") - testImplementation("org.testcontainers:kafka") } diff --git a/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-kafka/src/test/java/smoketest/kafka/ssl/SampleKafkaSslApplicationTests.java b/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-kafka/src/dockerTest/java/smoketest/kafka/ssl/SampleKafkaSslApplicationTests.java similarity index 100% rename from spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-kafka/src/test/java/smoketest/kafka/ssl/SampleKafkaSslApplicationTests.java rename to spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-kafka/src/dockerTest/java/smoketest/kafka/ssl/SampleKafkaSslApplicationTests.java From da28e03670a1ad5dd1d9fab3c9417585b9dca0cc Mon Sep 17 00:00:00 2001 From: Andy Wilkinson Date: Wed, 26 Jun 2024 10:49:29 +0100 Subject: [PATCH 23/28] Update spring-boot-smoke-test-pulsar to use docker-test plugin See gh-41228 --- .../spring-boot-smoke-test-pulsar/build.gradle | 14 ++++++++------ .../pulsar/SamplePulsarApplicationTests.java | 0 2 files changed, 8 insertions(+), 6 deletions(-) rename spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-pulsar/src/{test => dockerTest}/java/smoketest/pulsar/SamplePulsarApplicationTests.java (100%) diff --git a/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-pulsar/build.gradle b/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-pulsar/build.gradle index a0051d3f4ea..cbeea5eeb16 100644 --- a/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-pulsar/build.gradle +++ b/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-pulsar/build.gradle @@ -1,17 +1,19 @@ plugins { id "java" id "org.springframework.boot.conventions" + id "org.springframework.boot.docker-test" } description = "Spring Boot Pulsar smoke test" dependencies { + dockerTestImplementation(project(":spring-boot-project:spring-boot-starters:spring-boot-starter-test")) + dockerTestImplementation(project(":spring-boot-project:spring-boot-tools:spring-boot-test-support")) + dockerTestImplementation(project(":spring-boot-project:spring-boot-testcontainers")) + dockerTestImplementation("org.awaitility:awaitility") + dockerTestImplementation("org.testcontainers:junit-jupiter") + dockerTestImplementation("org.testcontainers:pulsar") + implementation(project(":spring-boot-project:spring-boot-starters:spring-boot-starter-pulsar")) implementation(project(":spring-boot-project:spring-boot-starters:spring-boot-starter-pulsar-reactive")) - testImplementation(project(":spring-boot-project:spring-boot-starters:spring-boot-starter-test")) - testImplementation(project(":spring-boot-project:spring-boot-tools:spring-boot-test-support")) - testImplementation(project(":spring-boot-project:spring-boot-testcontainers")) - testImplementation("org.awaitility:awaitility") - testImplementation("org.testcontainers:junit-jupiter") - testImplementation("org.testcontainers:pulsar") } diff --git a/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-pulsar/src/test/java/smoketest/pulsar/SamplePulsarApplicationTests.java b/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-pulsar/src/dockerTest/java/smoketest/pulsar/SamplePulsarApplicationTests.java similarity index 100% rename from spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-pulsar/src/test/java/smoketest/pulsar/SamplePulsarApplicationTests.java rename to spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-pulsar/src/dockerTest/java/smoketest/pulsar/SamplePulsarApplicationTests.java From b3f3501e2bc582802afbb29eab2199fc160c8256 Mon Sep 17 00:00:00 2001 From: Andy Wilkinson Date: Wed, 26 Jun 2024 10:49:49 +0100 Subject: [PATCH 24/28] Update spring-boot-smoke-test-session-mongo to use docker-test plugin See gh-41228 --- .../build.gradle | 13 +++++++------ .../mongodb/SampleSessionMongoApplicationTests.java | 0 2 files changed, 7 insertions(+), 6 deletions(-) rename spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-session-mongo/src/{test => dockerTest}/java/smoketest/session/mongodb/SampleSessionMongoApplicationTests.java (100%) diff --git a/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-session-mongo/build.gradle b/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-session-mongo/build.gradle index 0fa437924dd..8fcb96359ff 100644 --- a/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-session-mongo/build.gradle +++ b/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-session-mongo/build.gradle @@ -1,20 +1,21 @@ plugins { id "java" id "org.springframework.boot.conventions" + id "org.springframework.boot.docker-test" } description = "Spring Boot Session Mongodb smoke test" dependencies { + dockerTestImplementation("org.testcontainers:mongodb") + dockerTestImplementation("org.testcontainers:junit-jupiter") + dockerTestImplementation(project(":spring-boot-project:spring-boot-testcontainers")) + dockerTestImplementation(project(":spring-boot-project:spring-boot-tools:spring-boot-test-support")) + dockerTestImplementation(project(":spring-boot-project:spring-boot-starters:spring-boot-starter-test")) + implementation(project(":spring-boot-project:spring-boot-starters:spring-boot-starter-actuator")) implementation(project(":spring-boot-project:spring-boot-starters:spring-boot-starter-security")) implementation(project(":spring-boot-project:spring-boot-starters:spring-boot-starter-data-mongodb")) implementation(project(":spring-boot-project:spring-boot-starters:spring-boot-starter-web")) implementation("org.springframework.session:spring-session-data-mongodb") - - testImplementation("org.testcontainers:mongodb") - testImplementation("org.testcontainers:junit-jupiter") - testImplementation(project(":spring-boot-project:spring-boot-testcontainers")) - testImplementation(project(":spring-boot-project:spring-boot-tools:spring-boot-test-support")) - testImplementation(project(":spring-boot-project:spring-boot-starters:spring-boot-starter-test")) } diff --git a/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-session-mongo/src/test/java/smoketest/session/mongodb/SampleSessionMongoApplicationTests.java b/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-session-mongo/src/dockerTest/java/smoketest/session/mongodb/SampleSessionMongoApplicationTests.java similarity index 100% rename from spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-session-mongo/src/test/java/smoketest/session/mongodb/SampleSessionMongoApplicationTests.java rename to spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-session-mongo/src/dockerTest/java/smoketest/session/mongodb/SampleSessionMongoApplicationTests.java From 2890067e3a714098aec3ac9f573b27e931bb24b1 Mon Sep 17 00:00:00 2001 From: Andy Wilkinson Date: Wed, 26 Jun 2024 10:50:25 +0100 Subject: [PATCH 25/28] Update spring-boot-smoke-test-session-redis to use docker-test plugin See gh-41228 --- .../spring-boot-smoke-test-session-redis/build.gradle | 11 ++++++----- .../redis/SampleSessionRedisApplicationTests.java | 0 ...PropertiesImportSampleSessionRedisApplication.java | 0 .../TestPropertiesSampleSessionRedisApplication.java | 0 ...ConnectionImportSampleSessionRedisApplication.java | 0 ...erviceConnectionSampleSessionRedisApplication.java | 0 6 files changed, 6 insertions(+), 5 deletions(-) rename spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-session-redis/src/{test => dockerTest}/java/smoketest/session/redis/SampleSessionRedisApplicationTests.java (100%) rename spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-session-redis/src/{test => dockerTest}/java/smoketest/session/redis/TestPropertiesImportSampleSessionRedisApplication.java (100%) rename spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-session-redis/src/{test => dockerTest}/java/smoketest/session/redis/TestPropertiesSampleSessionRedisApplication.java (100%) rename spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-session-redis/src/{test => dockerTest}/java/smoketest/session/redis/TestServiceConnectionImportSampleSessionRedisApplication.java (100%) rename spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-session-redis/src/{test => dockerTest}/java/smoketest/session/redis/TestServiceConnectionSampleSessionRedisApplication.java (100%) diff --git a/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-session-redis/build.gradle b/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-session-redis/build.gradle index 53b67e4da1a..b4ad9bdad6f 100644 --- a/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-session-redis/build.gradle +++ b/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-session-redis/build.gradle @@ -1,19 +1,20 @@ plugins { id "java" id "org.springframework.boot.conventions" + id "org.springframework.boot.docker-test" } description = "Spring Boot Session Mongodb smoke test" dependencies { + dockerTestImplementation(project(":spring-boot-project:spring-boot-testcontainers")) + dockerTestImplementation(project(":spring-boot-project:spring-boot-tools:spring-boot-test-support")) + dockerTestImplementation(project(":spring-boot-project:spring-boot-starters:spring-boot-starter-test")) + dockerTestImplementation("org.testcontainers:junit-jupiter") + implementation(project(":spring-boot-project:spring-boot-starters:spring-boot-starter-actuator")) implementation(project(":spring-boot-project:spring-boot-starters:spring-boot-starter-security")) implementation(project(":spring-boot-project:spring-boot-starters:spring-boot-starter-data-redis")) implementation(project(":spring-boot-project:spring-boot-starters:spring-boot-starter-web")) implementation("org.springframework.session:spring-session-data-redis") - - testImplementation("org.testcontainers:junit-jupiter") - testImplementation(project(":spring-boot-project:spring-boot-testcontainers")) - testImplementation(project(":spring-boot-project:spring-boot-tools:spring-boot-test-support")) - testImplementation(project(":spring-boot-project:spring-boot-starters:spring-boot-starter-test")) } diff --git a/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-session-redis/src/test/java/smoketest/session/redis/SampleSessionRedisApplicationTests.java b/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-session-redis/src/dockerTest/java/smoketest/session/redis/SampleSessionRedisApplicationTests.java similarity index 100% rename from spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-session-redis/src/test/java/smoketest/session/redis/SampleSessionRedisApplicationTests.java rename to spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-session-redis/src/dockerTest/java/smoketest/session/redis/SampleSessionRedisApplicationTests.java diff --git a/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-session-redis/src/test/java/smoketest/session/redis/TestPropertiesImportSampleSessionRedisApplication.java b/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-session-redis/src/dockerTest/java/smoketest/session/redis/TestPropertiesImportSampleSessionRedisApplication.java similarity index 100% rename from spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-session-redis/src/test/java/smoketest/session/redis/TestPropertiesImportSampleSessionRedisApplication.java rename to spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-session-redis/src/dockerTest/java/smoketest/session/redis/TestPropertiesImportSampleSessionRedisApplication.java diff --git a/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-session-redis/src/test/java/smoketest/session/redis/TestPropertiesSampleSessionRedisApplication.java b/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-session-redis/src/dockerTest/java/smoketest/session/redis/TestPropertiesSampleSessionRedisApplication.java similarity index 100% rename from spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-session-redis/src/test/java/smoketest/session/redis/TestPropertiesSampleSessionRedisApplication.java rename to spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-session-redis/src/dockerTest/java/smoketest/session/redis/TestPropertiesSampleSessionRedisApplication.java diff --git a/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-session-redis/src/test/java/smoketest/session/redis/TestServiceConnectionImportSampleSessionRedisApplication.java b/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-session-redis/src/dockerTest/java/smoketest/session/redis/TestServiceConnectionImportSampleSessionRedisApplication.java similarity index 100% rename from spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-session-redis/src/test/java/smoketest/session/redis/TestServiceConnectionImportSampleSessionRedisApplication.java rename to spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-session-redis/src/dockerTest/java/smoketest/session/redis/TestServiceConnectionImportSampleSessionRedisApplication.java diff --git a/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-session-redis/src/test/java/smoketest/session/redis/TestServiceConnectionSampleSessionRedisApplication.java b/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-session-redis/src/dockerTest/java/smoketest/session/redis/TestServiceConnectionSampleSessionRedisApplication.java similarity index 100% rename from spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-session-redis/src/test/java/smoketest/session/redis/TestServiceConnectionSampleSessionRedisApplication.java rename to spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-session-redis/src/dockerTest/java/smoketest/session/redis/TestServiceConnectionSampleSessionRedisApplication.java From 5e332b87854667a4b939e1ce7142e96ccf3986f1 Mon Sep 17 00:00:00 2001 From: Andy Wilkinson Date: Wed, 26 Jun 2024 10:50:49 +0100 Subject: [PATCH 26/28] Update spring-boot-smoke-test-session-webflux-mongo to use docker-test plugin See gh-41228 --- .../build.gradle | 13 +++++++------ .../SampleSessionWebFluxMongoApplicationTests.java | 0 2 files changed, 7 insertions(+), 6 deletions(-) rename spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-session-webflux-mongo/src/{test => dockerTest}/java/smoketest/session/SampleSessionWebFluxMongoApplicationTests.java (100%) diff --git a/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-session-webflux-mongo/build.gradle b/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-session-webflux-mongo/build.gradle index 447310c98df..74465e2794d 100644 --- a/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-session-webflux-mongo/build.gradle +++ b/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-session-webflux-mongo/build.gradle @@ -1,20 +1,21 @@ plugins { id "java" id "org.springframework.boot.conventions" + id "org.springframework.boot.docker-test" } description = "Spring Boot Session WebFlux MongoDB smoke test" dependencies { + dockerTestImplementation(project(":spring-boot-project:spring-boot-starters:spring-boot-starter-test")) + dockerTestImplementation(project(":spring-boot-project:spring-boot-testcontainers")) + dockerTestImplementation(project(":spring-boot-project:spring-boot-tools:spring-boot-test-support")) + dockerTestImplementation("org.testcontainers:junit-jupiter") + dockerTestImplementation("org.testcontainers:mongodb") + implementation(project(":spring-boot-project:spring-boot-starters:spring-boot-starter-security")) implementation(project(":spring-boot-project:spring-boot-starters:spring-boot-starter-webflux")) runtimeOnly(project(":spring-boot-project:spring-boot-starters:spring-boot-starter-data-mongodb-reactive")) runtimeOnly("org.springframework.session:spring-session-data-mongodb") - - testImplementation(project(":spring-boot-project:spring-boot-starters:spring-boot-starter-test")) - testImplementation(project(":spring-boot-project:spring-boot-testcontainers")) - testImplementation(project(":spring-boot-project:spring-boot-tools:spring-boot-test-support")) - testImplementation("org.testcontainers:mongodb") - testImplementation("org.testcontainers:junit-jupiter") } diff --git a/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-session-webflux-mongo/src/test/java/smoketest/session/SampleSessionWebFluxMongoApplicationTests.java b/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-session-webflux-mongo/src/dockerTest/java/smoketest/session/SampleSessionWebFluxMongoApplicationTests.java similarity index 100% rename from spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-session-webflux-mongo/src/test/java/smoketest/session/SampleSessionWebFluxMongoApplicationTests.java rename to spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-session-webflux-mongo/src/dockerTest/java/smoketest/session/SampleSessionWebFluxMongoApplicationTests.java From fda6f19c5be885a11e662ea77c97efdb9fa3c628 Mon Sep 17 00:00:00 2001 From: Andy Wilkinson Date: Wed, 26 Jun 2024 10:51:06 +0100 Subject: [PATCH 27/28] Update spring-boot-smoke-test-session-webflux-redis to use docker-test plugin See gh-41228 --- .../build.gradle | 11 ++++++----- .../SampleSessionWebFluxRedisApplicationTests.java | 0 2 files changed, 6 insertions(+), 5 deletions(-) rename spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-session-webflux-redis/src/{test => dockerTest}/java/smoketest/session/SampleSessionWebFluxRedisApplicationTests.java (100%) diff --git a/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-session-webflux-redis/build.gradle b/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-session-webflux-redis/build.gradle index 947879031f7..0b5da25204d 100644 --- a/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-session-webflux-redis/build.gradle +++ b/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-session-webflux-redis/build.gradle @@ -1,19 +1,20 @@ plugins { id "java" id "org.springframework.boot.conventions" + id "org.springframework.boot.docker-test" } description = "Spring Boot Session WebFlux Redis smoke test" dependencies { + dockerTestImplementation(project(":spring-boot-project:spring-boot-starters:spring-boot-starter-test")) + dockerTestImplementation(project(":spring-boot-project:spring-boot-testcontainers")) + dockerTestImplementation(project(":spring-boot-project:spring-boot-tools:spring-boot-test-support")) + dockerTestImplementation("org.testcontainers:junit-jupiter") + implementation(project(":spring-boot-project:spring-boot-starters:spring-boot-starter-security")) implementation(project(":spring-boot-project:spring-boot-starters:spring-boot-starter-webflux")) runtimeOnly(project(":spring-boot-project:spring-boot-starters:spring-boot-starter-data-redis-reactive")) runtimeOnly("org.springframework.session:spring-session-data-redis") - - testImplementation(project(":spring-boot-project:spring-boot-starters:spring-boot-starter-test")) - testImplementation(project(":spring-boot-project:spring-boot-testcontainers")) - testImplementation(project(":spring-boot-project:spring-boot-tools:spring-boot-test-support")) - testImplementation("org.testcontainers:junit-jupiter") } diff --git a/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-session-webflux-redis/src/test/java/smoketest/session/SampleSessionWebFluxRedisApplicationTests.java b/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-session-webflux-redis/src/dockerTest/java/smoketest/session/SampleSessionWebFluxRedisApplicationTests.java similarity index 100% rename from spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-session-webflux-redis/src/test/java/smoketest/session/SampleSessionWebFluxRedisApplicationTests.java rename to spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-session-webflux-redis/src/dockerTest/java/smoketest/session/SampleSessionWebFluxRedisApplicationTests.java From 654016af7f376f069a0aab5ab43a99c47d1f35eb Mon Sep 17 00:00:00 2001 From: Andy Wilkinson Date: Wed, 26 Jun 2024 11:10:16 +0100 Subject: [PATCH 28/28] Move Docker-related test support into a separate module See gh-41228 --- settings.gradle | 1 + .../spring-boot-actuator/build.gradle | 2 +- .../spring-boot-autoconfigure/build.gradle | 4 +-- .../spring-boot-docker-compose/build.gradle | 8 ++--- .../build.gradle | 6 ++-- .../spring-boot-testcontainers/build.gradle | 2 +- .../build.gradle | 2 +- .../spring-boot-gradle-plugin/build.gradle | 4 +-- .../spring-boot-maven-plugin/build.gradle | 2 +- .../build.gradle | 32 +++++++++++++++++++ .../container/ActiveMQContainer.java | 0 .../DisabledIfDockerUnavailable.java | 0 .../DisabledIfDockerUnavailableCondition.java | 0 .../testsupport/container/RedisContainer.java | 0 .../container/RegistryContainer.java | 0 .../boot/testsupport/container/TestImage.java | 0 .../container/ZipkinContainer.java | 0 .../testsupport/container/package-info.java | 0 .../spring-boot-test-support/build.gradle | 16 ---------- .../build.gradle | 3 +- .../build.gradle | 3 +- .../spring-boot-loader-tests/build.gradle | 2 +- .../build.gradle | 8 ++--- .../spring-boot-smoke-test-amqp/build.gradle | 2 +- .../spring-boot-smoke-test-cache/build.gradle | 6 ++-- .../build.gradle | 6 ++-- .../build.gradle | 6 ++-- .../build.gradle | 8 ++--- .../build.gradle | 2 +- .../build.gradle | 2 +- .../build.gradle | 2 +- .../spring-boot-smoke-test-kafka/build.gradle | 6 ++-- .../build.gradle | 2 +- .../build.gradle | 10 +++--- .../build.gradle | 4 +-- .../build.gradle | 2 +- .../build.gradle | 2 +- src/checkstyle/checkstyle-suppressions.xml | 1 + 38 files changed, 86 insertions(+), 70 deletions(-) create mode 100644 spring-boot-project/spring-boot-tools/spring-boot-test-support-docker/build.gradle rename spring-boot-project/spring-boot-tools/{spring-boot-test-support => spring-boot-test-support-docker}/src/main/java/org/springframework/boot/testsupport/container/ActiveMQContainer.java (100%) rename spring-boot-project/spring-boot-tools/{spring-boot-test-support => spring-boot-test-support-docker}/src/main/java/org/springframework/boot/testsupport/container/DisabledIfDockerUnavailable.java (100%) rename spring-boot-project/spring-boot-tools/{spring-boot-test-support => spring-boot-test-support-docker}/src/main/java/org/springframework/boot/testsupport/container/DisabledIfDockerUnavailableCondition.java (100%) rename spring-boot-project/spring-boot-tools/{spring-boot-test-support => spring-boot-test-support-docker}/src/main/java/org/springframework/boot/testsupport/container/RedisContainer.java (100%) rename spring-boot-project/spring-boot-tools/{spring-boot-test-support => spring-boot-test-support-docker}/src/main/java/org/springframework/boot/testsupport/container/RegistryContainer.java (100%) rename spring-boot-project/spring-boot-tools/{spring-boot-test-support => spring-boot-test-support-docker}/src/main/java/org/springframework/boot/testsupport/container/TestImage.java (100%) rename spring-boot-project/spring-boot-tools/{spring-boot-test-support => spring-boot-test-support-docker}/src/main/java/org/springframework/boot/testsupport/container/ZipkinContainer.java (100%) rename spring-boot-project/spring-boot-tools/{spring-boot-test-support => spring-boot-test-support-docker}/src/main/java/org/springframework/boot/testsupport/container/package-info.java (100%) diff --git a/settings.gradle b/settings.gradle index 54a7bc343c7..c0385115cb4 100644 --- a/settings.gradle +++ b/settings.gradle @@ -64,6 +64,7 @@ include "spring-boot-project:spring-boot-tools:spring-boot-loader-tools" include "spring-boot-project:spring-boot-tools:spring-boot-maven-plugin" include "spring-boot-project:spring-boot-tools:spring-boot-properties-migrator" include "spring-boot-project:spring-boot-tools:spring-boot-test-support" +include "spring-boot-project:spring-boot-tools:spring-boot-test-support-docker" include "spring-boot-project:spring-boot" include "spring-boot-project:spring-boot-autoconfigure" include "spring-boot-project:spring-boot-actuator" diff --git a/spring-boot-project/spring-boot-actuator/build.gradle b/spring-boot-project/spring-boot-actuator/build.gradle index b793b0f8ab1..2ebdc1fc75a 100644 --- a/spring-boot-project/spring-boot-actuator/build.gradle +++ b/spring-boot-project/spring-boot-actuator/build.gradle @@ -14,7 +14,7 @@ dependencies { dockerTestImplementation(project(":spring-boot-project:spring-boot-autoconfigure")) dockerTestImplementation(project(":spring-boot-project:spring-boot-test")) - dockerTestImplementation(project(":spring-boot-project:spring-boot-tools:spring-boot-test-support")) + dockerTestImplementation(project(":spring-boot-project:spring-boot-tools:spring-boot-test-support-docker")) dockerTestImplementation("org.assertj:assertj-core") dockerTestImplementation("org.junit.jupiter:junit-jupiter") dockerTestImplementation("org.springframework:spring-test") diff --git a/spring-boot-project/spring-boot-autoconfigure/build.gradle b/spring-boot-project/spring-boot-autoconfigure/build.gradle index a2996eccdd5..b7a6e1be55d 100644 --- a/spring-boot-project/spring-boot-autoconfigure/build.gradle +++ b/spring-boot-project/spring-boot-autoconfigure/build.gradle @@ -13,9 +13,9 @@ description = "Spring Boot AutoConfigure" dependencies { api(project(":spring-boot-project:spring-boot")) - + dockerTestImplementation(project(":spring-boot-project:spring-boot-test")) - dockerTestImplementation(project(":spring-boot-project:spring-boot-tools:spring-boot-test-support")) + dockerTestImplementation(project(":spring-boot-project:spring-boot-tools:spring-boot-test-support-docker")) dockerTestImplementation("org.assertj:assertj-core") dockerTestImplementation("org.junit.jupiter:junit-jupiter") dockerTestImplementation("org.mockito:mockito-core") diff --git a/spring-boot-project/spring-boot-docker-compose/build.gradle b/spring-boot-project/spring-boot-docker-compose/build.gradle index 98d251ec695..95479da392b 100644 --- a/spring-boot-project/spring-boot-docker-compose/build.gradle +++ b/spring-boot-project/spring-boot-docker-compose/build.gradle @@ -1,10 +1,10 @@ plugins { - id "java-library" + id "java-library" id "org.springframework.boot.configuration-properties" id "org.springframework.boot.conventions" id "org.springframework.boot.deployed" id "org.springframework.boot.docker-test" - id "org.springframework.boot.optional-dependencies" + id "org.springframework.boot.optional-dependencies" } description = "Spring Boot Docker Compose Support" @@ -12,7 +12,7 @@ description = "Spring Boot Docker Compose Support" dependencies { api(project(":spring-boot-project:spring-boot")) - dockerTestImplementation(project(":spring-boot-project:spring-boot-tools:spring-boot-test-support")) + dockerTestImplementation(project(":spring-boot-project:spring-boot-tools:spring-boot-test-support-docker")) dockerTestImplementation("org.assertj:assertj-core") dockerTestImplementation("org.awaitility:awaitility") dockerTestImplementation("org.junit.jupiter:junit-jupiter") @@ -21,7 +21,7 @@ dependencies { dockerTestRuntimeOnly("com.microsoft.sqlserver:mssql-jdbc") dockerTestRuntimeOnly("com.oracle.database.r2dbc:oracle-r2dbc") dockerTestRuntimeOnly("io.r2dbc:r2dbc-mssql") - + implementation("com.fasterxml.jackson.core:jackson-databind") implementation("com.fasterxml.jackson.module:jackson-module-parameter-names") diff --git a/spring-boot-project/spring-boot-test-autoconfigure/build.gradle b/spring-boot-project/spring-boot-test-autoconfigure/build.gradle index b2af257c6c7..d1f9533dfed 100644 --- a/spring-boot-project/spring-boot-test-autoconfigure/build.gradle +++ b/spring-boot-project/spring-boot-test-autoconfigure/build.gradle @@ -12,9 +12,9 @@ dependencies { api(project(":spring-boot-project:spring-boot")) api(project(":spring-boot-project:spring-boot-test")) api(project(":spring-boot-project:spring-boot-autoconfigure")) - + dockerTestImplementation(project(":spring-boot-project:spring-boot-testcontainers")) - dockerTestImplementation(project(":spring-boot-project:spring-boot-tools:spring-boot-test-support")) + dockerTestImplementation(project(":spring-boot-project:spring-boot-tools:spring-boot-test-support-docker")) dockerTestImplementation("io.projectreactor:reactor-test") dockerTestImplementation("org.assertj:assertj-core") dockerTestImplementation("org.junit.jupiter:junit-jupiter") @@ -25,7 +25,7 @@ dependencies { dockerTestImplementation("org.testcontainers:mongodb") dockerTestImplementation("org.testcontainers:neo4j") dockerTestImplementation("org.testcontainers:testcontainers") - + dockerTestRuntimeOnly("io.lettuce:lettuce-core") dockerTestRuntimeOnly("org.springframework.data:spring-data-redis") diff --git a/spring-boot-project/spring-boot-testcontainers/build.gradle b/spring-boot-project/spring-boot-testcontainers/build.gradle index ecaf9121789..0f10b52c249 100644 --- a/spring-boot-project/spring-boot-testcontainers/build.gradle +++ b/spring-boot-project/spring-boot-testcontainers/build.gradle @@ -15,7 +15,7 @@ dependencies { api("org.testcontainers:testcontainers") dockerTestImplementation(project(":spring-boot-project:spring-boot-test")) - dockerTestImplementation(project(":spring-boot-project:spring-boot-tools:spring-boot-test-support")) + dockerTestImplementation(project(":spring-boot-project:spring-boot-tools:spring-boot-test-support-docker")) dockerTestImplementation("ch.qos.logback:logback-classic") dockerTestImplementation("co.elastic.clients:elasticsearch-java") { exclude group: "commons-logging", module: "commons-logging" diff --git a/spring-boot-project/spring-boot-tools/spring-boot-buildpack-platform/build.gradle b/spring-boot-project/spring-boot-tools/spring-boot-buildpack-platform/build.gradle index ca3e6644fb8..8e390dc70b0 100644 --- a/spring-boot-project/spring-boot-tools/spring-boot-buildpack-platform/build.gradle +++ b/spring-boot-project/spring-boot-tools/spring-boot-buildpack-platform/build.gradle @@ -44,7 +44,7 @@ dependencies { api("org.springframework:spring-core") api("org.tomlj:tomlj:1.0.0") - dockerTestImplementation(project(":spring-boot-project:spring-boot-tools:spring-boot-test-support")) + dockerTestImplementation(project(":spring-boot-project:spring-boot-tools:spring-boot-test-support-docker")) dockerTestImplementation("org.junit.jupiter:junit-jupiter") dockerTestRuntimeOnly("org.testcontainers:testcontainers") diff --git a/spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/build.gradle b/spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/build.gradle index 80b2fc9768d..385d08d1bbb 100644 --- a/spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/build.gradle +++ b/spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/build.gradle @@ -80,13 +80,13 @@ dependencies { asciidoctorExtensions("io.spring.asciidoctor:spring-asciidoctor-extensions-section-ids") dockerTestImplementation(project(":spring-boot-project:spring-boot-tools:spring-boot-gradle-test-support")) - dockerTestImplementation(project(":spring-boot-project:spring-boot-tools:spring-boot-test-support")) + dockerTestImplementation(project(":spring-boot-project:spring-boot-tools:spring-boot-test-support-docker")) dockerTestImplementation(gradleTestKit()) dockerTestImplementation("org.assertj:assertj-core") dockerTestImplementation("org.junit.jupiter:junit-jupiter") dockerTestImplementation("org.testcontainers:junit-jupiter") dockerTestImplementation("org.testcontainers:testcontainers") - + implementation(project(":spring-boot-project:spring-boot-tools:spring-boot-buildpack-platform")) implementation(project(":spring-boot-project:spring-boot-tools:spring-boot-loader-tools")) implementation("io.spring.gradle:dependency-management-plugin") 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 bc37953443f..ee2d3d9d1a2 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 @@ -27,7 +27,7 @@ dependencies { exclude(group: "javax.inject", module: "javax.inject") } - dockerTestImplementation(project(":spring-boot-project:spring-boot-tools:spring-boot-test-support")) + dockerTestImplementation(project(":spring-boot-project:spring-boot-tools:spring-boot-test-support-docker")) dockerTestImplementation("org.apache.maven.shared:maven-invoker") { exclude(group: "javax.inject", module: "javax.inject") } diff --git a/spring-boot-project/spring-boot-tools/spring-boot-test-support-docker/build.gradle b/spring-boot-project/spring-boot-tools/spring-boot-test-support-docker/build.gradle new file mode 100644 index 00000000000..944ab6cbf14 --- /dev/null +++ b/spring-boot-project/spring-boot-tools/spring-boot-test-support-docker/build.gradle @@ -0,0 +1,32 @@ +plugins { + id "java-library" + id "org.springframework.boot.conventions" + id "org.springframework.boot.optional-dependencies" +} + +description = "Spring Boot Docker Testing Support" + +dependencies { + api(platform(project(path: ":spring-boot-project:spring-boot-parent"))) + api(project(path: ":spring-boot-project:spring-boot-tools:spring-boot-test-support")) + + compileOnly("org.testcontainers:testcontainers") + + compileOnly("org.junit.jupiter:junit-jupiter") + compileOnly("org.springframework:spring-core") + + optional("org.testcontainers:cassandra") + optional("org.testcontainers:cassandra") + optional("org.testcontainers:couchbase") + optional("org.testcontainers:elasticsearch") + optional("org.testcontainers:junit-jupiter") + optional("org.testcontainers:kafka") + optional("org.testcontainers:mongodb") + optional("org.testcontainers:neo4j") + optional("org.testcontainers:oracle-xe") + optional("org.testcontainers:oracle-free") + optional("org.testcontainers:postgresql") + optional("org.testcontainers:pulsar") + optional("org.testcontainers:rabbitmq") + optional("org.testcontainers:redpanda") +} diff --git a/spring-boot-project/spring-boot-tools/spring-boot-test-support/src/main/java/org/springframework/boot/testsupport/container/ActiveMQContainer.java b/spring-boot-project/spring-boot-tools/spring-boot-test-support-docker/src/main/java/org/springframework/boot/testsupport/container/ActiveMQContainer.java similarity index 100% rename from spring-boot-project/spring-boot-tools/spring-boot-test-support/src/main/java/org/springframework/boot/testsupport/container/ActiveMQContainer.java rename to spring-boot-project/spring-boot-tools/spring-boot-test-support-docker/src/main/java/org/springframework/boot/testsupport/container/ActiveMQContainer.java diff --git a/spring-boot-project/spring-boot-tools/spring-boot-test-support/src/main/java/org/springframework/boot/testsupport/container/DisabledIfDockerUnavailable.java b/spring-boot-project/spring-boot-tools/spring-boot-test-support-docker/src/main/java/org/springframework/boot/testsupport/container/DisabledIfDockerUnavailable.java similarity index 100% rename from spring-boot-project/spring-boot-tools/spring-boot-test-support/src/main/java/org/springframework/boot/testsupport/container/DisabledIfDockerUnavailable.java rename to spring-boot-project/spring-boot-tools/spring-boot-test-support-docker/src/main/java/org/springframework/boot/testsupport/container/DisabledIfDockerUnavailable.java diff --git a/spring-boot-project/spring-boot-tools/spring-boot-test-support/src/main/java/org/springframework/boot/testsupport/container/DisabledIfDockerUnavailableCondition.java b/spring-boot-project/spring-boot-tools/spring-boot-test-support-docker/src/main/java/org/springframework/boot/testsupport/container/DisabledIfDockerUnavailableCondition.java similarity index 100% rename from spring-boot-project/spring-boot-tools/spring-boot-test-support/src/main/java/org/springframework/boot/testsupport/container/DisabledIfDockerUnavailableCondition.java rename to spring-boot-project/spring-boot-tools/spring-boot-test-support-docker/src/main/java/org/springframework/boot/testsupport/container/DisabledIfDockerUnavailableCondition.java diff --git a/spring-boot-project/spring-boot-tools/spring-boot-test-support/src/main/java/org/springframework/boot/testsupport/container/RedisContainer.java b/spring-boot-project/spring-boot-tools/spring-boot-test-support-docker/src/main/java/org/springframework/boot/testsupport/container/RedisContainer.java similarity index 100% rename from spring-boot-project/spring-boot-tools/spring-boot-test-support/src/main/java/org/springframework/boot/testsupport/container/RedisContainer.java rename to spring-boot-project/spring-boot-tools/spring-boot-test-support-docker/src/main/java/org/springframework/boot/testsupport/container/RedisContainer.java diff --git a/spring-boot-project/spring-boot-tools/spring-boot-test-support/src/main/java/org/springframework/boot/testsupport/container/RegistryContainer.java b/spring-boot-project/spring-boot-tools/spring-boot-test-support-docker/src/main/java/org/springframework/boot/testsupport/container/RegistryContainer.java similarity index 100% rename from spring-boot-project/spring-boot-tools/spring-boot-test-support/src/main/java/org/springframework/boot/testsupport/container/RegistryContainer.java rename to spring-boot-project/spring-boot-tools/spring-boot-test-support-docker/src/main/java/org/springframework/boot/testsupport/container/RegistryContainer.java diff --git a/spring-boot-project/spring-boot-tools/spring-boot-test-support/src/main/java/org/springframework/boot/testsupport/container/TestImage.java b/spring-boot-project/spring-boot-tools/spring-boot-test-support-docker/src/main/java/org/springframework/boot/testsupport/container/TestImage.java similarity index 100% rename from spring-boot-project/spring-boot-tools/spring-boot-test-support/src/main/java/org/springframework/boot/testsupport/container/TestImage.java rename to spring-boot-project/spring-boot-tools/spring-boot-test-support-docker/src/main/java/org/springframework/boot/testsupport/container/TestImage.java diff --git a/spring-boot-project/spring-boot-tools/spring-boot-test-support/src/main/java/org/springframework/boot/testsupport/container/ZipkinContainer.java b/spring-boot-project/spring-boot-tools/spring-boot-test-support-docker/src/main/java/org/springframework/boot/testsupport/container/ZipkinContainer.java similarity index 100% rename from spring-boot-project/spring-boot-tools/spring-boot-test-support/src/main/java/org/springframework/boot/testsupport/container/ZipkinContainer.java rename to spring-boot-project/spring-boot-tools/spring-boot-test-support-docker/src/main/java/org/springframework/boot/testsupport/container/ZipkinContainer.java diff --git a/spring-boot-project/spring-boot-tools/spring-boot-test-support/src/main/java/org/springframework/boot/testsupport/container/package-info.java b/spring-boot-project/spring-boot-tools/spring-boot-test-support-docker/src/main/java/org/springframework/boot/testsupport/container/package-info.java similarity index 100% rename from spring-boot-project/spring-boot-tools/spring-boot-test-support/src/main/java/org/springframework/boot/testsupport/container/package-info.java rename to spring-boot-project/spring-boot-tools/spring-boot-test-support-docker/src/main/java/org/springframework/boot/testsupport/container/package-info.java diff --git a/spring-boot-project/spring-boot-tools/spring-boot-test-support/build.gradle b/spring-boot-project/spring-boot-tools/spring-boot-test-support/build.gradle index 56e5b762434..49a0c125708 100644 --- a/spring-boot-project/spring-boot-tools/spring-boot-test-support/build.gradle +++ b/spring-boot-project/spring-boot-tools/spring-boot-test-support/build.gradle @@ -20,22 +20,6 @@ dependencies { compileOnly("org.mockito:mockito-core") compileOnly("org.springframework:spring-context") compileOnly("org.springframework.data:spring-data-redis") - compileOnly("org.testcontainers:testcontainers") - - optional("org.testcontainers:cassandra") - optional("org.testcontainers:cassandra") - optional("org.testcontainers:couchbase") - optional("org.testcontainers:elasticsearch") - optional("org.testcontainers:junit-jupiter") - optional("org.testcontainers:kafka") - optional("org.testcontainers:mongodb") - optional("org.testcontainers:neo4j") - optional("org.testcontainers:oracle-xe") - optional("org.testcontainers:oracle-free") - optional("org.testcontainers:postgresql") - optional("org.testcontainers:pulsar") - optional("org.testcontainers:rabbitmq") - optional("org.testcontainers:redpanda") implementation("jakarta.inject:jakarta.inject-api") implementation("org.apache.maven.resolver:maven-resolver-connector-basic") diff --git a/spring-boot-tests/spring-boot-integration-tests/spring-boot-launch-script-tests/build.gradle b/spring-boot-tests/spring-boot-integration-tests/spring-boot-launch-script-tests/build.gradle index db17b75713a..6ab89ff8d3d 100644 --- a/spring-boot-tests/spring-boot-integration-tests/spring-boot-launch-script-tests/build.gradle +++ b/spring-boot-tests/spring-boot-integration-tests/spring-boot-launch-script-tests/build.gradle @@ -19,8 +19,7 @@ dependencies { app project(path: ":spring-boot-project:spring-boot-parent", configuration: "mavenRepository") app project(path: ":spring-boot-project:spring-boot-tools:spring-boot-gradle-plugin", configuration: "mavenRepository") - dockerTestImplementation(enforcedPlatform(project(":spring-boot-project:spring-boot-parent"))) - dockerTestImplementation(project(":spring-boot-project:spring-boot-tools:spring-boot-test-support")) + dockerTestImplementation(project(":spring-boot-project:spring-boot-tools:spring-boot-test-support-docker")) dockerTestImplementation(project(":spring-boot-project:spring-boot-starters:spring-boot-starter-test")) dockerTestImplementation("org.testcontainers:testcontainers") } diff --git a/spring-boot-tests/spring-boot-integration-tests/spring-boot-loader-classic-tests/build.gradle b/spring-boot-tests/spring-boot-integration-tests/spring-boot-loader-classic-tests/build.gradle index 994565eb550..d4f026bdd6d 100644 --- a/spring-boot-tests/spring-boot-integration-tests/spring-boot-loader-classic-tests/build.gradle +++ b/spring-boot-tests/spring-boot-integration-tests/spring-boot-loader-classic-tests/build.gradle @@ -15,8 +15,7 @@ dependencies { app project(path: ":spring-boot-project:spring-boot-tools:spring-boot-gradle-plugin", configuration: "mavenRepository") app project(path: ":spring-boot-project:spring-boot-starters:spring-boot-starter-web", configuration: "mavenRepository") - dockerTestImplementation(enforcedPlatform(project(":spring-boot-project:spring-boot-parent"))) - dockerTestImplementation(project(":spring-boot-project:spring-boot-tools:spring-boot-test-support")) + dockerTestImplementation(project(":spring-boot-project:spring-boot-tools:spring-boot-test-support-docker")) dockerTestImplementation(project(":spring-boot-project:spring-boot-starters:spring-boot-starter-test")) dockerTestImplementation("org.testcontainers:junit-jupiter") dockerTestImplementation("org.testcontainers:testcontainers") diff --git a/spring-boot-tests/spring-boot-integration-tests/spring-boot-loader-tests/build.gradle b/spring-boot-tests/spring-boot-integration-tests/spring-boot-loader-tests/build.gradle index 5e4e6642c84..ddef1d8dce1 100644 --- a/spring-boot-tests/spring-boot-integration-tests/spring-boot-loader-tests/build.gradle +++ b/spring-boot-tests/spring-boot-integration-tests/spring-boot-loader-tests/build.gradle @@ -21,7 +21,7 @@ dependencies { app project(path: ":spring-boot-project:spring-boot-starters:spring-boot-starter", configuration: "mavenRepository") app("org.bouncycastle:bcprov-jdk18on:1.78.1") - dockerTestImplementation(project(":spring-boot-project:spring-boot-tools:spring-boot-test-support")) + dockerTestImplementation(project(":spring-boot-project:spring-boot-tools:spring-boot-test-support-docker")) dockerTestImplementation(project(":spring-boot-project:spring-boot-starters:spring-boot-starter-test")) dockerTestImplementation("org.testcontainers:junit-jupiter") dockerTestImplementation("org.testcontainers:testcontainers") diff --git a/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-activemq/build.gradle b/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-activemq/build.gradle index 518825084fb..699d4bdbe2b 100644 --- a/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-activemq/build.gradle +++ b/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-activemq/build.gradle @@ -7,11 +7,11 @@ plugins { description = "Spring Boot Actuator ActiveMQ smoke test" dependencies { - dockerTestImplementation("org.awaitility:awaitility") - dockerTestImplementation("org.testcontainers:junit-jupiter") dockerTestImplementation(project(":spring-boot-project:spring-boot-starters:spring-boot-starter-test")) dockerTestImplementation(project(":spring-boot-project:spring-boot-testcontainers")) - dockerTestImplementation(project(":spring-boot-project:spring-boot-tools:spring-boot-test-support")) - + dockerTestImplementation(project(":spring-boot-project:spring-boot-tools:spring-boot-test-support-docker")) + dockerTestImplementation("org.awaitility:awaitility") + dockerTestImplementation("org.testcontainers:junit-jupiter") + implementation(project(":spring-boot-project:spring-boot-starters:spring-boot-starter-activemq")) } \ No newline at end of file diff --git a/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-amqp/build.gradle b/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-amqp/build.gradle index 10b6ac14c48..60864527af5 100644 --- a/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-amqp/build.gradle +++ b/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-amqp/build.gradle @@ -9,7 +9,7 @@ description = "Spring Boot AMQP smoke test" dependencies { dockerTestImplementation(project(":spring-boot-project:spring-boot-starters:spring-boot-starter-test")) dockerTestImplementation(project(":spring-boot-project:spring-boot-testcontainers")) - dockerTestImplementation(project(":spring-boot-project:spring-boot-tools:spring-boot-test-support")) + dockerTestImplementation(project(":spring-boot-project:spring-boot-tools:spring-boot-test-support-docker")) dockerTestImplementation("org.awaitility:awaitility") dockerTestImplementation("org.testcontainers:junit-jupiter") dockerTestImplementation("org.testcontainers:rabbitmq") diff --git a/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-cache/build.gradle b/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-cache/build.gradle index 73d5790ff46..fd51155fdf0 100644 --- a/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-cache/build.gradle +++ b/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-cache/build.gradle @@ -27,13 +27,13 @@ dependencies { couchbase(enforcedPlatform(project(":spring-boot-project:spring-boot-dependencies"))) couchbase(project(":spring-boot-project:spring-boot-starters:spring-boot-starter-data-couchbase")) - + dockerTestImplementation(project(":spring-boot-project:spring-boot-starters:spring-boot-starter-data-redis")) dockerTestImplementation(project(":spring-boot-project:spring-boot-starters:spring-boot-starter-test")) dockerTestImplementation(project(":spring-boot-project:spring-boot-testcontainers")) - dockerTestImplementation(project(":spring-boot-project:spring-boot-tools:spring-boot-test-support")) + dockerTestImplementation(project(":spring-boot-project:spring-boot-tools:spring-boot-test-support-docker")) dockerTestImplementation("org.testcontainers:junit-jupiter") - + ehcache(enforcedPlatform(project(":spring-boot-project:spring-boot-dependencies"))) ehcache("javax.cache:cache-api") ehcache("org.ehcache:ehcache::jakarta") diff --git a/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-data-cassandra/build.gradle b/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-data-cassandra/build.gradle index 6fb7872d303..34b4de8755c 100644 --- a/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-data-cassandra/build.gradle +++ b/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-data-cassandra/build.gradle @@ -9,15 +9,15 @@ description = "Spring Boot Data Cassandra smoke test" dependencies { dockerTestImplementation(project(":spring-boot-project:spring-boot-test")) dockerTestImplementation(project(":spring-boot-project:spring-boot-starters:spring-boot-starter-test")) - dockerTestImplementation(project(":spring-boot-project:spring-boot-tools:spring-boot-test-support")) + dockerTestImplementation(project(":spring-boot-project:spring-boot-tools:spring-boot-test-support-docker")) dockerTestImplementation(project(":spring-boot-project:spring-boot-testcontainers")) dockerTestImplementation("org.junit.jupiter:junit-jupiter") dockerTestImplementation("org.junit.platform:junit-platform-engine") dockerTestImplementation("org.junit.platform:junit-platform-launcher") + dockerTestImplementation("org.testcontainers:cassandra") dockerTestImplementation("org.testcontainers:junit-jupiter") dockerTestImplementation("org.testcontainers:testcontainers") - dockerTestImplementation("org.testcontainers:cassandra") - + implementation(project(":spring-boot-project:spring-boot-starters:spring-boot-starter-data-cassandra")) implementation(project(":spring-boot-project:spring-boot-starters:spring-boot-starter-data-cassandra-reactive")) } diff --git a/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-data-couchbase/build.gradle b/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-data-couchbase/build.gradle index 153cc49baea..82dd3568d5c 100644 --- a/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-data-couchbase/build.gradle +++ b/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-data-couchbase/build.gradle @@ -9,7 +9,7 @@ description = "Spring Boot Data Couchbase smoke test" dependencies { dockerTestImplementation(project(":spring-boot-project:spring-boot-test")) dockerTestImplementation(project(":spring-boot-project:spring-boot-starters:spring-boot-starter-test")) - dockerTestImplementation(project(":spring-boot-project:spring-boot-tools:spring-boot-test-support")) + dockerTestImplementation(project(":spring-boot-project:spring-boot-tools:spring-boot-test-support-docker")) dockerTestImplementation(project(":spring-boot-project:spring-boot-testcontainers")) dockerTestImplementation("io.projectreactor:reactor-core") dockerTestImplementation("io.projectreactor:reactor-test") @@ -17,10 +17,10 @@ dependencies { dockerTestImplementation("org.junit.jupiter:junit-jupiter") dockerTestImplementation("org.junit.platform:junit-platform-engine") dockerTestImplementation("org.junit.platform:junit-platform-launcher") + dockerTestImplementation("org.testcontainers:couchbase") dockerTestImplementation("org.testcontainers:junit-jupiter") dockerTestImplementation("org.testcontainers:testcontainers") - dockerTestImplementation("org.testcontainers:couchbase") - + implementation(project(":spring-boot-project:spring-boot-starters:spring-boot-starter-data-couchbase")) implementation(project(":spring-boot-project:spring-boot-starters:spring-boot-starter-data-couchbase-reactive")) } diff --git a/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-data-mongo/build.gradle b/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-data-mongo/build.gradle index e0f3a5fc584..370b963ee52 100644 --- a/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-data-mongo/build.gradle +++ b/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-data-mongo/build.gradle @@ -7,19 +7,19 @@ plugins { description = "Spring Boot Data MongoDB smoke test" dependencies { - dockerTestImplementation(project(":spring-boot-project:spring-boot-test")) dockerTestImplementation(project(":spring-boot-project:spring-boot-starters:spring-boot-starter-test")) - dockerTestImplementation(project(":spring-boot-project:spring-boot-tools:spring-boot-test-support")) + dockerTestImplementation(project(":spring-boot-project:spring-boot-test")) + dockerTestImplementation(project(":spring-boot-project:spring-boot-tools:spring-boot-test-support-docker")) dockerTestImplementation(project(":spring-boot-project:spring-boot-testcontainers")) dockerTestImplementation("io.projectreactor:reactor-test") dockerTestImplementation("org.junit.jupiter:junit-jupiter") dockerTestImplementation("org.junit.platform:junit-platform-engine") dockerTestImplementation("org.junit.platform:junit-platform-launcher") dockerTestImplementation("org.testcontainers:junit-jupiter") - dockerTestImplementation("org.testcontainers:testcontainers") dockerTestImplementation("org.testcontainers:mongodb") + dockerTestImplementation("org.testcontainers:testcontainers") implementation(project(":spring-boot-project:spring-boot-starters:spring-boot-starter-data-mongodb")) implementation(project(":spring-boot-project:spring-boot-starters:spring-boot-starter-data-mongodb-reactive")) - implementation("io.projectreactor:reactor-core") + implementation("io.projectreactor:reactor-core") } \ No newline at end of file diff --git a/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-data-r2dbc-flyway/build.gradle b/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-data-r2dbc-flyway/build.gradle index c1f97a58d89..33dcf58c2a3 100644 --- a/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-data-r2dbc-flyway/build.gradle +++ b/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-data-r2dbc-flyway/build.gradle @@ -9,7 +9,7 @@ description = "Spring Boot Data R2DBC with Flyway smoke test" dependencies { dockerTestImplementation(project(":spring-boot-project:spring-boot-starters:spring-boot-starter-test")) dockerTestImplementation(project(":spring-boot-project:spring-boot-testcontainers")) - dockerTestImplementation(project(":spring-boot-project:spring-boot-tools:spring-boot-test-support")) + dockerTestImplementation(project(":spring-boot-project:spring-boot-tools:spring-boot-test-support-docker")) dockerTestImplementation("io.projectreactor:reactor-test") dockerTestImplementation("org.testcontainers:junit-jupiter") dockerTestImplementation("org.testcontainers:postgresql") diff --git a/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-data-r2dbc-liquibase/build.gradle b/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-data-r2dbc-liquibase/build.gradle index d256c4f5ece..fd8af2abfc4 100644 --- a/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-data-r2dbc-liquibase/build.gradle +++ b/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-data-r2dbc-liquibase/build.gradle @@ -9,7 +9,7 @@ description = "Spring Boot Data R2DBC with Liquibase smoke test" dependencies { dockerTestImplementation(project(":spring-boot-project:spring-boot-starters:spring-boot-starter-test")) dockerTestImplementation(project(":spring-boot-project:spring-boot-testcontainers")) - dockerTestImplementation(project(":spring-boot-project:spring-boot-tools:spring-boot-test-support")) + dockerTestImplementation(project(":spring-boot-project:spring-boot-tools:spring-boot-test-support-docker")) dockerTestImplementation("io.projectreactor:reactor-test") dockerTestImplementation("org.testcontainers:junit-jupiter") dockerTestImplementation("org.testcontainers:postgresql") diff --git a/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-data-redis/build.gradle b/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-data-redis/build.gradle index c7daa751063..83040c90c97 100644 --- a/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-data-redis/build.gradle +++ b/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-data-redis/build.gradle @@ -9,8 +9,8 @@ description = "Spring Boot Data Redis smoke test" dependencies { dockerTestImplementation(project(":spring-boot-project:spring-boot-test")) dockerTestImplementation(project(":spring-boot-project:spring-boot-starters:spring-boot-starter-test")) - dockerTestImplementation(project(":spring-boot-project:spring-boot-tools:spring-boot-test-support")) dockerTestImplementation(project(":spring-boot-project:spring-boot-testcontainers")) + dockerTestImplementation(project(":spring-boot-project:spring-boot-tools:spring-boot-test-support-docker")) dockerTestImplementation("io.projectreactor:reactor-core") dockerTestImplementation("io.projectreactor:reactor-test") dockerTestImplementation("org.junit.jupiter:junit-jupiter") diff --git a/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-kafka/build.gradle b/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-kafka/build.gradle index 4e7e5f9bf0c..e524a450adb 100644 --- a/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-kafka/build.gradle +++ b/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-kafka/build.gradle @@ -8,14 +8,14 @@ description = "Spring Boot Kafka smoke test" dependencies { dockerTestImplementation(project(":spring-boot-project:spring-boot-starters:spring-boot-starter-test")) - dockerTestImplementation(project(":spring-boot-project:spring-boot-tools:spring-boot-test-support")) + dockerTestImplementation(project(":spring-boot-project:spring-boot-tools:spring-boot-test-support-docker")) dockerTestImplementation("org.awaitility:awaitility") dockerTestImplementation("org.testcontainers:junit-jupiter") dockerTestImplementation("org.testcontainers:kafka") - + implementation(project(":spring-boot-project:spring-boot-starters:spring-boot-starter-json")) implementation("org.springframework.kafka:spring-kafka") - + testImplementation(project(":spring-boot-project:spring-boot-starters:spring-boot-starter-test")) testImplementation("org.awaitility:awaitility") testImplementation("org.springframework.kafka:spring-kafka-test") { diff --git a/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-pulsar/build.gradle b/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-pulsar/build.gradle index cbeea5eeb16..1b60f42b992 100644 --- a/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-pulsar/build.gradle +++ b/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-pulsar/build.gradle @@ -8,7 +8,7 @@ description = "Spring Boot Pulsar smoke test" dependencies { dockerTestImplementation(project(":spring-boot-project:spring-boot-starters:spring-boot-starter-test")) - dockerTestImplementation(project(":spring-boot-project:spring-boot-tools:spring-boot-test-support")) + dockerTestImplementation(project(":spring-boot-project:spring-boot-tools:spring-boot-test-support-docker")) dockerTestImplementation(project(":spring-boot-project:spring-boot-testcontainers")) dockerTestImplementation("org.awaitility:awaitility") dockerTestImplementation("org.testcontainers:junit-jupiter") diff --git a/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-session-mongo/build.gradle b/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-session-mongo/build.gradle index 8fcb96359ff..d1f7bd19466 100644 --- a/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-session-mongo/build.gradle +++ b/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-session-mongo/build.gradle @@ -7,15 +7,15 @@ plugins { description = "Spring Boot Session Mongodb smoke test" dependencies { - dockerTestImplementation("org.testcontainers:mongodb") - dockerTestImplementation("org.testcontainers:junit-jupiter") dockerTestImplementation(project(":spring-boot-project:spring-boot-testcontainers")) - dockerTestImplementation(project(":spring-boot-project:spring-boot-tools:spring-boot-test-support")) + dockerTestImplementation(project(":spring-boot-project:spring-boot-tools:spring-boot-test-support-docker")) dockerTestImplementation(project(":spring-boot-project:spring-boot-starters:spring-boot-starter-test")) - + dockerTestImplementation("org.testcontainers:junit-jupiter") + dockerTestImplementation("org.testcontainers:mongodb") + implementation(project(":spring-boot-project:spring-boot-starters:spring-boot-starter-actuator")) - implementation(project(":spring-boot-project:spring-boot-starters:spring-boot-starter-security")) implementation(project(":spring-boot-project:spring-boot-starters:spring-boot-starter-data-mongodb")) + implementation(project(":spring-boot-project:spring-boot-starters:spring-boot-starter-security")) implementation(project(":spring-boot-project:spring-boot-starters:spring-boot-starter-web")) implementation("org.springframework.session:spring-session-data-mongodb") } diff --git a/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-session-redis/build.gradle b/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-session-redis/build.gradle index b4ad9bdad6f..5a4231ea1d1 100644 --- a/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-session-redis/build.gradle +++ b/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-session-redis/build.gradle @@ -8,13 +8,13 @@ description = "Spring Boot Session Mongodb smoke test" dependencies { dockerTestImplementation(project(":spring-boot-project:spring-boot-testcontainers")) - dockerTestImplementation(project(":spring-boot-project:spring-boot-tools:spring-boot-test-support")) + dockerTestImplementation(project(":spring-boot-project:spring-boot-tools:spring-boot-test-support-docker")) dockerTestImplementation(project(":spring-boot-project:spring-boot-starters:spring-boot-starter-test")) dockerTestImplementation("org.testcontainers:junit-jupiter") implementation(project(":spring-boot-project:spring-boot-starters:spring-boot-starter-actuator")) - implementation(project(":spring-boot-project:spring-boot-starters:spring-boot-starter-security")) implementation(project(":spring-boot-project:spring-boot-starters:spring-boot-starter-data-redis")) + implementation(project(":spring-boot-project:spring-boot-starters:spring-boot-starter-security")) implementation(project(":spring-boot-project:spring-boot-starters:spring-boot-starter-web")) implementation("org.springframework.session:spring-session-data-redis") } diff --git a/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-session-webflux-mongo/build.gradle b/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-session-webflux-mongo/build.gradle index 74465e2794d..0de10a8f868 100644 --- a/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-session-webflux-mongo/build.gradle +++ b/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-session-webflux-mongo/build.gradle @@ -9,7 +9,7 @@ description = "Spring Boot Session WebFlux MongoDB smoke test" dependencies { dockerTestImplementation(project(":spring-boot-project:spring-boot-starters:spring-boot-starter-test")) dockerTestImplementation(project(":spring-boot-project:spring-boot-testcontainers")) - dockerTestImplementation(project(":spring-boot-project:spring-boot-tools:spring-boot-test-support")) + dockerTestImplementation(project(":spring-boot-project:spring-boot-tools:spring-boot-test-support-docker")) dockerTestImplementation("org.testcontainers:junit-jupiter") dockerTestImplementation("org.testcontainers:mongodb") diff --git a/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-session-webflux-redis/build.gradle b/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-session-webflux-redis/build.gradle index 0b5da25204d..0846636a940 100644 --- a/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-session-webflux-redis/build.gradle +++ b/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-session-webflux-redis/build.gradle @@ -9,7 +9,7 @@ description = "Spring Boot Session WebFlux Redis smoke test" dependencies { dockerTestImplementation(project(":spring-boot-project:spring-boot-starters:spring-boot-starter-test")) dockerTestImplementation(project(":spring-boot-project:spring-boot-testcontainers")) - dockerTestImplementation(project(":spring-boot-project:spring-boot-tools:spring-boot-test-support")) + dockerTestImplementation(project(":spring-boot-project:spring-boot-tools:spring-boot-test-support-docker")) dockerTestImplementation("org.testcontainers:junit-jupiter") implementation(project(":spring-boot-project:spring-boot-starters:spring-boot-starter-security")) diff --git a/src/checkstyle/checkstyle-suppressions.xml b/src/checkstyle/checkstyle-suppressions.xml index cfc49fb4392..6d8593ad949 100644 --- a/src/checkstyle/checkstyle-suppressions.xml +++ b/src/checkstyle/checkstyle-suppressions.xml @@ -58,6 +58,7 @@ +