4.x: Tests fail when upgrading to Hibernate 6.6.23.Final #10441

Signed-off-by: Jorge Bescos Gascon <[email protected]>

Author: jbescos

dependencies/pom.xml

@@ -67,8 +67,8 @@
         <version.lib.h2>2.2.220</version.lib.h2>
         <version.lib.hamcrest>1.3</version.lib.hamcrest>
         <version.lib.handlebars>4.4.0</version.lib.handlebars>
-        <version.lib.hibernate.family>6.3</version.lib.hibernate.family>
-        <version.lib.hibernate>${version.lib.hibernate.family}.1.Final</version.lib.hibernate>
+        <version.lib.hibernate.family>6.6</version.lib.hibernate.family>
+        <version.lib.hibernate>${version.lib.hibernate.family}.23.Final</version.lib.hibernate>
         <version.lib.hibernate-validator>8.0.2.Final</version.lib.hibernate-validator>
         <version.lib.hikaricp>5.0.1</version.lib.hikaricp>
         <version.lib.hystrix>1.5.18</version.lib.hystrix>
@@ -143,7 +143,7 @@
             UCP versions 21.10.0.0 and up throw NPEs. There is a test to catch them.
             Until this bug is fixed do not upgrade past version 21.9.0.0.
         -->
-        <version.lib.ojdbc>${version.lib.ojdbc.family}.6.0.24.10</version.lib.ojdbc>
+        <version.lib.ojdbc>${version.lib.ojdbc.family}.9.0.25.07</version.lib.ojdbc>
         <version.lib.ojdbc8>${version.lib.ojdbc}</version.lib.ojdbc8>
         <!-- Force upgrade okio for CVE-2023-3635. When okhttp 4.12.0 is available we can remove this -->
         <version.lib.okio>3.4.0</version.lib.okio>

integrations/cdi/jpa-cdi/src/test/java/io/helidon/integrations/cdi/jpa/chirp/TestJpaTransactionScopedSynchronizedEntityManager.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2019, 2023 Oracle and/or its affiliates.
+ * Copyright (c) 2019, 2025 Oracle and/or its affiliates.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -292,9 +292,9 @@ void testJpaTransactionScopedSynchronizedEntityManager()
         assertThat(transactionScopedContext.isActive(), is(true));
 
         // Remove the Author we successfully committed before.  We
-        // have to merge because author1 became detached a few lines
-        // above.
-        author1 = em.merge(author1);
+        // have to find because author1 became detached a few lines
+        // above and it is not allowed to attach it again with merge.
+        author1 = em.find(Author.class, Integer.valueOf(1));
         assertThat(author1, notNullValue());
         assertThat(em.contains(author1), is(true));
         em.remove(author1);
@@ -313,13 +313,15 @@ void testJpaTransactionScopedSynchronizedEntityManager()
         // tables.
         assertTableRowCount(dataSource, "AUTHOR", 0);
 
-        // Start a new transaction, merge our detached author1, and
+        // Start a new transaction, persist our detached author1, and
         // commit.  This will bump the author's ID and put a row in
         // the database.
         tm.begin();
         assertThat(em.isJoinedToTransaction(), is(true));
         assertThat(transactionScopedContext.isActive(), is(true));
-        author1 = em.merge(author1);
+        author1 = new Author("Abraham Lincoln");
+        em.persist(author1);
+        em.merge(author1);
         tm.commit();
         assertThat(em.isJoinedToTransaction(), is(false));
         assertThat(em.contains(author1), is(false));

integrations/cdi/jpa-cdi/src/test/java/io/helidon/integrations/cdi/jpa/chirp/TestRollbackScenarios.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2019, 2023 Oracle and/or its affiliates.
+ * Copyright (c) 2019, 2025 Oracle and/or its affiliates.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -276,6 +276,8 @@ void testRollbackScenarios()
         assertThat(tm.getStatus(), is(Status.STATUS_ACTIVE));
         assertThat(em.isJoinedToTransaction(), is(true));
         assertThat(em.contains(author), is(false));
+        author = new Author("John Kennedy");
+        em.persist(author);
         author = em.merge(author);
         em.remove(author);
         tm.commit();

tests/integration/packaging/mp-2/src/main/resources/META-INF/native-image/io.helidon.tests.integration.packaging/helidon-tests-integration-packaging-mp2/native-image.properties

@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2023, 2024 Oracle and/or its affiliates.
+# Copyright (c) 2023, 2025 Oracle and/or its affiliates.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -14,5 +14,5 @@
 # limitations under the License.
 #
 
-Args=--initialize-at-build-time=io.helidon.tests.integration.packaging.mp2 \
-    --enable-url-protocols=http
+Args=--initialize-at-build-time=io.helidon.tests.integration.packaging.mp2,net.bytebuddy \
+    --enable-url-protocols=http