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

Merge branch '2.3.x' into 2.4.x

Browse Source
This commit is contained in:
Phillip Webb
2020-12-15 19:46:04 -08:00
parent a2d0b64e9c 29300530c6
commit 4fba7d0c60
6 changed files with 11 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
spring-boot-project/spring-boot-tools/spring-boot-loader-tools/src/test/java/org/springframework/boot/loader/tools/AbstractPackagerTests.java
View File

@@ -644,7 +644,7 @@ abstract class AbstractPackagerTests<P extends Packager> {
private static final Layer DEFAULT_LAYER = new Layer("default");
private Set<Layer> layers = new LinkedHashSet<Layer>();
private Set<Layer> layers = new LinkedHashSet<>();
private Map<String, Layer> libraries = new HashMap<>();

2
spring-boot-project/spring-boot-tools/spring-boot-loader/src/test/java/org/springframework/boot/loader/jar/JarFileTests.java
View File

@@ -643,7 +643,7 @@ class JarFileTests {
@Test
void iterator() {
Iterator<JarEntry> iterator = this.jarFile.iterator();
List<String> names = new ArrayList<String>();
List<String> names = new ArrayList<>();
while (iterator.hasNext()) {
names.add(iterator.next().getName());
}