Spring/spring-boot
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch '2.7.x'

Browse Source 
Closes gh-33880
This commit is contained in:
Moritz Halbritter
2023-01-18 17:35:52 +01:00
parent a2f593c15f e8d809fe65
commit 94f4a4396c
92 changed files with 138 additions and 127 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -99,7 +99,7 @@ include::../maven/running/system-properties-pom.xml[tags=system-properties]
----
If the value is empty or not defined (that is `<my-property/`>), the system property is set with an empty String as the value.
Maven trims values specified in the pom so it is not possible to specify a System property which needs to start or end with a space via this mechanism: consider using `jvmArguments` instead.
Maven trims values specified in the pom, so it is not possible to specify a System property which needs to start or end with a space through this mechanism: consider using `jvmArguments` instead.
Any String typed Maven variable can be passed as system properties.
Any attempt to pass any other Maven variable type (for example a `List` or a `URL` variable) will cause the variable expression to be passed literally (unevaluated).

18
spring-boot-project/spring-boot-tools/spring-boot-maven-plugin/src/main/java/org/springframework/boot/maven/BuildImageMojo.java
View File

@@ -102,21 +102,23 @@ public abstract class BuildImageMojo extends AbstractPackagerMojo {
private Image image;
/**
* Alias for {@link Image#name} to support configuration via command-line property.
* Alias for {@link Image#name} to support configuration through command-line
* property.
* @since 2.3.0
*/
@Parameter(property = "spring-boot.build-image.imageName", readonly = true)
String imageName;
/**
* Alias for {@link Image#builder} to support configuration via command-line property.
* Alias for {@link Image#builder} to support configuration through command-line
* property.
* @since 2.3.0
*/
@Parameter(property = "spring-boot.build-image.builder", readonly = true)
String imageBuilder;
/**
* Alias for {@link Image#runImage} to support configuration via command-line
* Alias for {@link Image#runImage} to support configuration through command-line
* property.
* @since 2.3.1
*/
@@ -124,7 +126,7 @@ public abstract class BuildImageMojo extends AbstractPackagerMojo {
String runImage;
/**
* Alias for {@link Image#cleanCache} to support configuration via command-line
* Alias for {@link Image#cleanCache} to support configuration through command-line
* property.
* @since 2.4.0
*/
@@ -132,20 +134,22 @@ public abstract class BuildImageMojo extends AbstractPackagerMojo {
Boolean cleanCache;
/**
* Alias for {@link Image#pullPolicy} to support configuration via command-line
* Alias for {@link Image#pullPolicy} to support configuration through command-line
* property.
*/
@Parameter(property = "spring-boot.build-image.pullPolicy", readonly = true)
PullPolicy pullPolicy;
/**
* Alias for {@link Image#publish} to support configuration via command-line property.
* Alias for {@link Image#publish} to support configuration through command-line
* property.
*/
@Parameter(property = "spring-boot.build-image.publish", readonly = true)
Boolean publish;
/**
* Alias for {@link Image#network} to support configuration via command-line property.
* Alias for {@link Image#network} to support configuration through command-line
* property.
* @since 2.6.0
*/
@Parameter(property = "spring-boot.build-image.network", readonly = true)