From e230952dd20c894ed8f9c4e90f43ba8501489210 Mon Sep 17 00:00:00 2001 From: Stephane Nicoll Date: Thu, 22 Jun 2017 09:12:58 +0200 Subject: [PATCH] Polish "Add prefix to all properties in maven plugin" Closes gh-9567 --- .../boot/maven/AbstractDependencyFilterMojo.java | 4 ++-- .../java/org/springframework/boot/maven/AbstractRunMojo.java | 4 ++-- .../java/org/springframework/boot/maven/RepackageMojo.java | 2 +- .../src/site/apt/examples/run-debug.apt.vm | 2 +- .../src/site/apt/examples/run-profiles.apt.vm | 2 +- 5 files changed, 7 insertions(+), 7 deletions(-) diff --git a/spring-boot-tools/spring-boot-maven-plugin/src/main/java/org/springframework/boot/maven/AbstractDependencyFilterMojo.java b/spring-boot-tools/spring-boot-maven-plugin/src/main/java/org/springframework/boot/maven/AbstractDependencyFilterMojo.java index ef5123f7eb..8fdfff237c 100644 --- a/spring-boot-tools/spring-boot-maven-plugin/src/main/java/org/springframework/boot/maven/AbstractDependencyFilterMojo.java +++ b/spring-boot-tools/spring-boot-maven-plugin/src/main/java/org/springframework/boot/maven/AbstractDependencyFilterMojo.java @@ -45,7 +45,7 @@ public abstract class AbstractDependencyFilterMojo extends AbstractMojo { * {@code classifier} property. * @since 1.2 */ - @Parameter + @Parameter(property = "spring-boot.includes") private List includes; /** @@ -54,7 +54,7 @@ public abstract class AbstractDependencyFilterMojo extends AbstractMojo { * {@code classifier} property. * @since 1.1 */ - @Parameter + @Parameter(property = "spring-boot.excludes") private List excludes; /** diff --git a/spring-boot-tools/spring-boot-maven-plugin/src/main/java/org/springframework/boot/maven/AbstractRunMojo.java b/spring-boot-tools/spring-boot-maven-plugin/src/main/java/org/springframework/boot/maven/AbstractRunMojo.java index 2d5cf1befd..c5d00d30d3 100644 --- a/spring-boot-tools/spring-boot-maven-plugin/src/main/java/org/springframework/boot/maven/AbstractRunMojo.java +++ b/spring-boot-tools/spring-boot-maven-plugin/src/main/java/org/springframework/boot/maven/AbstractRunMojo.java @@ -127,7 +127,7 @@ public abstract class AbstractRunMojo extends AbstractDependencyFilterMojo { * contains a 'main' method will be used. * @since 1.0 */ - @Parameter + @Parameter(property = "spring-boot.run.main-class") private String mainClass; /** @@ -135,7 +135,7 @@ public abstract class AbstractRunMojo extends AbstractDependencyFilterMojo { * classpath. * @since 1.0 */ - @Parameter + @Parameter(property = "spring-boot.run.folders") private String[] folders; /** diff --git a/spring-boot-tools/spring-boot-maven-plugin/src/main/java/org/springframework/boot/maven/RepackageMojo.java b/spring-boot-tools/spring-boot-maven-plugin/src/main/java/org/springframework/boot/maven/RepackageMojo.java index bb1feb1dda..87ea8d3874 100644 --- a/spring-boot-tools/spring-boot-maven-plugin/src/main/java/org/springframework/boot/maven/RepackageMojo.java +++ b/spring-boot-tools/spring-boot-maven-plugin/src/main/java/org/springframework/boot/maven/RepackageMojo.java @@ -90,7 +90,7 @@ public class RepackageMojo extends AbstractDependencyFilterMojo { * Skip the execution. * @since 1.2 */ - @Parameter(property = "spring-boot.it.skip", defaultValue = "false") + @Parameter(property = "spring-boot.repackage.skip", defaultValue = "false") private boolean skip; /** diff --git a/spring-boot-tools/spring-boot-maven-plugin/src/site/apt/examples/run-debug.apt.vm b/spring-boot-tools/spring-boot-maven-plugin/src/site/apt/examples/run-debug.apt.vm index c6b362b4e6..679301a8aa 100644 --- a/spring-boot-tools/spring-boot-maven-plugin/src/site/apt/examples/run-debug.apt.vm +++ b/spring-boot-tools/spring-boot-maven-plugin/src/site/apt/examples/run-debug.apt.vm @@ -42,7 +42,7 @@ specified on the command line as well, make sure to wrap that properly, that is: --- -mvn spring-boot:run -Drun.jvmArguments="-Xdebug -Xrunjdwp:transport=dt_socket,server=y,suspend=y,address=5005" +mvn spring-boot:run -Dspring-boot.run.jvmArguments="-Xdebug -Xrunjdwp:transport=dt_socket,server=y,suspend=y,address=5005" --- diff --git a/spring-boot-tools/spring-boot-maven-plugin/src/site/apt/examples/run-profiles.apt.vm b/spring-boot-tools/spring-boot-maven-plugin/src/site/apt/examples/run-profiles.apt.vm index 1562e9ac89..203add200e 100644 --- a/spring-boot-tools/spring-boot-maven-plugin/src/site/apt/examples/run-profiles.apt.vm +++ b/spring-boot-tools/spring-boot-maven-plugin/src/site/apt/examples/run-profiles.apt.vm @@ -40,7 +40,7 @@ a comma, that is: --- -mvn spring-boot:run -Drun.profiles=foo,bar +mvn spring-boot:run -Dspring-boot.run.profiles=foo,bar ---