From e90225336a57fa269ec40d6e238e4a27541b56fc Mon Sep 17 00:00:00 2001 From: Sam Brannen Date: Sun, 27 Mar 2022 17:01:26 +0200 Subject: [PATCH] Use JPA from Jakarta --- .../junit/jupiter/orm/JpaEntityListenerTests.java | 6 +++--- .../jupiter/orm/domain/JpaPersonRepository.java | 4 ++-- .../context/junit/jupiter/orm/domain/Person.java | 10 +++++----- .../junit/jupiter/orm/domain/PersonListener.java | 14 +++++++------- 4 files changed, 17 insertions(+), 17 deletions(-) diff --git a/spring-test/src/test/java/org/springframework/test/context/junit/jupiter/orm/JpaEntityListenerTests.java b/spring-test/src/test/java/org/springframework/test/context/junit/jupiter/orm/JpaEntityListenerTests.java index b94e517b19..0056da8df6 100644 --- a/spring-test/src/test/java/org/springframework/test/context/junit/jupiter/orm/JpaEntityListenerTests.java +++ b/spring-test/src/test/java/org/springframework/test/context/junit/jupiter/orm/JpaEntityListenerTests.java @@ -18,11 +18,11 @@ package org.springframework.test.context.junit.jupiter.orm; import java.util.List; -import javax.persistence.EntityManager; -import javax.persistence.EntityManagerFactory; -import javax.persistence.PersistenceContext; import javax.sql.DataSource; +import jakarta.persistence.EntityManager; +import jakarta.persistence.EntityManagerFactory; +import jakarta.persistence.PersistenceContext; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; diff --git a/spring-test/src/test/java/org/springframework/test/context/junit/jupiter/orm/domain/JpaPersonRepository.java b/spring-test/src/test/java/org/springframework/test/context/junit/jupiter/orm/domain/JpaPersonRepository.java index a3984b5359..eb5e38973e 100644 --- a/spring-test/src/test/java/org/springframework/test/context/junit/jupiter/orm/domain/JpaPersonRepository.java +++ b/spring-test/src/test/java/org/springframework/test/context/junit/jupiter/orm/domain/JpaPersonRepository.java @@ -16,8 +16,8 @@ package org.springframework.test.context.junit.jupiter.orm.domain; -import javax.persistence.EntityManager; -import javax.persistence.PersistenceContext; +import jakarta.persistence.EntityManager; +import jakarta.persistence.PersistenceContext; import org.springframework.stereotype.Repository; import org.springframework.transaction.annotation.Transactional; diff --git a/spring-test/src/test/java/org/springframework/test/context/junit/jupiter/orm/domain/Person.java b/spring-test/src/test/java/org/springframework/test/context/junit/jupiter/orm/domain/Person.java index 8d8f5b22fb..1a67dc439b 100644 --- a/spring-test/src/test/java/org/springframework/test/context/junit/jupiter/orm/domain/Person.java +++ b/spring-test/src/test/java/org/springframework/test/context/junit/jupiter/orm/domain/Person.java @@ -16,11 +16,11 @@ package org.springframework.test.context.junit.jupiter.orm.domain; -import javax.persistence.Entity; -import javax.persistence.EntityListeners; -import javax.persistence.GeneratedValue; -import javax.persistence.GenerationType; -import javax.persistence.Id; +import jakarta.persistence.Entity; +import jakarta.persistence.EntityListeners; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.GenerationType; +import jakarta.persistence.Id; /** * Person entity. diff --git a/spring-test/src/test/java/org/springframework/test/context/junit/jupiter/orm/domain/PersonListener.java b/spring-test/src/test/java/org/springframework/test/context/junit/jupiter/orm/domain/PersonListener.java index 1b5c56ddf6..1ba3dce8b6 100644 --- a/spring-test/src/test/java/org/springframework/test/context/junit/jupiter/orm/domain/PersonListener.java +++ b/spring-test/src/test/java/org/springframework/test/context/junit/jupiter/orm/domain/PersonListener.java @@ -19,13 +19,13 @@ package org.springframework.test.context.junit.jupiter.orm.domain; import java.util.ArrayList; import java.util.List; -import javax.persistence.PostLoad; -import javax.persistence.PostPersist; -import javax.persistence.PostRemove; -import javax.persistence.PostUpdate; -import javax.persistence.PrePersist; -import javax.persistence.PreRemove; -import javax.persistence.PreUpdate; +import jakarta.persistence.PostLoad; +import jakarta.persistence.PostPersist; +import jakarta.persistence.PostRemove; +import jakarta.persistence.PostUpdate; +import jakarta.persistence.PrePersist; +import jakarta.persistence.PreRemove; +import jakarta.persistence.PreUpdate; /** * Person entity listener.