Merge branch '1.1.x'

Author: wilkinsona

spring-boot-tools/spring-boot-loader-tools/src/main/java/org/springframework/boot/loader/tools/Layouts.java

@@ -119,6 +119,7 @@ public static class War implements Layout {
 		static {
 			Map<LibraryScope, String> map = new HashMap<LibraryScope, String>();
 			map.put(LibraryScope.COMPILE, "WEB-INF/lib/");
+			map.put(LibraryScope.CUSTOM, "WEB-INF/lib/");
 			map.put(LibraryScope.RUNTIME, "WEB-INF/lib/");
 			map.put(LibraryScope.PROVIDED, "WEB-INF/lib-provided/");
 			SCOPE_DESTINATIONS = Collections.unmodifiableMap(map);

spring-boot-tools/spring-boot-loader-tools/src/test/java/org/springframework/boot/loader/tools/LayoutsTests.java

@@ -31,6 +31,7 @@
  * Tests for {@link Layouts}.
  *
  * @author Phillip Webb
+ * @author Andy Wilkinson
  */
 public class LayoutsTests {
 
@@ -65,6 +66,8 @@ public void jarLayout() throws Exception {
 		Layout layout = new Layouts.Jar();
 		assertThat(layout.getLibraryDestination("lib.jar", LibraryScope.COMPILE),
 				equalTo("lib/"));
+		assertThat(layout.getLibraryDestination("lib.jar", LibraryScope.CUSTOM),
+				equalTo("lib/"));
 		assertThat(layout.getLibraryDestination("lib.jar", LibraryScope.PROVIDED),
 				equalTo("lib/"));
 		assertThat(layout.getLibraryDestination("lib.jar", LibraryScope.RUNTIME),
@@ -76,6 +79,8 @@ public void warLayout() throws Exception {
 		Layout layout = new Layouts.War();
 		assertThat(layout.getLibraryDestination("lib.jar", LibraryScope.COMPILE),
 				equalTo("WEB-INF/lib/"));
+		assertThat(layout.getLibraryDestination("lib.jar", LibraryScope.CUSTOM),
+				equalTo("WEB-INF/lib/"));
 		assertThat(layout.getLibraryDestination("lib.jar", LibraryScope.PROVIDED),
 				equalTo("WEB-INF/lib-provided/"));
 		assertThat(layout.getLibraryDestination("lib.jar", LibraryScope.RUNTIME),