diff --git a/spring-boot-tools/spring-boot-loader-tools/src/main/java/org/springframework/boot/loader/tools/Layouts.java b/spring-boot-tools/spring-boot-loader-tools/src/main/java/org/springframework/boot/loader/tools/Layouts.java index be28fd56b9..ed1a5cb125 100644 --- a/spring-boot-tools/spring-boot-loader-tools/src/main/java/org/springframework/boot/loader/tools/Layouts.java +++ b/spring-boot-tools/spring-boot-loader-tools/src/main/java/org/springframework/boot/loader/tools/Layouts.java @@ -119,6 +119,7 @@ public class Layouts { static { Map map = new HashMap(); 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); diff --git a/spring-boot-tools/spring-boot-loader-tools/src/test/java/org/springframework/boot/loader/tools/LayoutsTests.java b/spring-boot-tools/spring-boot-loader-tools/src/test/java/org/springframework/boot/loader/tools/LayoutsTests.java index 31b98f4044..8fc7597924 100644 --- a/spring-boot-tools/spring-boot-loader-tools/src/test/java/org/springframework/boot/loader/tools/LayoutsTests.java +++ b/spring-boot-tools/spring-boot-loader-tools/src/test/java/org/springframework/boot/loader/tools/LayoutsTests.java @@ -31,6 +31,7 @@ import static org.junit.Assert.assertThat; * Tests for {@link Layouts}. * * @author Phillip Webb + * @author Andy Wilkinson */ public class LayoutsTests { @@ -65,6 +66,8 @@ public class LayoutsTests { 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 class LayoutsTests { 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),