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-projects · Dec 18, 2020 · a2a153a · a2a153a
1 parent c4e4130
commit a2a153a
Show file tree

Hide file tree

Showing 9 changed files with 6 additions and 6 deletions.
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
@@ -27,16 +27,16 @@ 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}\"")
 	}
 }
 
 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/...boot-launch-script-tests/app/build.gradle → ...boot-launch-script-tests-app/build.gradle b/...boot-launch-script-tests/app/build.gradle → ...boot-launch-script-tests-app/build.gradle
diff --git a/...t-launch-script-tests/app/settings.gradle → ...t-launch-script-tests-app/settings.gradle b/...t-launch-script-tests/app/settings.gradle → ...t-launch-script-tests-app/settings.gradle
diff --git a/...chscript/LaunchScriptTestApplication.java → ...chscript/LaunchScriptTestApplication.java b/...chscript/LaunchScriptTestApplication.java → ...chscript/LaunchScriptTestApplication.java
diff --git a/...hscript/LaunchVerificationController.java → ...hscript/LaunchVerificationController.java b/...hscript/LaunchVerificationController.java → ...hscript/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
@@ -28,16 +28,16 @@ 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}\"")
 	}
 }
 
 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-loader-tests/app/build.gradle → ...spring-boot-loader-tests-app/build.gradle b/...spring-boot-loader-tests/app/build.gradle → ...spring-boot-loader-tests-app/build.gradle
diff --git a/...ing-boot-loader-tests/app/settings.gradle → ...ing-boot-loader-tests-app/settings.gradle b/...ing-boot-loader-tests/app/settings.gradle → ...ing-boot-loader-tests-app/settings.gradle
diff --git a/...boot/loaderapp/LoaderTestApplication.java → ...boot/loaderapp/LoaderTestApplication.java b/...boot/loaderapp/LoaderTestApplication.java → ...boot/loaderapp/LoaderTestApplication.java