From 11c5fba355600e3e6340fa6181f241ff2998dc32 Mon Sep 17 00:00:00 2001
From: Stephane Nicoll <snicoll@pivotal.io>
Date: Mon, 27 Jan 2020 20:12:00 +0100
Subject: [PATCH] Remove unnecessary execution-specific configuration in
 documentation

This documentation moves the specific `build-image` execution
configuration example of the Maven plugin documentation to the general
plugin configuration. This makes sure that it works in most cases and
an execution-specific configuration is not required here anyway.

Closes gh-19946
---
 .../docs/asciidoc/packaging-oci-image.adoc    | 37 ++++++-------------
 1 file changed, 11 insertions(+), 26 deletions(-)

diff --git a/spring-boot-project/spring-boot-tools/spring-boot-maven-plugin/src/docs/asciidoc/packaging-oci-image.adoc b/spring-boot-project/spring-boot-tools/spring-boot-maven-plugin/src/docs/asciidoc/packaging-oci-image.adoc
index 786e068eef..462bd226ee 100644
--- a/spring-boot-project/spring-boot-tools/spring-boot-maven-plugin/src/docs/asciidoc/packaging-oci-image.adoc
+++ b/spring-boot-project/spring-boot-tools/spring-boot-maven-plugin/src/docs/asciidoc/packaging-oci-image.adoc
@@ -4,6 +4,7 @@
 The plugin can create https://github.com/opencontainers/image-spec[OCI images] using a https://buildpacks.io/[buildpack].
 Images can be built using the `build-image` goal and a local Docker installation.
 
+The easiest way to get started is to to invoke `mvn spring-boot:build-image` on a project.
 It is possible to automate the creation of an image whenever the `package` phase is invoked, as shown in the following example:
 
 [source,xml,indent=0,subs="verbatim,attributes"]
@@ -51,19 +52,11 @@ If you need to customize the builder used to create the image, configure yours a
 					<groupId>org.springframework.boot</groupId>
 					<artifactId>spring-boot-maven-plugin</artifactId>
 					<version>{version}</version>
-					<executions>
-						<execution>
-							<id>build-image</id>
-							<goals>
-								<goal>build-image</goal>
-							</goals>
-							<configuration>
-								<image>
-									<builder>mine/java-cnb-builder</builder>
-								</image>
-							</configuration>
-						</execution>
-					</executions>
+					<configuration>
+						<image>
+							<builder>mine/java-cnb-builder</builder>
+						</image>
+					</configuration>
 				</plugin>
 			</plugins>
 		</build>
@@ -88,19 +81,11 @@ You can take control over the name, as shown in the following example:
 					<groupId>org.springframework.boot</groupId>
 					<artifactId>spring-boot-maven-plugin</artifactId>
 					<version>{version}</version>
-					<executions>
-						<execution>
-							<id>build-image</id>
-							<goals>
-								<goal>build-image</goal>
-							</goals>
-							<configuration>
-								<image>
-									<name>example.com/library/${project.artifactId}</name>
-								</image>
-							</configuration>
-						</execution>
-					</executions>
+					<configuration>
+						<image>
+							<name>example.com/library/${project.artifactId}</name>
+						</image>
+					</configuration>
 				</plugin>
 			</plugins>
 		</build>