8165890: [TESTBUG] Compilation issue in MultiReleaseJarTest after 8165723
Reviewed-by: darcy
--- a/jdk/test/lib/testlibrary/java/util/jar/CreateMultiReleaseTestJars.java Mon Sep 12 09:38:32 2016 -0700
+++ b/jdk/test/lib/testlibrary/java/util/jar/CreateMultiReleaseTestJars.java Mon Sep 12 20:12:26 2016 +0200
@@ -90,6 +90,13 @@
public void buildMultiReleaseJar() throws IOException {
JarBuilder jb = customMultiReleaseJar("multi-release.jar", "true");
addEntries(jb);
+ jb.addEntry("META-INF/versions/9/version/Version.class", version9Classes.get("version.Version"));
+ jb.build();
+ }
+
+ public void buildShortMultiReleaseJar() throws IOException {
+ JarBuilder jb = customMultiReleaseJar("short-multi-release.jar", "true");
+ addEntries(jb);
jb.build();
}
@@ -118,7 +125,6 @@
jb.addEntry("META-INF/versions/9/README", readme9.getBytes());
jb.addEntry("META-INF/versions/9/version/Version.java", java9.getBytes());
jb.addEntry("META-INF/versions/9/version/PackagePrivate.java", ppjava9.getBytes());
- jb.addEntry("META-INF/versions/9/version/Version.class", version9Classes.get("version.Version"));
jb.addEntry("META-INF/versions/9/version/PackagePrivate.class", version9Classes.get("version.PackagePrivate"));
jb.addEntry("META-INF/versions/10/README", readme10.getBytes());
jb.addEntry("META-INF/versions/10/version/Version.java", java10.getBytes());