From 40f642167f017669b804eb207ca5201dd3f5104c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Thomas=20K=C3=A5sene?= <6691406+ThomasKasene@users.noreply.github.com> Date: Tue, 23 May 2023 20:44:14 +0200 Subject: [PATCH 1/4] Improved description of build-image-no-fork Maven plugin goal --- .../springframework/boot/maven/BuildImageNoForkMojo.java | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/spring-boot-project/spring-boot-tools/spring-boot-maven-plugin/src/main/java/org/springframework/boot/maven/BuildImageNoForkMojo.java b/spring-boot-project/spring-boot-tools/spring-boot-maven-plugin/src/main/java/org/springframework/boot/maven/BuildImageNoForkMojo.java index 23da7dc722ab..35f86734fb94 100644 --- a/spring-boot-project/spring-boot-tools/spring-boot-maven-plugin/src/main/java/org/springframework/boot/maven/BuildImageNoForkMojo.java +++ b/spring-boot-project/spring-boot-tools/spring-boot-maven-plugin/src/main/java/org/springframework/boot/maven/BuildImageNoForkMojo.java @@ -21,10 +21,10 @@ import org.apache.maven.plugins.annotations.ResolutionScope; /** - * {@link BuildImageMojo implementation} that does not fork the lifecycle to make sure - * that {@code package} ran. This goal should be used when configuring a mojo - * {@code execution} in your build. To invoke the goal on the command-line, use - * {@link BuildImageForkMojo} instead. + * Package an application into an OCI image using a buildpack, but without forking + * the lifecycle to make sure that {@code package} ran. This goal should be used + * when configuring a mojo {@code execution} in your build. To invoke the goal on + * the command-line, use {@code build-image} instead. * * @author Stephane Nicoll * @since 3.0.0 From 2e1f46d6a8f1e621e704fb8691060266b32466ae Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Thomas=20K=C3=A5sene?= <6691406+ThomasKasene@users.noreply.github.com> Date: Tue, 23 May 2023 20:48:16 +0200 Subject: [PATCH 2/4] Improved description of build-image Maven plugin goal --- .../springframework/boot/maven/BuildImageForkMojo.java | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/spring-boot-project/spring-boot-tools/spring-boot-maven-plugin/src/main/java/org/springframework/boot/maven/BuildImageForkMojo.java b/spring-boot-project/spring-boot-tools/spring-boot-maven-plugin/src/main/java/org/springframework/boot/maven/BuildImageForkMojo.java index 0fb3a81b2b8f..bf1fec59878d 100644 --- a/spring-boot-project/spring-boot-tools/spring-boot-maven-plugin/src/main/java/org/springframework/boot/maven/BuildImageForkMojo.java +++ b/spring-boot-project/spring-boot-tools/spring-boot-maven-plugin/src/main/java/org/springframework/boot/maven/BuildImageForkMojo.java @@ -22,10 +22,10 @@ import org.apache.maven.plugins.annotations.ResolutionScope; /** - * {@link BuildImageMojo implementation} that forks the lifecycle to make sure that - * {@code package} ran. This goal is suitable for command-line invocation. If you need to - * configure a mojo {@code execution} in your build, use {@link BuildImageNoForkMojo} - * instead. + * Package an application into an OCI image using a buildpack, forking the lifecycle + * to make sure that {@code package} ran. This goal is suitable for command-line + * invocation. If you need to configure a mojo {@code execution} in your build, use + * {@code build-image-no-fork} instead. * * @author Stephane Nicoll * @since 3.0.0 From afd5c618d6d0a100893c31ca131d76675de6d09e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Thomas=20K=C3=A5sene?= <6691406+ThomasKasene@users.noreply.github.com> Date: Tue, 23 May 2023 21:25:35 +0200 Subject: [PATCH 3/4] Ran formatting --- .../springframework/boot/maven/BuildImageForkMojo.java | 6 +++--- .../springframework/boot/maven/BuildImageNoForkMojo.java | 8 ++++---- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/spring-boot-project/spring-boot-tools/spring-boot-maven-plugin/src/main/java/org/springframework/boot/maven/BuildImageForkMojo.java b/spring-boot-project/spring-boot-tools/spring-boot-maven-plugin/src/main/java/org/springframework/boot/maven/BuildImageForkMojo.java index bf1fec59878d..2985e9e1df61 100644 --- a/spring-boot-project/spring-boot-tools/spring-boot-maven-plugin/src/main/java/org/springframework/boot/maven/BuildImageForkMojo.java +++ b/spring-boot-project/spring-boot-tools/spring-boot-maven-plugin/src/main/java/org/springframework/boot/maven/BuildImageForkMojo.java @@ -22,9 +22,9 @@ import org.apache.maven.plugins.annotations.ResolutionScope; /** - * Package an application into an OCI image using a buildpack, forking the lifecycle - * to make sure that {@code package} ran. This goal is suitable for command-line - * invocation. If you need to configure a mojo {@code execution} in your build, use + * Package an application into an OCI image using a buildpack, forking the lifecycle to + * make sure that {@code package} ran. This goal is suitable for command-line invocation. + * If you need to configure a mojo {@code execution} in your build, use * {@code build-image-no-fork} instead. * * @author Stephane Nicoll diff --git a/spring-boot-project/spring-boot-tools/spring-boot-maven-plugin/src/main/java/org/springframework/boot/maven/BuildImageNoForkMojo.java b/spring-boot-project/spring-boot-tools/spring-boot-maven-plugin/src/main/java/org/springframework/boot/maven/BuildImageNoForkMojo.java index 35f86734fb94..213f63a49360 100644 --- a/spring-boot-project/spring-boot-tools/spring-boot-maven-plugin/src/main/java/org/springframework/boot/maven/BuildImageNoForkMojo.java +++ b/spring-boot-project/spring-boot-tools/spring-boot-maven-plugin/src/main/java/org/springframework/boot/maven/BuildImageNoForkMojo.java @@ -21,10 +21,10 @@ import org.apache.maven.plugins.annotations.ResolutionScope; /** - * Package an application into an OCI image using a buildpack, but without forking - * the lifecycle to make sure that {@code package} ran. This goal should be used - * when configuring a mojo {@code execution} in your build. To invoke the goal on - * the command-line, use {@code build-image} instead. + * Package an application into an OCI image using a buildpack, but without forking the + * lifecycle to make sure that {@code package} ran. This goal should be used when + * configuring a mojo {@code execution} in your build. To invoke the goal on the + * command-line, use {@code build-image} instead. * * @author Stephane Nicoll * @since 3.0.0 From f3e9b5b5e6352fc4d43b0b45693fe7f6d3a3f892 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Thomas=20K=C3=A5sene?= <6691406+ThomasKasene@users.noreply.github.com> Date: Tue, 23 May 2023 21:28:47 +0200 Subject: [PATCH 4/4] Replaced mojo with goal --- .../java/org/springframework/boot/maven/BuildImageForkMojo.java | 2 +- .../org/springframework/boot/maven/BuildImageNoForkMojo.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/spring-boot-project/spring-boot-tools/spring-boot-maven-plugin/src/main/java/org/springframework/boot/maven/BuildImageForkMojo.java b/spring-boot-project/spring-boot-tools/spring-boot-maven-plugin/src/main/java/org/springframework/boot/maven/BuildImageForkMojo.java index 2985e9e1df61..312056e7b79d 100644 --- a/spring-boot-project/spring-boot-tools/spring-boot-maven-plugin/src/main/java/org/springframework/boot/maven/BuildImageForkMojo.java +++ b/spring-boot-project/spring-boot-tools/spring-boot-maven-plugin/src/main/java/org/springframework/boot/maven/BuildImageForkMojo.java @@ -24,7 +24,7 @@ /** * Package an application into an OCI image using a buildpack, forking the lifecycle to * make sure that {@code package} ran. This goal is suitable for command-line invocation. - * If you need to configure a mojo {@code execution} in your build, use + * If you need to configure a goal {@code execution} in your build, use * {@code build-image-no-fork} instead. * * @author Stephane Nicoll diff --git a/spring-boot-project/spring-boot-tools/spring-boot-maven-plugin/src/main/java/org/springframework/boot/maven/BuildImageNoForkMojo.java b/spring-boot-project/spring-boot-tools/spring-boot-maven-plugin/src/main/java/org/springframework/boot/maven/BuildImageNoForkMojo.java index 213f63a49360..c9e9812b45d6 100644 --- a/spring-boot-project/spring-boot-tools/spring-boot-maven-plugin/src/main/java/org/springframework/boot/maven/BuildImageNoForkMojo.java +++ b/spring-boot-project/spring-boot-tools/spring-boot-maven-plugin/src/main/java/org/springframework/boot/maven/BuildImageNoForkMojo.java @@ -23,7 +23,7 @@ /** * Package an application into an OCI image using a buildpack, but without forking the * lifecycle to make sure that {@code package} ran. This goal should be used when - * configuring a mojo {@code execution} in your build. To invoke the goal on the + * configuring a goal {@code execution} in your build. To invoke the goal on the * command-line, use {@code build-image} instead. * * @author Stephane Nicoll