HBX-2591: Update Hibernate ORM Dependency to Version 6.3.1.Final

  - Update dependency in pom.xml
  - Fix some failing tests

Signed-off-by: Koen Aers <[email protected]>

Author: koentsje

jbt/src/test/java/org/hibernate/tool/orm/jbt/wrp/QueryWrapperFactoryTest.java

@@ -68,6 +68,9 @@ public static void beforeAll() throws Exception {
 	private QueryWrapper<?> positionalParameterizedQueryWrapper = null;
 	private Query<?> wrappedPositionalParameterizedQuery = null;
 
+	private QueryWrapper<?> collectionParameterizedQueryWrapper = null;
+	private Query<?> wrappedCollectionParameterizedQuery = null;
+	
 	private SessionFactoryWrapper sessionFactory = null;
 	private Connection connection = null;
 	private Statement statement = null;
@@ -89,6 +92,9 @@ public void before() throws Exception {
 		positionalParameterizedQueryWrapper = (QueryWrapper<?>)session
 				.createQuery("from " + Foo.class.getName() + " where id = ?1");
 		wrappedPositionalParameterizedQuery = positionalParameterizedQueryWrapper.getWrappedObject();
+		collectionParameterizedQueryWrapper = (QueryWrapper<?>)session
+				.createQuery("from " + Foo.class.getName() + " where id in :foo");
+		wrappedCollectionParameterizedQuery = collectionParameterizedQueryWrapper.getWrappedObject();
 	}
 
 	@AfterEach
@@ -131,9 +137,9 @@ public void testSetMaxResults() {
 	@Test
 	public void testSetParameterList() {
 		QueryParameterBinding<?> binding = 
-				((QuerySqmImpl<?>)wrappedNamedParameterizedQuery).getParameterBindings().getBinding("foo");
+				((QuerySqmImpl<?>)wrappedCollectionParameterizedQuery).getParameterBindings().getBinding("foo");
 		assertFalse(binding.isBound());
-		namedParameterizedQueryWrapper.setParameterList("foo", Arrays.asList(1), new Object());
+		collectionParameterizedQueryWrapper.setParameterList("foo", Arrays.asList(1), new Object());
 		assertTrue(binding.isBound());
 	}
 

pom.xml

@@ -92,7 +92,7 @@
         <google-java-format.version>1.15.0</google-java-format.version>
         <h2.version>2.1.214</h2.version>
         <hibernate-commons-annotations.version>6.0.5.Final</hibernate-commons-annotations.version>
-        <hibernate-orm.version>6.3.0.Final</hibernate-orm.version>
+        <hibernate-orm.version>6.3.1.Final</hibernate-orm.version>
         <hsqldb.version>2.6.1</hsqldb.version>
         <javaee-api.version>8.0.1</javaee-api.version>
         <jboss-logging.version>3.5.0.Final</jboss-logging.version>

test/nodb/src/test/java/org/hibernate/tool/hbm2x/Hbm2CfgTest/TestCase.java

@@ -29,6 +29,10 @@
 
 import org.hibernate.cfg.AvailableSettings;
 import org.hibernate.cfg.Environment;
+import org.hibernate.resource.jdbc.spi.PhysicalConnectionHandlingMode;
+import org.hibernate.resource.transaction.spi.TransactionCoordinator;
+import org.hibernate.resource.transaction.spi.TransactionCoordinatorBuilder;
+import org.hibernate.resource.transaction.spi.TransactionCoordinatorOwner;
 import org.hibernate.tool.api.export.ArtifactCollector;
 import org.hibernate.tool.api.export.Exporter;
 import org.hibernate.tool.api.export.ExporterConstants;
@@ -49,6 +53,22 @@
  */
 public class TestCase {
 
+	@SuppressWarnings("serial")
+	public static class FakeTransactionManagerLookup implements TransactionCoordinatorBuilder {
+		@Override
+		public TransactionCoordinator buildTransactionCoordinator(TransactionCoordinatorOwner owner, Options options) {
+			return null;
+		}
+		@Override
+		public boolean isJta() {
+			return false;
+		}
+		@Override
+		public PhysicalConnectionHandlingMode getDefaultConnectionHandlingMode() {
+			return PhysicalConnectionHandlingMode.DELAYED_ACQUISITION_AND_RELEASE_AFTER_STATEMENT;
+		}		
+	}
+	
 	private static final String[] HBM_XML_FILES = new String[] {
 			"HelloWorld.hbm.xml"
 	};
@@ -114,18 +134,18 @@ public void testMagicPropertyHandling() {
 			   FileUtil.findFirstString( Environment.HBM2DDL_AUTO, file ));
 	   exporter = ExporterFactory.createExporter(ExporterType.CFG);
 	   properties = exporter.getProperties();
-	   properties.put( AvailableSettings.TRANSACTION_COORDINATOR_STRATEGY, "org.hibernate.console.FakeTransactionManagerLookup"); // Hack for seam-gen console configurations
+	   properties.put( AvailableSettings.TRANSACTION_COORDINATOR_STRATEGY, FakeTransactionManagerLookup.class.getName()); // Hack for seam-gen console configurations
 	   properties.put(AvailableSettings.DIALECT, HibernateUtil.Dialect.class.getName());
 	   properties.put(AvailableSettings.CONNECTION_PROVIDER, HibernateUtil.ConnectionProvider.class.getName());
 	   exporter.getProperties().put(
 			   ExporterConstants.METADATA_DESCRIPTOR, 
 			   MetadataDescriptorFactory.createNativeDescriptor(null, null, properties));
 	   exporter.getProperties().put(ExporterConstants.DESTINATION_FOLDER, srcDir);
 	   exporter.start();
-	   assertNull(
+	   assertNotNull(
 			   FileUtil.findFirstString( AvailableSettings.TRANSACTION_COORDINATOR_STRATEGY, file ));
 	}
-	
+		
 	@Test
 	public void testFileExistence() {
 		JUnitUtil.assertIsNonEmptyFile(new File(srcDir, "hibernate.cfg.xml") );