From 346b8bf049f26dd5f3ce7e7285079cafbe6cb49e Mon Sep 17 00:00:00 2001
From: Christian Beikov <christian.beikov@gmail.com>
Date: Mon, 21 Nov 2022 11:44:24 +0100
Subject: [PATCH] [#1633] Fix deployment problems with Hibernate 6 integration
 on Wildfly 27

---
 CHANGELOG.md                      |  1 +
 integration/hibernate-6.0/pom.xml | 21 +++++++++++++++++++++
 2 files changed, 22 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index c733e99444..bcec820195 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -36,6 +36,7 @@ Changes that happened in releases
 * Always treat flat views for embeddable types as updates to support partial flushing
 * Fix QUERY flushing issues with MappingSingular attributes
 * Fix support for entity functions in DML statements
+* Fix deployment problems with Hibernate 6 integration on Wildfly 27
 
 ### Backwards-incompatible changes
 
diff --git a/integration/hibernate-6.0/pom.xml b/integration/hibernate-6.0/pom.xml
index da6f865287..0d9674c8af 100644
--- a/integration/hibernate-6.0/pom.xml
+++ b/integration/hibernate-6.0/pom.xml
@@ -147,6 +147,27 @@
                     </execution>
                 </executions>
             </plugin>
+            <plugin>
+                <artifactId>maven-jar-plugin</artifactId>
+                <inherited>true</inherited>
+                <configuration>
+                    <archive>
+                        <manifestEntries>
+                            <!-- Newer Wildfly versions don't export the commons annotations module anymore, so we need an explicit dependency -->
+                            <Dependencies>org.hibernate.commons-annotations</Dependencies>
+                        </manifestEntries>
+                    </archive>
+                </configuration>
+                <executions>
+                    <execution>
+                        <id>default-jar</id>
+                        <phase>package</phase>
+                        <goals>
+                            <goal>jar</goal>
+                        </goals>
+                    </execution>
+                </executions>
+            </plugin>
         </plugins>
     </build>
 </project>