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 @@ 7.1.0.Final 7.0.0.Final - 2.1 + 2.3 8.0.0.Final 8.12.2 2.2.21 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();