8174692: New MultiReleaseJarTest.java tests fail in JDK 10

Reviewed-by: alanb

jdk/test/ProblemList.txt

@@ -264,9 +264,6 @@ tools/jimage/JImageExtractTest.java                             8170120 generic-
 tools/jimage/JImageListTest.java                                8170120 generic-all
 tools/jimage/JImageVerifyTest.java                              8170120 generic-all
 
-tools/schemagen/MultiReleaseJarTest.java                        8174692 generic-all
-tools/wsgen/MultiReleaseJarTest.java                            8174692 generic-all
-
 ############################################################################
 
 # jdk_jdi

jdk/test/tools/schemagen/MultiReleaseJarTest.java

@@ -56,7 +56,7 @@ public class MultiReleaseJarTest {
 
     @DataProvider(name = "jarFiles")
     public Object[][] jarFiles() {
-        return new Object[][]{{"MV_BOTH.jar", 9},
+        return new Object[][]{{"MV_BOTH.jar", Math.min(10, Runtime.version().major())},
                 {"MV_ONLY_9.jar", 9},
                 {"NON_MV.jar", 8}};
     }

jdk/test/tools/wsgen/MultiReleaseJarTest.java

@@ -56,7 +56,7 @@ public class MultiReleaseJarTest {
 
     @DataProvider(name = "jarFiles")
     public Object[][] jarFiles() {
-        return new Object[][]{{"MV_BOTH.jar", 9},
+        return new Object[][]{{"MV_BOTH.jar", Math.min(10, Runtime.version().major())},
                 {"MV_ONLY_9.jar", 9},
                 {"NON_MV.jar", 8}};
     }