test/langtools/tools/javac/classfiles/ClassVersionChecker.java

@@ -1,7 +1,7 @@
 /*
- * Copyright (c) 2012, 2017, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 2018, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
  * under the terms of the GNU General Public License version 2 only, as
  * published by the Free Software Foundation.

@@ -21,11 +21,11 @@
  * questions.
  */
 
 /*
  * @test
- * @bug 7157626 8001112 8188870 8173382
+ * @bug 7157626 8001112 8188870 8173382 8193290 8205619
  * @summary Test major version for all legal combinations for -source and -target
  * @author sgoel
  *
  * @modules jdk.compiler
  */

@@ -36,11 +36,11 @@
 import java.util.regex.*;
 
 public class ClassVersionChecker {
 
     int errors;
-    String[] jdk = {"", "1.6", "1.7", "1.8", "1.9", "1.10", "11"};
+    String[] jdk = {"", "1.6", "1.7", "1.8", "1.9", "1.10", "11", "12"};
     File javaFile = null;
 
     public static void main(String[] args) throws Throwable {
         new ClassVersionChecker().run();
     }

@@ -56,16 +56,16 @@
         /* -source (0=>empty,1=>1.2,...) X -target (0=>empty,1=>1.2,...)
          * ver[0][0] => no -source or -target was given
          * -1 => invalid combinations
          */
         int[][] ver =
-                {{55, -1, -1, -1, -1, -1, -1},
-                 {55, 50, 51, 52, 53, 54, 55},
-                 {55, -1, 51, 52, 53, 54, 55},
-                 {55, -1, -1, 52, 53, 54, 55},
-                 {55, -1, -1, -1, 53, 54, 55},
-                 {55, -1, -1, -1, -1, 54, 55}};
+            {{56, -1, -1, -1, -1, -1, -1, -1},
+             {56, 50, 51, 52, 53, 54, 55, 56},
+             {56, -1, 51, 52, 53, 54, 55, 56},
+             {56, -1, -1, 52, 53, 54, 55, 56},
+             {56, -1, -1, -1, 53, 54, 55, 56},
+             {56, -1, -1, -1, -1, 54, 55, 56}};
 
         // Loop to run all possible combinations of source/target values
         for (int i = 0; i< ver.length; i++) {
             for (int j = 0 ; j< ver[i].length; j++) {
                 if(ver[i][j] != -1) {