Browse Source

Merge branch '3.1.x'

Closes gh-38078
pull/38086/head
Moritz Halbritter 2 years ago
parent
commit
f66c76e2a8
  1. 6
      spring-boot-project/spring-boot-tools/spring-boot-maven-plugin/src/docs/asciidoc/build-info.adoc
  2. 3
      spring-boot-project/spring-boot-tools/spring-boot-maven-plugin/src/docs/maven/build-info/pom.xml

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

@ -9,9 +9,9 @@ It also allows you to add an arbitrary number of additional properties, as shown
include::../maven/build-info/pom.xml[tags=build-info] include::../maven/build-info/pom.xml[tags=build-info]
---- ----
This configuration will generate a `build-info.properties` at the expected location with four additional keys. This configuration will generate a `build-info.properties` at the expected location with three additional keys.
NOTE: `maven.compiler.source` and `maven.compiler.target` are expected to be regular properties available in the project. NOTE: `java.version` is expected to be a regular property available in the project.
They will be interpolated as you would expect. It will be interpolated as you would expect.
include::goals/build-info.adoc[leveloffset=+1] include::goals/build-info.adoc[leveloffset=+1]

3
spring-boot-project/spring-boot-tools/spring-boot-maven-plugin/src/docs/maven/build-info/pom.xml

@ -17,8 +17,7 @@
<additionalProperties> <additionalProperties>
<encoding.source>UTF-8</encoding.source> <encoding.source>UTF-8</encoding.source>
<encoding.reporting>UTF-8</encoding.reporting> <encoding.reporting>UTF-8</encoding.reporting>
<java.source>${maven.compiler.source}</java.source> <java.version>${java.version}</java.version>
<java.target>${maven.compiler.target}</java.target>
</additionalProperties> </additionalProperties>
</configuration> </configuration>
</execution> </execution>

Loading…
Cancel
Save