This is an automated email from the ASF dual-hosted git repository. elharo pushed a commit to branch replace in repository https://gitbox.apache.org/repos/asf/maven-shared-utils.git
commit f0c3da6562fc233652bb9cf28a01c9d34485c948 Author: Elliotte Rusty Harold <[email protected]> AuthorDate: Tue Feb 10 07:52:02 2026 -0500 Remove a lot of escaping logic that's never used --- .../maven/shared/utils/cli/shell/BourneShell.java | 5 -- .../maven/shared/utils/cli/shell/CmdShell.java | 1 - .../apache/maven/shared/utils/cli/shell/Shell.java | 74 ++-------------------- 3 files changed, 4 insertions(+), 76 deletions(-) diff --git a/src/main/java/org/apache/maven/shared/utils/cli/shell/BourneShell.java b/src/main/java/org/apache/maven/shared/utils/cli/shell/BourneShell.java index 5363fc3..e73ce68 100644 --- a/src/main/java/org/apache/maven/shared/utils/cli/shell/BourneShell.java +++ b/src/main/java/org/apache/maven/shared/utils/cli/shell/BourneShell.java @@ -34,11 +34,6 @@ public class BourneShell extends Shell { public BourneShell() { setUnconditionalQuoting(true); setShellCommand("/bin/sh"); - setArgumentQuoteDelimiter('\''); - setExecutableQuoteDelimiter('\''); - setSingleQuotedArgumentEscaped(true); - setSingleQuotedExecutableEscaped(false); - setQuotedExecutableEnabled(true); } /** diff --git a/src/main/java/org/apache/maven/shared/utils/cli/shell/CmdShell.java b/src/main/java/org/apache/maven/shared/utils/cli/shell/CmdShell.java index b84e19d..efd61d4 100644 --- a/src/main/java/org/apache/maven/shared/utils/cli/shell/CmdShell.java +++ b/src/main/java/org/apache/maven/shared/utils/cli/shell/CmdShell.java @@ -32,7 +32,6 @@ public class CmdShell extends Shell { */ public CmdShell() { setShellCommand("cmd.exe"); - setQuotedExecutableEnabled(true); setShellArgs(new String[] {"/X", "/C"}); } diff --git a/src/main/java/org/apache/maven/shared/utils/cli/shell/Shell.java b/src/main/java/org/apache/maven/shared/utils/cli/shell/Shell.java index c03d768..d05b49d 100644 --- a/src/main/java/org/apache/maven/shared/utils/cli/shell/Shell.java +++ b/src/main/java/org/apache/maven/shared/utils/cli/shell/Shell.java @@ -51,15 +51,7 @@ public class Shell { private String workingDir; - private boolean quotedExecutableEnabled = true; - - private boolean singleQuotedArgumentEscaped = false; - - private boolean singleQuotedExecutableEscaped = false; - - private char argQuoteDelimiter = '\"'; - - private char exeQuoteDelimiter = '\"'; + private final boolean singleQuotedArgumentEscaped = false; /** * Set the command to execute the shell (e.g. COMMAND.COM, /bin/bash,...). @@ -104,10 +96,10 @@ public class Shell { } protected String quoteOneItem(String inputString, boolean isExecutable) { - char[] escapeChars = getEscapeChars(isSingleQuotedExecutableEscaped(), isDoubleQuotedExecutableEscaped()); + char[] escapeChars = {}; return StringUtils.quoteAndEscape( inputString, - isExecutable ? getExecutableQuoteDelimiter() : getArgumentQuoteDelimiter(), + isExecutable ? '\"' : '\"', escapeChars, getQuotingTriggerChars(), '\\', @@ -171,22 +163,6 @@ public class Shell { return null; } - char[] getEscapeChars(boolean includeSingleQuote, boolean includeDoubleQuote) { - StringBuilder buf = new StringBuilder(2); - if (includeSingleQuote) { - buf.append('\''); - } - - if (includeDoubleQuote) { - buf.append('\"'); - } - - char[] result = new char[buf.length()]; - buf.getChars(0, buf.length(), result, 0); - - return result; - } - /** * @return false in all cases */ @@ -201,36 +177,6 @@ public class Shell { return singleQuotedArgumentEscaped; } - boolean isDoubleQuotedExecutableEscaped() { - return false; - } - - boolean isSingleQuotedExecutableEscaped() { - return singleQuotedExecutableEscaped; - } - - /** - * @param argQuoteDelimiterParameter {@link #argQuoteDelimiter} - */ - void setArgumentQuoteDelimiter(char argQuoteDelimiterParameter) { - this.argQuoteDelimiter = argQuoteDelimiterParameter; - } - - char getArgumentQuoteDelimiter() { - return argQuoteDelimiter; - } - - /** - * @param exeQuoteDelimiterParameter {@link #exeQuoteDelimiter} - */ - void setExecutableQuoteDelimiter(char exeQuoteDelimiterParameter) { - this.exeQuoteDelimiter = exeQuoteDelimiterParameter; - } - - char getExecutableQuoteDelimiter() { - return exeQuoteDelimiter; - } - /** * Get the full command line to execute, including shell command, shell arguments, * executable and executable arguments. @@ -271,12 +217,8 @@ public class Shell { return quotedArgumentsEnabled; } - void setQuotedExecutableEnabled(boolean quotedExecutableEnabled) { - this.quotedExecutableEnabled = quotedExecutableEnabled; - } - boolean isQuotedExecutableEnabled() { - return quotedExecutableEnabled; + return true; } /** @@ -331,14 +273,6 @@ public class Shell { return workingDir; } - void setSingleQuotedArgumentEscaped(boolean singleQuotedArgumentEscaped) { - this.singleQuotedArgumentEscaped = singleQuotedArgumentEscaped; - } - - void setSingleQuotedExecutableEscaped(boolean singleQuotedExecutableEscaped) { - this.singleQuotedExecutableEscaped = singleQuotedExecutableEscaped; - } - public boolean isUnconditionalQuoting() { return unconditionalQuoting; }
