New feature: thin.libs to append to classpath

Fixes #171, #15

Author: dsyer

Diff for: README.md

@@ -319,6 +319,7 @@ You can set a variety of options on the command line or with system properties (
 | `thin.force`        | false                                                                            | Force dependency resolution to happen, even if dependencies have been computed, and marked as "computed" in `thin.properties`.                                                                                                                                       |
 | `thin.classpath`    | false                                                                            | Only print the classpath. Don't run the main class. Two formats are supported: "path" and "properties". For backwards compatibility "true" or empty are equivalent to "path".                                                                                        |
 | `thin.root`         | `${user.home}/.m2`                                                               | The location of the local jar cache, laid out as a maven repository. The launcher creates a new directory here called "repository" if it doesn't exist.                                                                                                              |
+| `thin.libs`         | `<empty>`                                                                        | Additional classpath entries to append at runtime in the same form as you would use in `java -classpath ...`. If this property is defined then unresolved dependencies will be ignored when the classpath is computed, possibly leading to runtime class not found exceptions. |
 | `thin.archive`      | the same as the target archive                                                   | The archive to launch. Can be used to launch a JAR file that was build with a different version of the thin launcher, for instance, or a fat jar built by Spring Boot without the thin launcher.                                                                     |
 | `thin.parent`       | `<empty>`                                                                        | A parent archive to use for dependency management and common classpath entries. If you run two apps with the same parent, they will have a classpath that is the same, reading from left to right, until they actually differ.                                       |
 | `thin.location`     | `file:.,classpath:/`                                                             | The path to directory containing thin properties files (as per `thin.name`), as a comma-separated list of resource locations (directories). These locations plus the same paths relative /META-INF will be searched.                                                 |

Diff for: launcher/src/main/java/org/springframework/boot/loader/thin/ArchiveUtils.java

@@ -27,7 +27,6 @@
 
 import org.eclipse.aether.artifact.DefaultArtifact;
 import org.eclipse.aether.graph.Dependency;
-
 import org.springframework.boot.loader.archive.Archive;
 import org.springframework.boot.loader.archive.ExplodedArchive;
 import org.springframework.boot.loader.archive.JarFileArchive;
@@ -53,17 +52,15 @@ public static Archive getArchive(String path) {
 		}
 		try {
 			return new JarFileArchive(new JarFile(file));
-		}
-		catch (IOException e) {
+		} catch (IOException e) {
 			throw new IllegalStateException("Cannot create JAR archive: " + file, e);
 		}
 	}
 
 	public static File getArchiveRoot(Archive archive) {
 		try {
 			return new File(jarFile(archive.getUrl()).toURI());
-		}
-		catch (Exception e) {
+		} catch (Exception e) {
 			throw new IllegalStateException("Cannot locate JAR archive: " + archive, e);
 		}
 	}
@@ -82,19 +79,16 @@ public static String findMainClass(Archive archive) {
 					return mainClass;
 				}
 			}
-		}
-		catch (Exception e) {
+		} catch (Exception e) {
 		}
 		try {
 			File root = getArchiveRoot(archive);
 			if (archive instanceof ExplodedArchive) {
 				return MainClassFinder.findSingleMainClass(root);
-			}
-			else {
+			} else {
 				return MainClassFinder.findSingleMainClass(new JarFile(root), "");
 			}
-		}
-		catch (Exception e) {
+		} catch (Exception e) {
 			throw new IllegalStateException("Cannot locate main class in " + archive, e);
 		}
 	}
@@ -104,8 +98,7 @@ private static URI findArchive(String path) {
 		if (archive != null) {
 			try {
 				return jarFile(archive.toURL()).toURI();
-			}
-			catch (Exception e) {
+			} catch (Exception e) {
 				throw new IllegalStateException("Cannot create URI for " + archive);
 			}
 		}
@@ -148,8 +141,7 @@ private static URL jarFile(URL url) {
 			}
 			try {
 				url = new URL(path);
-			}
-			catch (MalformedURLException e) {
+			} catch (MalformedURLException e) {
 				throw new IllegalStateException("Bad URL for jar file: " + path, e);
 			}
 		}
@@ -165,8 +157,7 @@ public static List<URL> nestedClasses(Archive archive, String... paths) {
 					extras.add(classes.getURL());
 				}
 			}
-		}
-		catch (Exception e) {
+		} catch (Exception e) {
 			throw new IllegalStateException("Cannot create urls for resources", e);
 		}
 		return extras;
@@ -189,4 +180,27 @@ private static URL[] locateFiles(URL[] urls) {
 		return urls;
 	}
 
+	public static List<Archive> getArchives(String path) {
+		List<Archive> list = new ArrayList<>();
+		for (String element : path.split(File.pathSeparator)) {
+			if (element.endsWith("*")) {
+				File dir = new File(element.substring(0, element.length() - 1));
+				if (dir.isDirectory()) {
+					for (File file : dir.listFiles()) {
+						if (file.getName().endsWith(".jar")) {
+							try {
+								list.add(getArchive(file.getCanonicalPath()));
+							} catch (IOException e) {
+								// ignore
+							}
+						}
+					}
+				}
+			} else {
+				list.add(getArchive(element));
+			}
+		}
+		return list;
+	}
+
 }

Diff for: launcher/src/main/java/org/springframework/boot/loader/thin/DependencyResolver.java

@@ -214,7 +214,8 @@ public List<Dependency> dependencies(final Resource resource,
 				DependencyResolver.globals = null;
 				DependencyResolutionResult dependencies = result
 						.getDependencyResolutionResult();
-				if (!dependencies.getUnresolvedDependencies().isEmpty()) {
+				if (!dependencies.getUnresolvedDependencies().isEmpty() && 
+						properties.getProperty(ThinJarLauncher.THIN_LIBS, "").length()==0) {
 					StringBuilder builder = new StringBuilder();
 					for (Dependency dependency : dependencies
 							.getUnresolvedDependencies()) {

Diff for: launcher/src/main/java/org/springframework/boot/loader/thin/PathResolver.java

@@ -59,6 +59,8 @@ public class PathResolver {
 
 	private String root;
 
+	private String libs;
+
 	private Properties overrides = new Properties();
 
 	private boolean offline;
@@ -79,6 +81,10 @@ public void setRoot(String root) {
 		this.root = root;
 	}
 
+	public void setLibs(String libs) {
+		this.libs = libs;
+	}
+
 	public void setOverrides(Properties overrides) {
 		this.overrides = overrides;
 	}
@@ -274,6 +280,9 @@ private Properties getProperties(Archive archive, String name, String[] profiles
 		if (root != null) {
 			properties.setProperty("thin.root", root);
 		}
+		if (libs != null) {
+			properties.setProperty("thin.libs", libs);
+		}
 		if (offline) {
 			properties.setProperty("thin.offline", "true");
 		}