8205615: Start of release updates for JDK 12

8205621: Increment JDK version for JDK 12
8193292: Add SourceVersion.RELEASE_12
8193290: Add source 12 and target 12 to javac
8205619: Bump maximum recognized class file version to 56 for JDK 12

Co-authored-by: Erik Joelsson <erik.joelsson@oracle.com>
Co-authored-by: Mikael Vidstedt <mikael.vidstedt@oracle.com>
Reviewed-by: alanb, smarks, jjg, mr, erikj, psandoz, dholmes
This commit is contained in:
Joe Darcy 2018-06-27 21:01:12 -07:00
parent bc45576579
commit e56162b43d
45 changed files with 178 additions and 128 deletions

View file

@ -1,5 +1,5 @@
/*
* 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
@ -23,7 +23,7 @@
/*
* @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
*
@ -38,7 +38,7 @@ 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 {
@ -58,12 +58,12 @@ public class ClassVersionChecker {
* -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++) {