root
/
spring-boot
mirror of https://github.com/spring-projects/spring-boot.git
1
0
Fork 0
Code Issues Actions Packages Projects Releases Wiki Activity

Merge branch '2.3.x' 

Closes gh-23931
This commit is contained in:
Stephane Nicoll 2020-10-28 16:20:22 +01:00
parent 74ec5f65d1 0424689aee
commit 472c563451
8 changed files with 2 additions and 47 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
spring-boot-project/spring-boot-tools/spring-boot-maven-plugin/build.gradle
View File

@ -85,12 +85,6 @@ javadoc {
}
}
tasks.withType(org.asciidoctor.gradle.jvm.AbstractAsciidoctorTask) {
attributes "maven-jar-plugin-version": "1.2.3",
"maven-failsafe-plugin-version": "1.2.3",
"build-helper-maven-plugin-version": "1.2.3"
}
task zip(type: Zip) {
dependsOn asciidoctor, asciidoctorPdf
duplicatesStrategy "fail"

1
spring-boot-project/spring-boot-tools/spring-boot-maven-plugin/src/docs/asciidoc/build-info.adoc
View File

@ -12,7 +12,6 @@ It also allows you to add an arbitrary number of additional properties, as shown
<plugin>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-maven-plugin</artifactId>
<version>{gradle-project-version}</version>
<executions>
<execution>
<goals>

1
spring-boot-project/spring-boot-tools/spring-boot-maven-plugin/src/docs/asciidoc/getting-started.adoc
View File

@ -14,7 +14,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>{gradle-project-version}</version>
</plugin>
</plugins>
</build>

9
spring-boot-project/spring-boot-tools/spring-boot-maven-plugin/src/docs/asciidoc/integration-tests.adoc
View File

@ -10,7 +10,6 @@ To make sure that the lifecycle of your Spring Boot application is properly mana
<plugin>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-maven-plugin</artifactId>
<version>{gradle-project-version}</version>
<executions>
<execution>
<id>pre-integration-test</id>
@ -63,7 +62,6 @@ The example below showcases how you could achieve the same feature using the htt
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>build-helper-maven-plugin</artifactId>
<version>{build-helper-maven-plugin-version}</version>
<executions>
<execution>
<id>reserve-tomcat-port</id>
@ -82,7 +80,6 @@ The example below showcases how you could achieve the same feature using the htt
<plugin>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-maven-plugin</artifactId>
<version>{gradle-project-version}</version>
<executions>
<execution>
<id>pre-integration-test</id>
@ -106,7 +103,6 @@ The example below showcases how you could achieve the same feature using the htt
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-failsafe-plugin</artifactId>
<version>{maven-failsafe-plugin-version}</version>
<configuration>
<systemPropertyVariables>
<test.server.port>${tomcat.http.port}</test.server.port>
@ -136,8 +132,7 @@ This example shows how you can customize the port in case `9001` is already used
<plugin>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-maven-plugin</artifactId>
<version>{gradle-project-version}</version>
<configuration>
<configuration>
<jmxPort>9009</jmxPort>
</configuration>
<executions>
@ -187,7 +182,6 @@ This example shows how you can skip integration tests with a command-line proper
<plugin>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-maven-plugin</artifactId>
<version>{gradle-project-version}</version>
<executions>
<execution>
<id>pre-integration-test</id>
@ -212,7 +206,6 @@ This example shows how you can skip integration tests with a command-line proper
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-failsafe-plugin</artifactId>
<version>{maven-failsafe-plugin-version}</version>
<configuration>
<skip>${skip.it}</skip>
</configuration>

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

@ -16,7 +16,6 @@ It is possible to automate the creation of an image whenever the `package` phase
<plugin>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-maven-plugin</artifactId>
<version>{gradle-project-version}</version>
<executions>
<execution>
<goals>
@ -194,7 +193,6 @@ If you need to customize the builder used to create the image or the run image u
<plugin>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-maven-plugin</artifactId>
<version>{gradle-project-version}</version>
<configuration>
<image>
<builder>mine/java-cnb-builder</builder>
@ -232,7 +230,6 @@ The following is an example of {paketo-java-reference}/#configuring-the-jvm-vers
<plugin>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-maven-plugin</artifactId>
<version>{gradle-project-version}</version>
<configuration>
<image>
<env>
@ -260,7 +257,6 @@ When using the Paketo builder, this can be accomplished by setting the `HTTPS_PR
<plugin>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-maven-plugin</artifactId>
<version>{gradle-project-version}</version>
<configuration>
<image>
<env>
@ -290,7 +286,6 @@ You can take control over the name, as shown in the following example:
<plugin>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-maven-plugin</artifactId>
<version>{gradle-project-version}</version>
<configuration>
<image>
<name>example.com/library/${project.artifactId}</name>
@ -326,7 +321,6 @@ The generated image can be published to a Docker registry by enabling a `publish
<plugin>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-maven-plugin</artifactId>
<version>{gradle-project-version}</version>
<configuration>
<image>
<name>docker.example.com/library/${project.artifactId}</name>
@ -368,7 +362,6 @@ If you need the plugin to communicate with the Docker daemon using a remote conn
<plugin>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-maven-plugin</artifactId>
<version>{gradle-project-version}</version>
<configuration>
<docker>
<host>tcp://192.168.99.100:2376</host>
@ -392,7 +385,6 @@ If the builder or run image are stored in a private Docker registry that support
<plugin>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-maven-plugin</artifactId>
<version>{gradle-project-version}</version>
<configuration>
<docker>
<builderRegistry>
@ -419,7 +411,6 @@ If the builder or run image is stored in a private Docker registry that supports
<plugin>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-maven-plugin</artifactId>
<version>{gradle-project-version}</version>
<configuration>
<docker>
<builderRegistry>

13
spring-boot-project/spring-boot-tools/spring-boot-maven-plugin/src/docs/asciidoc/packaging.adoc
View File

@ -12,7 +12,6 @@ Packaging an executable archive is performed by the `repackage` goal, as shown i
<plugin>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-maven-plugin</artifactId>
<version>{gradle-project-version}</version>
<executions>
<execution>
<goals>
@ -48,7 +47,6 @@ The `Main-Class` in the manifest is controlled by the `layout` property of the S
<plugin>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-maven-plugin</artifactId>
<version>{gradle-project-version}</version>
<configuration>
<mainClass>${start.class}</mainClass>
<layout>ZIP</layout>
@ -106,7 +104,6 @@ To disable this feature, you can do so in the following manner:
<plugin>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-maven-plugin</artifactId>
<version>{gradle-project-version}</version>
<configuration>
<layers>
<enabled>false</enabled>
@ -133,7 +130,6 @@ This can be done using a separate configuration file that should be registered a
<plugin>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-maven-plugin</artifactId>
<version>{gradle-project-version}</version>
<configuration>
<layers>
<enabled>true</enabled>
@ -235,7 +231,6 @@ If that is the case or if you prefer to keep the original artifact and attach th
<plugin>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-maven-plugin</artifactId>
<version>{gradle-project-version}</version>
<executions>
<execution>
<id>repackage</id>
@ -292,7 +287,6 @@ The following configuration installs/deploys a single `task` classified artifact
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-jar-plugin</artifactId>
<version>{maven-jar-plugin-version}</version>
<executions>
<execution>
<goals>
@ -308,7 +302,6 @@ The following configuration installs/deploys a single `task` classified artifact
<plugin>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-maven-plugin</artifactId>
<version>{gradle-project-version}</version>
<executions>
<execution>
<id>repackage</id>
@ -378,7 +371,6 @@ If you need the repackaged jar to have a different local name than the one defin
<plugin>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-maven-plugin</artifactId>
<version>{gradle-project-version}</version>
<executions>
<execution>
<id>repackage</id>
@ -410,7 +402,6 @@ If you need to only deploy the original jar and yet be able to run your app with
<plugin>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-maven-plugin</artifactId>
<version>{gradle-project-version}</version>
<executions>
<execution>
<id>repackage</id>
@ -445,7 +436,6 @@ Spring Boot repackages the jar file for this project using a custom layout facto
<plugin>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-maven-plugin</artifactId>
<version>{gradle-project-version}</version>
<executions>
<execution>
<id>repackage</id>
@ -502,7 +492,6 @@ The following example excludes `com.foo:bar`, and only that artifact:
<plugin>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-maven-plugin</artifactId>
<version>{gradle-project-version}</version>
<configuration>
<excludes>
<exclude>
@ -527,7 +516,6 @@ This example excludes any artifact belonging to the `com.foo` group:
<plugin>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-maven-plugin</artifactId>
<version>{gradle-project-version}</version>
<configuration>
<excludeGroupIds>com.foo</excludeGroupIds>
</configuration>
@ -553,7 +541,6 @@ If you wish to exclude this dependency, you can do so in the following manner:
<plugin>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-maven-plugin</artifactId>
<version>{gradle-project-version}</version>
<configuration>
<layers>
<includeLayerTools>false</includeLayerTools>

7
spring-boot-project/spring-boot-tools/spring-boot-maven-plugin/src/docs/asciidoc/running.adoc
View File

@ -27,7 +27,6 @@ To enable it, just add the following dependency to your project:
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-devtools</artifactId>
<version>{gradle-project-version}</version>
<optional>true</optional>
</dependency>
</dependencies>
@ -55,7 +54,6 @@ You can restore it at any time by configuring your project:
<plugin>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-maven-plugin</artifactId>
<version>{gradle-project-version}</version>
<configuration>
<addResources>true</addResources>
</configuration>
@ -103,7 +101,6 @@ The following configuration suspend the process until a debugger has joined on p
<plugin>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-maven-plugin</artifactId>
<version>{gradle-project-version}</version>
<configuration>
<jvmArguments>
-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:
<plugin>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-maven-plugin</artifactId>
<version>{gradle-project-version}</version>
<configuration>
<systemPropertyVariables>
<property1>test</property1>
@ -182,7 +178,6 @@ The following example sets the 'ENV1', 'ENV2', 'ENV3', 'ENV4' env variables:
<plugin>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-maven-plugin</artifactId>
<version>{gradle-project-version}</version>
<configuration>
<environmentVariables>
<ENV1>5000</ENV1>
@ -220,7 +215,6 @@ The following example sets two arguments: `property1` and `property2=42`:
<plugin>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-maven-plugin</artifactId>
<version>{gradle-project-version}</version>
<configuration>
<arguments>
<argument>property1</argument>
@ -258,7 +252,6 @@ The following configuration enables the `foo` and `bar` profiles:
<plugin>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-maven-plugin</artifactId>
<version>{gradle-project-version}</version>
<configuration>
<profiles>
<profile>foo</profile>

3
spring-boot-project/spring-boot-tools/spring-boot-maven-plugin/src/docs/asciidoc/using.adoc
View File

@ -90,7 +90,7 @@ For instance, to use a different version of the SLF4J library and the Spring Dat
<dependency>
<groupId>org.springframework.data</groupId>
<artifactId>spring-data-releasetrain</artifactId>
<version>Moore-SR6</version>
<version>2020.0.0-SR1</version>
<type>pom</type>
<scope>import</scope>
</dependency>
@ -131,7 +131,6 @@ If you want to both have a default while allowing it to be overridden on the com
<plugin>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-maven-plugin</artifactId>
<version>{gradle-project-version}</version>
<configuration>
<profiles>${app.profiles}</profiles>
</configuration>