diff --git a/src/main/java/com/amashchenko/maven/plugin/gitflow/AbstractGitFlowMojo.java b/src/main/java/com/amashchenko/maven/plugin/gitflow/AbstractGitFlowMojo.java index c668086a..2d9a491f 100644 --- a/src/main/java/com/amashchenko/maven/plugin/gitflow/AbstractGitFlowMojo.java +++ b/src/main/java/com/amashchenko/maven/plugin/gitflow/AbstractGitFlowMojo.java @@ -1180,7 +1180,28 @@ private void executeGitCommand(final String... args) */ private void executeMvnCommand(final String... args) throws CommandLineException, MojoFailureException { - executeCommand(cmdMvn, true, argLine, args); + + final List argLines = new ArrayList(); + + if (StringUtils.isBlank(this.argLine) + || !this.argLine.contains("-gs")) { + argLines.add("-gs"); + argLines.add(this.mavenSession.getRequest() + .getGlobalSettingsFile() + .getAbsolutePath()); + } + if (StringUtils.isBlank(this.argLine) + || !this.argLine.contains("-s")) { + argLines.add("-s"); + argLines.add(this.mavenSession.getRequest() + .getUserSettingsFile() + .getAbsolutePath()); + } + if (StringUtils.isNotBlank(this.argLine)) { + argLines.add(this.argLine); + } + + executeCommand(cmdMvn, true, StringUtils.join(argLines.toArray(), " "), args); } /**