(maven-jmod-plugin) branch master updated: Replace deprecated code (#90)

[elharo]

This is an automated email from the ASF dual-hosted git repository.

elharo pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/maven-jmod-plugin.git


The following commit(s) were added to refs/heads/master by this push:
     new 5e76fe6  Replace deprecated code (#90)
5e76fe6 is described below

commit 5e76fe63ce293bd2c770458e78ba86d16f7b5674
Author: Elliotte Rusty Harold <elh...@users.noreply.github.com>
AuthorDate: Sat Dec 27 12:48:59 2025 +0000

    Replace deprecated code (#90)
    
    * Replace deprecated code
    
    * spotless
---
 src/main/java/org/apache/maven/plugins/jmod/AbstractJModMojo.java | 5 ++---
 src/main/java/org/apache/maven/plugins/jmod/JModCreateMojo.java   | 6 +++---
 2 files changed, 5 insertions(+), 6 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..f378a2c 100644
--- a/src/main/java/org/apache/maven/plugins/jmod/AbstractJModMojo.java
+++ b/src/main/java/org/apache/maven/plugins/jmod/AbstractJModMojo.java
@@ -24,7 +24,6 @@ import java.lang.reflect.InvocationTargetException;
 import java.lang.reflect.Method;
 import java.util.List;
 import java.util.Map;
-import java.util.Properties;
 
 import org.apache.maven.execution.MavenSession;
 import org.apache.maven.plugin.AbstractMojo;
@@ -112,8 +111,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 5586591..24c7162 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);