Merge branch '2.1.x'

2019-02-21 08:19:43 +00:00
parent 3d03c01bfc 53326695ea
commit f2e3e274a8
18 changed files with 37 additions and 38 deletions
--- a/spring-boot-project/spring-boot-tools/spring-boot-maven-plugin/src/main/java/org/springframework/boot/maven/AbstractRunMojo.java
+++ b/spring-boot-project/spring-boot-tools/spring-boot-maven-plugin/src/main/java/org/springframework/boot/maven/AbstractRunMojo.java
@@ -80,6 +80,7 @@ public abstract class AbstractRunMojo extends AbstractDependencyFilterMojo {
 	 * @since 1.0
 	 * @deprecated since version 2.2. Use agents instead.
 	 */
+	@Deprecated
 	@Parameter(property = "spring-boot.run.agent")
 	private File[] agent;

@@ -384,7 +385,6 @@ public abstract class AbstractRunMojo extends AbstractDependencyFilterMojo {
 		}
 	}

-	@SuppressWarnings("deprecation")
 	private File[] determineAgents() {
 		return (this.agents != null) ? this.agents : this.agent;
 	}