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
The following commit(s) were added to refs/heads/replace by this push:
new c3deefd Remove a lot of escaping logic that's never used
c3deefd is described below
commit c3deefdbfade420965b393c3e3a86da78c46845f
Author: Elliotte Rusty Harold <[email protected]>
AuthorDate: Tue Feb 10 07:57:35 2026 -0500
Remove a lot of escaping logic that's never used
---
.../org/apache/maven/shared/utils/cli/shell/BourneShell.java | 5 +++++
.../org/apache/maven/shared/utils/cli/shell/CmdShell.java | 1 +
.../java/org/apache/maven/shared/utils/cli/shell/Shell.java | 12 ++----------
3 files changed, 8 insertions(+), 10 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 e73ce68..bc3e9bb 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
@@ -39,6 +39,7 @@ public class BourneShell extends Shell {
/**
* {@inheritDoc}
*/
+ @Override
public String getExecutable() {
if (Os.isFamily(Os.FAMILY_WINDOWS)) {
return super.getExecutable();
@@ -50,6 +51,7 @@ public class BourneShell extends Shell {
/**
* {@inheritDoc}
*/
+ @Override
public List<String> getShellArgsList() {
List<String> shellArgs = new ArrayList<>();
List<String> existingShellArgs = super.getShellArgsList();
@@ -66,6 +68,7 @@ public class BourneShell extends Shell {
/**
* {@inheritDoc}
*/
+ @Override
public String[] getShellArgs() {
String[] shellArgs = super.getShellArgs();
if (shellArgs == null) {
@@ -87,6 +90,7 @@ public class BourneShell extends Shell {
/**
* {@inheritDoc}
*/
+ @Override
protected String getExecutionPreamble() {
if (getWorkingDirectoryAsString() == null) {
return null;
@@ -113,6 +117,7 @@ public class BourneShell extends Shell {
* @param path not null path
* @return the path unified correctly for the Bourne shell
*/
+ @Override
protected String quoteOneItem(String path, boolean isExecutable) {
if (path == null) {
return null;
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 efd61d4..b63cd0d 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
@@ -76,6 +76,7 @@ public class CmdShell extends Shell {
* @param arguments the arguments for the executable
* @return the resulting command line
*/
+ @Override
public List<String> getCommandLine(String executable, String... arguments)
{
StringBuilder sb = new StringBuilder();
sb.append('"');
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 d05b49d..537e420 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
@@ -132,11 +132,7 @@ public class Shell {
sb.append(preamble);
}
- if (isQuotedExecutableEnabled()) {
- sb.append(quoteOneItem(executableParameter, true));
- } else {
- sb.append(executableParameter);
- }
+ sb.append(quoteOneItem(executableParameter, true));
}
for (String argument : argumentsParameter) {
if (sb.length() > 0) {
@@ -213,14 +209,10 @@ public class Shell {
this.quotedArgumentsEnabled = quotedArgumentsEnabled;
}
- boolean isQuotedArgumentsEnabled() {
+ private boolean isQuotedArgumentsEnabled() {
return quotedArgumentsEnabled;
}
- boolean isQuotedExecutableEnabled() {
- return true;
- }
-
/**
* Sets the executable to run.
*
