Skip to content

Commit 6564abb

Browse files
committed
Update spring-boot-loader-classic-tests to use docker-test plugin
See gh-41228
1 parent edc5828 commit 6564abb

File tree

8 files changed

+12
-12
lines changed

8 files changed

+12
-12
lines changed

spring-boot-tests/spring-boot-integration-tests/spring-boot-loader-classic-tests/build.gradle

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
plugins {
22
id "java"
33
id "org.springframework.boot.conventions"
4-
id "org.springframework.boot.integration-test"
4+
id "org.springframework.boot.docker-test"
55
}
66

77
description = "Spring Boot Classic Loader Integration Tests"
@@ -15,16 +15,16 @@ dependencies {
1515
app project(path: ":spring-boot-project:spring-boot-tools:spring-boot-gradle-plugin", configuration: "mavenRepository")
1616
app project(path: ":spring-boot-project:spring-boot-starters:spring-boot-starter-web", configuration: "mavenRepository")
1717

18-
intTestImplementation(enforcedPlatform(project(":spring-boot-project:spring-boot-parent")))
19-
intTestImplementation(project(":spring-boot-project:spring-boot-tools:spring-boot-test-support"))
20-
intTestImplementation(project(":spring-boot-project:spring-boot-starters:spring-boot-starter-test"))
21-
intTestImplementation("org.testcontainers:junit-jupiter")
22-
intTestImplementation("org.testcontainers:testcontainers")
18+
dockerTestImplementation(enforcedPlatform(project(":spring-boot-project:spring-boot-parent")))
19+
dockerTestImplementation(project(":spring-boot-project:spring-boot-tools:spring-boot-test-support"))
20+
dockerTestImplementation(project(":spring-boot-project:spring-boot-starters:spring-boot-starter-test"))
21+
dockerTestImplementation("org.testcontainers:junit-jupiter")
22+
dockerTestImplementation("org.testcontainers:testcontainers")
2323
}
2424

2525
task syncMavenRepository(type: Sync) {
2626
from configurations.app
27-
into "${buildDir}/int-test-maven-repository"
27+
into "${buildDir}/docker-test-maven-repository"
2828
}
2929

3030
task syncAppSource(type: org.springframework.boot.build.SyncAppSource) {
@@ -39,6 +39,6 @@ task buildApp(type: GradleBuild) {
3939
tasks = ["build"]
4040
}
4141

42-
intTest {
42+
tasks.named("dockerTest").configure {
4343
dependsOn buildApp
44-
}
44+
}

spring-boot-tests/spring-boot-integration-tests/spring-boot-loader-classic-tests/spring-boot-loader-classic-tests-app/build.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ plugins {
66
apply plugin: "io.spring.dependency-management"
77

88
repositories {
9-
maven { url "file:${rootDir}/../int-test-maven-repository"}
9+
maven { url "file:${rootDir}/../docker-test-maven-repository"}
1010
mavenCentral()
1111
maven { url "https://repo.spring.io/snapshot" }
1212
maven { url "https://repo.spring.io/milestone" }

spring-boot-tests/spring-boot-integration-tests/spring-boot-loader-classic-tests/spring-boot-loader-classic-tests-app/settings.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
pluginManagement {
22
repositories {
3-
maven { url "file:${rootDir}/../int-test-maven-repository"}
3+
maven { url "file:${rootDir}/../docker-test-maven-repository"}
44
mavenCentral()
55
maven { url "https://repo.spring.io/snapshot" }
66
maven { url "https://repo.spring.io/milestone" }
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -130,7 +130,7 @@ static JavaRuntime oracleJdk17() {
130130
String arch = System.getProperty("os.arch");
131131
String dockerFile = ("aarch64".equals(arch)) ? "Dockerfile-aarch64" : "Dockerfile";
132132
ImageFromDockerfile image = new ImageFromDockerfile("spring-boot-loader/oracle-jdk-17")
133-
.withFileFromFile("Dockerfile", new File("src/intTest/resources/conf/oracle-jdk-17/" + dockerFile));
133+
.withFileFromFile("Dockerfile", new File("src/dockerTest/resources/conf/oracle-jdk-17/" + dockerFile));
134134
return new JavaRuntime("Oracle JDK 17", JavaVersion.SEVENTEEN, () -> new GenericContainer<>(image));
135135
}
136136

0 commit comments

Comments
 (0)