From f575af6ac0f9ca3e12b3697c47048856319f447b Mon Sep 17 00:00:00 2001
From: Lukasz Lenart <lukasz.lenart@gmail.com>
Date: Mon, 27 Apr 2015 10:40:48 +0200
Subject: [PATCH] Includes all direct dependencies closes #5

---
 .../java/com/akathist/maven/plugins/launch4j/ClassPath.java  | 5 +----
 .../com/akathist/maven/plugins/launch4j/Launch4jMojo.java    | 5 ++++-
 2 files changed, 5 insertions(+), 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
index bf5a6f4..1751ba9 100644
--- 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
index f40a31c..586321d 100644
--- 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());