Includes all direct dependencies closes #5

orphan-oss · Apr 27, 2015 · f575af6 · f575af6
1 parent 9099345
commit f575af6
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 5 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
@@ -74,7 +74,7 @@ private void addToCp(List<String> cp, String cpStr) {
         cp.addAll(Arrays.asList(cpStr.split("\\s*;\\s*")));
     }
 
-    net.sf.launch4j.config.ClassPath toL4j(Set<Artifact> dependencies, List<Artifact> runtimeDependencies) {
+    net.sf.launch4j.config.ClassPath toL4j(Set<Artifact> dependencies) {
         net.sf.launch4j.config.ClassPath ret = new net.sf.launch4j.config.ClassPath();
         ret.setMainClass(mainClass);
 
@@ -85,9 +85,6 @@ net.sf.launch4j.config.ClassPath toL4j(Set<Artifact> dependencies, List<Artifact
             if (jarLocation == null) jarLocation = "";
             else if (!jarLocation.endsWith("/")) jarLocation += "/";
 
-            // Add all runtime dependencies as we need them to run the wrapped jar
-            dependencies.addAll(runtimeDependencies);
-
             for (Artifact dependency : dependencies) {
                 if (Artifact.SCOPE_COMPILE.equals(dependency.getScope()) ||
                         Artifact.SCOPE_RUNTIME.equals(dependency.getScope())) {

diff --git a/src/main/java/com/akathist/maven/plugins/launch4j/Launch4jMojo.java b/src/main/java/com/akathist/maven/plugins/launch4j/Launch4jMojo.java
@@ -308,8 +308,11 @@ public void execute() throws MojoExecutionException {
         c.setLibs(relativizeAndCopy(workdir, libs));
         c.setVariables(vars);
 
+        dependencies.addAll(project.getDependencyArtifacts());
+        dependencies.addAll(project.getRuntimeArtifacts());
+
         if (classPath != null) {
-            c.setClassPath(classPath.toL4j(dependencies, project.getRuntimeArtifacts()));
+            c.setClassPath(classPath.toL4j(dependencies));
         }
         if (jre != null) {
             c.setJre(jre.toL4j());