From e745fe32569010f7a0a5e1eedf0b4dcdffa881e6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Yoann=20Rodi=C3=A8re?= <yoann@hibernate.org>
Date: Fri, 26 Jan 2024 16:02:13 +0100
Subject: [PATCH] Fix static JPA metamodel generated for Panache classes

---
 build-parent/pom.xml                                         | 5 +++++
 .../panache/hibernate-orm-panache-kotlin/runtime/pom.xml     | 1 +
 extensions/panache/hibernate-orm-panache/runtime/pom.xml     | 1 +
 .../hibernate-reactive-panache-kotlin/runtime/pom.xml        | 1 +
 .../panache/hibernate-reactive-panache/runtime/pom.xml       | 1 +
 5 files changed, 9 insertions(+)

diff --git a/build-parent/pom.xml b/build-parent/pom.xml
index 9bb085b7a9125..b46527638ec5b 100644
--- a/build-parent/pom.xml
+++ b/build-parent/pom.xml
@@ -71,6 +71,11 @@
 
         <!-- MicroProfile TCK versions used to be defined here but have moved to the concrete tck modules -->
 
+        <!-- Panache needs to run the hibernate-jpamodelgen annotation processor,
+             but version 6.3+ leads to issues in applications that use it too:
+             https://github.com/quarkusio/quarkus/issues/38378
+             As a workaround, we generate the static metamodel of Panache using an older version of jpamodelgen. -->
+        <hibernate-orm.jpamodelgen.for-panache.version>6.2.22.Final</hibernate-orm.jpamodelgen.for-panache.version>
         <!-- Antlr 4 is used by the PanacheQL parser but also needs to match the requirements of Hibernate ORM 6.x-->
         <antlr.version>4.13.0</antlr.version>
 
diff --git a/extensions/panache/hibernate-orm-panache-kotlin/runtime/pom.xml b/extensions/panache/hibernate-orm-panache-kotlin/runtime/pom.xml
index 54bc7352f0c67..75c910a9464f9 100644
--- a/extensions/panache/hibernate-orm-panache-kotlin/runtime/pom.xml
+++ b/extensions/panache/hibernate-orm-panache-kotlin/runtime/pom.xml
@@ -110,6 +110,7 @@
                                 <annotationProcessorPath>
                                     <groupId>org.hibernate.orm</groupId>
                                     <artifactId>hibernate-jpamodelgen</artifactId>
+                                    <version>${hibernate-orm.jpamodelgen.for-panache.version}</version>
                                 </annotationProcessorPath>
                             </annotationProcessorPaths>
                             <annotationProcessors>
diff --git a/extensions/panache/hibernate-orm-panache/runtime/pom.xml b/extensions/panache/hibernate-orm-panache/runtime/pom.xml
index 9fca077cf498f..7f12900d4c6a3 100644
--- a/extensions/panache/hibernate-orm-panache/runtime/pom.xml
+++ b/extensions/panache/hibernate-orm-panache/runtime/pom.xml
@@ -59,6 +59,7 @@
                         <annotationProcessorPath>
                             <groupId>org.hibernate.orm</groupId>
                             <artifactId>hibernate-jpamodelgen</artifactId>
+                            <version>${hibernate-orm.jpamodelgen.for-panache.version}</version>
                         </annotationProcessorPath>
                     </annotationProcessorPaths>
                     <annotationProcessors>
diff --git a/extensions/panache/hibernate-reactive-panache-kotlin/runtime/pom.xml b/extensions/panache/hibernate-reactive-panache-kotlin/runtime/pom.xml
index a7150f5688a59..ff79d15a29ab5 100644
--- a/extensions/panache/hibernate-reactive-panache-kotlin/runtime/pom.xml
+++ b/extensions/panache/hibernate-reactive-panache-kotlin/runtime/pom.xml
@@ -119,6 +119,7 @@
                                 <annotationProcessorPath>
                                     <groupId>org.hibernate.orm</groupId>
                                     <artifactId>hibernate-jpamodelgen</artifactId>
+                                    <version>${hibernate-orm.jpamodelgen.for-panache.version}</version>
                                 </annotationProcessorPath>
                             </annotationProcessorPaths>
                             <annotationProcessors>
diff --git a/extensions/panache/hibernate-reactive-panache/runtime/pom.xml b/extensions/panache/hibernate-reactive-panache/runtime/pom.xml
index e13e33af64fbc..f552aa5671f54 100644
--- a/extensions/panache/hibernate-reactive-panache/runtime/pom.xml
+++ b/extensions/panache/hibernate-reactive-panache/runtime/pom.xml
@@ -63,6 +63,7 @@
                         <annotationProcessorPath>
                             <groupId>org.hibernate.orm</groupId>
                             <artifactId>hibernate-jpamodelgen</artifactId>
+                            <version>${hibernate-orm.jpamodelgen.for-panache.version}</version>
                         </annotationProcessorPath>
                     </annotationProcessorPaths>
                     <annotationProcessors>