From cbab2396e2d0ec224c5cdf9ceef180c1f57c048f Mon Sep 17 00:00:00 2001 From: jnizet Date: Fri, 26 Feb 2021 21:07:17 +0100 Subject: [PATCH] Fix property name in gradle plugin documentation See gh-25454 --- .../docs/gradle/packaging/boot-build-image-publish.gradle | 6 ++++++ .../gradle/packaging/boot-build-image-publish.gradle.kts | 8 +++++++- .../boot/gradle/docs/PackagingDocumentationTests.java | 7 +++++++ 3 files changed, 20 insertions(+), 1 deletion(-) diff --git a/spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/docs/gradle/packaging/boot-build-image-publish.gradle b/spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/docs/gradle/packaging/boot-build-image-publish.gradle index 2bb6c81c37e..62ffcbd6da5 100644 --- a/spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/docs/gradle/packaging/boot-build-image-publish.gradle +++ b/spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/docs/gradle/packaging/boot-build-image-publish.gradle @@ -21,3 +21,9 @@ bootBuildImage { } } // end::publish[] + +task bootBuildImagePublish { + doFirst { + println(tasks.bootBuildImage.publish) + } +} diff --git a/spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/docs/gradle/packaging/boot-build-image-publish.gradle.kts b/spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/docs/gradle/packaging/boot-build-image-publish.gradle.kts index f104a3033db..c6c5f7b4640 100644 --- a/spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/docs/gradle/packaging/boot-build-image-publish.gradle.kts +++ b/spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/docs/gradle/packaging/boot-build-image-publish.gradle.kts @@ -13,7 +13,7 @@ tasks.getByName("bootJar") { // tag::publish[] tasks.getByName("bootBuildImage") { imageName = "docker.example.com/library/${project.name}" - publish = true + isPublish = true docker { publishRegistry { username = "user" @@ -24,3 +24,9 @@ tasks.getByName("bootBuildImage") { } } // end::publish[] + +tasks.register("bootBuildImagePublish") { + doFirst { + println(tasks.getByName("bootBuildImage").isPublish) + } +} 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 67742791b8e..c942b8db9db 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 @@ -242,6 +242,13 @@ class PackagingDocumentationTests { assertThat(result.getOutput()).contains("example.com/library/" + this.gradleBuild.getProjectDir().getName()); } + @TestTemplate + void bootBuildImagePublish() throws IOException { + BuildResult result = this.gradleBuild.script("src/docs/gradle/packaging/boot-build-image-publish") + .build("bootBuildImagePublish"); + assertThat(result.getOutput()).contains("true"); + } + protected void jarFile(File file) throws IOException { try (JarOutputStream jar = new JarOutputStream(new FileOutputStream(file))) { jar.putNextEntry(new ZipEntry("META-INF/MANIFEST.MF"));