Merge branch '2.3.x' into 2.4.x

snicoll · snicoll · commit 09fa16c58c59 · 2020-12-21T09:59:33.000+01:00
diff --git a/spring-boot-project/spring-boot-tools/spring-boot-loader/src/test/java/org/springframework/boot/loader/TestJarCreator.java b/spring-boot-project/spring-boot-tools/spring-boot-loader/src/test/java/org/springframework/boot/loader/TestJarCreator.java
@@ -98,6 +98,7 @@ private static byte[] getNestedJarData(boolean multiRelease) throws Exception {
 			writeEntry(jarOutputStream, "META-INF/versions/13/multi-release.dat", 13);
 			writeEntry(jarOutputStream, "META-INF/versions/14/multi-release.dat", 14);
 			writeEntry(jarOutputStream, "META-INF/versions/15/multi-release.dat", 15);
+			writeEntry(jarOutputStream, "META-INF/versions/16/multi-release.dat", 16);
 		}
 		else {
 			writeEntry(jarOutputStream, "3.dat", 3);

Original file line number	Diff line number	Diff line change
`@@ -98,6 +98,7 @@ private static byte[] getNestedJarData(boolean multiRelease) throws Exception {`
`98`	`98`	`writeEntry(jarOutputStream, "META-INF/versions/13/multi-release.dat", 13);`
`99`	`99`	`writeEntry(jarOutputStream, "META-INF/versions/14/multi-release.dat", 14);`
`100`	`100`	`writeEntry(jarOutputStream, "META-INF/versions/15/multi-release.dat", 15);`
	`101`	`+ writeEntry(jarOutputStream, "META-INF/versions/16/multi-release.dat", 16);`
`101`	`102`	`}`
`102`	`103`	`else {`
`103`	`104`	`writeEntry(jarOutputStream, "3.dat", 3);`