Hacking

See spring-projectsgh-26455
snicoll · Nov 21, 2022 · 5e539c7 · 5e539c7
1 parent c93e248
commit 5e539c7
Show file tree

Hide file tree

Showing 28 changed files with 102 additions and 33 deletions.
diff --git a/...-boot-tools/spring-boot-maven-plugin/src/docs/asciidoc/packaging-oci-image.adoc b/...-boot-tools/spring-boot-maven-plugin/src/docs/asciidoc/packaging-oci-image.adoc
@@ -209,6 +209,7 @@ You can override this behaviour as shown in the <<build-image.examples.builder-c
 For more details, see also <<build-image.examples,examples>>.
 
 include::goals/build-image.adoc[leveloffset=+1]
+include::goals/build-image-no-fork.adoc[leveloffset=+1]
 
 
 

diff --git a/...ect/spring-boot-tools/spring-boot-maven-plugin/src/docs/maven/packaging-oci-image/pom.xml b/...ect/spring-boot-tools/spring-boot-maven-plugin/src/docs/maven/packaging-oci-image/pom.xml
@@ -12,7 +12,7 @@
 				<executions>
 					<execution>
 						<goals>
-							<goal>build-image</goal>
+							<goal>build-image-no-fork</goal>
 						</goals>
 					</execution>
 				</executions>

diff --git a/...oot-tools/spring-boot-maven-plugin/src/intTest/projects/build-image-bad-buildpack/pom.xml b/...oot-tools/spring-boot-maven-plugin/src/intTest/projects/build-image-bad-buildpack/pom.xml
@@ -19,7 +19,7 @@
 				<executions>
 					<execution>
 						<goals>
-							<goal>build-image</goal>
+							<goal>build-image-no-fork</goal>
 						</goals>
 						<configuration>
 							<image>

diff --git a/...ing-boot-tools/spring-boot-maven-plugin/src/intTest/projects/build-image-bindings/pom.xml b/...ing-boot-tools/spring-boot-maven-plugin/src/intTest/projects/build-image-bindings/pom.xml
@@ -19,7 +19,7 @@
 				<executions>
 					<execution>
 						<goals>
-							<goal>build-image</goal>
+							<goal>build-image-no-fork</goal>
 						</goals>
 						<configuration>
 							<image>

diff --git a/...oot-tools/spring-boot-maven-plugin/src/intTest/projects/build-image-builder-error/pom.xml b/...oot-tools/spring-boot-maven-plugin/src/intTest/projects/build-image-builder-error/pom.xml
@@ -19,7 +19,7 @@
 				<executions>
 					<execution>
 						<goals>
-							<goal>build-image</goal>
+							<goal>build-image-no-fork</goal>
 						</goals>
 						<configuration>
 							<image>

diff --git a/...t-tools/spring-boot-maven-plugin/src/intTest/projects/build-image-caches-multiple/pom.xml b/...t-tools/spring-boot-maven-plugin/src/intTest/projects/build-image-caches-multiple/pom.xml
@@ -19,7 +19,7 @@
 				<executions>
 					<execution>
 						<goals>
-							<goal>build-image</goal>
+							<goal>build-image-no-fork</goal>
 						</goals>
 						<configuration>
 							<image>

diff --git a/...pring-boot-tools/spring-boot-maven-plugin/src/intTest/projects/build-image-caches/pom.xml b/...pring-boot-tools/spring-boot-maven-plugin/src/intTest/projects/build-image-caches/pom.xml
@@ -19,7 +19,7 @@
 				<executions>
 					<execution>
 						<goals>
-							<goal>build-image</goal>
+							<goal>build-image-no-fork</goal>
 						</goals>
 						<configuration>
 							<image>

diff --git a/...ot-maven-plugin/src/intTest/projects/build-image-classifier-source-with-repackage/pom.xml b/...ot-maven-plugin/src/intTest/projects/build-image-classifier-source-with-repackage/pom.xml
@@ -41,7 +41,7 @@
 					</execution>
 					<execution>
 						<goals>
-							<goal>build-image</goal>
+							<goal>build-image-no-fork</goal>
 						</goals>
 						<configuration>
 							<image>

diff --git a/...tools/spring-boot-maven-plugin/src/intTest/projects/build-image-classifier-source/pom.xml b/...tools/spring-boot-maven-plugin/src/intTest/projects/build-image-classifier-source/pom.xml
@@ -35,7 +35,7 @@
 				<executions>
 					<execution>
 						<goals>
-							<goal>build-image</goal>
+							<goal>build-image-no-fork</goal>
 						</goals>
 						<configuration>
 							<image>

diff --git a/...ring-boot-maven-plugin/src/intTest/projects/build-image-classifier-with-repackage/pom.xml b/...ring-boot-maven-plugin/src/intTest/projects/build-image-classifier-with-repackage/pom.xml
@@ -25,7 +25,7 @@
 					</execution>
 					<execution>
 						<goals>
-							<goal>build-image</goal>
+							<goal>build-image-no-fork</goal>
 						</goals>
 						<configuration>
 							<image>

diff --git a/...g-boot-tools/spring-boot-maven-plugin/src/intTest/projects/build-image-classifier/pom.xml b/...g-boot-tools/spring-boot-maven-plugin/src/intTest/projects/build-image-classifier/pom.xml
@@ -19,7 +19,7 @@
 				<executions>
 					<execution>
 						<goals>
-							<goal>build-image</goal>
+							<goal>build-image-no-fork</goal>
 						</goals>
 						<configuration>
 							<image>

diff --git a/...ing-boot-tools/spring-boot-maven-plugin/src/intTest/projects/build-image-cmd-line/pom.xml b/...ing-boot-tools/spring-boot-maven-plugin/src/intTest/projects/build-image-cmd-line/pom.xml
@@ -19,7 +19,7 @@
 				<executions>
 					<execution>
 						<goals>
-							<goal>build-image</goal>
+							<goal>build-image-no-fork</goal>
 						</goals>
 					</execution>
 				</executions>

diff --git a/...ot-tools/spring-boot-maven-plugin/src/intTest/projects/build-image-custom-builder/pom.xml b/...ot-tools/spring-boot-maven-plugin/src/intTest/projects/build-image-custom-builder/pom.xml
@@ -19,7 +19,7 @@
 				<executions>
 					<execution>
 						<goals>
-							<goal>build-image</goal>
+							<goal>build-image-no-fork</goal>
 						</goals>
 						<configuration>
 							<image>

diff --git a/...tools/spring-boot-maven-plugin/src/intTest/projects/build-image-custom-buildpacks/pom.xml b/...tools/spring-boot-maven-plugin/src/intTest/projects/build-image-custom-buildpacks/pom.xml
@@ -19,7 +19,7 @@
 				<executions>
 					<execution>
 						<goals>
-							<goal>build-image</goal>
+							<goal>build-image-no-fork</goal>
 						</goals>
 						<configuration>
 							<image>

diff --git a/...-boot-tools/spring-boot-maven-plugin/src/intTest/projects/build-image-custom-name/pom.xml b/...-boot-tools/spring-boot-maven-plugin/src/intTest/projects/build-image-custom-name/pom.xml
@@ -19,7 +19,7 @@
 				<executions>
 					<execution>
 						<goals>
-							<goal>build-image</goal>
+							<goal>build-image-no-fork</goal>
 						</goals>
 						<configuration>
 							<image>

diff --git a/...t-tools/spring-boot-maven-plugin/src/intTest/projects/build-image-empty-env-entry/pom.xml b/...t-tools/spring-boot-maven-plugin/src/intTest/projects/build-image-empty-env-entry/pom.xml
@@ -19,7 +19,7 @@
 				<executions>
 					<execution>
 						<goals>
-							<goal>build-image</goal>
+							<goal>build-image-no-fork</goal>
 						</goals>
 						<configuration>
 							<image>

diff --git a/...g-boot-tools/spring-boot-maven-plugin/src/intTest/projects/build-image-final-name/pom.xml b/...g-boot-tools/spring-boot-maven-plugin/src/intTest/projects/build-image-final-name/pom.xml
@@ -20,7 +20,7 @@
 					<execution>
 						<goals>
 							<goal>repackage</goal>
-							<goal>build-image</goal>
+							<goal>build-image-no-fork</goal>
 						</goals>
 						<configuration>
 							<finalName>final-name</finalName>

diff --git a/...-tools/spring-boot-maven-plugin/src/intTest/projects/build-image-multi-module/app/pom.xml b/...-tools/spring-boot-maven-plugin/src/intTest/projects/build-image-multi-module/app/pom.xml
@@ -27,7 +27,7 @@
 				<executions>
 					<execution>
 						<goals>
-							<goal>build-image</goal>
+							<goal>build-image-no-fork</goal>
 						</goals>
 						<configuration>
 							<image>

diff --git a/...ring-boot-tools/spring-boot-maven-plugin/src/intTest/projects/build-image-network/pom.xml b/...ring-boot-tools/spring-boot-maven-plugin/src/intTest/projects/build-image-network/pom.xml
@@ -19,7 +19,7 @@
 				<executions>
 					<execution>
 						<goals>
-							<goal>build-image</goal>
+							<goal>build-image-no-fork</goal>
 						</goals>
 						<configuration>
 							<image>

diff --git a/...ring-boot-tools/spring-boot-maven-plugin/src/intTest/projects/build-image-publish/pom.xml b/...ring-boot-tools/spring-boot-maven-plugin/src/intTest/projects/build-image-publish/pom.xml
@@ -19,7 +19,7 @@
 				<executions>
 					<execution>
 						<goals>
-							<goal>build-image</goal>
+							<goal>build-image-no-fork</goal>
 						</goals>
 						<configuration>
 							<image>

diff --git a/.../spring-boot-tools/spring-boot-maven-plugin/src/intTest/projects/build-image-tags/pom.xml b/.../spring-boot-tools/spring-boot-maven-plugin/src/intTest/projects/build-image-tags/pom.xml
@@ -19,7 +19,7 @@
 				<executions>
 					<execution>
 						<goals>
-							<goal>build-image</goal>
+							<goal>build-image-no-fork</goal>
 						</goals>
 						<configuration>
 							<image>

diff --git a/...oot-tools/spring-boot-maven-plugin/src/intTest/projects/build-image-war-packaging/pom.xml b/...oot-tools/spring-boot-maven-plugin/src/intTest/projects/build-image-war-packaging/pom.xml
@@ -20,7 +20,7 @@
 				<executions>
 					<execution>
 						<goals>
-							<goal>build-image</goal>
+							<goal>build-image-no-fork</goal>
 						</goals>
 						<configuration>
 							<image>

diff --git a/...ot-tools/spring-boot-maven-plugin/src/intTest/projects/build-image-with-repackage/pom.xml b/...ot-tools/spring-boot-maven-plugin/src/intTest/projects/build-image-with-repackage/pom.xml
@@ -25,7 +25,7 @@
 					</execution>
 					<execution>
 						<goals>
-							<goal>build-image</goal>
+							<goal>build-image-no-fork</goal>
 						</goals>
 						<configuration>
 							<image>

diff --git a/...oot-tools/spring-boot-maven-plugin/src/intTest/projects/build-image-zip-packaging/pom.xml b/...oot-tools/spring-boot-maven-plugin/src/intTest/projects/build-image-zip-packaging/pom.xml
@@ -19,7 +19,7 @@
 				<executions>
 					<execution>
 						<goals>
-							<goal>build-image</goal>
+							<goal>build-image-no-fork</goal>
 						</goals>
 					</execution>
 				</executions>

diff --git a/...oject/spring-boot-tools/spring-boot-maven-plugin/src/intTest/projects/build-image/pom.xml b/...oject/spring-boot-tools/spring-boot-maven-plugin/src/intTest/projects/build-image/pom.xml
@@ -19,7 +19,7 @@
 				<executions>
 					<execution>
 						<goals>
-							<goal>build-image</goal>
+							<goal>build-image-no-fork</goal>
 						</goals>
 						<configuration>
 							<image>

diff --git a/...ng-boot-maven-plugin/src/main/java/org/springframework/boot/maven/BuildImageForkMojo.java b/...ng-boot-maven-plugin/src/main/java/org/springframework/boot/maven/BuildImageForkMojo.java
@@ -0,0 +1,39 @@
+/*
+ * Copyright 2012-2022 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.
+ * You may obtain a copy of the License at
+ *
+ *      https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.springframework.boot.maven;
+
+import org.apache.maven.plugins.annotations.Execute;
+import org.apache.maven.plugins.annotations.LifecyclePhase;
+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.
+ *
+ * @author Stephane Nicoll
+ * @since 3.0.0
+ */
+@Mojo(name = "build-image", defaultPhase = LifecyclePhase.PACKAGE, requiresProject = true, threadSafe = true,
+		requiresDependencyResolution = ResolutionScope.COMPILE_PLUS_RUNTIME,
+		requiresDependencyCollection = ResolutionScope.COMPILE_PLUS_RUNTIME)
+@Execute(phase = LifecyclePhase.PACKAGE)
+public class BuildImageForkMojo extends BuildImageMojo {
+
+}
diff --git a/...spring-boot-maven-plugin/src/main/java/org/springframework/boot/maven/BuildImageMojo.java b/...spring-boot-maven-plugin/src/main/java/org/springframework/boot/maven/BuildImageMojo.java
@@ -32,11 +32,7 @@
 import org.apache.maven.artifact.Artifact;
 import org.apache.maven.plugin.MojoExecutionException;
 import org.apache.maven.plugin.logging.Log;
-import org.apache.maven.plugins.annotations.Execute;
-import org.apache.maven.plugins.annotations.LifecyclePhase;
-import org.apache.maven.plugins.annotations.Mojo;
 import org.apache.maven.plugins.annotations.Parameter;
-import org.apache.maven.plugins.annotations.ResolutionScope;
 
 import org.springframework.boot.buildpack.platform.build.AbstractBuildLog;
 import org.springframework.boot.buildpack.platform.build.BuildLog;
@@ -62,11 +58,7 @@
  * @author Jeroen Meijer
  * @since 2.3.0
  */
-@Mojo(name = "build-image", defaultPhase = LifecyclePhase.PACKAGE, requiresProject = true, threadSafe = true,
-		requiresDependencyResolution = ResolutionScope.COMPILE_PLUS_RUNTIME,
-		requiresDependencyCollection = ResolutionScope.COMPILE_PLUS_RUNTIME)
-@Execute(phase = LifecyclePhase.PACKAGE)
-public class BuildImageMojo extends AbstractPackagerMojo {
+public abstract class BuildImageMojo extends AbstractPackagerMojo {
 
 	static {
 		System.setProperty("org.slf4j.simpleLogger.log.org.apache.http.wire", "ERROR");

diff --git a/...-boot-maven-plugin/src/main/java/org/springframework/boot/maven/BuildImageNoForkMojo.java b/...-boot-maven-plugin/src/main/java/org/springframework/boot/maven/BuildImageNoForkMojo.java
@@ -0,0 +1,37 @@
+/*
+ * Copyright 2012-2022 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.
+ * You may obtain a copy of the License at
+ *
+ *      https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.springframework.boot.maven;
+
+import org.apache.maven.plugins.annotations.LifecyclePhase;
+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.
+ *
+ * @author Stephane Nicoll
+ * @since 3.0.0
+ */
+@Mojo(name = "build-image-no-fork", defaultPhase = LifecyclePhase.PACKAGE, requiresProject = true, threadSafe = true,
+		requiresDependencyResolution = ResolutionScope.COMPILE_PLUS_RUNTIME,
+		requiresDependencyCollection = ResolutionScope.COMPILE_PLUS_RUNTIME)
+public class BuildImageNoForkMojo extends BuildImageMojo {
+
+}