Skip to content

Commit 72da507

Browse files
committed
Support maven wrapper for internal commands
If plugin is started with maven wrapper then run internal maven command with it
1 parent 1369698 commit 72da507

File tree

1 file changed

+9
-1
lines changed

1 file changed

+9
-1
lines changed

src/main/java/com/amashchenko/maven/plugin/gitflow/AbstractGitFlowMojo.java

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,7 @@
2525
import java.util.TimeZone;
2626
import java.util.regex.Pattern;
2727

28+
import org.apache.commons.lang3.SystemUtils;
2829
import org.apache.maven.artifact.ArtifactUtils;
2930
import org.apache.maven.execution.MavenSession;
3031
import org.apache.maven.model.Dependency;
@@ -205,7 +206,14 @@ public abstract class AbstractGitFlowMojo extends AbstractMojo {
205206
private void initExecutables() {
206207
if (StringUtils.isBlank(cmdMvn.getExecutable())) {
207208
if (StringUtils.isBlank(mvnExecutable)) {
208-
mvnExecutable = "mvn";
209+
final String javaCommand = mavenSession.getSystemProperties().getProperty("sun.java.command", "");
210+
final boolean wrapper = javaCommand.startsWith("org.apache.maven.wrapper.MavenWrapperMain");
211+
212+
if (wrapper) {
213+
mvnExecutable = "." + SystemUtils.FILE_SEPARATOR + "mvnw";
214+
} else {
215+
mvnExecutable = "mvn";
216+
}
209217
}
210218
cmdMvn.setExecutable(mvnExecutable);
211219
}

0 commit comments

Comments
 (0)