Merge branch 'querydsl-7.0' of github.com:OpenFeign/querydsl

Author: velo

.circleci/config.yml

@@ -198,7 +198,7 @@ jobs:
           name: 'Build and test examples'
           command: |
             cd querydsl-examples/querydsl-example-ksp-codegen
-            ./gradlew --no-daemon --console=plain
+            ./gradlew --no-daemon --console=plain --info --stacktrace test
       - run:
           name: 'Save test results'
           command: |

pom.xml

@@ -128,9 +128,9 @@
     <r2dbc.version>1.0.0.RELEASE</r2dbc.version>
 
     <!-- JPA deps -->
-    <hibernate.version>7.0.0.Beta1</hibernate.version>
-    <hibernate.validator.version>8.0.2.Final</hibernate.validator.version>
-    <eclipselink.version>5.0.0-B07</eclipselink.version>
+    <hibernate.version>7.0.0.Final</hibernate.version>
+    <hibernate.validator.version>9.0.0.Final</hibernate.validator.version>
+    <eclipselink.version>5.0.0-B08</eclipselink.version>
     <jpa.version>3.2.0</jpa.version>
     <jakarta.annotation.version>3.0.0</jakarta.annotation.version>
 
@@ -157,6 +157,7 @@
     <osgi.import.package.root>*</osgi.import.package.root>
     <osgi.import.package>${osgi.import.package.root}</osgi.import.package>
 
+    <jacocoArgLine></jacocoArgLine>
     <jacoco.propertyName>jacocoArgLine</jacoco.propertyName>
   </properties>
 

querydsl-examples/querydsl-example-jpa-guice/pom.xml

@@ -53,6 +53,16 @@
         </exclusion>
       </exclusions>
     </dependency>
+    <dependency>
+      <groupId>org.hibernate.orm</groupId>
+      <artifactId>hibernate-scan-jandex</artifactId>
+      <version>${hibernate.version}</version>
+    </dependency>
+    <dependency>
+      <groupId>org.glassfish.expressly</groupId>
+      <artifactId>expressly</artifactId>
+      <version>5.0.0</version>
+    </dependency>
     <dependency>
       <groupId>org.hibernate.orm</groupId>
       <artifactId>hibernate-c3p0</artifactId>

querydsl-libraries/querydsl-jpa/pom.xml

@@ -42,6 +42,13 @@
       <scope>provided</scope>
       <optional>true</optional>
     </dependency>
+    <dependency>
+      <groupId>org.hibernate.orm</groupId>
+      <artifactId>hibernate-scan-jandex</artifactId>
+      <version>${hibernate.version}</version>
+      <scope>provided</scope>
+      <optional>true</optional>
+    </dependency>
 
     <dependency>
       <groupId>jakarta.persistence</groupId>
@@ -93,6 +100,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>

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;
 }

querydsl-tooling/querydsl-jpa-codegen/pom.xml

@@ -30,6 +30,13 @@
         </exclusion>
       </exclusions>
     </dependency>
+    <dependency>
+      <groupId>org.hibernate.orm</groupId>
+      <artifactId>hibernate-scan-jandex</artifactId>
+      <version>${hibernate.version}</version>
+      <scope>provided</scope>
+      <optional>true</optional>
+    </dependency>
     <dependency>
       <groupId>org.hibernate.validator</groupId>
       <artifactId>hibernate-validator</artifactId>
@@ -43,6 +50,14 @@
       </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>jakarta.persistence</groupId>
       <artifactId>jakarta.persistence-api</artifactId>