Skip to content
Permalink
Browse files
8267630: Start of release updates for JDK 18
8267632: Add source 18 and target 18 to javac
8267631: Add SourceVersion.RELEASE_18

Reviewed-by: iris, erikj, dholmes
  • Loading branch information
jddarcy committed Jun 10, 2021
1 parent 7400789 commit b018c450e5e4737ccd08ed505fd06cee16c42648
Showing with 5,352 additions and 60 deletions.
  1. +6 −6 make/conf/version-numbers.conf
  2. +891 −0 make/data/symbols/java.base-H.sym.txt
  3. +123 −0 make/data/symbols/java.compiler-H.sym.txt
  4. +42 −0 make/data/symbols/java.datatransfer-H.sym.txt
  5. +902 −0 make/data/symbols/java.desktop-H.sym.txt
  6. +31 −0 make/data/symbols/java.instrument-H.sym.txt
  7. +59 −0 make/data/symbols/java.logging-H.sym.txt
  8. +265 −0 make/data/symbols/java.management-H.sym.txt
  9. +39 −0 make/data/symbols/java.management.rmi-H.sym.txt
  10. +80 −0 make/data/symbols/java.naming-H.sym.txt
  11. +90 −0 make/data/symbols/java.rmi-H.sym.txt
  12. +32 −0 make/data/symbols/java.scripting-H.sym.txt
  13. +69 −0 make/data/symbols/java.security.jgss-H.sym.txt
  14. +32 −0 make/data/symbols/java.security.sasl-H.sym.txt
  15. +62 −0 make/data/symbols/java.smartcardio-H.sym.txt
  16. +60 −0 make/data/symbols/java.sql-H.sym.txt
  17. +69 −0 make/data/symbols/java.sql.rowset-H.sym.txt
  18. +150 −0 make/data/symbols/java.xml-H.sym.txt
  19. +54 −0 make/data/symbols/java.xml.crypto-H.sym.txt
  20. +44 −0 make/data/symbols/jdk.accessibility-H.sym.txt
  21. +55 −0 make/data/symbols/jdk.attach-H.sym.txt
  22. +367 −0 make/data/symbols/jdk.compiler-H.sym.txt
  23. +136 −0 make/data/symbols/jdk.dynalink-H.sym.txt
  24. +64 −0 make/data/symbols/jdk.httpserver-H.sym.txt
  25. +232 −0 make/data/symbols/jdk.incubator.foreign-H.sym.txt
  26. +31 −0 make/data/symbols/jdk.jartool-H.sym.txt
  27. +36 −0 make/data/symbols/jdk.javadoc-H.sym.txt
  28. +31 −0 make/data/symbols/jdk.jconsole-H.sym.txt
  29. +395 −0 make/data/symbols/jdk.jdi-H.sym.txt
  30. +113 −0 make/data/symbols/jdk.jshell-H.sym.txt
  31. +31 −0 make/data/symbols/jdk.jsobject-H.sym.txt
  32. +49 −0 make/data/symbols/jdk.management-H.sym.txt
  33. +31 −0 make/data/symbols/jdk.net-H.sym.txt
  34. +73 −0 make/data/symbols/jdk.sctp-H.sym.txt
  35. +106 −0 make/data/symbols/jdk.security.auth-H.sym.txt
  36. +48 −0 make/data/symbols/jdk.security.jgss-H.sym.txt
  37. +51 −0 make/data/symbols/jdk.unsupported-H.sym.txt
  38. +295 −0 make/data/symbols/jdk.xml.dom-H.sym.txt
  39. +3 −2 make/data/symbols/symbols
  40. +2 −0 src/hotspot/share/classfile/classFileParser.cpp
  41. +1 −1 src/java.base/share/classes/jdk/internal/org/objectweb/asm/ClassReader.java
  42. +1 −0 src/java.base/share/classes/jdk/internal/org/objectweb/asm/Opcodes.java
  43. +12 −4 src/java.compiler/share/classes/javax/lang/model/SourceVersion.java
  44. +2 −2 src/java.compiler/share/classes/javax/lang/model/util/AbstractAnnotationValueVisitor14.java
  45. +2 −2 src/java.compiler/share/classes/javax/lang/model/util/AbstractElementVisitor14.java
  46. +2 −2 src/java.compiler/share/classes/javax/lang/model/util/AbstractTypeVisitor14.java
  47. +2 −2 src/java.compiler/share/classes/javax/lang/model/util/ElementKindVisitor14.java
  48. +2 −2 src/java.compiler/share/classes/javax/lang/model/util/ElementScanner14.java
  49. +2 −2 src/java.compiler/share/classes/javax/lang/model/util/SimpleAnnotationValueVisitor14.java
  50. +2 −2 src/java.compiler/share/classes/javax/lang/model/util/SimpleElementVisitor14.java
  51. +2 −2 src/java.compiler/share/classes/javax/lang/model/util/SimpleTypeVisitor14.java
  52. +2 −2 src/java.compiler/share/classes/javax/lang/model/util/TypeKindVisitor14.java
  53. +8 −1 src/jdk.compiler/share/classes/com/sun/tools/javac/code/Source.java
  54. +3 −2 src/jdk.compiler/share/classes/com/sun/tools/javac/jvm/ClassFile.java
  55. +4 −1 src/jdk.compiler/share/classes/com/sun/tools/javac/jvm/Target.java
  56. +2 −2 src/jdk.compiler/share/classes/com/sun/tools/javac/processing/PrintingProcessor.java
  57. +7 −2 test/jdk/java/lang/module/ClassFileVersionsTest.java
  58. +2 −1 test/langtools/tools/javac/api/TestGetSourceVersions.java
  59. +3 −2 test/langtools/tools/javac/classfiles/ClassVersionChecker.java
  60. +10 −10 test/langtools/tools/javac/lib/JavacTestingAbstractProcessor.java
  61. +1 −1 test/langtools/tools/javac/preview/classReaderTest/Client.nopreview.out
  62. +1 −1 test/langtools/tools/javac/preview/classReaderTest/Client.preview.out
  63. +30 −6 test/langtools/tools/javac/versions/Versions.java
@@ -1,5 +1,5 @@
#
# Copyright (c) 2011, 2020, Oracle and/or its affiliates. All rights reserved.
# Copyright (c) 2011, 2021, 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
@@ -26,17 +26,17 @@
# Default version, product, and vendor information to use,
# unless overridden by configure

DEFAULT_VERSION_FEATURE=17
DEFAULT_VERSION_FEATURE=18
DEFAULT_VERSION_INTERIM=0
DEFAULT_VERSION_UPDATE=0
DEFAULT_VERSION_PATCH=0
DEFAULT_VERSION_EXTRA1=0
DEFAULT_VERSION_EXTRA2=0
DEFAULT_VERSION_EXTRA3=0
DEFAULT_VERSION_DATE=2021-09-14
DEFAULT_VERSION_CLASSFILE_MAJOR=61 # "`$EXPR $DEFAULT_VERSION_FEATURE + 44`"
DEFAULT_VERSION_DATE=2022-03-15
DEFAULT_VERSION_CLASSFILE_MAJOR=62 # "`$EXPR $DEFAULT_VERSION_FEATURE + 44`"
DEFAULT_VERSION_CLASSFILE_MINOR=0
DEFAULT_VERSION_DOCS_API_SINCE=11
DEFAULT_ACCEPTABLE_BOOT_VERSIONS="16 17"
DEFAULT_JDK_SOURCE_TARGET_VERSION=17
DEFAULT_ACCEPTABLE_BOOT_VERSIONS="16 17 18"
DEFAULT_JDK_SOURCE_TARGET_VERSION=18
DEFAULT_PROMOTED_VERSION_PRE=ea

Large diffs are not rendered by default.

@@ -0,0 +1,123 @@
#
# Copyright (c) 2021, 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. Oracle designates this
# particular file as subject to the "Classpath" exception as provided
# by Oracle in the LICENSE file that accompanied this code.
#
# This code is distributed in the hope that it will be useful, but WITHOUT
# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
# version 2 for more details (a copy is included in the LICENSE file that
# accompanied this code).
#
# You should have received a copy of the GNU General Public License version
# 2 along with this work; if not, write to the Free Software Foundation,
# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
#
# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
# or visit www.oracle.com if you need additional information or have any
# questions.
#
# ##########################################################
# ### THIS FILE IS AUTOMATICALLY GENERATED. DO NOT EDIT. ###
# ##########################################################
#
class name javax/annotation/processing/AbstractProcessor
header extends java/lang/Object implements javax/annotation/processing/Processor flags 421
innerclass innerClass javax/tools/Diagnostic$Kind outerClass javax/tools/Diagnostic innerClassName Kind flags 4019
innerclass innerClass java/lang/invoke/MethodHandles$Lookup outerClass java/lang/invoke/MethodHandles innerClassName Lookup flags 19

class name javax/annotation/processing/Generated
header extends java/lang/Object implements java/lang/annotation/Annotation flags 2601 runtimeAnnotations @Ljava/lang/annotation/Documented;@Ljava/lang/annotation/Retention;(value=eLjava/lang/annotation/RetentionPolicy;SOURCE;)@Ljava/lang/annotation/Target;(value={eLjava/lang/annotation/ElementType;PACKAGE;eLjava/lang/annotation/ElementType;TYPE;eLjava/lang/annotation/ElementType;METHOD;eLjava/lang/annotation/ElementType;CONSTRUCTOR;eLjava/lang/annotation/ElementType;FIELD;eLjava/lang/annotation/ElementType;LOCAL_VARIABLE;eLjava/lang/annotation/ElementType;PARAMETER;})

class name javax/lang/model/SourceVersion
field name RELEASE_17 descriptor Ljavax/lang/model/SourceVersion; flags 4019

class name javax/lang/model/element/Modifier
header extends java/lang/Enum sealed true flags 4021 signature Ljava/lang/Enum<Ljavax/lang/model/element/Modifier;>;
-field name SEALED descriptor Ljavax/lang/model/element/Modifier;
-field name NON_SEALED descriptor Ljavax/lang/model/element/Modifier;
field name SEALED descriptor Ljavax/lang/model/element/Modifier; flags 4019
field name NON_SEALED descriptor Ljavax/lang/model/element/Modifier; flags 4019

class name javax/lang/model/element/TypeElement
-method name getPermittedSubclasses descriptor ()Ljava/util/List;
method name getPermittedSubclasses descriptor ()Ljava/util/List; flags 1 signature ()Ljava/util/List<+Ljavax/lang/model/type/TypeMirror;>;

class name javax/lang/model/element/UnknownAnnotationValueException
header extends javax/lang/model/UnknownEntityException flags 21
innerclass innerClass java/lang/invoke/MethodHandles$Lookup outerClass java/lang/invoke/MethodHandles innerClassName Lookup flags 19

class name javax/lang/model/element/UnknownDirectiveException
header extends javax/lang/model/UnknownEntityException flags 21
innerclass innerClass javax/lang/model/element/ModuleElement$Directive outerClass javax/lang/model/element/ModuleElement innerClassName Directive flags 609
innerclass innerClass java/lang/invoke/MethodHandles$Lookup outerClass java/lang/invoke/MethodHandles innerClassName Lookup flags 19

class name javax/lang/model/element/UnknownElementException
header extends javax/lang/model/UnknownEntityException flags 21
innerclass innerClass java/lang/invoke/MethodHandles$Lookup outerClass java/lang/invoke/MethodHandles innerClassName Lookup flags 19

class name javax/lang/model/type/MirroredTypeException
header extends javax/lang/model/type/MirroredTypesException flags 21
innerclass innerClass java/lang/invoke/MethodHandles$Lookup outerClass java/lang/invoke/MethodHandles innerClassName Lookup flags 19

class name javax/lang/model/type/MirroredTypesException
header extends java/lang/RuntimeException flags 21
innerclass innerClass java/lang/invoke/MethodHandles$Lookup outerClass java/lang/invoke/MethodHandles innerClassName Lookup flags 19

class name javax/lang/model/type/UnknownTypeException
header extends javax/lang/model/UnknownEntityException flags 21
innerclass innerClass java/lang/invoke/MethodHandles$Lookup outerClass java/lang/invoke/MethodHandles innerClassName Lookup flags 19

class name javax/lang/model/util/AbstractAnnotationValueVisitor14
header extends javax/lang/model/util/AbstractAnnotationValueVisitor9 flags 421 signature <R:Ljava/lang/Object;P:Ljava/lang/Object;>Ljavax/lang/model/util/AbstractAnnotationValueVisitor9<TR;TP;>; runtimeAnnotations @Ljavax/annotation/processing/SupportedSourceVersion;(value=eLjavax/lang/model/SourceVersion;RELEASE_17;)

class name javax/lang/model/util/AbstractElementVisitor14
header extends javax/lang/model/util/AbstractElementVisitor9 flags 421 signature <R:Ljava/lang/Object;P:Ljava/lang/Object;>Ljavax/lang/model/util/AbstractElementVisitor9<TR;TP;>; runtimeAnnotations @Ljavax/annotation/processing/SupportedSourceVersion;(value=eLjavax/lang/model/SourceVersion;RELEASE_17;)

class name javax/lang/model/util/AbstractTypeVisitor14
header extends javax/lang/model/util/AbstractTypeVisitor9 flags 421 signature <R:Ljava/lang/Object;P:Ljava/lang/Object;>Ljavax/lang/model/util/AbstractTypeVisitor9<TR;TP;>; runtimeAnnotations @Ljavax/annotation/processing/SupportedSourceVersion;(value=eLjavax/lang/model/SourceVersion;RELEASE_17;)

class name javax/lang/model/util/AbstractTypeVisitor6
header extends java/lang/Object implements javax/lang/model/type/TypeVisitor flags 421 signature <R:Ljava/lang/Object;P:Ljava/lang/Object;>Ljava/lang/Object;Ljavax/lang/model/type/TypeVisitor<TR;TP;>; runtimeAnnotations @Ljavax/annotation/processing/SupportedSourceVersion;(value=eLjavax/lang/model/SourceVersion;RELEASE_6;)

class name javax/lang/model/util/AbstractTypeVisitor7
header extends javax/lang/model/util/AbstractTypeVisitor6 flags 421 signature <R:Ljava/lang/Object;P:Ljava/lang/Object;>Ljavax/lang/model/util/AbstractTypeVisitor6<TR;TP;>; runtimeAnnotations @Ljavax/annotation/processing/SupportedSourceVersion;(value=eLjavax/lang/model/SourceVersion;RELEASE_7;)

class name javax/lang/model/util/AbstractTypeVisitor8
header extends javax/lang/model/util/AbstractTypeVisitor7 flags 421 signature <R:Ljava/lang/Object;P:Ljava/lang/Object;>Ljavax/lang/model/util/AbstractTypeVisitor7<TR;TP;>; runtimeAnnotations @Ljavax/annotation/processing/SupportedSourceVersion;(value=eLjavax/lang/model/SourceVersion;RELEASE_8;)

class name javax/lang/model/util/ElementKindVisitor14
header extends javax/lang/model/util/ElementKindVisitor9 flags 21 signature <R:Ljava/lang/Object;P:Ljava/lang/Object;>Ljavax/lang/model/util/ElementKindVisitor9<TR;TP;>; runtimeAnnotations @Ljavax/annotation/processing/SupportedSourceVersion;(value=eLjavax/lang/model/SourceVersion;RELEASE_17;)

class name javax/lang/model/util/ElementScanner14
header extends javax/lang/model/util/ElementScanner9 flags 21 signature <R:Ljava/lang/Object;P:Ljava/lang/Object;>Ljavax/lang/model/util/ElementScanner9<TR;TP;>; runtimeAnnotations @Ljavax/annotation/processing/SupportedSourceVersion;(value=eLjavax/lang/model/SourceVersion;RELEASE_17;)

class name javax/lang/model/util/Elements
method name isAutomaticModule descriptor (Ljavax/lang/model/element/ModuleElement;)Z flags 1

class name javax/lang/model/util/SimpleAnnotationValueVisitor14
header extends javax/lang/model/util/SimpleAnnotationValueVisitor9 flags 21 signature <R:Ljava/lang/Object;P:Ljava/lang/Object;>Ljavax/lang/model/util/SimpleAnnotationValueVisitor9<TR;TP;>; runtimeAnnotations @Ljavax/annotation/processing/SupportedSourceVersion;(value=eLjavax/lang/model/SourceVersion;RELEASE_17;)

class name javax/lang/model/util/SimpleElementVisitor14
header extends javax/lang/model/util/SimpleElementVisitor9 flags 21 signature <R:Ljava/lang/Object;P:Ljava/lang/Object;>Ljavax/lang/model/util/SimpleElementVisitor9<TR;TP;>; runtimeAnnotations @Ljavax/annotation/processing/SupportedSourceVersion;(value=eLjavax/lang/model/SourceVersion;RELEASE_17;)

class name javax/lang/model/util/SimpleTypeVisitor14
header extends javax/lang/model/util/SimpleTypeVisitor9 flags 21 signature <R:Ljava/lang/Object;P:Ljava/lang/Object;>Ljavax/lang/model/util/SimpleTypeVisitor9<TR;TP;>; runtimeAnnotations @Ljavax/annotation/processing/SupportedSourceVersion;(value=eLjavax/lang/model/SourceVersion;RELEASE_17;)

class name javax/lang/model/util/TypeKindVisitor14
header extends javax/lang/model/util/TypeKindVisitor9 flags 21 signature <R:Ljava/lang/Object;P:Ljava/lang/Object;>Ljavax/lang/model/util/TypeKindVisitor9<TR;TP;>; runtimeAnnotations @Ljavax/annotation/processing/SupportedSourceVersion;(value=eLjavax/lang/model/SourceVersion;RELEASE_17;)

class name javax/tools/SimpleJavaFileObject
header extends java/lang/Object implements javax/tools/JavaFileObject flags 21
innerclass innerClass javax/tools/JavaFileObject$Kind outerClass javax/tools/JavaFileObject innerClassName Kind flags 4019
innerclass innerClass java/lang/invoke/MethodHandles$Lookup outerClass java/lang/invoke/MethodHandles innerClassName Lookup flags 19

class name javax/tools/ToolProvider
header extends java/lang/Object flags 21
innerclass innerClass java/lang/invoke/MethodHandles$Lookup outerClass java/lang/invoke/MethodHandles innerClassName Lookup flags 19

@@ -0,0 +1,42 @@
#
# Copyright (c) 2021, 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. Oracle designates this
# particular file as subject to the "Classpath" exception as provided
# by Oracle in the LICENSE file that accompanied this code.
#
# This code is distributed in the hope that it will be useful, but WITHOUT
# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
# version 2 for more details (a copy is included in the LICENSE file that
# accompanied this code).
#
# You should have received a copy of the GNU General Public License version
# 2 along with this work; if not, write to the Free Software Foundation,
# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
#
# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
# or visit www.oracle.com if you need additional information or have any
# questions.
#
# ##########################################################
# ### THIS FILE IS AUTOMATICALLY GENERATED. DO NOT EDIT. ###
# ##########################################################
#
class name java/awt/datatransfer/Clipboard
header extends java/lang/Object flags 21
innerclass innerClass java/lang/invoke/MethodHandles$Lookup outerClass java/lang/invoke/MethodHandles innerClassName Lookup flags 19

class name java/awt/datatransfer/DataFlavor
header extends java/lang/Object implements java/io/Externalizable,java/lang/Cloneable flags 21
innerclass innerClass java/lang/invoke/MethodHandles$Lookup outerClass java/lang/invoke/MethodHandles innerClassName Lookup flags 19
-field name selectionHtmlFlavor descriptor Ljava/awt/datatransfer/DataFlavor;
-field name fragmentHtmlFlavor descriptor Ljava/awt/datatransfer/DataFlavor;
-field name allHtmlFlavor descriptor Ljava/awt/datatransfer/DataFlavor;
field name selectionHtmlFlavor descriptor Ljava/awt/datatransfer/DataFlavor; flags 19
field name fragmentHtmlFlavor descriptor Ljava/awt/datatransfer/DataFlavor; flags 19
field name allHtmlFlavor descriptor Ljava/awt/datatransfer/DataFlavor; flags 19

1 comment on commit b018c45

@openjdk-notifier

This comment has been minimized.

Copy link

@openjdk-notifier openjdk-notifier bot commented on b018c45 Jun 10, 2021

Please sign in to comment.