diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index 88aaca4d1a5..8cb47410bbb 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -59,6 +59,7 @@ jobs:
       matrix:
         test-name:
           - 'jdk/crac'
+          - 'jdk/since checks'
           - 'jdk/tier1 part 1'
           - 'jdk/tier1 part 2'
           - 'jdk/tier1 part 3'
@@ -76,6 +77,9 @@ jobs:
           - test-name: 'jdk/crac'
             test-suite: 'test/jdk/jdk/crac/'
 
+          - test-name: 'jdk/since checks'
+            test-suite: 'test/jdk/:jdk_since_checks'
+
           - test-name: 'jdk/tier1 part 1'
             test-suite: 'test/jdk/:tier1_part1'
 
diff --git a/src/jdk.compiler/share/data/symbols/jdk.crac-O.sym.txt b/src/jdk.compiler/share/data/symbols/jdk.crac-O.sym.txt
new file mode 100644
index 00000000000..a10808df24c
--- /dev/null
+++ b/src/jdk.compiler/share/data/symbols/jdk.crac-O.sym.txt
@@ -0,0 +1,56 @@
+#
+# Copyright (c) 2025, 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. ###
+# ##########################################################
+#
+module name jdk.crac
+header exports jdk/crac requires name\u0020;java.base\u0020;flags\u0020;8000 target macos-aarch64 flags 8000
+
+class name jdk/crac/CheckpointException
+header extends java/lang/Exception flags 31
+method name <init> descriptor ()V flags 1
+
+class name jdk/crac/Context
+header extends java/lang/Object implements jdk/crac/Resource flags 421 signature <R::Ljdk/crac/Resource;>Ljava/lang/Object;Ljdk/crac/Resource;
+method name <init> descriptor ()V flags 4
+method name beforeCheckpoint descriptor (Ljdk/crac/Context;)V thrownTypes jdk/crac/CheckpointException flags 401 signature (Ljdk/crac/Context<+Ljdk/crac/Resource;>;)V
+method name afterRestore descriptor (Ljdk/crac/Context;)V thrownTypes jdk/crac/RestoreException flags 401 signature (Ljdk/crac/Context<+Ljdk/crac/Resource;>;)V
+method name register descriptor (Ljdk/crac/Resource;)V flags 401 signature (TR;)V
+
+class name jdk/crac/Core
+header extends java/lang/Object flags 21
+method name getGlobalContext descriptor ()Ljdk/crac/Context; flags 9 signature ()Ljdk/crac/Context<Ljdk/crac/Resource;>;
+method name checkpointRestore descriptor ()V thrownTypes jdk/crac/CheckpointException,jdk/crac/RestoreException flags 9
+
+class name jdk/crac/Resource
+header extends java/lang/Object flags 601
+method name beforeCheckpoint descriptor (Ljdk/crac/Context;)V thrownTypes java/lang/Exception flags 401 signature (Ljdk/crac/Context<+Ljdk/crac/Resource;>;)V
+method name afterRestore descriptor (Ljdk/crac/Context;)V thrownTypes java/lang/Exception flags 401 signature (Ljdk/crac/Context<+Ljdk/crac/Resource;>;)V
+
+class name jdk/crac/RestoreException
+header extends java/lang/Exception flags 31
+method name <init> descriptor ()V flags 1
+
diff --git a/src/jdk.compiler/share/data/symbols/jdk.management-O.sym.txt b/src/jdk.compiler/share/data/symbols/jdk.management-O.sym.txt
index 45640662a8c..74924a3ac7e 100644
--- a/src/jdk.compiler/share/data/symbols/jdk.management-O.sym.txt
+++ b/src/jdk.compiler/share/data/symbols/jdk.management-O.sym.txt
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2024, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2024, 2025, 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
@@ -27,7 +27,13 @@
 # ##########################################################
 #
 module name jdk.management
-header exports com/sun/management,jdk/management requires name\u0020;java.base\u0020;flags\u0020;8000,name\u0020;java.management\u0020;flags\u0020;20 provides interface\u0020;sun/management/spi/PlatformMBeanProvider\u0020;impls\u0020;com/sun/management/internal/PlatformMBeanProviderImpl target macos-aarch64 flags 8000
+header exports com/sun/management,jdk/crac/management,jdk/management requires name\u0020;java.base\u0020;flags\u0020;8000,name\u0020;java.management\u0020;flags\u0020;20 provides interface\u0020;sun/management/spi/PlatformMBeanProvider\u0020;impls\u0020;com/sun/management/internal/PlatformMBeanProviderImpl target macos-aarch64 flags 8000
+
+class name jdk/crac/management/CRaCMXBean
+header extends java/lang/Object implements java/lang/management/PlatformManagedObject flags 601
+method name getUptimeSinceRestore descriptor ()J flags 401
+method name getRestoreTime descriptor ()J flags 401
+method name getCRaCMXBean descriptor ()Ljdk/crac/management/CRaCMXBean; flags 9
 
 class name jdk/management/VirtualThreadSchedulerMXBean
 header extends java/lang/Object implements java/lang/management/PlatformManagedObject flags 601
diff --git a/src/jdk.compiler/share/data/symbols/symbols b/src/jdk.compiler/share/data/symbols/symbols
index f7f2946d582..a47438302cf 100644
--- a/src/jdk.compiler/share/data/symbols/symbols
+++ b/src/jdk.compiler/share/data/symbols/symbols
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2015, 2024, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2015, 2025, 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
@@ -46,4 +46,4 @@ platform version K base J files java.base-K.sym.txt:java.compiler-K.sym.txt:java
 platform version L base K files java.base-L.sym.txt:java.compiler-L.sym.txt:java.desktop-L.sym.txt:java.logging-L.sym.txt:java.management-L.sym.txt:java.management.rmi-L.sym.txt:java.net.http-L.sym.txt:java.xml.crypto-L.sym.txt:jdk.compiler-L.sym.txt:jdk.incubator.concurrent-L.sym.txt:jdk.incubator.foreign-L.sym.txt:jdk.incubator.vector-L.sym.txt:jdk.jartool-L.sym.txt:jdk.javadoc-L.sym.txt:jdk.jdi-L.sym.txt:jdk.jfr-L.sym.txt:jdk.jshell-L.sym.txt:jdk.management-L.sym.txt:jdk.sctp-L.sym.txt:jdk.unsupported-L.sym.txt
 platform version M base L files java.base-M.sym.txt:java.compiler-M.sym.txt:java.desktop-M.sym.txt:java.xml-M.sym.txt:java.xml.crypto-M.sym.txt:jdk.compiler-M.sym.txt:jdk.crypto.cryptoki-M.sym.txt:jdk.crypto.ec-M.sym.txt:jdk.incubator.foreign-M.sym.txt:jdk.incubator.vector-M.sym.txt:jdk.jartool-M.sym.txt:jdk.jdeps-M.sym.txt:jdk.jfr-M.sym.txt:jdk.jlink-M.sym.txt:jdk.jpackage-M.sym.txt:jdk.jshell-M.sym.txt:jdk.jstatd-M.sym.txt:jdk.unsupported-M.sym.txt
 platform version N base M files java.base-N.sym.txt:java.compiler-N.sym.txt:java.desktop-N.sym.txt:java.management-N.sym.txt:java.management.rmi-N.sym.txt:jdk.compiler-N.sym.txt:jdk.httpserver-N.sym.txt:jdk.incubator.foreign-N.sym.txt:jdk.javadoc-N.sym.txt:jdk.jshell-N.sym.txt:jdk.localedata-N.sym.txt:jdk.unsupported-N.sym.txt
-platform version O base N files java.base-O.sym.txt:java.compiler-O.sym.txt:java.datatransfer-O.sym.txt:java.desktop-O.sym.txt:java.instrument-O.sym.txt:java.logging-O.sym.txt:java.management-O.sym.txt:java.management.rmi-O.sym.txt:java.naming-O.sym.txt:java.net.http-O.sym.txt:java.prefs-O.sym.txt:java.rmi-O.sym.txt:java.scripting-O.sym.txt:java.se-O.sym.txt:java.security.jgss-O.sym.txt:java.security.sasl-O.sym.txt:java.smartcardio-O.sym.txt:java.sql-O.sym.txt:java.sql.rowset-O.sym.txt:java.transaction.xa-O.sym.txt:java.xml-O.sym.txt:java.xml.crypto-O.sym.txt:jdk.accessibility-O.sym.txt:jdk.attach-O.sym.txt:jdk.charsets-O.sym.txt:jdk.compiler-O.sym.txt:jdk.crypto.cryptoki-O.sym.txt:jdk.dynalink-O.sym.txt:jdk.editpad-O.sym.txt:jdk.hotspot.agent-O.sym.txt:jdk.httpserver-O.sym.txt:jdk.incubator.foreign-O.sym.txt:jdk.incubator.vector-O.sym.txt:jdk.jartool-O.sym.txt:jdk.javadoc-O.sym.txt:jdk.jcmd-O.sym.txt:jdk.jconsole-O.sym.txt:jdk.jdeps-O.sym.txt:jdk.jdi-O.sym.txt:jdk.jdwp.agent-O.sym.txt:jdk.jfr-O.sym.txt:jdk.jlink-O.sym.txt:jdk.jpackage-O.sym.txt:jdk.jshell-O.sym.txt:jdk.jsobject-O.sym.txt:jdk.jstatd-O.sym.txt:jdk.localedata-O.sym.txt:jdk.management-O.sym.txt:jdk.management.agent-O.sym.txt:jdk.management.jfr-O.sym.txt:jdk.naming.dns-O.sym.txt:jdk.naming.rmi-O.sym.txt:jdk.net-O.sym.txt:jdk.nio.mapmode-O.sym.txt:jdk.sctp-O.sym.txt:jdk.security.auth-O.sym.txt:jdk.security.jgss-O.sym.txt:jdk.unsupported-O.sym.txt:jdk.xml.dom-O.sym.txt:jdk.zipfs-O.sym.txt
+platform version O base N files java.base-O.sym.txt:java.compiler-O.sym.txt:java.datatransfer-O.sym.txt:java.desktop-O.sym.txt:java.instrument-O.sym.txt:java.logging-O.sym.txt:java.management-O.sym.txt:java.management.rmi-O.sym.txt:java.naming-O.sym.txt:java.net.http-O.sym.txt:java.prefs-O.sym.txt:java.rmi-O.sym.txt:java.scripting-O.sym.txt:java.se-O.sym.txt:java.security.jgss-O.sym.txt:java.security.sasl-O.sym.txt:java.smartcardio-O.sym.txt:java.sql-O.sym.txt:java.sql.rowset-O.sym.txt:java.transaction.xa-O.sym.txt:java.xml-O.sym.txt:java.xml.crypto-O.sym.txt:jdk.accessibility-O.sym.txt:jdk.attach-O.sym.txt:jdk.charsets-O.sym.txt:jdk.compiler-O.sym.txt:jdk.crac-O.sym.txt:jdk.crypto.cryptoki-O.sym.txt:jdk.dynalink-O.sym.txt:jdk.editpad-O.sym.txt:jdk.hotspot.agent-O.sym.txt:jdk.httpserver-O.sym.txt:jdk.incubator.foreign-O.sym.txt:jdk.incubator.vector-O.sym.txt:jdk.jartool-O.sym.txt:jdk.javadoc-O.sym.txt:jdk.jcmd-O.sym.txt:jdk.jconsole-O.sym.txt:jdk.jdeps-O.sym.txt:jdk.jdi-O.sym.txt:jdk.jdwp.agent-O.sym.txt:jdk.jfr-O.sym.txt:jdk.jlink-O.sym.txt:jdk.jpackage-O.sym.txt:jdk.jshell-O.sym.txt:jdk.jsobject-O.sym.txt:jdk.jstatd-O.sym.txt:jdk.localedata-O.sym.txt:jdk.management-O.sym.txt:jdk.management.agent-O.sym.txt:jdk.management.jfr-O.sym.txt:jdk.naming.dns-O.sym.txt:jdk.naming.rmi-O.sym.txt:jdk.net-O.sym.txt:jdk.nio.mapmode-O.sym.txt:jdk.sctp-O.sym.txt:jdk.security.auth-O.sym.txt:jdk.security.jgss-O.sym.txt:jdk.unsupported-O.sym.txt:jdk.xml.dom-O.sym.txt:jdk.zipfs-O.sym.txt
diff --git a/src/jdk.crac/share/classes/jdk/crac/package-info.java b/src/jdk.crac/share/classes/jdk/crac/package-info.java
index 3fcfd0cc251..c4a88a55dea 100644
--- a/src/jdk.crac/share/classes/jdk/crac/package-info.java
+++ b/src/jdk.crac/share/classes/jdk/crac/package-info.java
@@ -91,7 +91,7 @@
  * </li>
  * </ul>
  *
- * @since TBD
+ * @since 24 (TBD)
  */
 
 package jdk.crac;
diff --git a/src/jdk.crac/share/classes/module-info.java b/src/jdk.crac/share/classes/module-info.java
index 3e794ca40a3..4584f058371 100644
--- a/src/jdk.crac/share/classes/module-info.java
+++ b/src/jdk.crac/share/classes/module-info.java
@@ -23,6 +23,13 @@
  * questions.
  */
 
+/**
+ * CRaC (Coordinated Restore at Checkpoint) API.
+ *
+ * @moduleGraph
+ * @since 24 (TBD)
+ */
+
 module jdk.crac {
 
     exports jdk.crac;
diff --git a/src/jdk.management/share/classes/jdk/crac/management/package-info.java b/src/jdk.management/share/classes/jdk/crac/management/package-info.java
index 66970631b79..975afdbe84b 100644
--- a/src/jdk.management/share/classes/jdk/crac/management/package-info.java
+++ b/src/jdk.management/share/classes/jdk/crac/management/package-info.java
@@ -25,6 +25,8 @@
 
 /**
  * This package contains management interfaces for CRaC.
+ *
+ * @since 24 (TBD)
  */
 
 package jdk.crac.management;