From 028c3dd26e1b34b17f72b5683ae6f9a40369a0df Mon Sep 17 00:00:00 2001 From: Peter Zaoral Date: Fri, 27 Jan 2023 07:48:02 +0100 Subject: [PATCH] uarkus3 branch sync no. 13 (11.4.2023) Resolved conflicts: keycloak/testsuite/model/src/test/java/org/keycloak/testsuite/model/transaction/StorageTransactionTest.java - Modified --- 27.1.2023: * renamed imports from javax to jakarta as a part of the migration from JavaEE to JakartaEE Signed-off-by: Peter Zaoral --- .../testsuite/model/transaction/StorageTransactionTest.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/testsuite/model/src/test/java/org/keycloak/testsuite/model/transaction/StorageTransactionTest.java b/testsuite/model/src/test/java/org/keycloak/testsuite/model/transaction/StorageTransactionTest.java index 73e88837c9..2acac7a52c 100644 --- a/testsuite/model/src/test/java/org/keycloak/testsuite/model/transaction/StorageTransactionTest.java +++ b/testsuite/model/src/test/java/org/keycloak/testsuite/model/transaction/StorageTransactionTest.java @@ -34,9 +34,9 @@ import org.keycloak.testsuite.model.RequireProvider; import org.keycloak.testsuite.model.util.TransactionController; import org.keycloak.utils.LockObjectsForModification; -import javax.persistence.OptimisticLockException; -import javax.persistence.PessimisticLockException; -import javax.transaction.RollbackException; +import jakarta.persistence.OptimisticLockException; +import jakarta.persistence.PessimisticLockException; +import jakarta.transaction.RollbackException; import java.util.UUID; import java.util.function.Function;