Spring/spring-boot
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch '3.2.x' into 3.3.x

Browse Source 
Closes gh-42772
This commit is contained in:
Moritz Halbritter
2024-10-17 17:52:55 +02:00
parent fb9fee4ed8 ce106eb43c
commit 73150b799a
17 changed files with 75 additions and 73 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
spring-boot-tests/spring-boot-integration-tests/spring-boot-server-tests/build.gradle
View File

@@ -29,7 +29,7 @@ dependencies {
}
task syncTestRepository(type: Sync) {
destinationDir = file("${buildDir}/test-repository")
destinationDir = file(layout.buildDirectory.dir("test-repository"))
from {
configurations.testRepository
}
@@ -37,12 +37,12 @@ task syncTestRepository(type: Sync) {
task syncAppSource(type: org.springframework.boot.build.SyncAppSource) {
sourceDirectory = file("spring-boot-server-tests-app")
destinationDirectory = file("${buildDir}/spring-boot-server-tests-app")
destinationDirectory = file(layout.buildDirectory.dir("spring-boot-server-tests-app"))
}
task buildApps(type: GradleBuild) {
dependsOn syncAppSource, syncTestRepository
dir = "${buildDir}/spring-boot-server-tests-app"
dir = layout.buildDirectory.dir("spring-boot-server-tests-app")
startParameter.buildCacheEnabled = false
tasks = [
"jettyBootJar",
@@ -56,15 +56,16 @@ task buildApps(type: GradleBuild) {
intTest {
inputs.files(
"${buildDir}/spring-boot-server-tests-app/build/libs/spring-boot-server-tests-app-jetty.jar",
"${buildDir}/spring-boot-server-tests-app/build/libs/spring-boot-server-tests-app-jetty.war",
"${buildDir}/spring-boot-server-tests-app/build/libs/spring-boot-server-tests-app-resources.jar",
"${buildDir}/spring-boot-server-tests-app/build/libs/spring-boot-server-tests-app-tomcat.jar",
"${buildDir}/spring-boot-server-tests-app/build/libs/spring-boot-server-tests-app-tomcat.war",
"${buildDir}/spring-boot-server-tests-app/build/libs/spring-boot-server-tests-app-undertow.jar",
"${buildDir}/spring-boot-server-tests-app/build/libs/spring-boot-server-tests-app-undertow.war")
layout.buildDirectory.file("spring-boot-server-tests-app/build/libs/spring-boot-server-tests-app-jetty.jar"),
layout.buildDirectory.file("spring-boot-server-tests-app/build/libs/spring-boot-server-tests-app-jetty.war"),
layout.buildDirectory.file("spring-boot-server-tests-app/build/libs/spring-boot-server-tests-app-resources.jar"),
layout.buildDirectory.file("spring-boot-server-tests-app/build/libs/spring-boot-server-tests-app-tomcat.jar"),
layout.buildDirectory.file("spring-boot-server-tests-app/build/libs/spring-boot-server-tests-app-tomcat.war"),
layout.buildDirectory.file("spring-boot-server-tests-app/build/libs/spring-boot-server-tests-app-undertow.jar"),
layout.buildDirectory.file("spring-boot-server-tests-app/build/libs/spring-boot-server-tests-app-undertow.war")
)
.withPropertyName("applicationArchives")
.withPathSensitivity(PathSensitivity.RELATIVE)
.withNormalizer(ClasspathNormalizer)
dependsOn buildApps
}
}