Update spring-boot-loader-tests to use docker-test plugin
See gh-41228
This commit is contained in:
parent
d5ef5e9c9d
commit
edc582800b
|
|
@ -1,7 +1,7 @@
|
||||||
plugins {
|
plugins {
|
||||||
id "java"
|
id "java"
|
||||||
id "org.springframework.boot.conventions"
|
id "org.springframework.boot.conventions"
|
||||||
id "org.springframework.boot.integration-test"
|
id "org.springframework.boot.docker-test"
|
||||||
id "de.undercouch.download"
|
id "de.undercouch.download"
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
@ -21,16 +21,15 @@ dependencies {
|
||||||
app project(path: ":spring-boot-project:spring-boot-starters:spring-boot-starter", configuration: "mavenRepository")
|
app project(path: ":spring-boot-project:spring-boot-starters:spring-boot-starter", configuration: "mavenRepository")
|
||||||
app("org.bouncycastle:bcprov-jdk18on:1.78.1")
|
app("org.bouncycastle:bcprov-jdk18on:1.78.1")
|
||||||
|
|
||||||
intTestImplementation(enforcedPlatform(project(":spring-boot-project:spring-boot-parent")))
|
dockerTestImplementation(project(":spring-boot-project:spring-boot-tools:spring-boot-test-support"))
|
||||||
intTestImplementation(project(":spring-boot-project:spring-boot-tools:spring-boot-test-support"))
|
dockerTestImplementation(project(":spring-boot-project:spring-boot-starters:spring-boot-starter-test"))
|
||||||
intTestImplementation(project(":spring-boot-project:spring-boot-starters:spring-boot-starter-test"))
|
dockerTestImplementation("org.testcontainers:junit-jupiter")
|
||||||
intTestImplementation("org.testcontainers:junit-jupiter")
|
dockerTestImplementation("org.testcontainers:testcontainers")
|
||||||
intTestImplementation("org.testcontainers:testcontainers")
|
|
||||||
}
|
}
|
||||||
|
|
||||||
task syncMavenRepository(type: Sync) {
|
task syncMavenRepository(type: Sync) {
|
||||||
from configurations.app
|
from configurations.app
|
||||||
into "${buildDir}/int-test-maven-repository"
|
into "${buildDir}/docker-test-maven-repository"
|
||||||
}
|
}
|
||||||
|
|
||||||
task syncAppSource(type: org.springframework.boot.build.SyncAppSource) {
|
task syncAppSource(type: org.springframework.boot.build.SyncAppSource) {
|
||||||
|
|
@ -74,10 +73,10 @@ task syncJdkDownloads(type: Sync) {
|
||||||
into "${project.buildDir}/downloads/jdk/oracle/"
|
into "${project.buildDir}/downloads/jdk/oracle/"
|
||||||
}
|
}
|
||||||
|
|
||||||
processIntTestResources {
|
tasks.named("processDockerTestResources").configure {
|
||||||
dependsOn syncJdkDownloads
|
dependsOn syncJdkDownloads
|
||||||
}
|
}
|
||||||
|
|
||||||
intTest {
|
tasks.named("dockerTest").configure {
|
||||||
dependsOn buildApp, buildSignedJarApp
|
dependsOn buildApp, buildSignedJarApp
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -1,14 +1,12 @@
|
||||||
plugins {
|
plugins {
|
||||||
id "java"
|
id "java"
|
||||||
id "org.springframework.boot"
|
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"
|
apply plugin: "io.spring.dependency-management"
|
||||||
|
|
||||||
repositories {
|
repositories {
|
||||||
maven { url "file:${rootDir}/../int-test-maven-repository"}
|
maven { url "file:${rootDir}/../docker-test-maven-repository"}
|
||||||
mavenCentral()
|
mavenCentral()
|
||||||
maven { url "https://repo.spring.io/snapshot" }
|
maven { url "https://repo.spring.io/snapshot" }
|
||||||
maven { url "https://repo.spring.io/milestone" }
|
maven { url "https://repo.spring.io/milestone" }
|
||||||
|
|
|
||||||
|
|
@ -1,6 +1,6 @@
|
||||||
pluginManagement {
|
pluginManagement {
|
||||||
repositories {
|
repositories {
|
||||||
maven { url "file:${rootDir}/../int-test-maven-repository"}
|
maven { url "file:${rootDir}/../docker-test-maven-repository"}
|
||||||
mavenCentral()
|
mavenCentral()
|
||||||
maven { url "https://repo.spring.io/snapshot" }
|
maven { url "https://repo.spring.io/snapshot" }
|
||||||
maven { url "https://repo.spring.io/milestone" }
|
maven { url "https://repo.spring.io/milestone" }
|
||||||
|
|
|
||||||
|
|
@ -8,7 +8,7 @@ plugins {
|
||||||
apply plugin: "io.spring.dependency-management"
|
apply plugin: "io.spring.dependency-management"
|
||||||
|
|
||||||
repositories {
|
repositories {
|
||||||
maven { url "file:${rootDir}/../int-test-maven-repository"}
|
maven { url "file:${rootDir}/../docker-test-maven-repository"}
|
||||||
mavenCentral()
|
mavenCentral()
|
||||||
maven { url "https://repo.spring.io/snapshot" }
|
maven { url "https://repo.spring.io/snapshot" }
|
||||||
maven { url "https://repo.spring.io/milestone" }
|
maven { url "https://repo.spring.io/milestone" }
|
||||||
|
|
|
||||||
|
|
@ -1,6 +1,6 @@
|
||||||
pluginManagement {
|
pluginManagement {
|
||||||
repositories {
|
repositories {
|
||||||
maven { url "file:${rootDir}/../int-test-maven-repository"}
|
maven { url "file:${rootDir}/../docker-test-maven-repository"}
|
||||||
mavenCentral()
|
mavenCentral()
|
||||||
maven { url "https://repo.spring.io/snapshot" }
|
maven { url "https://repo.spring.io/snapshot" }
|
||||||
maven { url "https://repo.spring.io/milestone" }
|
maven { url "https://repo.spring.io/milestone" }
|
||||||
|
|
|
||||||
|
|
@ -156,7 +156,7 @@ class LoaderIntegrationTests {
|
||||||
|
|
||||||
static JavaRuntime oracleJdk17() {
|
static JavaRuntime oracleJdk17() {
|
||||||
ImageFromDockerfile image = new ImageFromDockerfile("spring-boot-loader/oracle-jdk");
|
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()) {
|
for (File file : new File("build/downloads/jdk/oracle").listFiles()) {
|
||||||
image.withFileFromFile("downloads/" + file.getName(), file);
|
image.withFileFromFile("downloads/" + file.getName(), file);
|
||||||
}
|
}
|
||||||
Loading…
Reference in New Issue