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

Author: joehni

pom.xml

@@ -1213,7 +1213,7 @@
     <version.org.codehaus.woodstox.asl>3.2.7</version.org.codehaus.woodstox.asl>
     <version.org.hibernate.core>5.6.15.Final</version.org.hibernate.core>
     <version.org.hibernate.envers>${version.org.hibernate.core}</version.org.hibernate.envers>
-    <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.5</version.org.jdom2>

xstream-distribution/src/content/changes.html

@@ -50,6 +50,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

@@ -23,6 +23,15 @@
   </description>
 
   <profiles>
+    <profile>
+      <id>jdk11-ge-jdk16</id>
+      <activation>
+        <jdk>[11,17)</jdk>
+      </activation>
+      <properties>
+        <version.org.hibernate.orm.core>6.6.28.Final</version.org.hibernate.orm.core>
+      </properties>
+    </profile>
     <profile>
       <id>jdk11-ge</id>
       <activation>
@@ -239,7 +248,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>
     <bundle.import.package>
         org.hibernate.proxy;resolution:=optional;version="${bundle.version.hibernate}",

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

@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2011, 2012 XStream Committers.
+ * Copyright (C) 2011, 2012, 2025 XStream Committers.
  * All rights reserved.
  *
  * The software in this package is published under the terms of the BSD
@@ -17,6 +17,8 @@
 import acceptance.hibernate.reference.Person;
 import acceptance.hibernate.reference.Site;
 
+import java.lang.reflect.Method;
+
 import org.hibernate.Session;
 import org.hibernate.proxy.HibernateProxy;
 
@@ -27,6 +29,38 @@
  */
 public class HibernateReferenceTest extends AbstractHibernateAcceptanceTest {
 
+    private final static Method persist;
+    private final static Method remove;
+    static {
+        Method method;
+        try {
+            method = Session.class.getMethod("save", new Class[]{Object.class});
+        } catch (Exception e1) {
+            try {
+                // Available since Hibernate 6.0
+                method = Session.class.getMethod("persist", new Class[]{Object.class});
+            } catch (Exception e2) {
+                throw new ExceptionInInitializerError("Cannot find method in "
+                    + Session.class.getName()
+                    + " to persist/save objects");
+            }
+        }
+        persist = method;
+        try {
+            method = Session.class.getMethod("delete", new Class[]{Object.class});
+        } catch (Exception e1) {
+            try {
+                // Available since Hibernate 6.0
+                method = Session.class.getMethod("remove", new Class[]{Object.class});
+            } catch (Exception e2) {
+                throw new ExceptionInInitializerError("Cannot find method in "
+                    + Session.class.getName()
+                    + " to remove/delete objects");
+            }
+        }
+        remove = method;
+    }
+
     protected void setUp() throws Exception {
         super.setUp();
         // don't write the primary keys in this test
@@ -42,14 +76,14 @@ protected void tearDown() {
             final Session session = getSessionFactory().getCurrentSession();
             session.beginTransaction();
             final Division div = (Division)session.createQuery("from Division").uniqueResult();
-            session.delete(div);
+            remove.invoke(session, new Object[]{div});
             session.getTransaction().commit();
-        } catch (RuntimeException e) {
+        } catch (Exception e) {
             e.printStackTrace();
         }
     }
 
-    public void testObjectGraphWithReferences() {
+    public void testObjectGraphWithReferences() throws Exception {
         final Division memory = setupNonpersistentDivision();
         final Division persisted = setupPersistentDivision();
 
@@ -66,7 +100,7 @@ public void testObjectGraphWithReferences() {
         assertEquals(expectedXml, loadedXml);
     }
 
-    public void testLazyProxyWithReferences() {
+    public void testLazyProxyWithReferences() throws Exception {
         setupPersistentDivision();
 
         final Session session = getSessionFactory().getCurrentSession();
@@ -108,21 +142,18 @@ public void testLazyProxyWithReferences() {
     /**
      * Create the object within a Hibernate session and persist it.
      */
-    private Division setupPersistentDivision() {
+    private Division setupPersistentDivision() throws Exception {
         final Session session = getSessionFactory().getCurrentSession();
         session.beginTransaction();
         final Division div = new Division("Div1");
         final Department dep = new Department("Dep1", div);
         final Site site = new Site("Site1");
-        /*
-         * 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);
+        /* 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. */
+        persist.invoke(session, new Object[]{site});
         new Person("Tom", dep, site);
-        session.save(div);
+        persist.invoke(session, new Object[]{div});
         session.flush();
         session.getTransaction().commit();
         return div;