escalate some annotation deprecations to forRemoval=true

especially the enums which names collide with JPA

Author: gavinking

hibernate-core/src/main/java/org/hibernate/annotations/Cascade.java

@@ -32,7 +32,7 @@
  * @deprecated Use the JPA-defined
  *             {@link jakarta.persistence.CascadeType}
  */
-@Deprecated(since = "7")
+@Deprecated(since = "7", forRemoval = true)
 @Target({METHOD, FIELD})
 @Retention(RUNTIME)
 public @interface Cascade {

hibernate-core/src/main/java/org/hibernate/annotations/CascadeType.java

@@ -30,9 +30,11 @@
  * @see Cascade
  *
  * @deprecated Use the JPA-defined
- *             {@link jakarta.persistence.CascadeType}
+ *             {@link jakarta.persistence.CascadeType}.
+ *             This enumeration will be removed to alleviate the
+ *             duplication in naming.
  */
-@Deprecated(since = "7")
+@Deprecated(since = "7", forRemoval = true)
 public enum CascadeType {
 	/**
 	 * Includes all types listed here.

hibernate-core/src/main/java/org/hibernate/annotations/Checks.java

@@ -15,10 +15,13 @@
 /**
  * A list of {@link Check}s.
  *
+ * @deprecated since {@link Check} is deprecated.
+ *
  * @author Gavin King
  */
 @Target({TYPE, METHOD, FIELD})
 @Retention(RUNTIME)
+@Deprecated(since = "7")
 public @interface Checks {
 	Check[] value();
 }

hibernate-core/src/main/java/org/hibernate/annotations/FlushModeType.java

@@ -17,9 +17,10 @@
  * @see NamedQuery#flushMode
  * @see NamedNativeQuery#flushMode
  *
- * @deprecated use {@link QueryFlushMode}
+ * @deprecated Use {@link QueryFlushMode}. This enumeration will be removed to alleviate
+ *             the duplication in naming with {@link jakarta.persistence.FlushModeType}.
  */
-@Deprecated(since="7")
+@Deprecated(since="7", forRemoval = true)
 public enum FlushModeType {
 	/**
 	 * Corresponds to {@link org.hibernate.FlushMode#ALWAYS}.

hibernate-core/src/main/java/org/hibernate/annotations/GenericGenerator.java

@@ -66,7 +66,7 @@
 @Target({PACKAGE, TYPE, METHOD, FIELD})
 @Retention(RUNTIME)
 @Repeatable(GenericGenerators.class)
-@Deprecated(since = "6.5")
+@Deprecated(since = "6.5", forRemoval = true)
 public @interface GenericGenerator {
 	/**
 	 * The name of the identifier generator. This is the name that may be specified by

hibernate-core/src/main/java/org/hibernate/annotations/GenericGenerators.java

@@ -20,7 +20,7 @@
  */
 @Target({PACKAGE, TYPE})
 @Retention(RUNTIME)
-@Deprecated(since = "6.5")
+@Deprecated(since = "6.5", forRemoval = true)
 public @interface GenericGenerators {
 	/**
 	 * The aggregated generators.

hibernate-core/src/main/java/org/hibernate/annotations/NamedNativeQuery.java

@@ -80,7 +80,7 @@
 	 *
 	 * @deprecated use {@link #flush()}
 	 */
-	@Deprecated(since = "7")
+	@Deprecated(since = "7", forRemoval = true)
 	FlushModeType flushMode() default FlushModeType.PERSISTENCE_CONTEXT;
 
 	/**

hibernate-core/src/main/java/org/hibernate/annotations/NamedQuery.java

@@ -75,7 +75,7 @@
 	 *
 	 * @deprecated use {@link #flush()}
 	 */
-	@Deprecated(since = "7")
+	@Deprecated(since = "7", forRemoval = true)
 	FlushModeType flushMode() default FlushModeType.PERSISTENCE_CONTEXT;
 
 	/**

hibernate-core/src/main/java/org/hibernate/annotations/ResultCheckStyle.java

@@ -24,7 +24,7 @@
  *
  * @deprecated Use an {@link Expectation} class instead.
  */
-@Deprecated(since = "6.5")
+@Deprecated(since = "6.5", forRemoval = true)
 public enum ResultCheckStyle {
 	/**
 	 * No return code checking. Might mean that no checks are required, or that

hibernate-core/src/main/java/org/hibernate/annotations/SQLDelete.java

@@ -59,7 +59,7 @@
 	 *
 	 * @deprecated use {@link #verify()} with an {@link Expectation} class
 	 */
-	@Deprecated(since = "6.5")
+	@Deprecated(since = "6.5", forRemoval = true)
 	ResultCheckStyle check() default ResultCheckStyle.NONE;
 
 	/**