diff --git a/src/java.compiler/share/classes/javax/lang/model/util/ElementKindVisitor14.java b/src/java.compiler/share/classes/javax/lang/model/util/ElementKindVisitor14.java
index 919ce5d42563c..28b913ed93d51 100644
--- a/src/java.compiler/share/classes/javax/lang/model/util/ElementKindVisitor14.java
+++ b/src/java.compiler/share/classes/javax/lang/model/util/ElementKindVisitor14.java
@@ -118,7 +118,7 @@ public R visitTypeAsRecord(TypeElement e, P p) {
      * @param p {@inheritDoc ElementKindVisitor6}
      * @return  the result of {@code defaultAction}
      *
-     * @since 14
+     * @since 16
      */
     @Override
     public R visitVariableAsBindingVariable(VariableElement e, P p) {
diff --git a/src/java.compiler/share/classes/javax/lang/model/util/ElementScanner6.java b/src/java.compiler/share/classes/javax/lang/model/util/ElementScanner6.java
index 47a2029d85079..c5bde23b47e1f 100644
--- a/src/java.compiler/share/classes/javax/lang/model/util/ElementScanner6.java
+++ b/src/java.compiler/share/classes/javax/lang/model/util/ElementScanner6.java
@@ -250,6 +250,8 @@ public R visitTypeParameter(TypeParameterElement e, P p) {
      * @param e  {@inheritDoc ElementVisitor}
      * @param p  {@inheritDoc ElementVisitor}
      * @return the result of scanning
+     *
+     * @since 14
      */
     @Override
     public R visitRecordComponent(RecordComponentElement e, P p) {
diff --git a/src/java.compiler/share/classes/javax/tools/ForwardingJavaFileManager.java b/src/java.compiler/share/classes/javax/tools/ForwardingJavaFileManager.java
index e0bb999c05b7f..40224abbd509d 100644
--- a/src/java.compiler/share/classes/javax/tools/ForwardingJavaFileManager.java
+++ b/src/java.compiler/share/classes/javax/tools/ForwardingJavaFileManager.java
@@ -154,6 +154,8 @@ public JavaFileObject getJavaFileForOutput(Location location,
      *
      * @throws IllegalArgumentException {@inheritDoc}
      * @throws IllegalStateException {@inheritDoc}
+     *
+     * @since 18
      */
     @Override
     public JavaFileObject getJavaFileForOutputForOriginatingFiles(Location location,
@@ -214,6 +216,8 @@ public FileObject getFileForOutput(Location location,
      *
      * @throws IllegalArgumentException {@inheritDoc}
      * @throws IllegalStateException {@inheritDoc}
+     *
+     * @since 18
      */
     @Override
     public FileObject getFileForOutputForOriginatingFiles(Location location,
diff --git a/src/jdk.compiler/share/classes/com/sun/source/tree/CaseTree.java b/src/jdk.compiler/share/classes/com/sun/source/tree/CaseTree.java
index facdb8efdafa8..62fa36fa6b7db 100644
--- a/src/jdk.compiler/share/classes/com/sun/source/tree/CaseTree.java
+++ b/src/jdk.compiler/share/classes/com/sun/source/tree/CaseTree.java
@@ -61,7 +61,8 @@ public interface CaseTree extends Tree {
      * For default case, returns an empty list.
      *
      * @return labels for this case
-     * @since 12
+     *
+     * @since 14
      */
     List<? extends ExpressionTree> getExpressions();
 
@@ -98,7 +99,8 @@ public interface CaseTree extends Tree {
      * {@linkplain CaseKind#STATEMENT}.
      *
      * @return case value or null
-     * @since 12
+     *
+     * @since 14
      */
     public default Tree getBody() {
         return null;
@@ -108,7 +110,8 @@ public default Tree getBody() {
      * Returns the kind of this case.
      *
      * @return the kind of this case
-     * @since 12
+     *
+     * @since 14
      */
     public default CaseKind getCaseKind() {
         return CaseKind.STATEMENT;
@@ -121,7 +124,7 @@ public default CaseKind getCaseKind() {
      *     <li>RULE: {@code case <expression> -> <expression>/<statement>}</li>
      * </ul>
      *
-     * @since 12
+     * @since 14
      */
     public enum CaseKind {
         /**
diff --git a/src/jdk.compiler/share/classes/com/sun/source/tree/SwitchExpressionTree.java b/src/jdk.compiler/share/classes/com/sun/source/tree/SwitchExpressionTree.java
index 4a60ea53f99c2..2327c7a3f49e9 100644
--- a/src/jdk.compiler/share/classes/com/sun/source/tree/SwitchExpressionTree.java
+++ b/src/jdk.compiler/share/classes/com/sun/source/tree/SwitchExpressionTree.java
@@ -39,7 +39,7 @@
  *
  * @jls 15.29 Switch Expressions
  *
- * @since 12
+ * @since 14
  */
 public interface SwitchExpressionTree extends ExpressionTree {
     /**
diff --git a/src/jdk.compiler/share/classes/com/sun/source/tree/Tree.java b/src/jdk.compiler/share/classes/com/sun/source/tree/Tree.java
index 0bd3823307b74..4b7df6185d626 100644
--- a/src/jdk.compiler/share/classes/com/sun/source/tree/Tree.java
+++ b/src/jdk.compiler/share/classes/com/sun/source/tree/Tree.java
@@ -284,7 +284,7 @@ public enum Kind {
         /**
          * Used for instances of {@link SwitchExpressionTree}.
          *
-         * @since 12
+         * @since 14
          */
         SWITCH_EXPRESSION(SwitchExpressionTree.class),
 
@@ -702,7 +702,7 @@ public enum Kind {
         /**
          * Used for instances of {@link YieldTree}.
          *
-         * @since 13
+         * @since 14
          */
         YIELD(YieldTree.class);
 
diff --git a/src/jdk.compiler/share/classes/com/sun/source/tree/TreeVisitor.java b/src/jdk.compiler/share/classes/com/sun/source/tree/TreeVisitor.java
index 3f7a683350c2e..b7851d8ff9a58 100644
--- a/src/jdk.compiler/share/classes/com/sun/source/tree/TreeVisitor.java
+++ b/src/jdk.compiler/share/classes/com/sun/source/tree/TreeVisitor.java
@@ -413,7 +413,8 @@ public interface TreeVisitor<R,P> {
      * @param node the node being visited
      * @param p a parameter value
      * @return a result value
-     * @since 12
+     *
+     * @since 14
      */
     R visitSwitchExpression(SwitchExpressionTree node, P p);
 
@@ -608,7 +609,8 @@ public interface TreeVisitor<R,P> {
      * @param node the node being visited
      * @param p a parameter value
      * @return a result value
-     * @since 13
+     *
+     * @since 14
      */
     R visitYield(YieldTree node, P p);
 }
diff --git a/src/jdk.compiler/share/classes/com/sun/source/tree/YieldTree.java b/src/jdk.compiler/share/classes/com/sun/source/tree/YieldTree.java
index 181d0495774ea..eeda36d84aed6 100644
--- a/src/jdk.compiler/share/classes/com/sun/source/tree/YieldTree.java
+++ b/src/jdk.compiler/share/classes/com/sun/source/tree/YieldTree.java
@@ -35,7 +35,7 @@
  *
  * @jls 14.21 The yield Statement
  *
- * @since 13
+ * @since 14
  */
 public interface YieldTree extends StatementTree {
 
diff --git a/src/jdk.compiler/share/classes/com/sun/source/util/DocTreeScanner.java b/src/jdk.compiler/share/classes/com/sun/source/util/DocTreeScanner.java
index 2dd83d85a5dda..d2d0753dbf287 100644
--- a/src/jdk.compiler/share/classes/com/sun/source/util/DocTreeScanner.java
+++ b/src/jdk.compiler/share/classes/com/sun/source/util/DocTreeScanner.java
@@ -229,6 +229,8 @@ public R visitDocRoot(DocRootTree node, P p) {
      * @param node  {@inheritDoc}
      * @param p  {@inheritDoc}
      * @return the result of scanning
+     *
+     * @since 10
      */
     @Override
     public R visitDocType(DocTypeTree node, P p) {
diff --git a/src/jdk.compiler/share/classes/com/sun/source/util/DocTrees.java b/src/jdk.compiler/share/classes/com/sun/source/util/DocTrees.java
index 6d2e60e58a33c..45a452bd0dd54 100644
--- a/src/jdk.compiler/share/classes/com/sun/source/util/DocTrees.java
+++ b/src/jdk.compiler/share/classes/com/sun/source/util/DocTrees.java
@@ -276,6 +276,8 @@ public abstract void printMessage(Diagnostic.Kind kind, CharSequence msg,
      * @param tree the tree containing the entity
      * @return a string containing the characters
      * @spec https://www.w3.org/TR/html52 HTML Standard
+     *
+     * @since 16
      */
     public abstract String getCharacters(EntityTree tree);
 }
diff --git a/src/jdk.compiler/share/classes/com/sun/source/util/Plugin.java b/src/jdk.compiler/share/classes/com/sun/source/util/Plugin.java
index 9a41396d84d9c..aee626929f4cd 100644
--- a/src/jdk.compiler/share/classes/com/sun/source/util/Plugin.java
+++ b/src/jdk.compiler/share/classes/com/sun/source/util/Plugin.java
@@ -74,6 +74,8 @@ public interface Plugin {
      * command-line option.
      *
      * @return whether or not this plugin should be automatically started
+     *
+     * @since 14
      */
     default boolean autoStart() {
         return false;
diff --git a/src/jdk.compiler/share/classes/com/sun/source/util/SimpleTreeVisitor.java b/src/jdk.compiler/share/classes/com/sun/source/util/SimpleTreeVisitor.java
index 5179061b4bb78..1a123a49faa12 100644
--- a/src/jdk.compiler/share/classes/com/sun/source/util/SimpleTreeVisitor.java
+++ b/src/jdk.compiler/share/classes/com/sun/source/util/SimpleTreeVisitor.java
@@ -299,6 +299,8 @@ public R visitSwitch(SwitchTree node, P p) {
      * @param node {@inheritDoc}
      * @param p {@inheritDoc}
      * @return  the result of {@code defaultAction}
+     *
+     * @since 14
      */
     @Override
     public R visitSwitchExpression(SwitchExpressionTree node, P p) {
@@ -1047,6 +1049,8 @@ public R visitOther(Tree node, P p) {
      * @param node {@inheritDoc}
      * @param p {@inheritDoc}
      * @return  the result of {@code defaultAction}
+     *
+     * @since 14
      */
     @Override
     public R visitYield(YieldTree node, P p) {
diff --git a/src/jdk.compiler/share/classes/com/sun/source/util/TreeScanner.java b/src/jdk.compiler/share/classes/com/sun/source/util/TreeScanner.java
index 49bec302100e8..4327c6f5f314e 100644
--- a/src/jdk.compiler/share/classes/com/sun/source/util/TreeScanner.java
+++ b/src/jdk.compiler/share/classes/com/sun/source/util/TreeScanner.java
@@ -376,6 +376,8 @@ public R visitSwitch(SwitchTree node, P p) {
      * @param node  {@inheritDoc}
      * @param p  {@inheritDoc}
      * @return the result of scanning
+     *
+     * @since 14
      */
     @Override
     public R visitSwitchExpression(SwitchExpressionTree node, P p) {
@@ -1200,6 +1202,8 @@ public R visitErroneous(ErroneousTree node, P p) {
      * @param node  {@inheritDoc}
      * @param p  {@inheritDoc}
      * @return the result of scanning
+     *
+     * @since 14
      */
     @Override
     public R visitYield(YieldTree node, P p) {