From 28ed59ca6e3a7ac7f8eb8138d6d7758b66185625 Mon Sep 17 00:00:00 2001 From: Stephane Nicoll Date: Tue, 11 Oct 2016 15:32:48 +0200 Subject: [PATCH] Polish contribution Closes gh-6645 --- .../springframework/boot/loader/tools/RunProcess.java | 2 +- .../springframework/boot/maven/AbstractRunMojo.java | 5 +++-- .../java/org/springframework/boot/maven/RunMojo.java | 2 +- .../java/org/springframework/boot/maven/StartMojo.java | 10 ++++++---- 4 files changed, 11 insertions(+), 8 deletions(-) diff --git a/spring-boot-tools/spring-boot-loader-tools/src/main/java/org/springframework/boot/loader/tools/RunProcess.java b/spring-boot-tools/spring-boot-loader-tools/src/main/java/org/springframework/boot/loader/tools/RunProcess.java index 36b0a217be..ebf81c9141 100644 --- a/spring-boot-tools/spring-boot-loader-tools/src/main/java/org/springframework/boot/loader/tools/RunProcess.java +++ b/spring-boot-tools/spring-boot-loader-tools/src/main/java/org/springframework/boot/loader/tools/RunProcess.java @@ -77,7 +77,7 @@ public class RunProcess { protected int run(boolean waitForProcess, Collection args) throws IOException { ProcessBuilder builder = new ProcessBuilder(this.command); - builder.directory(workingDirectory); + builder.directory(this.workingDirectory); builder.command().addAll(args); builder.redirectErrorStream(true); boolean inheritedIO = inheritIO(builder); 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 969f8eade6..0cf076b589 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 @@ -88,8 +88,9 @@ public abstract class AbstractRunMojo extends AbstractDependencyFilterMojo { private Boolean noverify; /** - * The working directory of the application. If specified by default the process - * will be started by forking a new JVM. + * Current working directory to use for the application. If not specified, basedir + * will be used NOTE: the use of working directory means that processes will be + * started by forking a new JVM. * @since 1.5 */ @Parameter(property = "run.workingDirectory") diff --git a/spring-boot-tools/spring-boot-maven-plugin/src/main/java/org/springframework/boot/maven/RunMojo.java b/spring-boot-tools/spring-boot-maven-plugin/src/main/java/org/springframework/boot/maven/RunMojo.java index 58590c55fe..55843def71 100644 --- a/spring-boot-tools/spring-boot-maven-plugin/src/main/java/org/springframework/boot/maven/RunMojo.java +++ b/spring-boot-tools/spring-boot-maven-plugin/src/main/java/org/springframework/boot/maven/RunMojo.java @@ -16,8 +16,8 @@ package org.springframework.boot.maven; -import java.net.URL; import java.io.File; +import java.net.URL; import java.net.URLClassLoader; import java.util.List; diff --git a/spring-boot-tools/spring-boot-maven-plugin/src/main/java/org/springframework/boot/maven/StartMojo.java b/spring-boot-tools/spring-boot-maven-plugin/src/main/java/org/springframework/boot/maven/StartMojo.java index 8895311130..595ef0e124 100644 --- a/spring-boot-tools/spring-boot-maven-plugin/src/main/java/org/springframework/boot/maven/StartMojo.java +++ b/spring-boot-tools/spring-boot-maven-plugin/src/main/java/org/springframework/boot/maven/StartMojo.java @@ -1,5 +1,5 @@ /* - * Copyright 2012-2015 the original author or authors. + * Copyright 2012-2016 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -90,7 +90,7 @@ public class StartMojo extends AbstractRunMojo { @Override protected void runWithForkedJvm(File workingDirectory, List args) throws MojoExecutionException, MojoFailureException { - RunProcess runProcess = runProcess(args, workingDirectory); + RunProcess runProcess = runProcess(workingDirectory, args); try { waitForSpringApplication(); } @@ -104,9 +104,11 @@ public class StartMojo extends AbstractRunMojo { } } - private RunProcess runProcess(List args, File workingDirectory) throws MojoExecutionException { + private RunProcess runProcess(File workingDirectory, List args) + throws MojoExecutionException { try { - RunProcess runProcess = new RunProcess(workingDirectory, new JavaExecutable().toString()); + RunProcess runProcess = new RunProcess(workingDirectory, + new JavaExecutable().toString()); runProcess.run(false, args.toArray(new String[args.size()])); return runProcess; }