From 93e36a97abe0a71e1868c6586599ca019967e126 Mon Sep 17 00:00:00 2001
From: Stephane Nicoll <snicoll@pivotal.io>
Date: Wed, 28 Oct 2020 13:39:03 +0100
Subject: [PATCH] Remove version elements from Maven plugin documentation

This commit removes `<version>` from the Maven Plugin documentation
where it makes sense so that versions aren't hardcoded unnecessarily.

Rather, a plugin or dependency management should be in place so those
are not needed.

Closes gh-23909
---
 .../src/main/asciidoc/build-tool-plugins.adoc               | 1 -
 .../spring-boot-docs/src/main/asciidoc/deployment.adoc      | 1 -
 .../spring-boot-docs/src/main/asciidoc/howto.adoc           | 3 ---
 .../src/main/asciidoc/using-spring-boot.adoc                | 2 +-
 .../src/site/apt/examples/build-info.apt.vm                 | 1 -
 .../src/site/apt/examples/custom-layout.apt.vm              | 1 -
 .../src/site/apt/examples/exclude-dependency.apt.vm         | 2 --
 .../src/site/apt/examples/it-random-port.apt.vm             | 1 -
 .../src/site/apt/examples/it-skip.apt.vm                    | 1 -
 .../src/site/apt/examples/repackage-classifier.apt.vm       | 3 ---
 .../src/site/apt/examples/repackage-disable-attach.apt.vm   | 1 -
 .../src/site/apt/examples/repackage-name.apt.vm             | 1 -
 .../src/site/apt/examples/run-arguments.apt.vm              | 1 -
 .../src/site/apt/examples/run-debug.apt.vm                  | 1 -
 .../src/site/apt/examples/run-env-variables.apt.vm          | 1 -
 .../src/site/apt/examples/run-profiles.apt.vm               | 1 -
 .../src/site/apt/examples/run-system-properties.apt.vm      | 1 -
 .../spring-boot-maven-plugin/src/site/apt/usage.apt.vm      | 6 ------
 18 files changed, 1 insertion(+), 28 deletions(-)

diff --git a/spring-boot-project/spring-boot-docs/src/main/asciidoc/build-tool-plugins.adoc b/spring-boot-project/spring-boot-docs/src/main/asciidoc/build-tool-plugins.adoc
index a25d94d136..06d8dcf49e 100644
--- a/spring-boot-project/spring-boot-docs/src/main/asciidoc/build-tool-plugins.adoc
+++ b/spring-boot-project/spring-boot-docs/src/main/asciidoc/build-tool-plugins.adoc
@@ -34,7 +34,6 @@ To use the Spring Boot Maven Plugin, include the appropriate XML in the `plugins
 				<plugin>
 					<groupId>org.springframework.boot</groupId>
 					<artifactId>spring-boot-maven-plugin</artifactId>
-					<version>{spring-boot-version}</version>
 					<executions>
 						<execution>
 							<goals>
diff --git a/spring-boot-project/spring-boot-docs/src/main/asciidoc/deployment.adoc b/spring-boot-project/spring-boot-docs/src/main/asciidoc/deployment.adoc
index b3cdb1b9b6..0fc5690499 100644
--- a/spring-boot-project/spring-boot-docs/src/main/asciidoc/deployment.adoc
+++ b/spring-boot-project/spring-boot-docs/src/main/asciidoc/deployment.adoc
@@ -435,7 +435,6 @@ You can deploy the app (for example, with a Maven plugin) by adding the project
 	<plugin>
 		<groupId>com.google.cloud.tools</groupId>
 		<artifactId>appengine-maven-plugin</artifactId>
-		<version>1.3.0</version>
 		<configuration>
 			<project>myproject</project>
 		</configuration>
diff --git a/spring-boot-project/spring-boot-docs/src/main/asciidoc/howto.adoc b/spring-boot-project/spring-boot-docs/src/main/asciidoc/howto.adoc
index d3866f1b0c..b290ff82d7 100644
--- a/spring-boot-project/spring-boot-docs/src/main/asciidoc/howto.adoc
+++ b/spring-boot-project/spring-boot-docs/src/main/asciidoc/howto.adoc
@@ -177,7 +177,6 @@ You also need to include the following element inside `<plugins/>`:
 	<plugin>
 		<groupId>org.apache.maven.plugins</groupId>
 		<artifactId>maven-resources-plugin</artifactId>
-		<version>2.7</version>
 		<configuration>
 			<delimiters>
 				<delimiter>@</delimiter>
@@ -2460,7 +2459,6 @@ To generate build information with Maven, add an execution for the `build-info`
 			<plugin>
 				<groupId>org.springframework.boot</groupId>
 				<artifactId>spring-boot-maven-plugin</artifactId>
-				<version>{spring-boot-version}</version>
 				<executions>
 					<execution>
 						<goals>
@@ -2572,7 +2570,6 @@ However, you must additionally add an `<executions>` section, as follows:
 			<plugin>
 				<groupId>org.springframework.boot</groupId>
 				<artifactId>spring-boot-maven-plugin</artifactId>
-				<version>{spring-boot-version}</version>
 				<executions>
 					<execution>
 						<goals>
diff --git a/spring-boot-project/spring-boot-docs/src/main/asciidoc/using-spring-boot.adoc b/spring-boot-project/spring-boot-docs/src/main/asciidoc/using-spring-boot.adoc
index 23e2d5a74a..1b1dd12ab3 100644
--- a/spring-boot-project/spring-boot-docs/src/main/asciidoc/using-spring-boot.adoc
+++ b/spring-boot-project/spring-boot-docs/src/main/asciidoc/using-spring-boot.adoc
@@ -120,7 +120,7 @@ For instance, to upgrade to another Spring Data release train, you could add the
 			<dependency>
 				<groupId>org.springframework.data</groupId>
 				<artifactId>spring-data-releasetrain</artifactId>
-				<version>Fowler-SR2</version>
+				<version>Moore-SR10</version>
 				<type>pom</type>
 				<scope>import</scope>
 			</dependency>
diff --git a/spring-boot-project/spring-boot-tools/spring-boot-maven-plugin/src/site/apt/examples/build-info.apt.vm b/spring-boot-project/spring-boot-tools/spring-boot-maven-plugin/src/site/apt/examples/build-info.apt.vm
index 359a55cabe..c0206f443c 100644
--- a/spring-boot-project/spring-boot-tools/spring-boot-maven-plugin/src/site/apt/examples/build-info.apt.vm
+++ b/spring-boot-project/spring-boot-tools/spring-boot-maven-plugin/src/site/apt/examples/build-info.apt.vm
@@ -20,7 +20,6 @@
       <plugin>
         <groupId>${project.groupId}</groupId>
         <artifactId>${project.artifactId}</artifactId>
-        <version>${project.version}</version>
         <executions>
           <execution>
             <goals>
diff --git a/spring-boot-project/spring-boot-tools/spring-boot-maven-plugin/src/site/apt/examples/custom-layout.apt.vm b/spring-boot-project/spring-boot-tools/spring-boot-maven-plugin/src/site/apt/examples/custom-layout.apt.vm
index 2cffd8f029..9c17dbb58e 100644
--- a/spring-boot-project/spring-boot-tools/spring-boot-maven-plugin/src/site/apt/examples/custom-layout.apt.vm
+++ b/spring-boot-project/spring-boot-tools/spring-boot-maven-plugin/src/site/apt/examples/custom-layout.apt.vm
@@ -19,7 +19,6 @@
       <plugin>
         <groupId>${project.groupId}</groupId>
         <artifactId>${project.artifactId}</artifactId>
-        <version>${project.version}</version>
         <executions>
           <execution>
             <id>repackage</id>
diff --git a/spring-boot-project/spring-boot-tools/spring-boot-maven-plugin/src/site/apt/examples/exclude-dependency.apt.vm b/spring-boot-project/spring-boot-tools/spring-boot-maven-plugin/src/site/apt/examples/exclude-dependency.apt.vm
index a992836991..1265c8cb44 100644
--- a/spring-boot-project/spring-boot-tools/spring-boot-maven-plugin/src/site/apt/examples/exclude-dependency.apt.vm
+++ b/spring-boot-project/spring-boot-tools/spring-boot-maven-plugin/src/site/apt/examples/exclude-dependency.apt.vm
@@ -36,7 +36,6 @@
       <plugin>
         <groupId>${project.groupId}</groupId>
         <artifactId>${project.artifactId}</artifactId>
-        <version>${project.version}</version>
         <configuration>
           <excludes>
             <exclude>
@@ -68,7 +67,6 @@
       <plugin>
         <groupId>${project.groupId}</groupId>
         <artifactId>${project.artifactId}</artifactId>
-        <version>${project.version}</version>
         <configuration>
           <excludeGroupIds>com.foo</excludeGroupIds>
         </configuration>
diff --git a/spring-boot-project/spring-boot-tools/spring-boot-maven-plugin/src/site/apt/examples/it-random-port.apt.vm b/spring-boot-project/spring-boot-tools/spring-boot-maven-plugin/src/site/apt/examples/it-random-port.apt.vm
index 8635e87c3b..36c029fb86 100644
--- a/spring-boot-project/spring-boot-tools/spring-boot-maven-plugin/src/site/apt/examples/it-random-port.apt.vm
+++ b/spring-boot-project/spring-boot-tools/spring-boot-maven-plugin/src/site/apt/examples/it-random-port.apt.vm
@@ -42,7 +42,6 @@
       <plugin>
         <groupId>${project.groupId}</groupId>
         <artifactId>${project.artifactId}</artifactId>
-        <version>${project.version}</version>
         <executions>
           <execution>
             <id>pre-integration-test</id>
diff --git a/spring-boot-project/spring-boot-tools/spring-boot-maven-plugin/src/site/apt/examples/it-skip.apt.vm b/spring-boot-project/spring-boot-tools/spring-boot-maven-plugin/src/site/apt/examples/it-skip.apt.vm
index f846bca20c..10ca1723aa 100644
--- a/spring-boot-project/spring-boot-tools/spring-boot-maven-plugin/src/site/apt/examples/it-skip.apt.vm
+++ b/spring-boot-project/spring-boot-tools/spring-boot-maven-plugin/src/site/apt/examples/it-skip.apt.vm
@@ -24,7 +24,6 @@
       <plugin>
         <groupId>${project.groupId}</groupId>
         <artifactId>${project.artifactId}</artifactId>
-        <version>${project.version}</version>
         <executions>
           <execution>
             <id>pre-integration-test</id>
diff --git a/spring-boot-project/spring-boot-tools/spring-boot-maven-plugin/src/site/apt/examples/repackage-classifier.apt.vm b/spring-boot-project/spring-boot-tools/spring-boot-maven-plugin/src/site/apt/examples/repackage-classifier.apt.vm
index d64dc2ea64..f2717176c1 100644
--- a/spring-boot-project/spring-boot-tools/spring-boot-maven-plugin/src/site/apt/examples/repackage-classifier.apt.vm
+++ b/spring-boot-project/spring-boot-tools/spring-boot-maven-plugin/src/site/apt/examples/repackage-classifier.apt.vm
@@ -26,7 +26,6 @@
       <plugin>
         <groupId>${project.groupId}</groupId>
         <artifactId>${project.artifactId}</artifactId>
-        <version>${project.version}</version>
         <executions>
           <execution>
             <id>repackage</id>
@@ -98,7 +97,6 @@
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-jar-plugin</artifactId>
-        <version>@maven-jar-plugin.version@</version>
         <executions>
           <execution>
             <goals>
@@ -114,7 +112,6 @@
       <plugin>
         <groupId>${project.groupId}</groupId>
         <artifactId>${project.artifactId}</artifactId>
-        <version>${project.version}</version>
         <executions>
           <execution>
             <id>repackage</id>
diff --git a/spring-boot-project/spring-boot-tools/spring-boot-maven-plugin/src/site/apt/examples/repackage-disable-attach.apt.vm b/spring-boot-project/spring-boot-tools/spring-boot-maven-plugin/src/site/apt/examples/repackage-disable-attach.apt.vm
index dcd4dfa142..c410d6bd56 100644
--- a/spring-boot-project/spring-boot-tools/spring-boot-maven-plugin/src/site/apt/examples/repackage-disable-attach.apt.vm
+++ b/spring-boot-project/spring-boot-tools/spring-boot-maven-plugin/src/site/apt/examples/repackage-disable-attach.apt.vm
@@ -20,7 +20,6 @@
       <plugin>
         <groupId>${project.groupId}</groupId>
         <artifactId>${project.artifactId}</artifactId>
-        <version>${project.version}</version>
         <executions>
           <execution>
             <id>repackage</id>
diff --git a/spring-boot-project/spring-boot-tools/spring-boot-maven-plugin/src/site/apt/examples/repackage-name.apt.vm b/spring-boot-project/spring-boot-tools/spring-boot-maven-plugin/src/site/apt/examples/repackage-name.apt.vm
index 9a21dd9ff8..fd41a5d86e 100644
--- a/spring-boot-project/spring-boot-tools/spring-boot-maven-plugin/src/site/apt/examples/repackage-name.apt.vm
+++ b/spring-boot-project/spring-boot-tools/spring-boot-maven-plugin/src/site/apt/examples/repackage-name.apt.vm
@@ -20,7 +20,6 @@
       <plugin>
         <groupId>${project.groupId}</groupId>
         <artifactId>${project.artifactId}</artifactId>
-        <version>${project.version}</version>
         <executions>
           <execution>
             <id>repackage</id>
diff --git a/spring-boot-project/spring-boot-tools/spring-boot-maven-plugin/src/site/apt/examples/run-arguments.apt.vm b/spring-boot-project/spring-boot-tools/spring-boot-maven-plugin/src/site/apt/examples/run-arguments.apt.vm
index 9569519dc8..92255df1d7 100644
--- a/spring-boot-project/spring-boot-tools/spring-boot-maven-plugin/src/site/apt/examples/run-arguments.apt.vm
+++ b/spring-boot-project/spring-boot-tools/spring-boot-maven-plugin/src/site/apt/examples/run-arguments.apt.vm
@@ -22,7 +22,6 @@
       <plugin>
         <groupId>${project.groupId}</groupId>
         <artifactId>${project.artifactId}</artifactId>
-        <version>${project.version}</version>
         <configuration>
           <arguments>
             <argument>property1</argument>
diff --git a/spring-boot-project/spring-boot-tools/spring-boot-maven-plugin/src/site/apt/examples/run-debug.apt.vm b/spring-boot-project/spring-boot-tools/spring-boot-maven-plugin/src/site/apt/examples/run-debug.apt.vm
index d8d5d0261b..e9dd7a6e21 100644
--- a/spring-boot-project/spring-boot-tools/spring-boot-maven-plugin/src/site/apt/examples/run-debug.apt.vm
+++ b/spring-boot-project/spring-boot-tools/spring-boot-maven-plugin/src/site/apt/examples/run-debug.apt.vm
@@ -20,7 +20,6 @@
       <plugin>
         <groupId>${project.groupId}</groupId>
         <artifactId>${project.artifactId}</artifactId>
-        <version>${project.version}</version>
         <configuration>
           <jvmArguments>
             -Xdebug -Xrunjdwp:transport=dt_socket,server=y,suspend=y,address=5005
diff --git a/spring-boot-project/spring-boot-tools/spring-boot-maven-plugin/src/site/apt/examples/run-env-variables.apt.vm b/spring-boot-project/spring-boot-tools/spring-boot-maven-plugin/src/site/apt/examples/run-env-variables.apt.vm
index 7a3b7e560a..66d367ba27 100644
--- a/spring-boot-project/spring-boot-tools/spring-boot-maven-plugin/src/site/apt/examples/run-env-variables.apt.vm
+++ b/spring-boot-project/spring-boot-tools/spring-boot-maven-plugin/src/site/apt/examples/run-env-variables.apt.vm
@@ -19,7 +19,6 @@ Dmytro Nosan
       <plugin>
         <groupId>${project.groupId}</groupId>
         <artifactId>${project.artifactId}</artifactId>
-        <version>${project.version}</version>
         <configuration>
             <environmentVariables>
                 <ENV1>5000</ENV1>
diff --git a/spring-boot-project/spring-boot-tools/spring-boot-maven-plugin/src/site/apt/examples/run-profiles.apt.vm b/spring-boot-project/spring-boot-tools/spring-boot-maven-plugin/src/site/apt/examples/run-profiles.apt.vm
index 203add200e..6b6c353236 100644
--- a/spring-boot-project/spring-boot-tools/spring-boot-maven-plugin/src/site/apt/examples/run-profiles.apt.vm
+++ b/spring-boot-project/spring-boot-tools/spring-boot-maven-plugin/src/site/apt/examples/run-profiles.apt.vm
@@ -19,7 +19,6 @@
       <plugin>
         <groupId>${project.groupId}</groupId>
         <artifactId>${project.artifactId}</artifactId>
-        <version>${project.version}</version>
         <configuration>
           <profiles>
             <profile>foo</profile>
diff --git a/spring-boot-project/spring-boot-tools/spring-boot-maven-plugin/src/site/apt/examples/run-system-properties.apt.vm b/spring-boot-project/spring-boot-tools/spring-boot-maven-plugin/src/site/apt/examples/run-system-properties.apt.vm
index 0483f58f9d..5616c65564 100644
--- a/spring-boot-project/spring-boot-tools/spring-boot-maven-plugin/src/site/apt/examples/run-system-properties.apt.vm
+++ b/spring-boot-project/spring-boot-tools/spring-boot-maven-plugin/src/site/apt/examples/run-system-properties.apt.vm
@@ -22,7 +22,6 @@
       <plugin>
         <groupId>${project.groupId}</groupId>
         <artifactId>${project.artifactId}</artifactId>
-        <version>${project.version}</version>
         <configuration>
           <systemPropertyVariables>
             <property1>test</property1>
diff --git a/spring-boot-project/spring-boot-tools/spring-boot-maven-plugin/src/site/apt/usage.apt.vm b/spring-boot-project/spring-boot-tools/spring-boot-maven-plugin/src/site/apt/usage.apt.vm
index fb70a97697..2ffadc0734 100644
--- a/spring-boot-project/spring-boot-tools/spring-boot-maven-plugin/src/site/apt/usage.apt.vm
+++ b/spring-boot-project/spring-boot-tools/spring-boot-maven-plugin/src/site/apt/usage.apt.vm
@@ -38,7 +38,6 @@ Usage
     <plugin>
       <groupId>${project.groupId}</groupId>
       <artifactId>${project.artifactId}</artifactId>
-      <version>${project.version}</version>
       <executions>
         <execution>
           <goals>
@@ -80,7 +79,6 @@ Usage
     <plugin>
       <groupId>${project.groupId}</groupId>
       <artifactId>${project.artifactId}</artifactId>
-      <version>${project.version}</version>
       <configuration>
         <mainClass>${start-class}</mainClass>
         <layout>ZIP</layout>
@@ -156,7 +154,6 @@ mvn spring-boot:run
   <dependency>
     <groupId>org.springframework.boot</groupId>
     <artifactId>spring-boot-devtools</artifactId>
-    <version>${project.version}</version>
     <optional>true</optional>
   </dependency>
 </dependencies>
@@ -187,7 +184,6 @@ spring.devtools.remote.restart.enabled=false
     <plugin>
       <groupId>${project.groupId}</groupId>
       <artifactId>${project.artifactId}</artifactId>
-      <version>${project.version}</version>
       <configuration>
         <addResources>true</addResources>
       </configuration>
@@ -234,7 +230,6 @@ spring.devtools.remote.restart.enabled=false
     <plugin>
       <groupId>${project.groupId}</groupId>
       <artifactId>${project.artifactId}</artifactId>
-      <version>${project.version}</version>
       <executions>
         <execution>
           <id>pre-integration-test</id>
@@ -278,7 +273,6 @@ spring.devtools.remote.restart.enabled=false
     <plugin>
       <groupId>${project.groupId}</groupId>
       <artifactId>${project.artifactId}</artifactId>
-      <version>${project.version}</version>
       <executions>
         <execution>
           <id>pre-integration-test</id>