This is an automated email from the ASF dual-hosted git repository. slachiewicz pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/maven-jarsigner-plugin.git
commit 2d2a4b589c75f5c84dc6e03574fe71dd696e9fb4 Author: Sylwester Lachiewicz <[email protected]> AuthorDate: Tue Nov 17 06:35:23 2026 +0000 Replace plexus-utils StringUtils and FileUtils calls with the JDK --- .../org/apache/maven/plugins/jarsigner/AbstractJarsignerMojo.java | 7 ++++++- .../org/apache/maven/plugins/jarsigner/JarsignerSignMojo.java | 8 ++++++-- 2 files changed, 12 insertions(+), 3 deletions(-) diff --git a/src/main/java/org/apache/maven/plugins/jarsigner/AbstractJarsignerMojo.java b/src/main/java/org/apache/maven/plugins/jarsigner/AbstractJarsignerMojo.java index 2332f84..3cedfbc 100644 --- a/src/main/java/org/apache/maven/plugins/jarsigner/AbstractJarsignerMojo.java +++ b/src/main/java/org/apache/maven/plugins/jarsigner/AbstractJarsignerMojo.java @@ -384,7 +384,12 @@ public abstract class AbstractJarsignerMojo extends AbstractMojo { } String commandLineInfo = commandLine.toString(); - commandLineInfo = StringUtils.replace(commandLineInfo, this.storepass, "'*****'"); + commandLineInfo = commandLineInfo == null + || commandLineInfo.isEmpty() + || this.storepass == null + || this.storepass.isEmpty() + ? commandLineInfo + : commandLineInfo.replace(this.storepass, "'*****'"); return commandLineInfo; } diff --git a/src/main/java/org/apache/maven/plugins/jarsigner/JarsignerSignMojo.java b/src/main/java/org/apache/maven/plugins/jarsigner/JarsignerSignMojo.java index 1092a70..8525332 100644 --- a/src/main/java/org/apache/maven/plugins/jarsigner/JarsignerSignMojo.java +++ b/src/main/java/org/apache/maven/plugins/jarsigner/JarsignerSignMojo.java @@ -45,7 +45,6 @@ import org.apache.maven.shared.utils.cli.Commandline; import org.apache.maven.shared.utils.cli.javatool.JavaToolException; import org.apache.maven.shared.utils.cli.javatool.JavaToolResult; import org.apache.maven.toolchain.ToolchainManager; -import org.codehaus.plexus.util.StringUtils; import org.sonatype.plexus.components.sec.dispatcher.SecDispatcher; /** @@ -248,7 +247,12 @@ public class JarsignerSignMojo extends AbstractJarsignerMojo { String commandLineInfo = commandLine != null ? commandLine.toString() : null; if (commandLineInfo != null) { - commandLineInfo = StringUtils.replace(commandLineInfo, this.keypass, "'*****'"); + commandLineInfo = commandLineInfo == null + || commandLineInfo.isEmpty() + || this.keypass == null + || this.keypass.isEmpty() + ? commandLineInfo + : commandLineInfo.replace(this.keypass, "'*****'"); } return commandLineInfo;
