diff --git a/pom.xml b/pom.xml
index 885cf27ac0..8cb329a674 100644
--- a/pom.xml
+++ b/pom.xml
@@ -4,7 +4,7 @@
   <modelVersion>4.0.0</modelVersion>
   <groupId>io.github.openfeign.querydsl</groupId>
   <artifactId>querydsl-root</artifactId>
-  <version>6.5-SNAPSHOT</version>
+  <version>6.6-SNAPSHOT</version>
 
   <packaging>pom</packaging>
   <name>Querydsl</name>
@@ -104,8 +104,8 @@
     <junit.version>5.10.2</junit.version>
     <ecj.version>3.33.0</ecj.version>
     <jdo.version>3.2.1</jdo.version>
-    <springboot.version>3.3.0</springboot.version>
-    <spring.version>6.1.9</spring.version>
+    <springboot.version>3.3.1</springboot.version>
+    <spring.version>6.1.10</spring.version>
 
     <!-- SQL deps -->
     <db2.version>11.5.9.0</db2.version>
@@ -196,7 +196,7 @@
       <dependency>
         <groupId>io.github.classgraph</groupId>
         <artifactId>classgraph</artifactId>
-        <version>4.8.173</version>
+        <version>4.8.174</version>
         <scope>test</scope>
         <exclusions>
           <exclusion>
@@ -524,7 +524,7 @@
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-jar-plugin</artifactId>
-        <version>3.4.1</version>
+        <version>3.4.2</version>
       </plugin>
       <plugin>
         <groupId>de.qaware.maven</groupId>
diff --git a/querydsl-docs/pom.xml b/querydsl-docs/pom.xml
index 0d63e9da13..106943bff4 100644
--- a/querydsl-docs/pom.xml
+++ b/querydsl-docs/pom.xml
@@ -5,7 +5,7 @@
   <parent>
     <groupId>io.github.openfeign.querydsl</groupId>
     <artifactId>querydsl-root</artifactId>
-    <version>6.5-SNAPSHOT</version>
+    <version>6.6-SNAPSHOT</version>
   </parent>
 
   <artifactId>querydsl-docs</artifactId>
diff --git a/querydsl-examples/pom.xml b/querydsl-examples/pom.xml
index a54e81a6db..2a347dfb98 100644
--- a/querydsl-examples/pom.xml
+++ b/querydsl-examples/pom.xml
@@ -5,7 +5,7 @@
   <parent>
     <groupId>io.github.openfeign.querydsl</groupId>
     <artifactId>querydsl-root</artifactId>
-    <version>6.5-SNAPSHOT</version>
+    <version>6.6-SNAPSHOT</version>
   </parent>
 
   <artifactId>querydsl-examples</artifactId>
diff --git a/querydsl-examples/querydsl-example-jpa-guice/pom.xml b/querydsl-examples/querydsl-example-jpa-guice/pom.xml
index e658df26b9..e3f4728c46 100644
--- a/querydsl-examples/querydsl-example-jpa-guice/pom.xml
+++ b/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.5-SNAPSHOT</version>
+    <version>6.6-SNAPSHOT</version>
   </parent>
 
   <artifactId>querydsl-example-jpa-guice</artifactId>
diff --git a/querydsl-examples/querydsl-example-jpa-quarkus/pom.xml b/querydsl-examples/querydsl-example-jpa-quarkus/pom.xml
index 18f7a6dc62..2becd5f92a 100644
--- a/querydsl-examples/querydsl-example-jpa-quarkus/pom.xml
+++ b/querydsl-examples/querydsl-example-jpa-quarkus/pom.xml
@@ -5,14 +5,14 @@
   <parent>
     <groupId>io.github.openfeign.querydsl</groupId>
     <artifactId>querydsl-examples</artifactId>
-    <version>6.5-SNAPSHOT</version>
+    <version>6.6-SNAPSHOT</version>
   </parent>
 
   <artifactId>querydsl-example-jpa-quarkus</artifactId>
   <name>Querydsl example - JPA Quarkus</name>
 
   <properties>
-    <quarkus.version>3.11.2</quarkus.version>
+    <quarkus.version>3.12.0</quarkus.version>
   </properties>
 
   <dependencyManagement>
diff --git a/querydsl-examples/querydsl-example-jpa-spring/pom.xml b/querydsl-examples/querydsl-example-jpa-spring/pom.xml
index 4ece918e71..53dc713083 100755
--- a/querydsl-examples/querydsl-example-jpa-spring/pom.xml
+++ b/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.5-SNAPSHOT</version>
+    <version>6.6-SNAPSHOT</version>
   </parent>
 
   <artifactId>querydsl-example-jpa-spring</artifactId>
diff --git a/querydsl-examples/querydsl-example-kotlin-codegen/pom.xml b/querydsl-examples/querydsl-example-kotlin-codegen/pom.xml
index f0567871d3..5faaa1e550 100644
--- a/querydsl-examples/querydsl-example-kotlin-codegen/pom.xml
+++ b/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.5-SNAPSHOT</version>
+    <version>6.6-SNAPSHOT</version>
   </parent>
   <artifactId>querydsl-example-kotlin-codegen</artifactId>
   <name>Querydsl example - Kotlin Codegen</name>
diff --git a/querydsl-examples/querydsl-example-kotlin-jpa/pom.xml b/querydsl-examples/querydsl-example-kotlin-jpa/pom.xml
index 92ae31882a..2d83a65ae3 100644
--- a/querydsl-examples/querydsl-example-kotlin-jpa/pom.xml
+++ b/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.5-SNAPSHOT</version>
+    <version>6.6-SNAPSHOT</version>
   </parent>
   <artifactId>querydsl-example-kotlin</artifactId>
   <name>Querydsl example - Kotlin JPA</name>
diff --git a/querydsl-examples/querydsl-example-kotlin-mongodb/pom.xml b/querydsl-examples/querydsl-example-kotlin-mongodb/pom.xml
index c16d13c6b9..13b3f79f66 100644
--- a/querydsl-examples/querydsl-example-kotlin-mongodb/pom.xml
+++ b/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.5-SNAPSHOT</version>
+    <version>6.6-SNAPSHOT</version>
   </parent>
   <artifactId>querydsl-example-kotlin-mongodb</artifactId>
   <name>Querydsl example - Kotlin MongoDB</name>
diff --git a/querydsl-examples/querydsl-example-r2dbc-sql-codegen/pom.xml b/querydsl-examples/querydsl-example-r2dbc-sql-codegen/pom.xml
index 7e884019de..171b8d8954 100644
--- a/querydsl-examples/querydsl-example-r2dbc-sql-codegen/pom.xml
+++ b/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.5-SNAPSHOT</version>
+    <version>6.6-SNAPSHOT</version>
   </parent>
 
   <artifactId>querydsl-example-r2dbc-sql-codegen</artifactId>
diff --git a/querydsl-examples/querydsl-example-sql-guice/pom.xml b/querydsl-examples/querydsl-example-sql-guice/pom.xml
index cc49675375..a0e07ab7ab 100644
--- a/querydsl-examples/querydsl-example-sql-guice/pom.xml
+++ b/querydsl-examples/querydsl-example-sql-guice/pom.xml
@@ -5,7 +5,7 @@
   <parent>
     <groupId>io.github.openfeign.querydsl</groupId>
     <artifactId>querydsl-examples</artifactId>
-    <version>6.5-SNAPSHOT</version>
+    <version>6.6-SNAPSHOT</version>
   </parent>
 
   <artifactId>querydsl-example-sql-guice</artifactId>
diff --git a/querydsl-examples/querydsl-example-sql-spring/pom.xml b/querydsl-examples/querydsl-example-sql-spring/pom.xml
index e6d686e4b2..06ea645e0a 100644
--- a/querydsl-examples/querydsl-example-sql-spring/pom.xml
+++ b/querydsl-examples/querydsl-example-sql-spring/pom.xml
@@ -5,7 +5,7 @@
   <parent>
     <groupId>io.github.openfeign.querydsl</groupId>
     <artifactId>querydsl-examples</artifactId>
-    <version>6.5-SNAPSHOT</version>
+    <version>6.6-SNAPSHOT</version>
   </parent>
 
   <artifactId>querydsl-example-sql-spring</artifactId>
diff --git a/querydsl-libraries/pom.xml b/querydsl-libraries/pom.xml
index 052aec4415..05035921c4 100644
--- a/querydsl-libraries/pom.xml
+++ b/querydsl-libraries/pom.xml
@@ -5,7 +5,7 @@
   <parent>
     <groupId>io.github.openfeign.querydsl</groupId>
     <artifactId>querydsl-root</artifactId>
-    <version>6.5-SNAPSHOT</version>
+    <version>6.6-SNAPSHOT</version>
   </parent>
 
   <artifactId>querydsl-libraries</artifactId>
diff --git a/querydsl-libraries/querydsl-collections/pom.xml b/querydsl-libraries/querydsl-collections/pom.xml
index b471e3827c..ee6059de32 100644
--- a/querydsl-libraries/querydsl-collections/pom.xml
+++ b/querydsl-libraries/querydsl-collections/pom.xml
@@ -5,7 +5,7 @@
   <parent>
     <groupId>io.github.openfeign.querydsl</groupId>
     <artifactId>querydsl-libraries</artifactId>
-    <version>6.5-SNAPSHOT</version>
+    <version>6.6-SNAPSHOT</version>
   </parent>
 
   <groupId>io.github.openfeign.querydsl</groupId>
@@ -80,7 +80,7 @@
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-jar-plugin</artifactId>
-        <version>3.4.1</version>
+        <version>3.4.2</version>
         <configuration>
           <archive>
             <manifestEntries>
diff --git a/querydsl-libraries/querydsl-core/pom.xml b/querydsl-libraries/querydsl-core/pom.xml
index 24b64ffdf2..8dc698c3c8 100644
--- a/querydsl-libraries/querydsl-core/pom.xml
+++ b/querydsl-libraries/querydsl-core/pom.xml
@@ -5,7 +5,7 @@
   <parent>
     <groupId>io.github.openfeign.querydsl</groupId>
     <artifactId>querydsl-libraries</artifactId>
-    <version>6.5-SNAPSHOT</version>
+    <version>6.6-SNAPSHOT</version>
   </parent>
 
   <artifactId>querydsl-core</artifactId>
@@ -64,7 +64,7 @@
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-jar-plugin</artifactId>
-        <version>3.4.1</version>
+        <version>3.4.2</version>
         <configuration>
           <archive>
             <manifestEntries>
diff --git a/querydsl-libraries/querydsl-guava/pom.xml b/querydsl-libraries/querydsl-guava/pom.xml
index ed9ecedb62..41df9d5a87 100644
--- a/querydsl-libraries/querydsl-guava/pom.xml
+++ b/querydsl-libraries/querydsl-guava/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <groupId>io.github.openfeign.querydsl</groupId>
     <artifactId>querydsl-libraries</artifactId>
-    <version>6.5-SNAPSHOT</version>
+    <version>6.6-SNAPSHOT</version>
   </parent>
 
   <artifactId>querydsl-guava</artifactId>
@@ -32,7 +32,7 @@
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-jar-plugin</artifactId>
-        <version>3.4.1</version>
+        <version>3.4.2</version>
         <configuration>
           <archive>
             <manifestEntries>
diff --git a/querydsl-libraries/querydsl-jpa-spring/pom.xml b/querydsl-libraries/querydsl-jpa-spring/pom.xml
index b255003838..0843764dfe 100644
--- a/querydsl-libraries/querydsl-jpa-spring/pom.xml
+++ b/querydsl-libraries/querydsl-jpa-spring/pom.xml
@@ -5,7 +5,7 @@
   <parent>
     <groupId>io.github.openfeign.querydsl</groupId>
     <artifactId>querydsl-libraries</artifactId>
-    <version>6.5-SNAPSHOT</version>
+    <version>6.6-SNAPSHOT</version>
   </parent>
 
   <artifactId>querydsl-jpa-spring</artifactId>
diff --git a/querydsl-libraries/querydsl-jpa/pom.xml b/querydsl-libraries/querydsl-jpa/pom.xml
index 6dafde7d49..0ba8f25a03 100644
--- a/querydsl-libraries/querydsl-jpa/pom.xml
+++ b/querydsl-libraries/querydsl-jpa/pom.xml
@@ -5,7 +5,7 @@
   <parent>
     <groupId>io.github.openfeign.querydsl</groupId>
     <artifactId>querydsl-libraries</artifactId>
-    <version>6.5-SNAPSHOT</version>
+    <version>6.6-SNAPSHOT</version>
   </parent>
 
   <artifactId>querydsl-jpa</artifactId>
@@ -190,7 +190,7 @@
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-jar-plugin</artifactId>
-        <version>3.4.1</version>
+        <version>3.4.2</version>
         <configuration>
           <archive>
             <manifestEntries>
diff --git a/querydsl-libraries/querydsl-kotlin/pom.xml b/querydsl-libraries/querydsl-kotlin/pom.xml
index 32eebcba07..c6bc6267b3 100644
--- a/querydsl-libraries/querydsl-kotlin/pom.xml
+++ b/querydsl-libraries/querydsl-kotlin/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <groupId>io.github.openfeign.querydsl</groupId>
     <artifactId>querydsl-libraries</artifactId>
-    <version>6.5-SNAPSHOT</version>
+    <version>6.6-SNAPSHOT</version>
   </parent>
 
   <artifactId>querydsl-kotlin</artifactId>
diff --git a/querydsl-libraries/querydsl-mongodb/pom.xml b/querydsl-libraries/querydsl-mongodb/pom.xml
index 84d7764924..f3f85bb197 100644
--- a/querydsl-libraries/querydsl-mongodb/pom.xml
+++ b/querydsl-libraries/querydsl-mongodb/pom.xml
@@ -5,7 +5,7 @@
   <parent>
     <groupId>io.github.openfeign.querydsl</groupId>
     <artifactId>querydsl-libraries</artifactId>
-    <version>6.5-SNAPSHOT</version>
+    <version>6.6-SNAPSHOT</version>
   </parent>
 
   <artifactId>querydsl-mongodb</artifactId>
@@ -78,7 +78,7 @@
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-jar-plugin</artifactId>
-        <version>3.4.1</version>
+        <version>3.4.2</version>
         <configuration>
           <archive>
             <manifestEntries>
diff --git a/querydsl-libraries/querydsl-r2dbc/pom.xml b/querydsl-libraries/querydsl-r2dbc/pom.xml
index 16e4b85539..f5be19d67b 100644
--- a/querydsl-libraries/querydsl-r2dbc/pom.xml
+++ b/querydsl-libraries/querydsl-r2dbc/pom.xml
@@ -5,7 +5,7 @@
   <parent>
     <groupId>io.github.openfeign.querydsl</groupId>
     <artifactId>querydsl-libraries</artifactId>
-    <version>6.5-SNAPSHOT</version>
+    <version>6.6-SNAPSHOT</version>
   </parent>
 
   <artifactId>querydsl-r2dbc</artifactId>
diff --git a/querydsl-libraries/querydsl-scala/pom.xml b/querydsl-libraries/querydsl-scala/pom.xml
index ed004111ba..b6d7ce70c0 100644
--- a/querydsl-libraries/querydsl-scala/pom.xml
+++ b/querydsl-libraries/querydsl-scala/pom.xml
@@ -5,7 +5,7 @@
   <parent>
     <groupId>io.github.openfeign.querydsl</groupId>
     <artifactId>querydsl-libraries</artifactId>
-    <version>6.5-SNAPSHOT</version>
+    <version>6.6-SNAPSHOT</version>
   </parent>
 
   <artifactId>querydsl-scala</artifactId>
diff --git a/querydsl-libraries/querydsl-spatial/pom.xml b/querydsl-libraries/querydsl-spatial/pom.xml
index e75ce9d88c..e9d9c1c4f8 100644
--- a/querydsl-libraries/querydsl-spatial/pom.xml
+++ b/querydsl-libraries/querydsl-spatial/pom.xml
@@ -5,7 +5,7 @@
   <parent>
     <groupId>io.github.openfeign.querydsl</groupId>
     <artifactId>querydsl-libraries</artifactId>
-    <version>6.5-SNAPSHOT</version>
+    <version>6.6-SNAPSHOT</version>
   </parent>
 
   <artifactId>querydsl-spatial</artifactId>
@@ -61,7 +61,7 @@
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-jar-plugin</artifactId>
-        <version>3.4.1</version>
+        <version>3.4.2</version>
         <configuration>
           <archive>
             <manifestEntries>
diff --git a/querydsl-libraries/querydsl-sql-spatial/pom.xml b/querydsl-libraries/querydsl-sql-spatial/pom.xml
index 669176dc1f..67d1c5d1b7 100644
--- a/querydsl-libraries/querydsl-sql-spatial/pom.xml
+++ b/querydsl-libraries/querydsl-sql-spatial/pom.xml
@@ -5,7 +5,7 @@
   <parent>
     <groupId>io.github.openfeign.querydsl</groupId>
     <artifactId>querydsl-libraries</artifactId>
-    <version>6.5-SNAPSHOT</version>
+    <version>6.6-SNAPSHOT</version>
   </parent>
 
   <artifactId>querydsl-sql-spatial</artifactId>
@@ -196,7 +196,7 @@
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-jar-plugin</artifactId>
-        <version>3.4.1</version>
+        <version>3.4.2</version>
         <configuration>
           <archive>
             <manifestEntries>
diff --git a/querydsl-libraries/querydsl-sql-spring/pom.xml b/querydsl-libraries/querydsl-sql-spring/pom.xml
index 8636d50d52..1520fce8b6 100644
--- a/querydsl-libraries/querydsl-sql-spring/pom.xml
+++ b/querydsl-libraries/querydsl-sql-spring/pom.xml
@@ -5,7 +5,7 @@
   <parent>
     <groupId>io.github.openfeign.querydsl</groupId>
     <artifactId>querydsl-libraries</artifactId>
-    <version>6.5-SNAPSHOT</version>
+    <version>6.6-SNAPSHOT</version>
   </parent>
 
   <artifactId>querydsl-sql-spring</artifactId>
diff --git a/querydsl-libraries/querydsl-sql/pom.xml b/querydsl-libraries/querydsl-sql/pom.xml
index dd222e6426..5b34e61e22 100644
--- a/querydsl-libraries/querydsl-sql/pom.xml
+++ b/querydsl-libraries/querydsl-sql/pom.xml
@@ -5,7 +5,7 @@
   <parent>
     <groupId>io.github.openfeign.querydsl</groupId>
     <artifactId>querydsl-libraries</artifactId>
-    <version>6.5-SNAPSHOT</version>
+    <version>6.6-SNAPSHOT</version>
   </parent>
 
   <artifactId>querydsl-sql</artifactId>
@@ -199,7 +199,7 @@
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-jar-plugin</artifactId>
-        <version>3.4.1</version>
+        <version>3.4.2</version>
         <configuration>
           <archive>
             <manifestEntries>
diff --git a/querydsl-tooling/pom.xml b/querydsl-tooling/pom.xml
index 3d83c6def8..c949d34cae 100644
--- a/querydsl-tooling/pom.xml
+++ b/querydsl-tooling/pom.xml
@@ -5,7 +5,7 @@
   <parent>
     <groupId>io.github.openfeign.querydsl</groupId>
     <artifactId>querydsl-root</artifactId>
-    <version>6.5-SNAPSHOT</version>
+    <version>6.6-SNAPSHOT</version>
   </parent>
 
   <artifactId>querydsl-tooling</artifactId>
diff --git a/querydsl-tooling/querydsl-apt/pom.xml b/querydsl-tooling/querydsl-apt/pom.xml
index 1c1a8fdcbf..78ad16566c 100644
--- a/querydsl-tooling/querydsl-apt/pom.xml
+++ b/querydsl-tooling/querydsl-apt/pom.xml
@@ -5,7 +5,7 @@
   <parent>
     <groupId>io.github.openfeign.querydsl</groupId>
     <artifactId>querydsl-tooling</artifactId>
-    <version>6.5-SNAPSHOT</version>
+    <version>6.6-SNAPSHOT</version>
   </parent>
 
   <artifactId>querydsl-apt</artifactId>
@@ -122,7 +122,7 @@
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-jar-plugin</artifactId>
-        <version>3.4.1</version>
+        <version>3.4.2</version>
         <configuration>
           <archive>
             <manifestEntries>
diff --git a/querydsl-tooling/querydsl-codegen-utils/pom.xml b/querydsl-tooling/querydsl-codegen-utils/pom.xml
index 0cdc025fcf..6f0ebb3b73 100644
--- a/querydsl-tooling/querydsl-codegen-utils/pom.xml
+++ b/querydsl-tooling/querydsl-codegen-utils/pom.xml
@@ -6,7 +6,7 @@
   <parent>
     <groupId>io.github.openfeign.querydsl</groupId>
     <artifactId>querydsl-tooling</artifactId>
-    <version>6.5-SNAPSHOT</version>
+    <version>6.6-SNAPSHOT</version>
   </parent>
   <artifactId>codegen-utils</artifactId>
 
@@ -49,7 +49,7 @@
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-jar-plugin</artifactId>
-        <version>3.4.1</version>
+        <version>3.4.2</version>
         <configuration>
           <archive>
             <manifestEntries>
diff --git a/querydsl-tooling/querydsl-codegen/pom.xml b/querydsl-tooling/querydsl-codegen/pom.xml
index a5aececd35..77b76d1ddf 100644
--- a/querydsl-tooling/querydsl-codegen/pom.xml
+++ b/querydsl-tooling/querydsl-codegen/pom.xml
@@ -5,7 +5,7 @@
   <parent>
     <groupId>io.github.openfeign.querydsl</groupId>
     <artifactId>querydsl-tooling</artifactId>
-    <version>6.5-SNAPSHOT</version>
+    <version>6.6-SNAPSHOT</version>
   </parent>
 
   <artifactId>querydsl-codegen</artifactId>
@@ -62,7 +62,7 @@
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-jar-plugin</artifactId>
-        <version>3.4.1</version>
+        <version>3.4.2</version>
         <configuration>
           <archive>
             <manifestEntries>
diff --git a/querydsl-tooling/querydsl-codegen/src/main/java/com/querydsl/codegen/DefaultEntitySerializer.java b/querydsl-tooling/querydsl-codegen/src/main/java/com/querydsl/codegen/DefaultEntitySerializer.java
index df7d9a6836..a885e950c4 100644
--- a/querydsl-tooling/querydsl-codegen/src/main/java/com/querydsl/codegen/DefaultEntitySerializer.java
+++ b/querydsl-tooling/querydsl-codegen/src/main/java/com/querydsl/codegen/DefaultEntitySerializer.java
@@ -487,6 +487,9 @@ protected void introImports(CodeWriter writer, SerializerConfig config, EntityTy
     // other packages
     writer.imports(SimpleExpression.class.getPackage());
 
+    // explicit reference to StringTemplate
+    writer.importClasses("com.querydsl.core.types.dsl.StringTemplate");
+
     // other classes
     List<Class<?>> classes = new ArrayList<>();
     classes.add(PathMetadata.class);
diff --git a/querydsl-tooling/querydsl-jpa-codegen/pom.xml b/querydsl-tooling/querydsl-jpa-codegen/pom.xml
index 18ce9c35c8..aab2751bae 100644
--- a/querydsl-tooling/querydsl-jpa-codegen/pom.xml
+++ b/querydsl-tooling/querydsl-jpa-codegen/pom.xml
@@ -5,7 +5,7 @@
   <parent>
     <groupId>io.github.openfeign.querydsl</groupId>
     <artifactId>querydsl-tooling</artifactId>
-    <version>6.5-SNAPSHOT</version>
+    <version>6.6-SNAPSHOT</version>
   </parent>
 
   <artifactId>querydsl-jpa-codegen</artifactId>
@@ -98,7 +98,7 @@
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-jar-plugin</artifactId>
-        <version>3.4.1</version>
+        <version>3.4.2</version>
         <configuration>
           <archive>
             <manifestEntries>
diff --git a/querydsl-tooling/querydsl-kotlin-codegen/pom.xml b/querydsl-tooling/querydsl-kotlin-codegen/pom.xml
index 57726483d1..29625e4e5d 100644
--- a/querydsl-tooling/querydsl-kotlin-codegen/pom.xml
+++ b/querydsl-tooling/querydsl-kotlin-codegen/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <groupId>io.github.openfeign.querydsl</groupId>
     <artifactId>querydsl-tooling</artifactId>
-    <version>6.5-SNAPSHOT</version>
+    <version>6.6-SNAPSHOT</version>
   </parent>
 
   <artifactId>querydsl-kotlin-codegen</artifactId>
diff --git a/querydsl-tooling/querydsl-maven-plugin/pom.xml b/querydsl-tooling/querydsl-maven-plugin/pom.xml
index 3c6f2f0220..6ef0179fc4 100644
--- a/querydsl-tooling/querydsl-maven-plugin/pom.xml
+++ b/querydsl-tooling/querydsl-maven-plugin/pom.xml
@@ -5,7 +5,7 @@
   <parent>
     <groupId>io.github.openfeign.querydsl</groupId>
     <artifactId>querydsl-tooling</artifactId>
-    <version>6.5-SNAPSHOT</version>
+    <version>6.6-SNAPSHOT</version>
   </parent>
 
   <artifactId>querydsl-maven-plugin</artifactId>
diff --git a/querydsl-tooling/querydsl-sql-codegen/pom.xml b/querydsl-tooling/querydsl-sql-codegen/pom.xml
index 94359c0799..1716106c08 100644
--- a/querydsl-tooling/querydsl-sql-codegen/pom.xml
+++ b/querydsl-tooling/querydsl-sql-codegen/pom.xml
@@ -5,7 +5,7 @@
   <parent>
     <groupId>io.github.openfeign.querydsl</groupId>
     <artifactId>querydsl-tooling</artifactId>
-    <version>6.5-SNAPSHOT</version>
+    <version>6.6-SNAPSHOT</version>
   </parent>
 
   <artifactId>querydsl-sql-codegen</artifactId>
@@ -184,7 +184,7 @@
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-jar-plugin</artifactId>
-        <version>3.4.1</version>
+        <version>3.4.2</version>
         <configuration>
           <archive>
             <manifestEntries>