Skip to content

Commit d21ca93

Browse files
authored
Try to convert Hib6 to JPMS too (#194)
1 parent b3d1ce6 commit d21ca93

File tree

4 files changed

+15
-7
lines changed

4 files changed

+15
-7
lines changed

hibernate6/pom.xml

Lines changed: 13 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ Hibernate (https://hibernate.org/) version 6.x with Jakarta data types.
2222
<packageVersion.dir>tools/jackson/datatype/hibernate6</packageVersion.dir>
2323
<packageVersion.package>${project.groupId}.hibernate6</packageVersion.package>
2424
<!-- Hibernate with Jakarta Persistence 3.0 -->
25-
<hibernate.version>6.2.33.Final</hibernate.version>
25+
<hibernate.version>6.2.48.Final</hibernate.version>
2626
<osgi.export>${project.groupId}.hibernate6</osgi.export>
2727
</properties>
2828

@@ -90,12 +90,20 @@ Hibernate (https://hibernate.org/) version 6.x with Jakarta data types.
9090
<groupId>org.cyclonedx</groupId>
9191
<artifactId>cyclonedx-maven-plugin</artifactId>
9292
</plugin>
93+
<!-- 05-Nov-2025, tatu: Could not figure out how to make it all work
94+
with separate test `module-info.java` (like hibernate5-jakarta does), so
95+
for now just open up access. Same approach as hibernate7.
96+
-->
9397
<plugin>
94-
<groupId>org.moditect</groupId>
95-
<artifactId>moditect-maven-plugin</artifactId>
96-
<inherited>true</inherited>
98+
<groupId>org.apache.maven.plugins</groupId>
99+
<artifactId>maven-surefire-plugin</artifactId>
97100
<configuration>
98-
<jvmVersion>11</jvmVersion>
101+
<argLine>--add-opens=java.base/java.lang=ALL-UNNAMED
102+
--add-opens=java.base/java.util=ALL-UNNAMED
103+
--add-opens=tools.jackson.datatype.hibernate6/tools.jackson.datatype.hibernate6.data=ALL-UNNAMED
104+
--add-opens=tools.jackson.datatype.hibernate6/tools.jackson.datatype.hibernate6.data=org.hibernate.orm.core
105+
--add-opens=tools.jackson.datatype.hibernate6/tools.jackson.datatype.hibernate6.data=tools.jackson.databind
106+
</argLine>
99107
</configuration>
100108
</plugin>
101109
<!-- 05-Jul-2020, tatu: Add generation of Gradle Module Metadata -->

hibernate7/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ Hibernate (https://hibernate.org/) version 7.x with Jakarta data types.
2222
<packageVersion.dir>tools/jackson/datatype/hibernate7</packageVersion.dir>
2323
<packageVersion.package>${project.groupId}.hibernate7</packageVersion.package>
2424
<!-- Hibernate with Jakarta Persistence 3.0 -->
25-
<hibernate.version>7.0.3.Final</hibernate.version>
25+
<hibernate.version>7.0.10.Final</hibernate.version>
2626
<osgi.export>${project.groupId}.hibernate7</osgi.export>
2727
</properties>
2828

release-notes/VERSION

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,4 +10,4 @@ For versions 3.x (for earlier see VERSION-2.x)
1010

1111
#114: Initial conversion to 3.0
1212
(@pjfanning)
13-
- (hibernate5-jakarta, hibernate7) Convert from Moditect to native JPMS
13+
- (hibernate5-jakarta/6/7) Convert from Moditect to native JPMS

0 commit comments

Comments
 (0)