Uses Maven Artifact class instead of Aether Artifact to properly reso…

…lve dependencies Closes #273
orphan-oss · Apr 20, 2023 · 7667ffa · 7667ffa
1 parent 524d344
commit 7667ffa
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 6 deletions.
diff --git a/src/main/java/com/akathist/maven/plugins/launch4j/ClassPath.java b/src/main/java/com/akathist/maven/plugins/launch4j/ClassPath.java
@@ -18,8 +18,8 @@
  */
 package com.akathist.maven.plugins.launch4j;
 
+import org.apache.maven.artifact.Artifact;
 import org.apache.maven.plugins.annotations.Parameter;
-import org.eclipse.aether.artifact.Artifact;
 
 import java.util.ArrayList;
 import java.util.Arrays;

diff --git a/src/main/java/com/akathist/maven/plugins/launch4j/Launch4jMojo.java b/src/main/java/com/akathist/maven/plugins/launch4j/Launch4jMojo.java
@@ -390,7 +390,7 @@ private void doExecute() throws MojoExecutionException {
                         getLog().debug("Overwriting config file property 'outfile' (='" + c.getOutfile().getAbsolutePath() + "') with local value '" + outfile.getAbsolutePath() + "'");
                         c.setOutfile(outfile);
                     }
-                    
+
                     if (icon != null) {
                     	c.setIcon(icon);
                     }
@@ -445,10 +445,7 @@ private void doExecute() throws MojoExecutionException {
             c.setVariables(vars);
 
             if (classPath != null) {
-                Set<Artifact> newArtifacts = dependencies.stream().map(old ->
-                        new DefaultArtifact(old.getGroupId(), old.getArtifactId(), old.getClassifier(), null, old.getVersion())
-                ).collect(Collectors.toSet());
-                c.setClassPath(classPath.toL4j(newArtifacts));
+                c.setClassPath(classPath.toL4j(dependencies));
             }
             if (jre != null) {
                 jre.deprecationWarning(getLog());