Inherit Global Settings and User Settings

aleksandr-m · Jul 27, 2020 · 4189dfd · 4189dfd
1 parent 14a282f
commit 4189dfd
Showing 1 changed file with 23 additions and 1 deletion.
diff --git a/src/main/java/com/amashchenko/maven/plugin/gitflow/AbstractGitFlowMojo.java b/src/main/java/com/amashchenko/maven/plugin/gitflow/AbstractGitFlowMojo.java
@@ -1159,10 +1159,32 @@ private CommandResult executeCommand(final Commandline cmd,
         cmd.clearArgs();
         cmd.addArguments(args);
 
+        final String globalSettingsFileArgLine = String.format("-gs %s", this.mavenSession.getRequest()
+                .getGlobalSettingsFile()
+                .getAbsolutePath());
+
+        final String userSettingsFileArgLine = String.format("-s %s", this.mavenSession.getRequest()
+                .getUserSettingsFile()
+                .getAbsolutePath());
+
+        final StringBuilder argLineStr = new StringBuilder();
+
         if (StringUtils.isNotBlank(argStr)) {
-            cmd.createArg().setLine(argStr);
+            argLineStr.append(globalSettingsFileArgLine);
+            argLineStr.append(userSettingsFileArgLine);
+
+        } else {
+            if (!argStr.contains("-gs")) {
+                argLineStr.append(globalSettingsFileArgLine);
+            }
+            if (!argStr.contains("-s")) {
+                argLineStr.append(userSettingsFileArgLine);
+            }
+            argLineStr.append(argStr);
         }
 
+        cmd.createArg().setLine(argLineStr.toString());
+
         final StringBufferStreamConsumer out = new StringBufferStreamConsumer(
                 verbose);