From e84025b1b8a577d5c3efef3e0effa26ca0645aec 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/2] Fix description of build-image[-no-fork] Maven plugin goals See gh-35609 --- .../springframework/boot/maven/BuildImageForkMojo.java | 8 ++++---- .../springframework/boot/maven/BuildImageNoForkMojo.java | 8 ++++---- 2 files changed, 8 insertions(+), 8 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 0fb3a81b2b8..312056e7b79 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.Mojo; 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 goal {@code execution} in your build, use + * {@code build-image-no-fork} instead. * * @author Stephane Nicoll * @since 3.0.0 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 23da7dc722a..c9e9812b45d 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.Mojo; 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 goal {@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 44c209009206d9d52b546e002d5b19afa4072d0f Mon Sep 17 00:00:00 2001 From: Stephane Nicoll Date: Wed, 24 May 2023 13:28:01 +0200 Subject: [PATCH 2/2] Polish "Fix description of build-image[-no-fork] Maven plugin goals" See gh-35609 --- .../org/springframework/boot/maven/BuildImageForkMojo.java | 2 +- .../springframework/boot/maven/BuildImageNoForkMojo.java | 7 +++---- 2 files changed, 4 insertions(+), 5 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 312056e7b79..9ade9bc3774 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 @@ -1,5 +1,5 @@ /* - * Copyright 2012-2022 the original author or authors. + * Copyright 2012-2023 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. 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 c9e9812b45d..495c5234764 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 @@ -1,5 +1,5 @@ /* - * Copyright 2012-2022 the original author or authors. + * Copyright 2012-2023 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -22,9 +22,8 @@ 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 goal {@code execution} in your build. To invoke the goal on the - * command-line, use {@code build-image} instead. + * lifecycle. This goal should be used when configuring a goal {@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