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 846e178969b3f1581d1c8416dc9807116b38e78b Author: Sylwester Lachiewicz <[email protected]> AuthorDate: Sun Nov 8 11:49:02 2026 +0000 Replace shared-utils StringUtils, io.FileUtils and ReaderFactory with plexus-utils and the JDK The shared-utils cli package stays: it has no replacement. Part of apache/maven-shared-utils#452 --- pom.xml | 4 ++++ .../org/apache/maven/plugins/jarsigner/AbstractJarsignerMojo.java | 7 +++---- .../java/org/apache/maven/plugins/jarsigner/JarsignerSignMojo.java | 2 +- 3 files changed, 8 insertions(+), 5 deletions(-) diff --git a/pom.xml b/pom.xml index 4beeb3e..837583b 100644 --- a/pom.xml +++ b/pom.xml @@ -110,6 +110,10 @@ under the License. <artifactId>maven-shared-utils</artifactId> <version>3.5.0</version> </dependency> + <dependency> + <groupId>org.codehaus.plexus</groupId> + <artifactId>plexus-utils</artifactId> + </dependency> <dependency> <groupId>org.codehaus.plexus</groupId> <artifactId>plexus-xml</artifactId> 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 d5cc756..81e8983 100644 --- a/src/main/java/org/apache/maven/plugins/jarsigner/AbstractJarsignerMojo.java +++ b/src/main/java/org/apache/maven/plugins/jarsigner/AbstractJarsignerMojo.java @@ -41,13 +41,12 @@ import org.apache.maven.settings.Settings; import org.apache.maven.shared.jarsigner.JarSigner; import org.apache.maven.shared.jarsigner.JarSignerRequest; import org.apache.maven.shared.jarsigner.JarSignerUtil; -import org.apache.maven.shared.utils.ReaderFactory; -import org.apache.maven.shared.utils.StringUtils; import org.apache.maven.shared.utils.cli.Commandline; import org.apache.maven.shared.utils.cli.javatool.JavaToolException; -import org.apache.maven.shared.utils.io.FileUtils; import org.apache.maven.toolchain.Toolchain; import org.apache.maven.toolchain.ToolchainManager; +import org.codehaus.plexus.util.FileUtils; +import org.codehaus.plexus.util.StringUtils; import org.sonatype.plexus.components.sec.dispatcher.SecDispatcher; import org.sonatype.plexus.components.sec.dispatcher.SecDispatcherException; @@ -510,7 +509,7 @@ public abstract class AbstractJarsignerMojo extends AbstractMojo { } if (!fileEncodingSeen) { - additionalArguments.add("-J-Dfile.encoding=" + ReaderFactory.FILE_ENCODING); + additionalArguments.add("-J-Dfile.encoding=" + System.getProperty("file.encoding")); } // Adds proxy information. 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 ff5caea..1092a70 100644 --- a/src/main/java/org/apache/maven/plugins/jarsigner/JarsignerSignMojo.java +++ b/src/main/java/org/apache/maven/plugins/jarsigner/JarsignerSignMojo.java @@ -41,11 +41,11 @@ import org.apache.maven.shared.jarsigner.JarSigner; import org.apache.maven.shared.jarsigner.JarSignerRequest; import org.apache.maven.shared.jarsigner.JarSignerSignRequest; import org.apache.maven.shared.jarsigner.JarSignerUtil; -import org.apache.maven.shared.utils.StringUtils; 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; /**
