diff --git a/pom.xml b/pom.xml
index 44b0e8af9..8b7e66384 100644
--- a/pom.xml
+++ b/pom.xml
@@ -128,7 +128,7 @@
     <r2dbc.version>1.0.0.RELEASE</r2dbc.version>
 
     <!-- JPA deps -->
-    <hibernate.version>7.0.0.Beta1</hibernate.version>
+    <hibernate.version>7.0.0.CR1</hibernate.version>
     <hibernate.validator.version>8.0.2.Final</hibernate.validator.version>
     <eclipselink.version>5.0.0-B07</eclipselink.version>
     <jpa.version>3.2.0</jpa.version>
diff --git a/querydsl-libraries/querydsl-jpa/pom.xml b/querydsl-libraries/querydsl-jpa/pom.xml
index 76313464f..42fc230e1 100644
--- a/querydsl-libraries/querydsl-jpa/pom.xml
+++ b/querydsl-libraries/querydsl-jpa/pom.xml
@@ -93,6 +93,13 @@
         </exclusion>
       </exclusions>
     </dependency>
+    <dependency>
+      <groupId>org.glassfish.expressly</groupId>
+      <artifactId>expressly</artifactId>
+      <version>5.0.0</version>
+      <scope>provided</scope>
+      <optional>true</optional>
+    </dependency>
 
     <dependency>
       <groupId>org.postgresql</groupId>
diff --git a/querydsl-tooling/querydsl-apt/src/test/java/com/querydsl/apt/domain/Revision.java b/querydsl-tooling/querydsl-apt/src/test/java/com/querydsl/apt/domain/Revision.java
index 4cd3eae47..e26e1829f 100644
--- a/querydsl-tooling/querydsl-apt/src/test/java/com/querydsl/apt/domain/Revision.java
+++ b/querydsl-tooling/querydsl-apt/src/test/java/com/querydsl/apt/domain/Revision.java
@@ -1,12 +1,12 @@
 package com.querydsl.apt.domain;
 
 import jakarta.persistence.Entity;
-import org.hibernate.envers.DefaultRevisionEntity;
 import org.hibernate.envers.RevisionEntity;
+import org.hibernate.envers.RevisionMapping;
 
 @Entity
 @RevisionEntity
-public class Revision extends DefaultRevisionEntity {
+public class Revision extends RevisionMapping {
 
   private static final long serialVersionUID = 4587663183059799464L;
 }