Bump org.eclipse.persistence.jpa from 2.7.7 to 3.0.0

pom.xml

@@ -9,7 +9,7 @@
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <dropwizard.version>2.0.10</dropwizard.version>
         <hamcrest.version>2.2</hamcrest.version>
-        <eclipselink.version>2.7.7</eclipselink.version>
+        <eclipselink.version>3.0.0</eclipselink.version>
         <guice.version>4.2.3</guice.version>
         <guava.version>29.0-jre</guava.version>
         <jackson.version>2.12.0</jackson.version>

src/main/java/uk/gov/pay/adminusers/persistence/dao/ForgottenPasswordDao.java

@@ -4,9 +4,9 @@
 import com.google.inject.Provider;
 import com.google.inject.name.Named;
 import com.google.inject.persist.Transactional;
+import jakarta.persistence.EntityManager;
 import uk.gov.pay.adminusers.persistence.entity.ForgottenPasswordEntity;
 
-import javax.persistence.EntityManager;
 import java.time.ZoneId;
 import java.time.ZonedDateTime;
 import java.util.Optional;

src/main/java/uk/gov/pay/adminusers/persistence/dao/GovUkPayAgreementDao.java

@@ -2,10 +2,10 @@
 
 import com.google.inject.Provider;
 import com.google.inject.persist.Transactional;
+import jakarta.persistence.EntityManager;
 import uk.gov.pay.adminusers.persistence.entity.GovUkPayAgreementEntity;
 
 import javax.inject.Inject;
-import javax.persistence.EntityManager;
 import java.util.Optional;
 
 @Transactional

src/main/java/uk/gov/pay/adminusers/persistence/dao/InviteDao.java

@@ -3,9 +3,9 @@
 import com.google.inject.Inject;
 import com.google.inject.Provider;
 import com.google.inject.persist.Transactional;
+import jakarta.persistence.EntityManager;
 import uk.gov.pay.adminusers.persistence.entity.InviteEntity;
 
-import javax.persistence.EntityManager;
 import java.util.List;
 import java.util.Optional;
 

src/main/java/uk/gov/pay/adminusers/persistence/dao/JpaDao.java

@@ -2,8 +2,8 @@
 
 import com.google.inject.Provider;
 import com.google.inject.persist.Transactional;
+import jakarta.persistence.EntityManager;
 
-import javax.persistence.EntityManager;
 import java.util.Optional;
 
 @Transactional

src/main/java/uk/gov/pay/adminusers/persistence/dao/RoleDao.java

@@ -3,9 +3,9 @@
 
 import com.google.inject.Inject;
 import com.google.inject.Provider;
+import jakarta.persistence.EntityManager;
 import uk.gov.pay.adminusers.persistence.entity.RoleEntity;
 
-import javax.persistence.EntityManager;
 import java.util.Optional;
 
 /**

src/main/java/uk/gov/pay/adminusers/persistence/dao/ServiceDao.java

@@ -2,11 +2,11 @@
 
 import com.google.inject.Provider;
 import com.google.inject.persist.Transactional;
+import jakarta.persistence.EntityManager;
 import uk.gov.pay.adminusers.persistence.entity.GatewayAccountIdEntity;
 import uk.gov.pay.adminusers.persistence.entity.ServiceEntity;
 
 import javax.inject.Inject;
-import javax.persistence.EntityManager;
 import java.util.List;
 import java.util.Optional;
 

src/main/java/uk/gov/pay/adminusers/persistence/dao/ServiceRoleDao.java

@@ -3,9 +3,9 @@
 import com.google.inject.Inject;
 import com.google.inject.Provider;
 import com.google.inject.persist.Transactional;
+import jakarta.persistence.EntityManager;
 import uk.gov.pay.adminusers.persistence.entity.ServiceRoleEntity;
 
-import javax.persistence.EntityManager;
 
 @Transactional
 public class ServiceRoleDao extends JpaDao<ServiceRoleEntity> {

src/main/java/uk/gov/pay/adminusers/persistence/dao/StripeAgreementDao.java

@@ -2,10 +2,10 @@
 
 import com.google.inject.Provider;
 import com.google.inject.persist.Transactional;
+import jakarta.persistence.EntityManager;
 import uk.gov.pay.adminusers.persistence.entity.StripeAgreementEntity;
 
 import javax.inject.Inject;
-import javax.persistence.EntityManager;
 import java.util.Optional;
 
 @Transactional

src/main/java/uk/gov/pay/adminusers/persistence/dao/UserDao.java

@@ -2,11 +2,11 @@
 
 import com.google.inject.Provider;
 import com.google.inject.persist.Transactional;
+import jakarta.persistence.EntityManager;
 import uk.gov.pay.adminusers.persistence.entity.ServiceRoleEntity;
 import uk.gov.pay.adminusers.persistence.entity.UserEntity;
 
 import javax.inject.Inject;
-import javax.persistence.EntityManager;
 import java.util.List;
 import java.util.Optional;
 import java.util.stream.Collectors;

src/main/java/uk/gov/pay/adminusers/persistence/entity/AbstractEntity.java

@@ -1,11 +1,12 @@
 package uk.gov.pay.adminusers.persistence.entity;
 
-import javax.persistence.Column;
-import javax.persistence.GeneratedValue;
-import javax.persistence.GenerationType;
-import javax.persistence.Id;
-import javax.persistence.MappedSuperclass;
-import javax.persistence.Version;
+import jakarta.persistence.Column;
+import jakarta.persistence.GeneratedValue;
+import jakarta.persistence.GenerationType;
+import jakarta.persistence.Id;
+import jakarta.persistence.MappedSuperclass;
+import jakarta.persistence.Version;
+
 import java.io.Serializable;
 
 @MappedSuperclass

src/main/java/uk/gov/pay/adminusers/persistence/entity/CustomBrandingConverter.java

@@ -3,10 +3,10 @@
 import com.fasterxml.jackson.core.JsonProcessingException;
 import com.fasterxml.jackson.core.type.TypeReference;
 import com.fasterxml.jackson.databind.ObjectMapper;
+import jakarta.persistence.AttributeConverter;
+import jakarta.persistence.Converter;
 import org.postgresql.util.PGobject;
 
-import javax.persistence.AttributeConverter;
-import javax.persistence.Converter;
 import java.io.IOException;
 import java.sql.SQLException;
 import java.util.Map;

src/main/java/uk/gov/pay/adminusers/persistence/entity/ForgottenPasswordEntity.java

@@ -1,14 +1,14 @@
 package uk.gov.pay.adminusers.persistence.entity;
 
+import jakarta.persistence.Column;
+import jakarta.persistence.Convert;
+import jakarta.persistence.Entity;
+import jakarta.persistence.JoinColumn;
+import jakarta.persistence.ManyToOne;
+import jakarta.persistence.SequenceGenerator;
+import jakarta.persistence.Table;
 import uk.gov.pay.adminusers.model.ForgottenPassword;
 
-import javax.persistence.Column;
-import javax.persistence.Convert;
-import javax.persistence.Entity;
-import javax.persistence.JoinColumn;
-import javax.persistence.ManyToOne;
-import javax.persistence.SequenceGenerator;
-import javax.persistence.Table;
 import java.time.ZoneId;
 import java.time.ZonedDateTime;
 

src/main/java/uk/gov/pay/adminusers/persistence/entity/GatewayAccountIdEntity.java

@@ -1,15 +1,15 @@
 package uk.gov.pay.adminusers.persistence.entity;
 
-import javax.persistence.Column;
-import javax.persistence.Entity;
-import javax.persistence.FetchType;
-import javax.persistence.GeneratedValue;
-import javax.persistence.GenerationType;
-import javax.persistence.Id;
-import javax.persistence.JoinColumn;
-import javax.persistence.ManyToOne;
-import javax.persistence.SequenceGenerator;
-import javax.persistence.Table;
+import jakarta.persistence.Column;
+import jakarta.persistence.Entity;
+import jakarta.persistence.FetchType;
+import jakarta.persistence.GeneratedValue;
+import jakarta.persistence.GenerationType;
+import jakarta.persistence.Id;
+import jakarta.persistence.JoinColumn;
+import jakarta.persistence.ManyToOne;
+import jakarta.persistence.SequenceGenerator;
+import jakarta.persistence.Table;
 
 @Entity
 @Table(name = "service_gateway_accounts")

src/main/java/uk/gov/pay/adminusers/persistence/entity/GovUkPayAgreementEntity.java

@@ -1,17 +1,17 @@
 package uk.gov.pay.adminusers.persistence.entity;
 
+import jakarta.persistence.Column;
+import jakarta.persistence.Convert;
+import jakarta.persistence.Entity;
+import jakarta.persistence.GeneratedValue;
+import jakarta.persistence.GenerationType;
+import jakarta.persistence.Id;
+import jakarta.persistence.JoinColumn;
+import jakarta.persistence.OneToOne;
+import jakarta.persistence.SequenceGenerator;
+import jakarta.persistence.Table;
 import uk.gov.pay.adminusers.model.GovUkPayAgreement;
 
-import javax.persistence.Column;
-import javax.persistence.Convert;
-import javax.persistence.Entity;
-import javax.persistence.GeneratedValue;
-import javax.persistence.GenerationType;
-import javax.persistence.Id;
-import javax.persistence.JoinColumn;
-import javax.persistence.OneToOne;
-import javax.persistence.SequenceGenerator;
-import javax.persistence.Table;
 import java.time.ZonedDateTime;
 
 @Entity

src/main/java/uk/gov/pay/adminusers/persistence/entity/InviteEntity.java

@@ -1,17 +1,17 @@
 package uk.gov.pay.adminusers.persistence.entity;
 
+import jakarta.persistence.Column;
+import jakarta.persistence.Convert;
+import jakarta.persistence.Entity;
+import jakarta.persistence.JoinColumn;
+import jakarta.persistence.ManyToOne;
+import jakarta.persistence.Table;
 import uk.gov.pay.adminusers.app.util.RandomIdGenerator;
 import uk.gov.pay.adminusers.model.Invite;
 import uk.gov.pay.adminusers.model.InviteType;
 import uk.gov.pay.adminusers.model.SecondFactorMethod;
 import uk.gov.pay.adminusers.utils.telephonenumber.TelephoneNumberUtility;
 
-import javax.persistence.Column;
-import javax.persistence.Convert;
-import javax.persistence.Entity;
-import javax.persistence.JoinColumn;
-import javax.persistence.ManyToOne;
-import javax.persistence.Table;
 import java.time.ZoneId;
 import java.time.ZonedDateTime;
 import java.util.Locale;

src/main/java/uk/gov/pay/adminusers/persistence/entity/InviteTypeConverter.java

@@ -1,10 +1,9 @@
 package uk.gov.pay.adminusers.persistence.entity;
 
+import jakarta.persistence.AttributeConverter;
+import jakarta.persistence.Converter;
 import uk.gov.pay.adminusers.model.InviteType;
 
-import javax.persistence.AttributeConverter;
-import javax.persistence.Converter;
-
 @Converter
 public class InviteTypeConverter implements AttributeConverter<InviteType, String> {
 

src/main/java/uk/gov/pay/adminusers/persistence/entity/MerchantDetailsEntity.java

@@ -1,10 +1,10 @@
 package uk.gov.pay.adminusers.persistence.entity;
 
+import jakarta.persistence.Column;
+import jakarta.persistence.Embeddable;
 import uk.gov.pay.adminusers.model.MerchantDetails;
 import uk.gov.pay.adminusers.model.UpdateMerchantDetailsRequest;
 
-import javax.persistence.Column;
-import javax.persistence.Embeddable;
 import java.util.Objects;
 
 @Embeddable

src/main/java/uk/gov/pay/adminusers/persistence/entity/PermissionEntity.java

@@ -1,13 +1,12 @@
 package uk.gov.pay.adminusers.persistence.entity;
 
+import jakarta.persistence.Column;
+import jakarta.persistence.Entity;
+import jakarta.persistence.Id;
+import jakarta.persistence.Table;
 import org.eclipse.persistence.annotations.ReadOnly;
 import uk.gov.pay.adminusers.model.Permission;
 
-import javax.persistence.Column;
-import javax.persistence.Entity;
-import javax.persistence.Id;
-import javax.persistence.Table;
-
 /**
  * Represents a single Permission assignable to a selfservice user (Government department user)
  * <p>

src/main/java/uk/gov/pay/adminusers/persistence/entity/RoleEntity.java

@@ -1,16 +1,16 @@
 package uk.gov.pay.adminusers.persistence.entity;
 
+import jakarta.persistence.Column;
+import jakarta.persistence.Entity;
+import jakarta.persistence.FetchType;
+import jakarta.persistence.Id;
+import jakarta.persistence.JoinColumn;
+import jakarta.persistence.JoinTable;
+import jakarta.persistence.ManyToMany;
+import jakarta.persistence.Table;
 import org.eclipse.persistence.annotations.ReadOnly;
 import uk.gov.pay.adminusers.model.Role;
 
-import javax.persistence.Column;
-import javax.persistence.Entity;
-import javax.persistence.FetchType;
-import javax.persistence.Id;
-import javax.persistence.JoinColumn;
-import javax.persistence.JoinTable;
-import javax.persistence.ManyToMany;
-import javax.persistence.Table;
 import java.util.HashSet;
 import java.util.Set;
 

src/main/java/uk/gov/pay/adminusers/persistence/entity/SecondFactorMethodConverter.java

@@ -1,10 +1,9 @@
 package uk.gov.pay.adminusers.persistence.entity;
 
+import jakarta.persistence.AttributeConverter;
+import jakarta.persistence.Converter;
 import uk.gov.pay.adminusers.model.SecondFactorMethod;
 
-import javax.persistence.AttributeConverter;
-import javax.persistence.Converter;
-
 @Converter
 public class SecondFactorMethodConverter implements AttributeConverter<SecondFactorMethod, String> {
 

src/main/java/uk/gov/pay/adminusers/persistence/entity/ServiceEntity.java

@@ -1,24 +1,24 @@
 package uk.gov.pay.adminusers.persistence.entity;
 
+import jakarta.persistence.CascadeType;
+import jakarta.persistence.Column;
+import jakarta.persistence.Convert;
+import jakarta.persistence.Embedded;
+import jakarta.persistence.Entity;
+import jakarta.persistence.Enumerated;
+import jakarta.persistence.FetchType;
+import jakarta.persistence.GeneratedValue;
+import jakarta.persistence.GenerationType;
+import jakarta.persistence.Id;
+import jakarta.persistence.OneToMany;
+import jakarta.persistence.SequenceGenerator;
+import jakarta.persistence.Table;
 import uk.gov.pay.adminusers.model.GoLiveStage;
 import uk.gov.pay.adminusers.model.Service;
 import uk.gov.pay.adminusers.model.ServiceName;
 import uk.gov.pay.adminusers.persistence.entity.service.ServiceNameEntity;
 import uk.gov.pay.commons.model.SupportedLanguage;
 
-import javax.persistence.CascadeType;
-import javax.persistence.Column;
-import javax.persistence.Convert;
-import javax.persistence.Embedded;
-import javax.persistence.Entity;
-import javax.persistence.Enumerated;
-import javax.persistence.FetchType;
-import javax.persistence.GeneratedValue;
-import javax.persistence.GenerationType;
-import javax.persistence.Id;
-import javax.persistence.OneToMany;
-import javax.persistence.SequenceGenerator;
-import javax.persistence.Table;
 import java.time.ZonedDateTime;
 import java.util.ArrayList;
 import java.util.HashSet;
@@ -27,9 +27,9 @@
 import java.util.Set;
 import java.util.stream.Collectors;
 
+import static jakarta.persistence.EnumType.STRING;
 import static java.time.ZoneOffset.UTC;
 import static java.util.Arrays.asList;
-import static javax.persistence.EnumType.STRING;
 import static uk.gov.pay.adminusers.app.util.RandomIdGenerator.randomUuid;
 
 @Entity

src/main/java/uk/gov/pay/adminusers/persistence/entity/ServiceRoleEntity.java

@@ -1,14 +1,14 @@
 package uk.gov.pay.adminusers.persistence.entity;
 
+import jakarta.persistence.EmbeddedId;
+import jakarta.persistence.Entity;
+import jakarta.persistence.FetchType;
+import jakarta.persistence.JoinColumn;
+import jakarta.persistence.ManyToOne;
+import jakarta.persistence.MapsId;
+import jakarta.persistence.Table;
 import uk.gov.pay.adminusers.model.ServiceRole;
 
-import javax.persistence.EmbeddedId;
-import javax.persistence.Entity;
-import javax.persistence.FetchType;
-import javax.persistence.JoinColumn;
-import javax.persistence.ManyToOne;
-import javax.persistence.MapsId;
-import javax.persistence.Table;
 
 @Entity
 @Table(name = "user_services_roles")