From 48790adebbf39a79f706095c38b78026a479bef9 Mon Sep 17 00:00:00 2001
From: "Greg L. Turnquist" <gturnquist@vmware.com>
Date: Wed, 8 Jun 2022 10:23:30 -0500
Subject: [PATCH] Align Spring Data JPA annotations with Spring Framework
 annotations.

Remove @Inherited from Spring Data JPA annotations to align with Spring Framework ones.

Closes #803.
---
 .../envers/repository/config/EnableEnversRepositories.java | 7 +++----
 .../data/jpa/repository/config/EnableJpaAuditing.java      | 7 +++----
 .../data/jpa/repository/config/EnableJpaRepositories.java  | 7 +++----
 3 files changed, 9 insertions(+), 12 deletions(-)

diff --git a/spring-data-envers/src/main/java/org/springframework/data/envers/repository/config/EnableEnversRepositories.java b/spring-data-envers/src/main/java/org/springframework/data/envers/repository/config/EnableEnversRepositories.java
index 663fe2425..632ef5fa9 100644
--- a/spring-data-envers/src/main/java/org/springframework/data/envers/repository/config/EnableEnversRepositories.java
+++ b/spring-data-envers/src/main/java/org/springframework/data/envers/repository/config/EnableEnversRepositories.java
@@ -15,15 +15,14 @@
  */
 package org.springframework.data.envers.repository.config;
 
+import jakarta.persistence.EntityManagerFactory;
+
 import java.lang.annotation.Documented;
 import java.lang.annotation.ElementType;
-import java.lang.annotation.Inherited;
 import java.lang.annotation.Retention;
 import java.lang.annotation.RetentionPolicy;
 import java.lang.annotation.Target;
 
-import jakarta.persistence.EntityManagerFactory;
-
 import org.springframework.beans.factory.FactoryBean;
 import org.springframework.context.annotation.ComponentScan.Filter;
 import org.springframework.context.annotation.Lazy;
@@ -45,6 +44,7 @@ import org.springframework.transaction.PlatformTransactionManager;
  * {@link #repositoryFactoryBeanClass} to {@link EnversRevisionRepositoryFactoryBean}.
  *
  * @author Mark Paluch
+ * @author Greg Turnquist
  * @since 2.5
  * @see EnableJpaRepositories
  * @see AliasFor
@@ -52,7 +52,6 @@ import org.springframework.transaction.PlatformTransactionManager;
 @Target(ElementType.TYPE)
 @Retention(RetentionPolicy.RUNTIME)
 @Documented
-@Inherited
 @EnableJpaRepositories
 public @interface EnableEnversRepositories {
 
diff --git a/spring-data-jpa/src/main/java/org/springframework/data/jpa/repository/config/EnableJpaAuditing.java b/spring-data-jpa/src/main/java/org/springframework/data/jpa/repository/config/EnableJpaAuditing.java
index 69df7a7cb..b462df485 100644
--- a/spring-data-jpa/src/main/java/org/springframework/data/jpa/repository/config/EnableJpaAuditing.java
+++ b/spring-data-jpa/src/main/java/org/springframework/data/jpa/repository/config/EnableJpaAuditing.java
@@ -17,7 +17,6 @@ package org.springframework.data.jpa.repository.config;
 
 import java.lang.annotation.Documented;
 import java.lang.annotation.ElementType;
-import java.lang.annotation.Inherited;
 import java.lang.annotation.Retention;
 import java.lang.annotation.RetentionPolicy;
 import java.lang.annotation.Target;
@@ -31,8 +30,8 @@ import org.springframework.data.domain.AuditorAware;
  *
  * @author Thomas Darimont
  * @author Oliver Gierke
+ * @author Greg Turnquist
  */
-@Inherited
 @Documented
 @Target(ElementType.TYPE)
 @Retention(RetentionPolicy.RUNTIME)
@@ -61,8 +60,8 @@ public @interface EnableJpaAuditing {
 	boolean modifyOnCreate() default true;
 
 	/**
-	 * Configures a {@link DateTimeProvider} bean name that allows customizing the {@link java.time.temporal.TemporalAccessor} to be
-	 * used for setting creation and modification dates.
+	 * Configures a {@link DateTimeProvider} bean name that allows customizing the
+	 * {@link java.time.temporal.TemporalAccessor} to be used for setting creation and modification dates.
 	 *
 	 * @return
 	 */
diff --git a/spring-data-jpa/src/main/java/org/springframework/data/jpa/repository/config/EnableJpaRepositories.java b/spring-data-jpa/src/main/java/org/springframework/data/jpa/repository/config/EnableJpaRepositories.java
index 802b83170..fa2241dc7 100644
--- a/spring-data-jpa/src/main/java/org/springframework/data/jpa/repository/config/EnableJpaRepositories.java
+++ b/spring-data-jpa/src/main/java/org/springframework/data/jpa/repository/config/EnableJpaRepositories.java
@@ -15,15 +15,14 @@
  */
 package org.springframework.data.jpa.repository.config;
 
+import jakarta.persistence.EntityManagerFactory;
+
 import java.lang.annotation.Documented;
 import java.lang.annotation.ElementType;
-import java.lang.annotation.Inherited;
 import java.lang.annotation.Retention;
 import java.lang.annotation.RetentionPolicy;
 import java.lang.annotation.Target;
 
-import jakarta.persistence.EntityManagerFactory;
-
 import org.springframework.beans.factory.FactoryBean;
 import org.springframework.context.annotation.ComponentScan.Filter;
 import org.springframework.context.annotation.Import;
@@ -41,11 +40,11 @@ import org.springframework.transaction.PlatformTransactionManager;
  *
  * @author Oliver Gierke
  * @author Thomas Darimont
+ * @author Greg Turnquist
  */
 @Target(ElementType.TYPE)
 @Retention(RetentionPolicy.RUNTIME)
 @Documented
-@Inherited
 @Import(JpaRepositoriesRegistrar.class)
 public @interface EnableJpaRepositories {