Merge branch '2.3.x'

scottfrederick · scottfrederick · commit 7c7079f91a48 · 2020-08-12T17:44:52.000-05:00
diff --git a/spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/test/java/org/springframework/boot/gradle/docs/PackagingDocumentationTests.java b/spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/test/java/org/springframework/boot/gradle/docs/PackagingDocumentationTests.java
@@ -224,7 +224,7 @@ void bootJarLayeredExcludeTools() throws IOException {
 	void bootBuildImageWithCustomBuildpackJvmVersion() throws IOException {
 		BuildResult result = this.gradleBuild.script("src/docs/gradle/packaging/boot-build-image-env")
 				.build("bootBuildImageEnvironment");
-		assertThat(result.getOutput()).contains("BP_JVM_VERSION=13.0.1");
+		assertThat(result.getOutput()).contains("BP_JVM_VERSION=8.*");
 	}
 
 	@TestTemplate

Original file line number	Diff line number	Diff line change
`@@ -224,7 +224,7 @@ void bootJarLayeredExcludeTools() throws IOException {`
`224`	`224`	`void bootBuildImageWithCustomBuildpackJvmVersion() throws IOException {`
`225`	`225`	`BuildResult result = this.gradleBuild.script("src/docs/gradle/packaging/boot-build-image-env")`
`226`	`226`	`.build("bootBuildImageEnvironment");`
`227`		`- assertThat(result.getOutput()).contains("BP_JVM_VERSION=13.0.1");`
	`227`	`+ assertThat(result.getOutput()).contains("BP_JVM_VERSION=8.*");`
`228`	`228`	`}`
`229`	`229`
`230`	`230`	`@TestTemplate`