Browse Source

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 5 years ago
parent
commit
a2a153ade6
  1. 6
      spring-boot-tests/spring-boot-integration-tests/spring-boot-launch-script-tests/build.gradle
  2. 0
      spring-boot-tests/spring-boot-integration-tests/spring-boot-launch-script-tests/spring-boot-launch-script-tests-app/build.gradle
  3. 0
      spring-boot-tests/spring-boot-integration-tests/spring-boot-launch-script-tests/spring-boot-launch-script-tests-app/settings.gradle
  4. 0
      spring-boot-tests/spring-boot-integration-tests/spring-boot-launch-script-tests/spring-boot-launch-script-tests-app/src/main/java/org/springframework/boot/launchscript/LaunchScriptTestApplication.java
  5. 0
      spring-boot-tests/spring-boot-integration-tests/spring-boot-launch-script-tests/spring-boot-launch-script-tests-app/src/main/java/org/springframework/boot/launchscript/LaunchVerificationController.java
  6. 6
      spring-boot-tests/spring-boot-integration-tests/spring-boot-loader-tests/build.gradle
  7. 0
      spring-boot-tests/spring-boot-integration-tests/spring-boot-loader-tests/spring-boot-loader-tests-app/build.gradle
  8. 0
      spring-boot-tests/spring-boot-integration-tests/spring-boot-loader-tests/spring-boot-loader-tests-app/settings.gradle
  9. 0
      spring-boot-tests/spring-boot-integration-tests/spring-boot-loader-tests/spring-boot-loader-tests-app/src/main/java/org/springframework/boot/loaderapp/LoaderTestApplication.java

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

@ -27,8 +27,8 @@ task syncMavenRepository(type: Sync) { @@ -27,8 +27,8 @@ task syncMavenRepository(type: Sync) {
}
task syncAppSource(type: Sync) {
from "app"
into "${buildDir}/app"
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}\"")
}
@ -36,7 +36,7 @@ task syncAppSource(type: Sync) { @@ -36,7 +36,7 @@ task syncAppSource(type: Sync) {
task buildApp(type: GradleBuild) {
dependsOn syncAppSource, syncMavenRepository
dir = "${buildDir}/app"
dir = "${buildDir}/spring-boot-launch-script-tests-app"
startParameter.buildCacheEnabled = false
tasks = ["build"]
}

0
spring-boot-tests/spring-boot-integration-tests/spring-boot-launch-script-tests/app/build.gradle → spring-boot-tests/spring-boot-integration-tests/spring-boot-launch-script-tests/spring-boot-launch-script-tests-app/build.gradle

0
spring-boot-tests/spring-boot-integration-tests/spring-boot-launch-script-tests/app/settings.gradle → spring-boot-tests/spring-boot-integration-tests/spring-boot-launch-script-tests/spring-boot-launch-script-tests-app/settings.gradle

0
spring-boot-tests/spring-boot-integration-tests/spring-boot-launch-script-tests/app/src/main/java/org/springframework/boot/launchscript/LaunchScriptTestApplication.java → spring-boot-tests/spring-boot-integration-tests/spring-boot-launch-script-tests/spring-boot-launch-script-tests-app/src/main/java/org/springframework/boot/launchscript/LaunchScriptTestApplication.java

0
spring-boot-tests/spring-boot-integration-tests/spring-boot-launch-script-tests/app/src/main/java/org/springframework/boot/launchscript/LaunchVerificationController.java → spring-boot-tests/spring-boot-integration-tests/spring-boot-launch-script-tests/spring-boot-launch-script-tests-app/src/main/java/org/springframework/boot/launchscript/LaunchVerificationController.java

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

@ -28,8 +28,8 @@ task syncMavenRepository(type: Sync) { @@ -28,8 +28,8 @@ task syncMavenRepository(type: Sync) {
}
task syncAppSource(type: Sync) {
from "app"
into "${buildDir}/app"
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}\"")
}
@ -37,7 +37,7 @@ task syncAppSource(type: Sync) { @@ -37,7 +37,7 @@ task syncAppSource(type: Sync) {
task buildApp(type: GradleBuild) {
dependsOn syncAppSource, syncMavenRepository
dir = "${buildDir}/app"
dir = "${buildDir}/spring-boot-loader-tests-app"
startParameter.buildCacheEnabled = false
tasks = ["build"]
}

0
spring-boot-tests/spring-boot-integration-tests/spring-boot-loader-tests/app/build.gradle → spring-boot-tests/spring-boot-integration-tests/spring-boot-loader-tests/spring-boot-loader-tests-app/build.gradle

0
spring-boot-tests/spring-boot-integration-tests/spring-boot-loader-tests/app/settings.gradle → spring-boot-tests/spring-boot-integration-tests/spring-boot-loader-tests/spring-boot-loader-tests-app/settings.gradle

0
spring-boot-tests/spring-boot-integration-tests/spring-boot-loader-tests/app/src/main/java/org/springframework/boot/loaderapp/LoaderTestApplication.java → spring-boot-tests/spring-boot-integration-tests/spring-boot-loader-tests/spring-boot-loader-tests-app/src/main/java/org/springframework/boot/loaderapp/LoaderTestApplication.java

Loading…
Cancel
Save