Merge branch '2.3.x' into 2.4.x

spring-projects · Dec 18, 2020 · abd0b48 · abd0b48
2 parents 0730949 + b351288
commit abd0b48
Show file tree

Hide file tree

Showing 11 changed files with 17 additions and 18 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
@@ -28,16 +28,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/...Test/java/org/springframework/boot/launchscript/AbstractLaunchScriptIntegrationTests.java b/...Test/java/org/springframework/boot/launchscript/AbstractLaunchScriptIntegrationTests.java
@@ -30,6 +30,7 @@
 import org.testcontainers.utility.MountableFile;
 
 import org.springframework.boot.ansi.AnsiColor;
+import org.springframework.util.Assert;
 
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.hamcrest.Matchers.containsString;
@@ -110,12 +111,10 @@ private LaunchScriptTestContainer(String os, String version, String scriptsDir,
 		}
 
 		private static File findApplication() {
-			File appJar = new File("build/app/build/libs/app.jar");
-			if (appJar.isFile()) {
-				return appJar;
-			}
-			throw new IllegalStateException(
-					"Could not find test application in build/app/build/libs directory. Have you built it?");
+			String name = String.format("build/%1$s/build/libs/%1$s.jar", "spring-boot-launch-script-tests-app");
+			File jar = new File(name);
+			Assert.state(jar.isFile(), () -> "Could not find " + name + ". Have you built it?");
+			return jar;
 		}
 
 	}

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
diff --git a/...loader-tests/src/intTest/java/org/springframework/boot/loader/LoaderIntegrationTests.java b/...loader-tests/src/intTest/java/org/springframework/boot/loader/LoaderIntegrationTests.java
@@ -28,6 +28,8 @@
 import org.testcontainers.utility.DockerImageName;
 import org.testcontainers.utility.MountableFile;
 
+import org.springframework.util.Assert;
+
 import static org.assertj.core.api.Assertions.assertThat;
 
 /**
@@ -49,12 +51,10 @@ class LoaderIntegrationTests {
 			.withCommand("java", "-jar", "app.jar");
 
 	private static File findApplication() {
-		File appJar = new File("build/app/build/libs/app.jar");
-		if (appJar.isFile()) {
-			return appJar;
-		}
-		throw new IllegalStateException(
-				"Could not find test application in build/app/build/libs directory. Have you built it?");
+		String name = String.format("build/%1$s/build/libs/%1$s.jar", "spring-boot-loader-tests-app");
+		File jar = new File(name);
+		Assert.state(jar.isFile(), () -> "Could not find " + name + ". Have you built it?");
+		return jar;
 	}
 
 	@Test