Fix classpath order

Author: adrienlauer

CHANGELOG.md

@@ -1,3 +1,7 @@
+# Version 2.7.4 (2019-03-11)
+
+* [fix] Preserve classpath order in packaged capsules (CLI having precedence over POM having precedence over application manifest).
+
 # Version 2.7.3 (2018-12-04)
 
 * [chg] Built and tested with OpenJDK 11 (minimum Java version still being 8).

pom.xml

@@ -19,7 +19,7 @@
 
     <groupId>org.seedstack</groupId>
     <artifactId>seedstack-maven-plugin</artifactId>
-    <version>2.7.3-SNAPSHOT</version>
+    <version>2.7.4-SNAPSHOT</version>
     <packaging>maven-plugin</packaging>
 
     <properties>
@@ -174,7 +174,7 @@
         <dependency>
             <groupId>co.paralleluniverse</groupId>
             <artifactId>capsule</artifactId>
-            <version>1.0.2</version>
+            <version>1.0.3</version>
             <scope>provided</scope>
         </dependency>
         <dependency>

src/license/THIRD-PARTY.properties

@@ -13,7 +13,7 @@
 # Please fill the missing licenses for dependencies :
 #
 #
-#Tue Dec 04 16:12:43 CET 2018
+#Mon Mar 11 15:55:38 CET 2019
 classworlds--classworlds--1.1-alpha-2=
 org.codehaus.plexus--plexus-container-default--1.0-alpha-9-stable-1=
 jdom--jdom--1.0=

src/main/java/SeedStackCaplet.java

@@ -5,20 +5,24 @@
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/.
  */
+
 import java.io.File;
 import java.net.URLDecoder;
 import java.nio.file.Path;
 import java.security.CodeSource;
 import java.util.ArrayList;
-import java.util.Collections;
 import java.util.HashSet;
+import java.util.LinkedHashSet;
 import java.util.List;
 import java.util.Map;
-import java.util.Set;
 import java.util.regex.Matcher;
 
 public class SeedStackCaplet extends Capsule {
-    private static final Map.Entry<String, List<String>> RAW_ATTR_APP_CLASS_PATH = ATTRIBUTE("App-Class-Path", T_LIST(T_STRING()), null, true, "A list of entries that are added to the classpath on runtime");
+    private static final Map.Entry<String, List<String>> RAW_ATTR_APP_CLASS_PATH = ATTRIBUTE("App-Class-Path",
+            T_LIST(T_STRING()),
+            null,
+            true,
+            "A list of entries that are added to the classpath on runtime");
     private static final String CLASSPATH = "capsule.classpath";
     private final String homePath = getHomePath();
     private final String startupPath = getStartupPath();
@@ -60,28 +64,32 @@ private String getStartupPath() {
     @SuppressWarnings("unchecked")
     protected <T> T attribute(Map.Entry<String, T> attr) {
         if (attr.getKey().equals(RAW_ATTR_APP_CLASS_PATH.getKey())) {
-            final List<String> rawClasspath = new ArrayList<>(super.attribute(RAW_ATTR_APP_CLASS_PATH));
-            final Set<Object> resolvedClasspath = new HashSet<>();
-
-            resolvedClasspath.add(lookup("*.jar", ATTR_APP_CLASS_PATH));
+            final List<Object> resolvedClasspath = new ArrayList<>();
 
+            // Runtime classpath
             String runtimeClasspath = System.getProperty(CLASSPATH);
             if (runtimeClasspath != null && !runtimeClasspath.isEmpty()) {
-                Collections.addAll(rawClasspath, runtimeClasspath.split(File.pathSeparator));
+                for (String rawPath : runtimeClasspath.split(File.pathSeparator)) {
+                    resolvedClasspath.add(resolvePath(rawPath));
+                }
             }
 
-            for (String rawPath : rawClasspath) {
-                resolvedClasspath.addAll(resolvePath(rawPath));
+            // Static POM classpath
+            for (String rawPath : super.attribute(RAW_ATTR_APP_CLASS_PATH)) {
+                resolvedClasspath.add(resolvePath(rawPath));
             }
 
+            // App classpath
+            resolvedClasspath.add(lookup("*.jar", ATTR_APP_CLASS_PATH));
+
             return (T) new ArrayList<>(resolvedClasspath);
         } else {
             return super.attribute(attr);
         }
     }
 
-    private Set<Path> resolvePath(String path) {
-        HashSet<Path> result = new HashSet<>();
+    private List<Path> resolvePath(String path) {
+        HashSet<Path> result = new LinkedHashSet<>();
 
         if (path.startsWith("~")) {
             if (homePath == null) {
@@ -114,7 +122,7 @@ private Set<Path> resolvePath(String path) {
             result.add(normalizePath(file));
         }
 
-        return result;
+        return new ArrayList<>(result);
     }
 
     private Path normalizePath(File file) {