From 67af4c0a653d7db77cc3093809c1b7ccdcb99f2a Mon Sep 17 00:00:00 2001 From: Scott Frederick Date: Wed, 26 Oct 2022 14:58:46 -0500 Subject: [PATCH] Polish documentation --- .../src/docs/gradle/packaging/boot-build-image-env.gradle | 2 +- .../src/docs/gradle/packaging/boot-build-image-env.gradle.kts | 2 +- .../boot/gradle/docs/PackagingDocumentationTests.java | 2 +- .../build-image-example-builder-configuration-pom.xml | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/docs/gradle/packaging/boot-build-image-env.gradle b/spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/docs/gradle/packaging/boot-build-image-env.gradle index d04fe50064..92aab0f5a4 100644 --- a/spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/docs/gradle/packaging/boot-build-image-env.gradle +++ b/spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/docs/gradle/packaging/boot-build-image-env.gradle @@ -5,7 +5,7 @@ plugins { // tag::env[] tasks.named("bootBuildImage") { - environment = ["BP_JVM_VERSION" : "8.*"] + environment = ["BP_JVM_VERSION" : "17"] } // end::env[] diff --git a/spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/docs/gradle/packaging/boot-build-image-env.gradle.kts b/spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/docs/gradle/packaging/boot-build-image-env.gradle.kts index 4e6e31fe69..2e0afb7ecd 100644 --- a/spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/docs/gradle/packaging/boot-build-image-env.gradle.kts +++ b/spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/docs/gradle/packaging/boot-build-image-env.gradle.kts @@ -7,7 +7,7 @@ plugins { // tag::env[] tasks.named("bootBuildImage") { - environment.set(mapOf("BP_JVM_VERSION" to "8.*")) + environment.set(mapOf("BP_JVM_VERSION" to "17")) } // end::env[] 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 index 9a7e64872f..c13b63795a 100644 --- 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 @@ -252,7 +252,7 @@ class PackagingDocumentationTests { void bootBuildImageWithCustomBuildpackJvmVersion() { BuildResult result = this.gradleBuild.script("src/docs/gradle/packaging/boot-build-image-env") .build("bootBuildImageEnvironment"); - assertThat(result.getOutput()).contains("BP_JVM_VERSION=8.*"); + assertThat(result.getOutput()).contains("BP_JVM_VERSION=17"); } @TestTemplate diff --git a/spring-boot-project/spring-boot-tools/spring-boot-maven-plugin/src/docs/maven/packaging-oci-image/build-image-example-builder-configuration-pom.xml b/spring-boot-project/spring-boot-tools/spring-boot-maven-plugin/src/docs/maven/packaging-oci-image/build-image-example-builder-configuration-pom.xml index 5e6dde3e79..308e99805c 100644 --- a/spring-boot-project/spring-boot-tools/spring-boot-maven-plugin/src/docs/maven/packaging-oci-image/build-image-example-builder-configuration-pom.xml +++ b/spring-boot-project/spring-boot-tools/spring-boot-maven-plugin/src/docs/maven/packaging-oci-image/build-image-example-builder-configuration-pom.xml @@ -9,7 +9,7 @@ - 8.* + 17