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-jmod-plugin.git
commit 88f430f5c620b18c9e9d087e57630e17eeb230bd Author: Sylwester Lachiewicz <[email protected]> AuthorDate: Sun Nov 8 11:49:57 2026 +0000 Replace maven-shared-utils Os, StringUtils and FileUtils with plexus-utils and the JDK The cli and logging packages stay: cli has no replacement and logging waits for the Maven 3.10 floor. Part of apache/maven-shared-utils#452 --- pom.xml | 4 ++++ src/main/java/org/apache/maven/plugins/jmod/AbstractJModMojo.java | 8 ++++---- src/main/java/org/apache/maven/plugins/jmod/JModCreateMojo.java | 6 +++--- 3 files changed, 11 insertions(+), 7 deletions(-) diff --git a/pom.xml b/pom.xml index 4d03dfc..d25cf8c 100644 --- a/pom.xml +++ b/pom.xml @@ -103,6 +103,10 @@ <artifactId>plexus-java</artifactId> <version>1.6.0</version> </dependency> + <dependency> + <groupId>org.codehaus.plexus</groupId> + <artifactId>plexus-utils</artifactId> + </dependency> <dependency> <groupId>org.apache.maven.shared</groupId> <artifactId>maven-shared-utils</artifactId> diff --git a/src/main/java/org/apache/maven/plugins/jmod/AbstractJModMojo.java b/src/main/java/org/apache/maven/plugins/jmod/AbstractJModMojo.java index 569956a..b23c3e6 100644 --- a/src/main/java/org/apache/maven/plugins/jmod/AbstractJModMojo.java +++ b/src/main/java/org/apache/maven/plugins/jmod/AbstractJModMojo.java @@ -28,13 +28,13 @@ import org.apache.maven.plugin.AbstractMojo; import org.apache.maven.plugin.MojoExecutionException; import org.apache.maven.plugins.annotations.Parameter; import org.apache.maven.project.MavenProject; -import org.apache.maven.shared.utils.Os; -import org.apache.maven.shared.utils.StringUtils; import org.apache.maven.shared.utils.cli.CommandLineException; import org.apache.maven.shared.utils.cli.CommandLineUtils; import org.apache.maven.shared.utils.cli.Commandline; import org.apache.maven.toolchain.Toolchain; import org.apache.maven.toolchain.ToolchainManager; +import org.codehaus.plexus.util.Os; +import org.codehaus.plexus.util.StringUtils; /** * This contains the code to handle toolchains and the execution of the command which is similar to code in @@ -111,7 +111,7 @@ public abstract class AbstractJModMojo extends AbstractMojo { if (!jModExe.exists() || !jModExe.isFile()) { Map<String, String> env = System.getenv(); String javaHome = env.get("JAVA_HOME"); - if (StringUtils.isEmpty(javaHome)) { + if (StringUtils.isBlank(javaHome)) { throw new IOException("The environment variable JAVA_HOME is not correctly set."); } if ((!new File(javaHome).getCanonicalFile().exists()) @@ -150,7 +150,7 @@ public abstract class AbstractJModMojo extends AbstractMojo { try { int exitCode = CommandLineUtils.executeCommandLine(cmd, out, err); - String output = (StringUtils.isEmpty(out.getOutput()) + String output = (StringUtils.isBlank(out.getOutput()) ? null : '\n' + out.getOutput().trim()); diff --git a/src/main/java/org/apache/maven/plugins/jmod/JModCreateMojo.java b/src/main/java/org/apache/maven/plugins/jmod/JModCreateMojo.java index 2d426b1..2caf314 100644 --- a/src/main/java/org/apache/maven/plugins/jmod/JModCreateMojo.java +++ b/src/main/java/org/apache/maven/plugins/jmod/JModCreateMojo.java @@ -22,6 +22,7 @@ import javax.inject.Inject; import java.io.File; import java.io.IOException; +import java.nio.file.Files; import java.util.ArrayList; import java.util.Collection; import java.util.Collections; @@ -37,9 +38,7 @@ import org.apache.maven.plugins.annotations.Mojo; import org.apache.maven.plugins.annotations.Parameter; import org.apache.maven.plugins.annotations.ResolutionScope; import org.apache.maven.project.MavenProject; -import org.apache.maven.shared.utils.StringUtils; import org.apache.maven.shared.utils.cli.Commandline; -import org.apache.maven.shared.utils.io.FileUtils; import org.apache.maven.shared.utils.logging.MessageUtils; import org.apache.maven.toolchain.Toolchain; import org.apache.maven.toolchain.ToolchainManager; @@ -49,6 +48,7 @@ import org.codehaus.plexus.languages.java.jpms.LocationManager; import org.codehaus.plexus.languages.java.jpms.ModuleNameSource; import org.codehaus.plexus.languages.java.jpms.ResolvePathsRequest; import org.codehaus.plexus.languages.java.jpms.ResolvePathsResult; +import org.codehaus.plexus.util.StringUtils; /** * The <code>create</code> goal is intended to create <code>jmod</code> files which can be used for later linking via @@ -339,7 +339,7 @@ public class JModCreateMojo extends AbstractJModMojo { if (resultingJModFile.exists() && resultingJModFile.isFile()) { try { getLog().debug("Deleting the existing " + resultingJModFile.getAbsolutePath() + " file."); - FileUtils.forceDelete(resultingJModFile); + Files.deleteIfExists(resultingJModFile.toPath()); } catch (IOException e) { String message = "Failure during deleting of file " + resultingJModFile.getAbsolutePath(); getLog().error(message);
