This is an automated email from the ASF dual-hosted git repository. elharo pushed a commit to branch deor in repository https://gitbox.apache.org/repos/asf/maven-jmod-plugin.git
commit cd6890633cd217c7b06405da01d34b61d9690a06 Author: Elliotte Rusty Harold <[email protected]> AuthorDate: Mon Dec 22 06:29:58 2025 -0500 Replace deprecated code --- src/main/java/org/apache/maven/plugins/jmod/AbstractJModMojo.java | 4 ++-- src/main/java/org/apache/maven/plugins/jmod/JModCreateMojo.java | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) 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 49d8804..dda2e68 100644 --- a/src/main/java/org/apache/maven/plugins/jmod/AbstractJModMojo.java +++ b/src/main/java/org/apache/maven/plugins/jmod/AbstractJModMojo.java @@ -112,8 +112,8 @@ public abstract class AbstractJModMojo extends AbstractMojo { // Try to find jmod from JAVA_HOME environment variable // ---------------------------------------------------------------------- if (!jModExe.exists() || !jModExe.isFile()) { - Properties env = CommandLineUtils.getSystemEnvVars(); - String javaHome = env.getProperty("JAVA_HOME"); + Map<String, String> env = System.getenv(); + String javaHome = env.get("JAVA_HOME"); if (StringUtils.isEmpty(javaHome)) { throw new IOException("The environment variable JAVA_HOME is not correctly set."); } 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 c716388..5efd792 100644 --- a/src/main/java/org/apache/maven/plugins/jmod/JModCreateMojo.java +++ b/src/main/java/org/apache/maven/plugins/jmod/JModCreateMojo.java @@ -42,7 +42,7 @@ 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; -import org.apache.maven.toolchain.java.DefaultJavaToolChain; +import org.apache.maven.toolchain.java.JavaToolchainImpl; import org.codehaus.plexus.languages.java.jpms.JavaModuleDescriptor; import org.codehaus.plexus.languages.java.jpms.LocationManager; import org.codehaus.plexus.languages.java.jpms.ModuleNameSource; @@ -420,8 +420,8 @@ public class JModCreateMojo extends AbstractJModMojo { ResolvePathsRequest.ofFiles(dependencyArtifacts).setMainModuleDescriptor(moduleInfo); Toolchain toolchain = getToolchain(); - if (toolchain != null && toolchain instanceof DefaultJavaToolChain) { - request.setJdkHome(new File(((DefaultJavaToolChain) toolchain).getJavaHome())); + if (toolchain != null && toolchain instanceof JavaToolchainImpl) { + request.setJdkHome(new File(((JavaToolchainImpl) toolchain).getJavaHome())); } resolvePathsResult = locationManager.resolvePaths(request);
