Update Hibernate support to latest version of 7.x line. Closes #346.

Author: joehni

pom.xml

@@ -1098,7 +1098,7 @@
     <version.org.codehaus.jettison>1.5.4</version.org.codehaus.jettison>
     <version.com.fasterxml.woodstox.core>6.4.0</version.com.fasterxml.woodstox.core>
     <version.org.dom4j>2.0.2</version.org.dom4j>
-    <version.org.hibernate.orm.core>6.6.28.Final</version.org.hibernate.orm.core>
+    <version.org.hibernate.orm.core>7.1.0.Final</version.org.hibernate.orm.core>
     <version.org.hibernate.orm.envers>${version.org.hibernate.orm.core}</version.org.hibernate.orm.envers>
     <version.org.jdom>1.1.3</version.org.jdom>
     <version.org.jdom2>2.0.6</version.org.jdom2>

xstream-distribution/src/content/changes.html

@@ -127,6 +127,7 @@ <h2>Minor changes</h2>
 
 	<ul>
 		<li>GHI:#347: PrettyPrintWriter exposes internal classes of com.thoughtworks.xstream.core.util.</li>
+		<li>GHPR:#346: XStream supports now Hibernate from 3.x up to current version 7.1.0.</li>
 	</ul>
 
 	<h2>API changes</h2>

xstream-hibernate/pom.xml

@@ -19,7 +19,7 @@
   <packaging>jar</packaging>
   <name>XStream Hibernate Extension</name>
   <description>
-    XStream extension for Hibernate 4 to untie Java objects from Hibernate.
+    XStream extension for Hibernate to untie Java objects from Hibernate.
   </description>
 
   <profiles>
@@ -37,6 +37,15 @@
         </plugins>
       </build>
     </profile>
+    <profile>
+      <id>jdk16-le</id>
+      <activation>
+        <jdk>(,17)</jdk>
+      </activation>
+      <properties>
+        <version.org.hibernate.orm.core>6.6.28.Final</version.org.hibernate.orm.core>
+      </properties>
+    </profile>
   </profiles>
 
   <build>
@@ -117,7 +126,7 @@
   </dependencies>
 
   <properties>
-    <bundle.version.hibernate>[3,7)</bundle.version.hibernate>
+    <bundle.version.hibernate>[3,8)</bundle.version.hibernate>
     <bundle.export.package>!com.thoughtworks.xstream.hibernate.util,com.thoughtworks.xstream.hibernate.*;-noimport:=true</bundle.export.package>
     <jar.module.name>xstream.hibernate</jar.module.name>
     <surefire.argline>--add-opens java.base/java.lang=ALL-UNNAMED</surefire.argline>

xstream-hibernate/src/test/acceptance/hibernate/HibernateReferenceTest.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2011, 2012, 2018 XStream Committers.
+ * Copyright (C) 2011, 2012, 2018, 2025 XStream Committers.
  * All rights reserved.
  *
  * The software in this package is published under the terms of the BSD
@@ -44,7 +44,7 @@ protected void tearDown() {
             final Session session = getSessionFactory().getCurrentSession();
             session.beginTransaction();
             final Division div = (Division)session.createQuery("from Division").uniqueResult();
-            session.delete(div);
+            session.remove(div);
             session.getTransaction().commit();
         } catch (final RuntimeException e) {
             e.printStackTrace();
@@ -119,9 +119,9 @@ private Division setupPersistentDivision() {
         /* This save is necessitated by the fact that Hibernate's transitive persistence is depth-first and does not do
          * a full graph analysis. Therefore it would be possible for Hibernate to try to save the person record before
          * the site record, which would throw an error if the person.site FK is non-nullable. */
-        session.save(site);
+        session.persist(site);
         new Person("Tom", dep, site);
-        session.save(div);
+        session.persist(div);
         session.flush();
         session.getTransaction().commit();
         return div;