diff --git a/spring-data-jpa/src/main/java/org/springframework/data/jpa/repository/support/JpaEntityInformation.java b/spring-data-jpa/src/main/java/org/springframework/data/jpa/repository/support/JpaEntityInformation.java
index 096bd77d21..d38332ac57 100644
--- a/spring-data-jpa/src/main/java/org/springframework/data/jpa/repository/support/JpaEntityInformation.java
+++ b/spring-data-jpa/src/main/java/org/springframework/data/jpa/repository/support/JpaEntityInformation.java
@@ -19,6 +19,7 @@
 
 import java.util.Collection;
 import java.util.Map;
+import java.util.Optional;
 
 import org.springframework.data.jpa.repository.query.JpaEntityMetadata;
 import org.springframework.data.repository.core.EntityInformation;
@@ -30,6 +31,7 @@
  * @author Oliver Gierke
  * @author Thomas Darimont
  * @author Mark Paluch
+ * @author Yanming Zhou
  */
 public interface JpaEntityInformation<T, ID> extends EntityInformation<T, ID>, JpaEntityMetadata<T> {
 
@@ -39,6 +41,11 @@ public interface JpaEntityInformation<T, ID> extends EntityInformation<T, ID>, J
 	@Nullable
 	SingularAttribute<? super T, ?> getIdAttribute();
 
+	/**
+	 * Returns the version attribute of the entity.
+	 */
+	Optional<SingularAttribute<? super T, ?>> getVersionAttribute();
+
 	/**
 	 * Returns the required identifier type.
 	 *
diff --git a/spring-data-jpa/src/main/java/org/springframework/data/jpa/repository/support/JpaMetamodelEntityInformation.java b/spring-data-jpa/src/main/java/org/springframework/data/jpa/repository/support/JpaMetamodelEntityInformation.java
index 9979fc773b..a508a45456 100644
--- a/spring-data-jpa/src/main/java/org/springframework/data/jpa/repository/support/JpaMetamodelEntityInformation.java
+++ b/spring-data-jpa/src/main/java/org/springframework/data/jpa/repository/support/JpaMetamodelEntityInformation.java
@@ -47,7 +47,7 @@
 
 /**
  * Implementation of {@link org.springframework.data.repository.core.EntityInformation} that uses JPA {@link Metamodel}
- * to find the domain class' id field.
+ * to find the domain class' id and version field.
  *
  * @author Oliver Gierke
  * @author Thomas Darimont
@@ -55,6 +55,7 @@
  * @author Mark Paluch
  * @author Jens Schauder
  * @author Greg Turnquist
+ * @author Yanming Zhou
  */
 public class JpaMetamodelEntityInformation<T, ID> extends JpaEntityInformationSupport<T, ID> {
 
@@ -191,6 +192,11 @@ public Class<ID> getIdType() {
 		return idMetadata.getSimpleIdAttribute();
 	}
 
+	@Override
+	public Optional<SingularAttribute<? super T, ?>> getVersionAttribute() {
+		return versionAttribute;
+	}
+
 	@Override
 	public boolean hasCompositeId() {
 		return !idMetadata.hasSimpleId();
diff --git a/spring-data-jpa/src/test/java/org/springframework/data/jpa/repository/support/JpaEntityInformationSupportUnitTests.java b/spring-data-jpa/src/test/java/org/springframework/data/jpa/repository/support/JpaEntityInformationSupportUnitTests.java
index e66e624b12..df7522a65e 100644
--- a/spring-data-jpa/src/test/java/org/springframework/data/jpa/repository/support/JpaEntityInformationSupportUnitTests.java
+++ b/spring-data-jpa/src/test/java/org/springframework/data/jpa/repository/support/JpaEntityInformationSupportUnitTests.java
@@ -29,6 +29,7 @@
 import java.util.Collection;
 import java.util.Collections;
 import java.util.Map;
+import java.util.Optional;
 
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.extension.ExtendWith;
@@ -42,6 +43,7 @@
  *
  * @author Oliver Gierke
  * @author Jens Schauder
+ * @author Yanming Zhou
  */
 @ExtendWith(MockitoExtension.class)
 @MockitoSettings(strictness = Strictness.LENIENT)
@@ -88,6 +90,11 @@ static class DummyJpaEntityInformation<T, ID> extends JpaEntityInformationSuppor
 			return null;
 		}
 
+		@Override
+		public Optional<SingularAttribute<? super T, ?>> getVersionAttribute() {
+			return Optional.empty();
+		}
+
 		@Override
 		public ID getId(T entity) {
 			return null;