8342979: Start of release updates for JDK 25

8342982: Add SourceVersion.RELEASE_25
8342983: Add source 25 and target 25 to javac

Co-authored-by: Joe Darcy <darcy@openjdk.org>
Reviewed-by: iris, darcy, erikj, dholmes

Author: Pavel Rappo

.jcheck/conf

@@ -1,7 +1,7 @@
 [general]
 project=jdk
 jbs=JDK
-version=24
+version=25
 
 [checks]
 error=author,committer,reviewers,merge,issues,executable,symlink,message,hg-tag,whitespace,problemlists

make/conf/version-numbers.conf

@@ -26,17 +26,17 @@
 # Default version, product, and vendor information to use,
 # unless overridden by configure
 
-DEFAULT_VERSION_FEATURE=24
+DEFAULT_VERSION_FEATURE=25
 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=2025-03-18
-DEFAULT_VERSION_CLASSFILE_MAJOR=68  # "`$EXPR $DEFAULT_VERSION_FEATURE + 44`"
+DEFAULT_VERSION_DATE=2025-09-16
+DEFAULT_VERSION_CLASSFILE_MAJOR=69  # "`$EXPR $DEFAULT_VERSION_FEATURE + 44`"
 DEFAULT_VERSION_CLASSFILE_MINOR=0
 DEFAULT_VERSION_DOCS_API_SINCE=11
-DEFAULT_ACCEPTABLE_BOOT_VERSIONS="23 24"
-DEFAULT_JDK_SOURCE_TARGET_VERSION=24
+DEFAULT_ACCEPTABLE_BOOT_VERSIONS="23 24 25"
+DEFAULT_JDK_SOURCE_TARGET_VERSION=25
 DEFAULT_PROMOTED_VERSION_PRE=ea

src/hotspot/share/classfile/classFileParser.cpp

@@ -153,6 +153,8 @@
 
 #define JAVA_24_VERSION                   68
 
+#define JAVA_25_VERSION                   69
+
 void ClassFileParser::set_class_bad_constant_seen(short bad_constant) {
   assert((bad_constant == JVM_CONSTANT_Module ||
           bad_constant == JVM_CONSTANT_Package) && _major_version >= JAVA_9_VERSION,

src/java.base/share/classes/java/lang/classfile/ClassFile.java

@@ -641,6 +641,12 @@ default List<VerifyError> verify(Path path) throws IOException {
     /** The class major version of JAVA_24. */
     int JAVA_24_VERSION = 68;
 
+    /**
+     * The class major version of JAVA_25.
+     * @since 25
+     */
+    int JAVA_25_VERSION = 69;
+
     /**
      * A minor version number indicating a class uses preview features
      * of a Java SE version since 12, for major versions {@value
@@ -652,7 +658,7 @@ default List<VerifyError> verify(Path path) throws IOException {
      * {@return the latest major Java version}
      */
     static int latestMajorVersion() {
-        return JAVA_24_VERSION;
+        return JAVA_25_VERSION;
     }
 
     /**

src/java.base/share/classes/java/lang/reflect/ClassFileFormatVersion.java

@@ -318,6 +318,18 @@ public enum ClassFileFormatVersion {
      * <cite>The Java Virtual Machine Specification, Java SE 24 Edition</cite></a>
      */
     RELEASE_24(68),
+
+    /**
+     * The version introduced by the Java Platform, Standard Edition
+     * 25.
+     *
+     * @since 25
+     *
+     * @see <a
+     * href="https://docs.oracle.com/javase/specs/jvms/se25/html/index.html">
+     * <cite>The Java Virtual Machine Specification, Java SE 25 Edition</cite></a>
+     */
+    RELEASE_25(69),
     ; // Reduce code churn when appending new constants
 
     // Note to maintainers: when adding constants for newer releases,
@@ -333,7 +345,7 @@ private ClassFileFormatVersion(int major) {
      * {@return the latest class file format version}
      */
     public static ClassFileFormatVersion latest() {
-        return RELEASE_24;
+        return RELEASE_25;
     }
 
     /**

src/java.base/share/classes/jdk/internal/org/objectweb/asm/ClassReader.java

@@ -227,7 +227,7 @@ public ClassReader(
         this.b = classFileBuffer;
         // Check the class' major_version. This field is after the magic and minor_version fields, which
         // use 4 and 2 bytes respectively.
-        if (checkClassVersion && readShort(classFileOffset + 6) > Opcodes.V24) {
+        if (checkClassVersion && readShort(classFileOffset + 6) > Opcodes.V25) {
             throw new IllegalArgumentException(
                     "Unsupported class file major version " + readShort(classFileOffset + 6));
         }

src/java.base/share/classes/jdk/internal/org/objectweb/asm/Opcodes.java

@@ -314,6 +314,7 @@ public interface Opcodes {
     int V22 = 0 << 16 | 66;
     int V23 = 0 << 16 | 67;
     int V24 = 0 << 16 | 68;
+    int V25 = 0 << 16 | 69;
 
     /**
       * Version flag indicating that the class is using 'preview' features.

src/java.compiler/share/classes/javax/lang/model/SourceVersion.java

@@ -444,6 +444,18 @@ public enum SourceVersion {
      * <cite>The Java Language Specification, Java SE 24 Edition</cite></a>
      */
     RELEASE_24,
+
+    /**
+     * The version introduced by the Java Platform, Standard Edition
+     * 25.
+     *
+     * @since 25
+     *
+     * @see <a
+     * href="https://docs.oracle.com/javase/specs/jls/se25/html/index.html">
+     * <cite>The Java Language Specification, Java SE 25 Edition</cite></a>
+     */
+    RELEASE_25,
     ; // Reduce code churn when appending new constants
 
     // Note that when adding constants for newer releases, the
@@ -453,7 +465,7 @@ public enum SourceVersion {
      * {@return the latest source version that can be modeled}
      */
     public static SourceVersion latest() {
-        return RELEASE_24;
+        return RELEASE_25;
     }
 
     private static final SourceVersion latestSupported = getLatestSupported();
@@ -468,7 +480,7 @@ public static SourceVersion latest() {
     private static SourceVersion getLatestSupported() {
         int intVersion = Runtime.version().feature();
         return (intVersion >= 11) ?
-            valueOf("RELEASE_" + Math.min(24, intVersion)):
+            valueOf("RELEASE_" + Math.min(25, intVersion)):
             RELEASE_10;
     }
 

src/java.compiler/share/classes/javax/lang/model/util/AbstractAnnotationValueVisitor14.java

@@ -44,7 +44,7 @@
  * @see AbstractAnnotationValueVisitor9
  * @since 14
  */
-@SupportedSourceVersion(RELEASE_24)
+@SupportedSourceVersion(RELEASE_25)
 public abstract class AbstractAnnotationValueVisitor14<R, P> extends AbstractAnnotationValueVisitor9<R, P> {
 
     /**

src/java.compiler/share/classes/javax/lang/model/util/AbstractAnnotationValueVisitorPreview.java

@@ -50,7 +50,7 @@
  * @see AbstractAnnotationValueVisitor14
  * @since 23
  */
-@SupportedSourceVersion(RELEASE_24)
+@SupportedSourceVersion(RELEASE_25)
 @PreviewFeature(feature=PreviewFeature.Feature.LANGUAGE_MODEL, reflective=true)
 public abstract class AbstractAnnotationValueVisitorPreview<R, P> extends AbstractAnnotationValueVisitor14<R, P> {
 

src/java.compiler/share/classes/javax/lang/model/util/AbstractElementVisitor14.java

@@ -50,7 +50,7 @@
  * @see AbstractElementVisitor9
  * @since 16
  */
-@SupportedSourceVersion(RELEASE_24)
+@SupportedSourceVersion(RELEASE_25)
 public abstract class AbstractElementVisitor14<R, P> extends AbstractElementVisitor9<R, P> {
     /**
      * Constructor for concrete subclasses to call.

src/java.compiler/share/classes/javax/lang/model/util/AbstractElementVisitorPreview.java

@@ -53,7 +53,7 @@
  * @see AbstractElementVisitor14
  * @since 23
  */
-@SupportedSourceVersion(RELEASE_24)
+@SupportedSourceVersion(RELEASE_25)
 @PreviewFeature(feature=PreviewFeature.Feature.LANGUAGE_MODEL, reflective=true)
 public abstract class AbstractElementVisitorPreview<R, P> extends AbstractElementVisitor14<R, P> {
     /**

src/java.compiler/share/classes/javax/lang/model/util/AbstractTypeVisitor14.java

@@ -47,7 +47,7 @@
  * @see AbstractTypeVisitor9
  * @since 14
  */
-@SupportedSourceVersion(RELEASE_24)
+@SupportedSourceVersion(RELEASE_25)
 public abstract class AbstractTypeVisitor14<R, P> extends AbstractTypeVisitor9<R, P> {
     /**
      * Constructor for concrete subclasses to call.

src/java.compiler/share/classes/javax/lang/model/util/AbstractTypeVisitorPreview.java

@@ -53,7 +53,7 @@
  * @see AbstractTypeVisitor14
  * @since 23
  */
-@SupportedSourceVersion(RELEASE_24)
+@SupportedSourceVersion(RELEASE_25)
 @PreviewFeature(feature=PreviewFeature.Feature.LANGUAGE_MODEL, reflective=true)
 public abstract class AbstractTypeVisitorPreview<R, P> extends AbstractTypeVisitor14<R, P> {
     /**

src/java.compiler/share/classes/javax/lang/model/util/ElementKindVisitor14.java

@@ -61,7 +61,7 @@
  * @see ElementKindVisitor9
  * @since 16
  */
-@SupportedSourceVersion(RELEASE_24)
+@SupportedSourceVersion(RELEASE_25)
 public class ElementKindVisitor14<R, P> extends ElementKindVisitor9<R, P> {
     /**
      * Constructor for concrete subclasses; uses {@code null} for the

src/java.compiler/share/classes/javax/lang/model/util/ElementKindVisitorPreview.java

@@ -67,7 +67,7 @@
  * @see ElementKindVisitor14
  * @since 23
  */
-@SupportedSourceVersion(RELEASE_24)
+@SupportedSourceVersion(RELEASE_25)
 @PreviewFeature(feature=PreviewFeature.Feature.LANGUAGE_MODEL, reflective=true)
 public class ElementKindVisitorPreview<R, P> extends ElementKindVisitor14<R, P> {
     /**

src/java.compiler/share/classes/javax/lang/model/util/ElementScanner14.java

@@ -77,7 +77,7 @@
  * @see ElementScanner9
  * @since 16
  */
-@SupportedSourceVersion(RELEASE_24)
+@SupportedSourceVersion(RELEASE_25)
 public class ElementScanner14<R, P> extends ElementScanner9<R, P> {
     /**
      * Constructor for concrete subclasses; uses {@code null} for the

src/java.compiler/share/classes/javax/lang/model/util/ElementScannerPreview.java

@@ -81,7 +81,7 @@
  * @see ElementScanner14
  * @since 23
  */
-@SupportedSourceVersion(RELEASE_24)
+@SupportedSourceVersion(RELEASE_25)
 @PreviewFeature(feature=PreviewFeature.Feature.LANGUAGE_MODEL, reflective=true)
 public class ElementScannerPreview<R, P> extends ElementScanner14<R, P> {
     /**

src/java.compiler/share/classes/javax/lang/model/util/SimpleAnnotationValueVisitor14.java

@@ -52,7 +52,7 @@
  * @see SimpleAnnotationValueVisitor9
  * @since 14
  */
-@SupportedSourceVersion(RELEASE_24)
+@SupportedSourceVersion(RELEASE_25)
 public class SimpleAnnotationValueVisitor14<R, P> extends SimpleAnnotationValueVisitor9<R, P> {
     /**
      * Constructor for concrete subclasses; uses {@code null} for the

src/java.compiler/share/classes/javax/lang/model/util/SimpleAnnotationValueVisitorPreview.java

@@ -58,7 +58,7 @@
  * @see SimpleAnnotationValueVisitor14
  * @since 23
  */
-@SupportedSourceVersion(RELEASE_24)
+@SupportedSourceVersion(RELEASE_25)
 @PreviewFeature(feature=PreviewFeature.Feature.LANGUAGE_MODEL, reflective=true)
 public class SimpleAnnotationValueVisitorPreview<R, P> extends SimpleAnnotationValueVisitor14<R, P> {
     /**

src/java.compiler/share/classes/javax/lang/model/util/SimpleElementVisitor14.java

@@ -58,7 +58,7 @@
  * @see SimpleElementVisitor9
  * @since 16
  */
-@SupportedSourceVersion(RELEASE_24)
+@SupportedSourceVersion(RELEASE_25)
 public class SimpleElementVisitor14<R, P> extends SimpleElementVisitor9<R, P> {
     /**
      * Constructor for concrete subclasses; uses {@code null} for the

src/java.compiler/share/classes/javax/lang/model/util/SimpleElementVisitorPreview.java

@@ -61,7 +61,7 @@
  * @see SimpleElementVisitor14
  * @since 23
  */
-@SupportedSourceVersion(RELEASE_24)
+@SupportedSourceVersion(RELEASE_25)
 @PreviewFeature(feature=PreviewFeature.Feature.LANGUAGE_MODEL, reflective=true)
 public class SimpleElementVisitorPreview<R, P> extends SimpleElementVisitor14<R, P> {
     /**

src/java.compiler/share/classes/javax/lang/model/util/SimpleTypeVisitor14.java

@@ -56,7 +56,7 @@
  * @see SimpleTypeVisitor9
  * @since 14
  */
-@SupportedSourceVersion(RELEASE_24)
+@SupportedSourceVersion(RELEASE_25)
 public class SimpleTypeVisitor14<R, P> extends SimpleTypeVisitor9<R, P> {
     /**
      * Constructor for concrete subclasses; uses {@code null} for the

src/java.compiler/share/classes/javax/lang/model/util/SimpleTypeVisitorPreview.java

@@ -62,7 +62,7 @@
  * @see SimpleTypeVisitor14
  * @since 23
  */
-@SupportedSourceVersion(RELEASE_24)
+@SupportedSourceVersion(RELEASE_25)
 @PreviewFeature(feature=PreviewFeature.Feature.LANGUAGE_MODEL, reflective=true)
 public class SimpleTypeVisitorPreview<R, P> extends SimpleTypeVisitor14<R, P> {
     /**

src/java.compiler/share/classes/javax/lang/model/util/TypeKindVisitor14.java

@@ -61,7 +61,7 @@
  * @see TypeKindVisitor9
  * @since 14
  */
-@SupportedSourceVersion(RELEASE_24)
+@SupportedSourceVersion(RELEASE_25)
 public class TypeKindVisitor14<R, P> extends TypeKindVisitor9<R, P> {
     /**
      * Constructor for concrete subclasses to call; uses {@code null}

src/java.compiler/share/classes/javax/lang/model/util/TypeKindVisitorPreview.java

@@ -66,7 +66,7 @@
  * @see TypeKindVisitor14
  * @since 23
  */
-@SupportedSourceVersion(RELEASE_24)
+@SupportedSourceVersion(RELEASE_25)
 @PreviewFeature(feature=PreviewFeature.Feature.LANGUAGE_MODEL, reflective=true)
 public class TypeKindVisitorPreview<R, P> extends TypeKindVisitor14<R, P> {
     /**

src/jdk.compiler/share/classes/com/sun/tools/javac/code/Source.java

@@ -148,6 +148,11 @@ public enum Source {
       * 24, tbd
       */
     JDK24("24"),
+
+    /**
+      * 25, tbd
+      */
+    JDK25("25"),
     ; // Reduce code churn when appending new constants
 
     private static final Context.Key<Source> sourceKey = new Context.Key<>();
@@ -200,6 +205,7 @@ public boolean isSupported() {
 
     public Target requiredTarget() {
         return switch(this) {
+        case JDK25  -> Target.JDK1_25;
         case JDK24  -> Target.JDK1_24;
         case JDK23  -> Target.JDK1_23;
         case JDK22  -> Target.JDK1_22;
@@ -351,6 +357,7 @@ public static SourceVersion toSourceVersion(Source source) {
         case JDK22  -> RELEASE_22;
         case JDK23  -> RELEASE_23;
         case JDK24  -> RELEASE_24;
+        case JDK25  -> RELEASE_25;
         default     -> null;
         };
     }

src/jdk.compiler/share/classes/com/sun/tools/javac/jvm/ClassFile.java

@@ -128,6 +128,7 @@ public enum Version {
         V66(66, 0),   // JDK 22
         V67(67, 0),   // JDK 23
         V68(68, 0),   // JDK 24
+        V69(69, 0),   // JDK 25
         ; // Reduce code churn when appending new constants
         Version(int major, int minor) {
             this.major = major;

src/jdk.compiler/share/classes/com/sun/tools/javac/jvm/Target.java

@@ -107,6 +107,9 @@ public enum Target {
 
     /** JDK 24. */
     JDK1_24("24", 68, 0),
+
+    /** JDK 25. */
+    JDK1_25("25", 69, 0),
     ; // Reduce code churn when appending new constants
 
     private static final Context.Key<Target> targetKey = new Context.Key<>();

src/jdk.compiler/share/classes/com/sun/tools/javac/processing/PrintingProcessor.java

@@ -55,7 +55,7 @@
  * deletion without notice.</b>
  */
 @SupportedAnnotationTypes("*")
-@SupportedSourceVersion(SourceVersion.RELEASE_24)
+@SupportedSourceVersion(SourceVersion.RELEASE_25)
 public class PrintingProcessor extends AbstractProcessor {
     PrintWriter writer;