Skip to content

Commit a2a153a

Browse files
committed
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
1 parent c4e4130 commit a2a153a

File tree

9 files changed

+6
-6
lines changed

9 files changed

+6
-6
lines changed

spring-boot-tests/spring-boot-integration-tests/spring-boot-launch-script-tests/build.gradle

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -27,16 +27,16 @@ task syncMavenRepository(type: Sync) {
2727
}
2828

2929
task syncAppSource(type: Sync) {
30-
from "app"
31-
into "${buildDir}/app"
30+
from "spring-boot-launch-script-tests-app"
31+
into "${buildDir}/spring-boot-launch-script-tests-app"
3232
filter { line ->
3333
line.replace("id \"org.springframework.boot\"", "id \"org.springframework.boot\" version \"${project.version}\"")
3434
}
3535
}
3636

3737
task buildApp(type: GradleBuild) {
3838
dependsOn syncAppSource, syncMavenRepository
39-
dir = "${buildDir}/app"
39+
dir = "${buildDir}/spring-boot-launch-script-tests-app"
4040
startParameter.buildCacheEnabled = false
4141
tasks = ["build"]
4242
}

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -28,16 +28,16 @@ task syncMavenRepository(type: Sync) {
2828
}
2929

3030
task syncAppSource(type: Sync) {
31-
from "app"
32-
into "${buildDir}/app"
31+
from "spring-boot-loader-tests-app"
32+
into "${buildDir}/spring-boot-loader-tests-app"
3333
filter { line ->
3434
line.replace("id \"org.springframework.boot\"", "id \"org.springframework.boot\" version \"${project.version}\"")
3535
}
3636
}
3737

3838
task buildApp(type: GradleBuild) {
3939
dependsOn syncAppSource, syncMavenRepository
40-
dir = "${buildDir}/app"
40+
dir = "${buildDir}/spring-boot-loader-tests-app"
4141
startParameter.buildCacheEnabled = false
4242
tasks = ["build"]
4343
}

0 commit comments

Comments
 (0)