Merge pull request #16941 from dosdebug

* pr/16941:
  Polish "Default to optimized launch of the JVM when using spring-boot:run"
  Default to optimized launch of the JVM when using spring-boot:run

Author: snicoll

spring-boot-project/spring-boot-tools/spring-boot-maven-plugin/src/it/run-fork/invoker.properties

@@ -0,0 +1 @@
+invoker.goals=clean verify -X

spring-boot-project/spring-boot-tools/spring-boot-maven-plugin/src/it/run-fork/verify.groovy

@@ -1,3 +1,6 @@
+import static org.junit.Assert.assertTrue
+
 def file = new File(basedir, "build.log")
-return file.text.contains("I haz been run from '$basedir'")
+assertTrue file.text.contains("I haz been run from '$basedir'")
+assertTrue file.text.contains("JVM argument(s): -Xverify:none -XX:TieredStopAtLevel=1")
 

spring-boot-project/spring-boot-tools/spring-boot-maven-plugin/src/main/java/org/springframework/boot/maven/RunMojo.java

@@ -26,6 +26,7 @@
 import org.apache.maven.plugins.annotations.Execute;
 import org.apache.maven.plugins.annotations.LifecyclePhase;
 import org.apache.maven.plugins.annotations.Mojo;
+import org.apache.maven.plugins.annotations.Parameter;
 import org.apache.maven.plugins.annotations.ResolutionScope;
 
 import org.springframework.boot.loader.tools.JavaExecutable;
@@ -53,6 +54,13 @@ public class RunMojo extends AbstractRunMojo {
 	 */
 	private Boolean hasDevtools;
 
+	/**
+	 * Whether the JVM's launch should be optimized.
+	 * @since 2.2.0
+	 */
+	@Parameter(property = "optimizedLaunch", defaultValue = "true")
+	private boolean optimizedLaunch;
+
 	@Override
 	@Deprecated
 	protected boolean enableForkByDefault() {
@@ -67,6 +75,16 @@ protected void logDisabledFork() {
 		}
 	}
 
+	@Override
+	protected RunArguments resolveJvmArguments() {
+		RunArguments jvmArguments = super.resolveJvmArguments();
+		if (isFork() && this.optimizedLaunch) {
+			jvmArguments.getArgs().addFirst("-XX:TieredStopAtLevel=1");
+			jvmArguments.getArgs().addFirst("-Xverify:none");
+		}
+		return jvmArguments;
+	}
+
 	@Override
 	protected void runWithForkedJvm(File workingDirectory, List<String> args,
 			Map<String, String> environmentVariables) throws MojoExecutionException {