Merge pull request #23445 from dreis2211

snicoll · snicoll · commit 9b8866c45c4b · 2020-09-22T10:10:10.000+02:00
* pr/23445: Fix multi-release JAR test on JDK 15 Closes gh-23445
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
@@ -99,6 +99,7 @@ private static byte[] getNestedJarData(boolean multiRelease) throws Exception {
 			writeEntry(jarOutputStream, "META-INF/versions/12/multi-release.dat", 12);
 			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);
 		}
 		else {
 			writeEntry(jarOutputStream, "3.dat", 3);

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