Merge branch 'querydsl-7.0' into master

Author: velo

pom.xml

@@ -4,7 +4,7 @@
   <modelVersion>4.0.0</modelVersion>
   <groupId>io.github.openfeign.querydsl</groupId>
   <artifactId>querydsl-root</artifactId>
-  <version>6.11-SNAPSHOT</version>
+  <version>7.0-SNAPSHOT</version>
 
   <packaging>pom</packaging>
   <name>Querydsl</name>
@@ -87,6 +87,9 @@
   </distributionManagement>
 
   <properties>
+    <!-- removing old modules on 7.0 release -->
+    <japicmp.skip>true</japicmp.skip>
+
     <failIfNoTests>false</failIfNoTests>
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
     <project.homepage>http://www.querydsl.com</project.homepage>
@@ -96,13 +99,13 @@
     <argLine>-Xms256m -Xmx512m</argLine>
 
     <!-- default bytecode version for src/main -->
-    <main.java.version>11</main.java.version>
+    <main.java.version>17</main.java.version>
     <latest.java.version>21</latest.java.version>
 
     <git-code-format-maven-plugin.version>5.3</git-code-format-maven-plugin.version>
 
     <junit.version>5.11.4</junit.version>
-    <ecj.version>3.33.0</ecj.version>
+    <ecj.version>3.40.0</ecj.version>
     <jdo.version>3.2.1</jdo.version>
     <springboot.version>3.4.2</springboot.version>
     <spring.version>6.2.2</spring.version>
@@ -125,17 +128,16 @@
     <r2dbc.version>1.0.0.RELEASE</r2dbc.version>
 
     <!-- JPA deps -->
-    <hibernate.version>6.6.6.Final</hibernate.version>
+    <hibernate.version>7.0.0.Beta1</hibernate.version>
     <hibernate.validator.version>8.0.2.Final</hibernate.validator.version>
-    <eclipselink.version>4.0.5</eclipselink.version>
-    <jpa.version>3.1.0</jpa.version>
+    <eclipselink.version>5.0.0-B06</eclipselink.version>
+    <jpa.version>3.2.0</jpa.version>
     <jakarta.annotation.version>3.0.0</jakarta.annotation.version>
 
     <assertj.version>3.27.3</assertj.version>
     <mvn.version>3.9.9</mvn.version>
     <guava.version>33.4.0-jre</guava.version>
     <codegen.version>0.6.8</codegen.version>
-    <mysema.lang.version>0.2.4</mysema.lang.version>
     <byte-buddy.version>1.17.0</byte-buddy.version>
     <slf4j.version>2.0.16</slf4j.version>
     <surefire.version>3.5.2</surefire.version>
@@ -1055,7 +1057,7 @@
                 <configuration>
                   <exportDatatables>true</exportDatatables>
                   <activeRecipes>
-                    <recipe>org.openrewrite.java.migrate.Java8toJava11</recipe>
+                    <recipe>org.openrewrite.java.migrate.UpgradeToJava17</recipe>
                   </activeRecipes>
                 </configuration>
               </execution>

querydsl-docs/pom.xml

@@ -5,7 +5,7 @@
   <parent>
     <groupId>io.github.openfeign.querydsl</groupId>
     <artifactId>querydsl-root</artifactId>
-    <version>6.11-SNAPSHOT</version>
+    <version>7.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>querydsl-docs</artifactId>

querydsl-examples/pom.xml

@@ -5,7 +5,7 @@
   <parent>
     <groupId>io.github.openfeign.querydsl</groupId>
     <artifactId>querydsl-root</artifactId>
-    <version>6.11-SNAPSHOT</version>
+    <version>7.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>querydsl-examples</artifactId>
@@ -27,10 +27,6 @@
     <module>querydsl-example-r2dbc-sql-codegen</module>
   </modules>
 
-  <properties>
-    <main.java.version>17</main.java.version>
-  </properties>
-
   <dependencyManagement>
     <dependencies>
       <dependency>

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

@@ -5,7 +5,7 @@
   <parent>
     <groupId>io.github.openfeign.querydsl</groupId>
     <artifactId>querydsl-examples</artifactId>
-    <version>6.11-SNAPSHOT</version>
+    <version>7.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>querydsl-example-jpa-guice</artifactId>

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

@@ -5,7 +5,7 @@
   <parent>
     <groupId>io.github.openfeign.querydsl</groupId>
     <artifactId>querydsl-examples</artifactId>
-    <version>6.11-SNAPSHOT</version>
+    <version>7.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>querydsl-example-jpa-quarkus</artifactId>

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

@@ -4,7 +4,7 @@
   <parent>
     <groupId>io.github.openfeign.querydsl</groupId>
     <artifactId>querydsl-examples</artifactId>
-    <version>6.11-SNAPSHOT</version>
+    <version>7.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>querydsl-example-jpa-spring</artifactId>

querydsl-examples/querydsl-example-kotlin-codegen/pom.xml

@@ -4,7 +4,7 @@
   <parent>
     <groupId>io.github.openfeign.querydsl</groupId>
     <artifactId>querydsl-examples</artifactId>
-    <version>6.11-SNAPSHOT</version>
+    <version>7.0-SNAPSHOT</version>
   </parent>
   <artifactId>querydsl-example-kotlin-codegen</artifactId>
   <name>Querydsl example - Kotlin Codegen</name>

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

@@ -4,7 +4,7 @@
   <parent>
     <groupId>io.github.openfeign.querydsl</groupId>
     <artifactId>querydsl-examples</artifactId>
-    <version>6.11-SNAPSHOT</version>
+    <version>7.0-SNAPSHOT</version>
   </parent>
   <artifactId>querydsl-example-kotlin</artifactId>
   <name>Querydsl example - Kotlin JPA</name>

querydsl-examples/querydsl-example-kotlin-mongodb/pom.xml

@@ -4,7 +4,7 @@
   <parent>
     <groupId>io.github.openfeign.querydsl</groupId>
     <artifactId>querydsl-examples</artifactId>
-    <version>6.11-SNAPSHOT</version>
+    <version>7.0-SNAPSHOT</version>
   </parent>
   <artifactId>querydsl-example-kotlin-mongodb</artifactId>
   <name>Querydsl example - Kotlin MongoDB</name>

querydsl-examples/querydsl-example-r2dbc-sql-codegen/pom.xml

@@ -5,7 +5,7 @@
   <parent>
     <groupId>io.github.openfeign.querydsl</groupId>
     <artifactId>querydsl-examples</artifactId>
-    <version>6.11-SNAPSHOT</version>
+    <version>7.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>querydsl-example-r2dbc-sql-codegen</artifactId>