Fix name clash with integration test apps

Rename "app" projects in `spring-boot-launch-script-tests` and
`spring-boot-loader-tests` to something unique.

See gh-18631
pull/25129/head
Phillip Webb 4 years ago
parent c4e41305d5
commit a2a153ade6

@ -27,8 +27,8 @@ task syncMavenRepository(type: Sync) {
} }
task syncAppSource(type: Sync) { task syncAppSource(type: Sync) {
from "app" from "spring-boot-launch-script-tests-app"
into "${buildDir}/app" into "${buildDir}/spring-boot-launch-script-tests-app"
filter { line -> filter { line ->
line.replace("id \"org.springframework.boot\"", "id \"org.springframework.boot\" version \"${project.version}\"") line.replace("id \"org.springframework.boot\"", "id \"org.springframework.boot\" version \"${project.version}\"")
} }
@ -36,7 +36,7 @@ task syncAppSource(type: Sync) {
task buildApp(type: GradleBuild) { task buildApp(type: GradleBuild) {
dependsOn syncAppSource, syncMavenRepository dependsOn syncAppSource, syncMavenRepository
dir = "${buildDir}/app" dir = "${buildDir}/spring-boot-launch-script-tests-app"
startParameter.buildCacheEnabled = false startParameter.buildCacheEnabled = false
tasks = ["build"] tasks = ["build"]
} }

@ -28,8 +28,8 @@ task syncMavenRepository(type: Sync) {
} }
task syncAppSource(type: Sync) { task syncAppSource(type: Sync) {
from "app" from "spring-boot-loader-tests-app"
into "${buildDir}/app" into "${buildDir}/spring-boot-loader-tests-app"
filter { line -> filter { line ->
line.replace("id \"org.springframework.boot\"", "id \"org.springframework.boot\" version \"${project.version}\"") line.replace("id \"org.springframework.boot\"", "id \"org.springframework.boot\" version \"${project.version}\"")
} }
@ -37,7 +37,7 @@ task syncAppSource(type: Sync) {
task buildApp(type: GradleBuild) { task buildApp(type: GradleBuild) {
dependsOn syncAppSource, syncMavenRepository dependsOn syncAppSource, syncMavenRepository
dir = "${buildDir}/app" dir = "${buildDir}/spring-boot-loader-tests-app"
startParameter.buildCacheEnabled = false startParameter.buildCacheEnabled = false
tasks = ["build"] tasks = ["build"]
} }

Loading…
Cancel
Save