Spring/spring-boot
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch '1.5.x'

Browse Source
This commit is contained in:
Phillip Webb
2017-12-13 13:07:18 -08:00
parent 681fdb1ee8 2aa3295675
commit 5ca608330c
14 changed files with 124 additions and 44 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
spring-boot-project/spring-boot-tools/spring-boot-loader-tools/src/main/java/org/springframework/boot/loader/tools/Layouts.java
View File

@@ -121,7 +121,7 @@ public final class Layouts {
*/
public static class War implements Layout {
private static final Map<LibraryScope, String> scopeDestinations;
private static final Map<LibraryScope, String> SCOPE_DESTINATIONS;
static {
Map<LibraryScope, String> map = new HashMap<>();
@@ -129,7 +129,7 @@ public final class Layouts {
map.put(LibraryScope.CUSTOM, "WEB-INF/lib/");
map.put(LibraryScope.RUNTIME, "WEB-INF/lib/");
map.put(LibraryScope.PROVIDED, "WEB-INF/lib-provided/");
scopeDestinations = Collections.unmodifiableMap(map);
SCOPE_DESTINATIONS = Collections.unmodifiableMap(map);
}
@Override
@@ -139,7 +139,7 @@ public final class Layouts {
@Override
public String getLibraryDestination(String libraryName, LibraryScope scope) {
return scopeDestinations.get(scope);
return SCOPE_DESTINATIONS.get(scope);
}
@Override