Fix compilation errors after merge

This commit is contained in:
Andrea Boriero 2021-11-16 17:27:56 +01:00
parent 8c5adc86d0
commit 088baa6e86
2 changed files with 12 additions and 10 deletions

View File

@ -10,15 +10,16 @@ import static org.junit.Assert.assertEquals;
import java.util.Map;
import javax.persistence.EntityManager;
import javax.transaction.TransactionManager;
import jakarta.persistence.EntityManager;
import jakarta.transaction.TransactionManager;
import org.hibernate.FlushMode;
import org.hibernate.cfg.AvailableSettings;
import org.hibernate.envers.test.BaseEnversJPAFunctionalTestCase;
import org.hibernate.envers.test.Priority;
import org.hibernate.envers.test.entities.StrTestEntity;
import org.hibernate.internal.SessionImpl;
import org.hibernate.orm.test.envers.BaseEnversJPAFunctionalTestCase;
import org.hibernate.orm.test.envers.Priority;
import org.hibernate.orm.test.envers.entities.StrTestEntity;
import org.junit.Test;
import org.hibernate.testing.jta.TestingJtaBootstrap;

View File

@ -10,15 +10,16 @@ import static org.junit.Assert.assertEquals;
import java.util.Map;
import javax.persistence.EntityManager;
import javax.transaction.TransactionManager;
import jakarta.persistence.EntityManager;
import jakarta.transaction.TransactionManager;
import org.hibernate.FlushMode;
import org.hibernate.cfg.AvailableSettings;
import org.hibernate.envers.test.BaseEnversJPAFunctionalTestCase;
import org.hibernate.envers.test.Priority;
import org.hibernate.envers.test.entities.StrTestEntity;
import org.hibernate.internal.SessionImpl;
import org.hibernate.orm.test.envers.BaseEnversJPAFunctionalTestCase;
import org.hibernate.orm.test.envers.Priority;
import org.hibernate.orm.test.envers.entities.StrTestEntity;
import org.junit.Test;
import org.hibernate.testing.jta.TestingJtaBootstrap;