From 772955a2d52bbc16ec3b546cea5b1347771018b3 Mon Sep 17 00:00:00 2001
From: Tatu Saloranta <tatu.saloranta@iki.fi>
Date: Wed, 5 Nov 2025 09:45:59 -0800
Subject: [PATCH 1/5] Try to convert Hib6 to JPMS too

---
 hibernate6/pom.xml                                      | 8 --------
 hibernate6/src/{moditect => main/java}/module-info.java | 0
 2 files changed, 8 deletions(-)
 rename hibernate6/src/{moditect => main/java}/module-info.java (100%)

diff --git a/hibernate6/pom.xml b/hibernate6/pom.xml
index 3bbe4e0c..75b7e281 100644
--- a/hibernate6/pom.xml
+++ b/hibernate6/pom.xml
@@ -90,14 +90,6 @@ Hibernate (https://hibernate.org/) version 6.x with Jakarta data types.
         <groupId>org.cyclonedx</groupId>
         <artifactId>cyclonedx-maven-plugin</artifactId>
       </plugin>
-      <plugin>
-        <groupId>org.moditect</groupId>
-        <artifactId>moditect-maven-plugin</artifactId>
-        <inherited>true</inherited>
-        <configuration>
-          <jvmVersion>11</jvmVersion>
-        </configuration>
-      </plugin>
       <!-- 05-Jul-2020, tatu: Add generation of Gradle Module Metadata -->
       <!-- 28-Feb-2025, jjohannes: Apply plugin last as it has to be the last of all 'package phase' plugins -->
       <plugin>
diff --git a/hibernate6/src/moditect/module-info.java b/hibernate6/src/main/java/module-info.java
similarity index 100%
rename from hibernate6/src/moditect/module-info.java
rename to hibernate6/src/main/java/module-info.java

From 6672524b79ac4734014e251f8a625e2ad2d8884c Mon Sep 17 00:00:00 2001
From: Tatu Saloranta <tatu.saloranta@iki.fi>
Date: Wed, 5 Nov 2025 15:35:06 -0800
Subject: [PATCH 2/5] Add module overrides for tests

---
 hibernate6/pom.xml | 15 +++++++++++++++
 1 file changed, 15 insertions(+)

diff --git a/hibernate6/pom.xml b/hibernate6/pom.xml
index 75b7e281..05a318e9 100644
--- a/hibernate6/pom.xml
+++ b/hibernate6/pom.xml
@@ -90,6 +90,21 @@ Hibernate (https://hibernate.org/) version 6.x with Jakarta data types.
         <groupId>org.cyclonedx</groupId>
         <artifactId>cyclonedx-maven-plugin</artifactId>
       </plugin>
+      <!-- 05-Nov-2025, tatu: Could not figure out how to make it all work
+         with separate test `module-info.java`, so for now just open up access
+        -->
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-surefire-plugin</artifactId>
+        <configuration>
+          <argLine>--add-opens=java.base/java.lang=ALL-UNNAMED
+                   --add-opens=java.base/java.util=ALL-UNNAMED
+                   --add-opens=tools.jackson.datatype.hibernate6/tools.jackson.datatype.hibernate6.data=ALL-UNNAMED
+                   --add-opens=tools.jackson.datatype.hibernate6/tools.jackson.datatype.hibernate6.data=org.hibernate.orm.core
+                   --add-opens=tools.jackson.datatype.hibernate6/tools.jackson.datatype.hibernate6.data=tools.jackson.databind
+          </argLine>
+        </configuration>
+      </plugin>
       <!-- 05-Jul-2020, tatu: Add generation of Gradle Module Metadata -->
       <!-- 28-Feb-2025, jjohannes: Apply plugin last as it has to be the last of all 'package phase' plugins -->
       <plugin>

From 9ab5186dc041b7eff308cf2fc6490bb42597f2eb Mon Sep 17 00:00:00 2001
From: Tatu Saloranta <tatu.saloranta@iki.fi>
Date: Wed, 5 Nov 2025 15:43:03 -0800
Subject: [PATCH 3/5] Comment update, hib6 dep now latest, 6.2.48

---
 hibernate6/pom.xml | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/hibernate6/pom.xml b/hibernate6/pom.xml
index 05a318e9..cdd23e02 100644
--- a/hibernate6/pom.xml
+++ b/hibernate6/pom.xml
@@ -22,7 +22,7 @@ Hibernate (https://hibernate.org/) version 6.x with Jakarta data types.
     <packageVersion.dir>tools/jackson/datatype/hibernate6</packageVersion.dir>
     <packageVersion.package>${project.groupId}.hibernate6</packageVersion.package>
     <!-- Hibernate with Jakarta Persistence 3.0 -->
-    <hibernate.version>6.2.33.Final</hibernate.version>
+    <hibernate.version>6.2.48.Final</hibernate.version>
     <osgi.export>${project.groupId}.hibernate6</osgi.export>
   </properties>
 
@@ -91,7 +91,8 @@ Hibernate (https://hibernate.org/) version 6.x with Jakarta data types.
         <artifactId>cyclonedx-maven-plugin</artifactId>
       </plugin>
       <!-- 05-Nov-2025, tatu: Could not figure out how to make it all work
-         with separate test `module-info.java`, so for now just open up access
+         with separate test `module-info.java` (like hibernate5-jakarta does), so
+         for now just open up access. Same approach as hibernate7.
         -->
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>

From 047d6eefea05a444c53c09946ee22794b9bcef4b Mon Sep 17 00:00:00 2001
From: Tatu Saloranta <tatu.saloranta@iki.fi>
Date: Wed, 5 Nov 2025 15:43:45 -0800
Subject: [PATCH 4/5] ...

---
 release-notes/VERSION | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/release-notes/VERSION b/release-notes/VERSION
index a9d176b8..7b6a8eb6 100644
--- a/release-notes/VERSION
+++ b/release-notes/VERSION
@@ -10,4 +10,4 @@ For versions 3.x (for earlier see VERSION-2.x)
 
 #114: Initial conversion to 3.0
  (@pjfanning)
-- (hibernate5-jakarta, hibernate7) Convert from Moditect to native JPMS
+- (hibernate5-jakarta/6/7) Convert from Moditect to native JPMS

From 4341225c57943d6730aeb661d7d53e6a68c093e8 Mon Sep 17 00:00:00 2001
From: Tatu Saloranta <tatu.saloranta@iki.fi>
Date: Wed, 5 Nov 2025 15:51:59 -0800
Subject: [PATCH 5/5] Update hib7 dep to 7.0.10

---
 hibernate7/pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/hibernate7/pom.xml b/hibernate7/pom.xml
index 91c41c7d..acd7e999 100644
--- a/hibernate7/pom.xml
+++ b/hibernate7/pom.xml
@@ -22,7 +22,7 @@ Hibernate (https://hibernate.org/) version 7.x with Jakarta data types.
     <packageVersion.dir>tools/jackson/datatype/hibernate7</packageVersion.dir>
     <packageVersion.package>${project.groupId}.hibernate7</packageVersion.package>
     <!-- Hibernate with Jakarta Persistence 3.0 -->
-    <hibernate.version>7.0.3.Final</hibernate.version>
+    <hibernate.version>7.0.10.Final</hibernate.version>
     <osgi.export>${project.groupId}.hibernate7</osgi.export>
   </properties>