Skip to content

Commit 0424689

Browse files
snicollsnicoll
committed
Merge branch '2.2.x' into 2.3.x
Closes gh-23930
2 parents c02b16e + 93e36a9 commit 0424689

File tree

8 files changed

+1
-42
lines changed

8 files changed

+1
-42
lines changed

‎spring-boot-project/spring-boot-tools/spring-boot-maven-plugin/build.gradle

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -83,12 +83,6 @@ javadoc {
8383
}
8484
}
8585

86-
tasks.withType(org.asciidoctor.gradle.jvm.AbstractAsciidoctorTask) {
87-
attributes "maven-jar-plugin-version": "1.2.3",
88-
"maven-failsafe-plugin-version": "1.2.3",
89-
"build-helper-maven-plugin-version": "1.2.3"
90-
}
91-
9286
task zip(type: Zip) {
9387
dependsOn asciidoctor, asciidoctorPdf
9488
duplicatesStrategy "fail"

‎spring-boot-project/spring-boot-tools/spring-boot-maven-plugin/src/docs/asciidoc/build-info.adoc

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,6 @@ It also allows you to add an arbitrary number of additional properties, as shown
1212
<plugin>
1313
<groupId>org.springframework.boot</groupId>
1414
<artifactId>spring-boot-maven-plugin</artifactId>
15-
<version>{gradle-project-version}</version>
1615
<executions>
1716
<execution>
1817
<goals>

‎spring-boot-project/spring-boot-tools/spring-boot-maven-plugin/src/docs/asciidoc/getting-started.adoc

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,6 @@ To use the Spring Boot Maven Plugin, include the appropriate XML in the `plugins
1414
<plugin>
1515
<groupId>org.springframework.boot</groupId>
1616
<artifactId>spring-boot-maven-plugin</artifactId>
17-
<version>{gradle-project-version}</version>
1817
</plugin>
1918
</plugins>
2019
</build>

‎spring-boot-project/spring-boot-tools/spring-boot-maven-plugin/src/docs/asciidoc/integration-tests.adoc

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,6 @@ To make sure that the lifecycle of your Spring Boot application is properly mana
1010
<plugin>
1111
<groupId>org.springframework.boot</groupId>
1212
<artifactId>spring-boot-maven-plugin</artifactId>
13-
<version>{gradle-project-version}</version>
1413
<executions>
1514
<execution>
1615
<id>pre-integration-test</id>
@@ -63,7 +62,6 @@ The example below showcases how you could achieve the same feature using the htt
6362
<plugin>
6463
<groupId>org.codehaus.mojo</groupId>
6564
<artifactId>build-helper-maven-plugin</artifactId>
66-
<version>{build-helper-maven-plugin-version}</version>
6765
<executions>
6866
<execution>
6967
<id>reserve-tomcat-port</id>
@@ -82,7 +80,6 @@ The example below showcases how you could achieve the same feature using the htt
8280
<plugin>
8381
<groupId>org.springframework.boot</groupId>
8482
<artifactId>spring-boot-maven-plugin</artifactId>
85-
<version>{gradle-project-version}</version>
8683
<executions>
8784
<execution>
8885
<id>pre-integration-test</id>
@@ -106,7 +103,6 @@ The example below showcases how you could achieve the same feature using the htt
106103
<plugin>
107104
<groupId>org.apache.maven.plugins</groupId>
108105
<artifactId>maven-failsafe-plugin</artifactId>
109-
<version>{maven-failsafe-plugin-version}</version>
110106
<configuration>
111107
<systemPropertyVariables>
112108
<test.server.port>${tomcat.http.port}</test.server.port>
@@ -136,7 +132,6 @@ This example shows how you can customize the port in case `9001` is already used
136132
<plugin>
137133
<groupId>org.springframework.boot</groupId>
138134
<artifactId>spring-boot-maven-plugin</artifactId>
139-
<version>{gradle-project-version}</version>
140135
<configuration>
141136
<jmxPort>9009</jmxPort>
142137
</configuration>
@@ -187,7 +182,6 @@ This example shows how you can skip integration tests with a command-line proper
187182
<plugin>
188183
<groupId>org.springframework.boot</groupId>
189184
<artifactId>spring-boot-maven-plugin</artifactId>
190-
<version>{gradle-project-version}</version>
191185
<executions>
192186
<execution>
193187
<id>pre-integration-test</id>
@@ -212,7 +206,6 @@ This example shows how you can skip integration tests with a command-line proper
212206
<plugin>
213207
<groupId>org.apache.maven.plugins</groupId>
214208
<artifactId>maven-failsafe-plugin</artifactId>
215-
<version>{maven-failsafe-plugin-version}</version>
216209
<configuration>
217210
<skip>${skip.it}</skip>
218211
</configuration>

‎spring-boot-project/spring-boot-tools/spring-boot-maven-plugin/src/docs/asciidoc/packaging-oci-image.adoc

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,6 @@ It is possible to automate the creation of an image whenever the `package` phase
1616
<plugin>
1717
<groupId>org.springframework.boot</groupId>
1818
<artifactId>spring-boot-maven-plugin</artifactId>
19-
<version>{gradle-project-version}</version>
2019
<executions>
2120
<execution>
2221
<goals>
@@ -131,7 +130,6 @@ If you need to customize the builder used to create the image or the run image u
131130
<plugin>
132131
<groupId>org.springframework.boot</groupId>
133132
<artifactId>spring-boot-maven-plugin</artifactId>
134-
<version>{gradle-project-version}</version>
135133
<configuration>
136134
<image>
137135
<builder>mine/java-cnb-builder</builder>
@@ -169,7 +167,6 @@ The following is an example of {paketo-java-reference}/#configuring-the-jvm-vers
169167
<plugin>
170168
<groupId>org.springframework.boot</groupId>
171169
<artifactId>spring-boot-maven-plugin</artifactId>
172-
<version>{gradle-project-version}</version>
173170
<configuration>
174171
<image>
175172
<env>
@@ -197,7 +194,6 @@ When using the Paketo builder, this can be accomplished by setting the `HTTPS_PR
197194
<plugin>
198195
<groupId>org.springframework.boot</groupId>
199196
<artifactId>spring-boot-maven-plugin</artifactId>
200-
<version>{gradle-project-version}</version>
201197
<configuration>
202198
<image>
203199
<env>
@@ -227,7 +223,6 @@ You can take control over the name, as shown in the following example:
227223
<plugin>
228224
<groupId>org.springframework.boot</groupId>
229225
<artifactId>spring-boot-maven-plugin</artifactId>
230-
<version>{gradle-project-version}</version>
231226
<configuration>
232227
<image>
233228
<name>example.com/library/${project.artifactId}</name>

‎spring-boot-project/spring-boot-tools/spring-boot-maven-plugin/src/docs/asciidoc/packaging.adoc

Lines changed: 0 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,6 @@ Packaging an executable archive is performed by the `repackage` goal, as shown i
1212
<plugin>
1313
<groupId>org.springframework.boot</groupId>
1414
<artifactId>spring-boot-maven-plugin</artifactId>
15-
<version>{gradle-project-version}</version>
1615
<executions>
1716
<execution>
1817
<goals>
@@ -48,7 +47,6 @@ The `Main-Class` in the manifest is controlled by the `layout` property of the S
4847
<plugin>
4948
<groupId>org.springframework.boot</groupId>
5049
<artifactId>spring-boot-maven-plugin</artifactId>
51-
<version>{gradle-project-version}</version>
5250
<configuration>
5351
<mainClass>${start.class}</mainClass>
5452
<layout>ZIP</layout>
@@ -90,7 +88,6 @@ To use this feature, the layering feature must be enabled:
9088
<plugin>
9189
<groupId>org.springframework.boot</groupId>
9290
<artifactId>spring-boot-maven-plugin</artifactId>
93-
<version>{gradle-project-version}</version>
9491
<configuration>
9592
<layers>
9693
<enabled>true</enabled>
@@ -128,7 +125,6 @@ This can be done using a separate configuration file that should be registered a
128125
<plugin>
129126
<groupId>org.springframework.boot</groupId>
130127
<artifactId>spring-boot-maven-plugin</artifactId>
131-
<version>{gradle-project-version}</version>
132128
<configuration>
133129
<layers>
134130
<enabled>true</enabled>
@@ -225,7 +221,6 @@ If that is the case or if you prefer to keep the original artifact and attach th
225221
<plugin>
226222
<groupId>org.springframework.boot</groupId>
227223
<artifactId>spring-boot-maven-plugin</artifactId>
228-
<version>{gradle-project-version}</version>
229224
<executions>
230225
<execution>
231226
<id>repackage</id>
@@ -282,7 +277,6 @@ The following configuration installs/deploys a single `task` classified artifact
282277
<plugin>
283278
<groupId>org.apache.maven.plugins</groupId>
284279
<artifactId>maven-jar-plugin</artifactId>
285-
<version>{maven-jar-plugin-version}</version>
286280
<executions>
287281
<execution>
288282
<goals>
@@ -298,7 +292,6 @@ The following configuration installs/deploys a single `task` classified artifact
298292
<plugin>
299293
<groupId>org.springframework.boot</groupId>
300294
<artifactId>spring-boot-maven-plugin</artifactId>
301-
<version>{gradle-project-version}</version>
302295
<executions>
303296
<execution>
304297
<id>repackage</id>
@@ -368,7 +361,6 @@ If you need the repackaged jar to have a different local name than the one defin
368361
<plugin>
369362
<groupId>org.springframework.boot</groupId>
370363
<artifactId>spring-boot-maven-plugin</artifactId>
371-
<version>{gradle-project-version}</version>
372364
<executions>
373365
<execution>
374366
<id>repackage</id>
@@ -400,7 +392,6 @@ If you need to only deploy the original jar and yet be able to run your app with
400392
<plugin>
401393
<groupId>org.springframework.boot</groupId>
402394
<artifactId>spring-boot-maven-plugin</artifactId>
403-
<version>{gradle-project-version}</version>
404395
<executions>
405396
<execution>
406397
<id>repackage</id>
@@ -435,7 +426,6 @@ Spring Boot repackages the jar file for this project using a custom layout facto
435426
<plugin>
436427
<groupId>org.springframework.boot</groupId>
437428
<artifactId>spring-boot-maven-plugin</artifactId>
438-
<version>{gradle-project-version}</version>
439429
<executions>
440430
<execution>
441431
<id>repackage</id>
@@ -492,7 +482,6 @@ The following example excludes `com.foo:bar`, and only that artifact:
492482
<plugin>
493483
<groupId>org.springframework.boot</groupId>
494484
<artifactId>spring-boot-maven-plugin</artifactId>
495-
<version>{gradle-project-version}</version>
496485
<configuration>
497486
<excludes>
498487
<exclude>
@@ -517,7 +506,6 @@ This example excludes any artifact belonging to the `com.foo` group:
517506
<plugin>
518507
<groupId>org.springframework.boot</groupId>
519508
<artifactId>spring-boot-maven-plugin</artifactId>
520-
<version>{gradle-project-version}</version>
521509
<configuration>
522510
<excludeGroupIds>com.foo</excludeGroupIds>
523511
</configuration>
@@ -543,7 +531,6 @@ If you wish to exclude this dependency, you can do so in the following manner:
543531
<plugin>
544532
<groupId>org.springframework.boot</groupId>
545533
<artifactId>spring-boot-maven-plugin</artifactId>
546-
<version>{gradle-project-version}</version>
547534
<configuration>
548535
<layers>
549536
<enabled>true</enabled>

‎spring-boot-project/spring-boot-tools/spring-boot-maven-plugin/src/docs/asciidoc/running.adoc

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,6 @@ To enable it, just add the following dependency to your project:
2727
<dependency>
2828
<groupId>org.springframework.boot</groupId>
2929
<artifactId>spring-boot-devtools</artifactId>
30-
<version>{gradle-project-version}</version>
3130
<optional>true</optional>
3231
</dependency>
3332
</dependencies>
@@ -55,7 +54,6 @@ You can restore it at any time by configuring your project:
5554
<plugin>
5655
<groupId>org.springframework.boot</groupId>
5756
<artifactId>spring-boot-maven-plugin</artifactId>
58-
<version>{gradle-project-version}</version>
5957
<configuration>
6058
<addResources>true</addResources>
6159
</configuration>
@@ -103,7 +101,6 @@ The following configuration suspend the process until a debugger has joined on p
103101
<plugin>
104102
<groupId>org.springframework.boot</groupId>
105103
<artifactId>spring-boot-maven-plugin</artifactId>
106-
<version>{gradle-project-version}</version>
107104
<configuration>
108105
<jvmArguments>
109106
-Xdebug -Xrunjdwp:transport=dt_socket,server=y,suspend=y,address=5005
@@ -140,7 +137,6 @@ The following example sets `property1` to `test` and `property2` to 42:
140137
<plugin>
141138
<groupId>org.springframework.boot</groupId>
142139
<artifactId>spring-boot-maven-plugin</artifactId>
143-
<version>{gradle-project-version}</version>
144140
<configuration>
145141
<systemPropertyVariables>
146142
<property1>test</property1>
@@ -182,7 +178,6 @@ The following example sets the 'ENV1', 'ENV2', 'ENV3', 'ENV4' env variables:
182178
<plugin>
183179
<groupId>org.springframework.boot</groupId>
184180
<artifactId>spring-boot-maven-plugin</artifactId>
185-
<version>{gradle-project-version}</version>
186181
<configuration>
187182
<environmentVariables>
188183
<ENV1>5000</ENV1>
@@ -220,7 +215,6 @@ The following example sets two arguments: `property1` and `property2=42`:
220215
<plugin>
221216
<groupId>org.springframework.boot</groupId>
222217
<artifactId>spring-boot-maven-plugin</artifactId>
223-
<version>{gradle-project-version}</version>
224218
<configuration>
225219
<arguments>
226220
<argument>property1</argument>
@@ -258,7 +252,6 @@ The following configuration enables the `foo` and `bar` profiles:
258252
<plugin>
259253
<groupId>org.springframework.boot</groupId>
260254
<artifactId>spring-boot-maven-plugin</artifactId>
261-
<version>{gradle-project-version}</version>
262255
<configuration>
263256
<profiles>
264257
<profile>foo</profile>

‎spring-boot-project/spring-boot-tools/spring-boot-maven-plugin/src/docs/asciidoc/using.adoc

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -90,7 +90,7 @@ For instance, to use a different version of the SLF4J library and the Spring Dat
9090
<dependency>
9191
<groupId>org.springframework.data</groupId>
9292
<artifactId>spring-data-releasetrain</artifactId>
93-
<version>Moore-SR6</version>
93+
<version>Neumann-SR5</version>
9494
<type>pom</type>
9595
<scope>import</scope>
9696
</dependency>
@@ -131,7 +131,6 @@ If you want to both have a default while allowing it to be overridden on the com
131131
<plugin>
132132
<groupId>org.springframework.boot</groupId>
133133
<artifactId>spring-boot-maven-plugin</artifactId>
134-
<version>{gradle-project-version}</version>
135134
<configuration>
136135
<profiles>${app.profiles}</profiles>
137136
</configuration>

0 commit comments

Comments
 (0)