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

Merge branch '2.5.x'

Browse Source 
Closes gh-28200
This commit is contained in:
Andy Wilkinson
2021-10-05 11:13:20 +01:00
parent 8aa9d0c13d 322615d9c5
commit 0b58d4858d
4 changed files with 84 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
spring-boot-tests/spring-boot-integration-tests/spring-boot-launch-script-tests/build.gradle
View File

@@ -26,12 +26,9 @@ task syncMavenRepository(type: Sync) {
into "${buildDir}/int-test-maven-repository"
}
task syncAppSource(type: Sync) {
from "spring-boot-launch-script-tests-app"
into "${buildDir}/spring-boot-launch-script-tests-app"
filter { line ->
line.replace("id \"org.springframework.boot\"", "id \"org.springframework.boot\" version \"${project.version}\"")
}
task syncAppSource(type: org.springframework.boot.build.SyncAppSource) {
sourceDirectory = file("spring-boot-launch-script-tests-app")
destinationDirectory = file("${buildDir}/spring-boot-launch-script-tests-app")
}
task buildApp(type: GradleBuild) {

9
spring-boot-tests/spring-boot-integration-tests/spring-boot-loader-tests/build.gradle
View File

@@ -27,12 +27,9 @@ task syncMavenRepository(type: Sync) {
into "${buildDir}/int-test-maven-repository"
}
task syncAppSource(type: Sync) {
from "spring-boot-loader-tests-app"
into "${buildDir}/spring-boot-loader-tests-app"
filter { line ->
line.replace("id \"org.springframework.boot\"", "id \"org.springframework.boot\" version \"${project.version}\"")
}
task syncAppSource(type: org.springframework.boot.build.SyncAppSource) {
sourceDirectory = file("spring-boot-loader-tests-app")
destinationDirectory = file("${buildDir}/spring-boot-loader-tests-app")
}
task buildApp(type: GradleBuild) {

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

@@ -36,12 +36,9 @@ task syncTestRepository(type: Sync) {
}
}
task syncAppSource(type: Sync) {
from "spring-boot-server-tests-app"
into "${buildDir}/spring-boot-server-tests-app"
filter { line ->
line.replace("id \"org.springframework.boot\"", "id \"org.springframework.boot\" version \"${project.version}\"")
}
task syncAppSource(type: org.springframework.boot.build.SyncAppSource) {
sourceDirectory = file("spring-boot-server-tests-app")
destinationDirectory = file("${buildDir}/spring-boot-server-tests-app")
}
task buildApps(type: GradleBuild) {