From a2a153ade65280dad8aaab8e45b31c08deb221f1 Mon Sep 17 00:00:00 2001 From: Phillip Webb Date: Thu, 17 Dec 2020 21:56:13 -0800 Subject: [PATCH] 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 --- .../spring-boot-launch-script-tests/build.gradle | 6 +++--- .../build.gradle | 0 .../settings.gradle | 0 .../boot/launchscript/LaunchScriptTestApplication.java | 0 .../boot/launchscript/LaunchVerificationController.java | 0 .../spring-boot-loader-tests/build.gradle | 6 +++--- .../{app => spring-boot-loader-tests-app}/build.gradle | 0 .../{app => spring-boot-loader-tests-app}/settings.gradle | 0 .../boot/loaderapp/LoaderTestApplication.java | 0 9 files changed, 6 insertions(+), 6 deletions(-) rename spring-boot-tests/spring-boot-integration-tests/spring-boot-launch-script-tests/{app => spring-boot-launch-script-tests-app}/build.gradle (100%) rename spring-boot-tests/spring-boot-integration-tests/spring-boot-launch-script-tests/{app => spring-boot-launch-script-tests-app}/settings.gradle (100%) rename spring-boot-tests/spring-boot-integration-tests/spring-boot-launch-script-tests/{app => spring-boot-launch-script-tests-app}/src/main/java/org/springframework/boot/launchscript/LaunchScriptTestApplication.java (100%) rename spring-boot-tests/spring-boot-integration-tests/spring-boot-launch-script-tests/{app => spring-boot-launch-script-tests-app}/src/main/java/org/springframework/boot/launchscript/LaunchVerificationController.java (100%) rename spring-boot-tests/spring-boot-integration-tests/spring-boot-loader-tests/{app => spring-boot-loader-tests-app}/build.gradle (100%) rename spring-boot-tests/spring-boot-integration-tests/spring-boot-loader-tests/{app => spring-boot-loader-tests-app}/settings.gradle (100%) rename spring-boot-tests/spring-boot-integration-tests/spring-boot-loader-tests/{app => spring-boot-loader-tests-app}/src/main/java/org/springframework/boot/loaderapp/LoaderTestApplication.java (100%) diff --git a/spring-boot-tests/spring-boot-integration-tests/spring-boot-launch-script-tests/build.gradle b/spring-boot-tests/spring-boot-integration-tests/spring-boot-launch-script-tests/build.gradle index 1eb19db0984a..3e26f0e96db7 100644 --- a/spring-boot-tests/spring-boot-integration-tests/spring-boot-launch-script-tests/build.gradle +++ b/spring-boot-tests/spring-boot-integration-tests/spring-boot-launch-script-tests/build.gradle @@ -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) { task buildApp(type: GradleBuild) { dependsOn syncAppSource, syncMavenRepository - dir = "${buildDir}/app" + dir = "${buildDir}/spring-boot-launch-script-tests-app" startParameter.buildCacheEnabled = false tasks = ["build"] } diff --git a/spring-boot-tests/spring-boot-integration-tests/spring-boot-launch-script-tests/app/build.gradle b/spring-boot-tests/spring-boot-integration-tests/spring-boot-launch-script-tests/spring-boot-launch-script-tests-app/build.gradle similarity index 100% rename from spring-boot-tests/spring-boot-integration-tests/spring-boot-launch-script-tests/app/build.gradle rename to spring-boot-tests/spring-boot-integration-tests/spring-boot-launch-script-tests/spring-boot-launch-script-tests-app/build.gradle diff --git a/spring-boot-tests/spring-boot-integration-tests/spring-boot-launch-script-tests/app/settings.gradle b/spring-boot-tests/spring-boot-integration-tests/spring-boot-launch-script-tests/spring-boot-launch-script-tests-app/settings.gradle similarity index 100% rename from spring-boot-tests/spring-boot-integration-tests/spring-boot-launch-script-tests/app/settings.gradle rename to spring-boot-tests/spring-boot-integration-tests/spring-boot-launch-script-tests/spring-boot-launch-script-tests-app/settings.gradle diff --git a/spring-boot-tests/spring-boot-integration-tests/spring-boot-launch-script-tests/app/src/main/java/org/springframework/boot/launchscript/LaunchScriptTestApplication.java b/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 similarity index 100% rename from spring-boot-tests/spring-boot-integration-tests/spring-boot-launch-script-tests/app/src/main/java/org/springframework/boot/launchscript/LaunchScriptTestApplication.java rename to 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 diff --git a/spring-boot-tests/spring-boot-integration-tests/spring-boot-launch-script-tests/app/src/main/java/org/springframework/boot/launchscript/LaunchVerificationController.java b/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 similarity index 100% rename from spring-boot-tests/spring-boot-integration-tests/spring-boot-launch-script-tests/app/src/main/java/org/springframework/boot/launchscript/LaunchVerificationController.java rename to 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 diff --git a/spring-boot-tests/spring-boot-integration-tests/spring-boot-loader-tests/build.gradle b/spring-boot-tests/spring-boot-integration-tests/spring-boot-loader-tests/build.gradle index 46a8ce7cd962..7a39e57c4673 100644 --- a/spring-boot-tests/spring-boot-integration-tests/spring-boot-loader-tests/build.gradle +++ b/spring-boot-tests/spring-boot-integration-tests/spring-boot-loader-tests/build.gradle @@ -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) { task buildApp(type: GradleBuild) { dependsOn syncAppSource, syncMavenRepository - dir = "${buildDir}/app" + dir = "${buildDir}/spring-boot-loader-tests-app" startParameter.buildCacheEnabled = false tasks = ["build"] } diff --git a/spring-boot-tests/spring-boot-integration-tests/spring-boot-loader-tests/app/build.gradle b/spring-boot-tests/spring-boot-integration-tests/spring-boot-loader-tests/spring-boot-loader-tests-app/build.gradle similarity index 100% rename from spring-boot-tests/spring-boot-integration-tests/spring-boot-loader-tests/app/build.gradle rename to spring-boot-tests/spring-boot-integration-tests/spring-boot-loader-tests/spring-boot-loader-tests-app/build.gradle diff --git a/spring-boot-tests/spring-boot-integration-tests/spring-boot-loader-tests/app/settings.gradle b/spring-boot-tests/spring-boot-integration-tests/spring-boot-loader-tests/spring-boot-loader-tests-app/settings.gradle similarity index 100% rename from spring-boot-tests/spring-boot-integration-tests/spring-boot-loader-tests/app/settings.gradle rename to spring-boot-tests/spring-boot-integration-tests/spring-boot-loader-tests/spring-boot-loader-tests-app/settings.gradle diff --git a/spring-boot-tests/spring-boot-integration-tests/spring-boot-loader-tests/app/src/main/java/org/springframework/boot/loaderapp/LoaderTestApplication.java b/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 similarity index 100% rename from spring-boot-tests/spring-boot-integration-tests/spring-boot-loader-tests/app/src/main/java/org/springframework/boot/loaderapp/LoaderTestApplication.java rename to 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