From 22a463bfdffcb3b57fb12988a20f2d66a8ee5245 Mon Sep 17 00:00:00 2001
From: barreiro <lbbbarreiro@gmail.com>
Date: Sat, 2 Mar 2024 18:10:21 +0000
Subject: [PATCH] Update to Agroal 2.3

---
 bom/application/pom.xml                             |  2 +-
 .../MultiplePersistenceUnitsInterceptorTest.java    |  4 ++++
 ...tiplePersistenceUnitsPackageAnnotationsTest.java | 13 +++++++++++--
 ...enceUnitsResourceInjectionEntityManagerTest.java |  1 -
 ...ersistenceUnitsResourceInjectionSessionTest.java |  1 -
 5 files changed, 16 insertions(+), 5 deletions(-)

diff --git a/bom/application/pom.xml b/bom/application/pom.xml
index ba6824f7c91f6..9792cd600b5f4 100644
--- a/bom/application/pom.xml
+++ b/bom/application/pom.xml
@@ -108,7 +108,7 @@
         <!-- When updating, align hibernate-search.version-for-documentation in docs/pom.xml -->
         <hibernate-search.version>7.1.0.Final</hibernate-search.version>
         <narayana.version>7.0.0.Final</narayana.version>
-        <agroal.version>2.1</agroal.version>
+        <agroal.version>2.3</agroal.version>
         <jboss-transaction-spi.version>8.0.0.Final</jboss-transaction-spi.version>
         <elasticsearch-opensource-components.version>8.12.2</elasticsearch-opensource-components.version>
         <rxjava.version>2.2.21</rxjava.version>
diff --git a/extensions/hibernate-orm/deployment/src/test/java/io/quarkus/hibernate/orm/multiplepersistenceunits/MultiplePersistenceUnitsInterceptorTest.java b/extensions/hibernate-orm/deployment/src/test/java/io/quarkus/hibernate/orm/multiplepersistenceunits/MultiplePersistenceUnitsInterceptorTest.java
index d5f73061f69ad..74b7d037bf1c0 100644
--- a/extensions/hibernate-orm/deployment/src/test/java/io/quarkus/hibernate/orm/multiplepersistenceunits/MultiplePersistenceUnitsInterceptorTest.java
+++ b/extensions/hibernate-orm/deployment/src/test/java/io/quarkus/hibernate/orm/multiplepersistenceunits/MultiplePersistenceUnitsInterceptorTest.java
@@ -60,8 +60,12 @@ public void initData() throws Exception {
         transaction.begin();
         DefaultEntity entity = new DefaultEntity("default");
         defaultSession.persist(entity);
+        transaction.commit();
+        transaction.begin();
         User user = new User("user");
         usersSession.persist(user);
+        transaction.commit();
+        transaction.begin();
         Plane plane = new Plane("plane");
         inventorySession.persist(plane);
         transaction.commit();
diff --git a/extensions/hibernate-orm/deployment/src/test/java/io/quarkus/hibernate/orm/multiplepersistenceunits/MultiplePersistenceUnitsPackageAnnotationsTest.java b/extensions/hibernate-orm/deployment/src/test/java/io/quarkus/hibernate/orm/multiplepersistenceunits/MultiplePersistenceUnitsPackageAnnotationsTest.java
index 0afa94de532cd..b73c006ce0e46 100644
--- a/extensions/hibernate-orm/deployment/src/test/java/io/quarkus/hibernate/orm/multiplepersistenceunits/MultiplePersistenceUnitsPackageAnnotationsTest.java
+++ b/extensions/hibernate-orm/deployment/src/test/java/io/quarkus/hibernate/orm/multiplepersistenceunits/MultiplePersistenceUnitsPackageAnnotationsTest.java
@@ -6,6 +6,7 @@
 import jakarta.inject.Inject;
 import jakarta.persistence.EntityManager;
 import jakarta.transaction.Transactional;
+import jakarta.transaction.UserTransaction;
 
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.extension.RegisterExtension;
@@ -39,26 +40,34 @@ public class MultiplePersistenceUnitsPackageAnnotationsTest {
     @PersistenceUnit("inventory")
     EntityManager inventoryEntityManager;
 
+    @Inject
+    UserTransaction transaction;
+
     @Test
-    @Transactional
-    public void testDefault() {
+    public void testDefault() throws Exception {
+        transaction.begin();
         SharedEntity defaultEntity = new SharedEntity("default");
         defaultEntityManager.persist(defaultEntity);
 
         SharedEntity savedDefaultEntity = defaultEntityManager.find(SharedEntity.class, defaultEntity.getId());
         assertEquals(defaultEntity.getName(), savedDefaultEntity.getName());
+        transaction.commit();
 
+        transaction.begin();
         SharedEntity defaultEntity2 = new SharedEntity("default2");
         usersEntityManager.persist(defaultEntity2);
 
         SharedEntity savedDefaultEntity2 = usersEntityManager.find(SharedEntity.class, defaultEntity2.getId());
         assertEquals(defaultEntity2.getName(), savedDefaultEntity2.getName());
+        transaction.commit();
 
+        transaction.begin();
         SharedEntity defaultEntity3 = new SharedEntity("default3");
         inventoryEntityManager.persist(defaultEntity3);
 
         SharedEntity savedDefaultEntity3 = inventoryEntityManager.find(SharedEntity.class, defaultEntity3.getId());
         assertEquals(defaultEntity3.getName(), savedDefaultEntity3.getName());
+        transaction.commit();
     }
 
     @Test
diff --git a/extensions/hibernate-orm/deployment/src/test/java/io/quarkus/hibernate/orm/multiplepersistenceunits/MultiplePersistenceUnitsResourceInjectionEntityManagerTest.java b/extensions/hibernate-orm/deployment/src/test/java/io/quarkus/hibernate/orm/multiplepersistenceunits/MultiplePersistenceUnitsResourceInjectionEntityManagerTest.java
index d115d67dfb842..52a5fafc14ea1 100644
--- a/extensions/hibernate-orm/deployment/src/test/java/io/quarkus/hibernate/orm/multiplepersistenceunits/MultiplePersistenceUnitsResourceInjectionEntityManagerTest.java
+++ b/extensions/hibernate-orm/deployment/src/test/java/io/quarkus/hibernate/orm/multiplepersistenceunits/MultiplePersistenceUnitsResourceInjectionEntityManagerTest.java
@@ -58,7 +58,6 @@ public void testUserInInventoryEntityManager() {
     }
 
     @Test
-    @Transactional
     public void testAccessBothPersistenceUnits() {
         testUser();
         testPlane();
diff --git a/extensions/hibernate-orm/deployment/src/test/java/io/quarkus/hibernate/orm/multiplepersistenceunits/MultiplePersistenceUnitsResourceInjectionSessionTest.java b/extensions/hibernate-orm/deployment/src/test/java/io/quarkus/hibernate/orm/multiplepersistenceunits/MultiplePersistenceUnitsResourceInjectionSessionTest.java
index b13741e7a9490..1d5e0ab49a7dc 100644
--- a/extensions/hibernate-orm/deployment/src/test/java/io/quarkus/hibernate/orm/multiplepersistenceunits/MultiplePersistenceUnitsResourceInjectionSessionTest.java
+++ b/extensions/hibernate-orm/deployment/src/test/java/io/quarkus/hibernate/orm/multiplepersistenceunits/MultiplePersistenceUnitsResourceInjectionSessionTest.java
@@ -58,7 +58,6 @@ public void testUserInInventorySession() {
     }
 
     @Test
-    @Transactional
     public void testAccessBothPersistenceUnits() {
         testUser();
         testPlane();