Jakarta Persistence namespace transition
Signed-off-by: Gaurav Gupta <gaurav.gupta@payara.fish>
diff --git a/appserver/common/container-common/src/main/java/com/sun/enterprise/container/common/impl/QueryWrapper.java b/appserver/common/container-common/src/main/java/com/sun/enterprise/container/common/impl/QueryWrapper.java
index 9aef388..6dd00fb 100644
--- a/appserver/common/container-common/src/main/java/com/sun/enterprise/container/common/impl/QueryWrapper.java
+++ b/appserver/common/container-common/src/main/java/com/sun/enterprise/container/common/impl/QueryWrapper.java
@@ -24,7 +24,7 @@
import java.util.*;
/**
- * Wrapper class for javax.persistence.Query objects returned from
+ * Wrapper class for jakarta.persistence.Query objects returned from
* non-transactional access of a container-managed transactional
* EntityManager. Proxying the Query object allows us to clear persistence
* context after execution to allow for returned objects to be detached
diff --git a/appserver/common/container-common/src/main/java/com/sun/enterprise/container/common/impl/StoreProcedureQueryWrapper.java b/appserver/common/container-common/src/main/java/com/sun/enterprise/container/common/impl/StoreProcedureQueryWrapper.java
index 005a76c..1d97f7f 100644
--- a/appserver/common/container-common/src/main/java/com/sun/enterprise/container/common/impl/StoreProcedureQueryWrapper.java
+++ b/appserver/common/container-common/src/main/java/com/sun/enterprise/container/common/impl/StoreProcedureQueryWrapper.java
@@ -22,7 +22,7 @@
import java.util.Date;
/**
- * Wrapper class for javax.persistence.StoredProcedyreQyery objects returned from
+ * Wrapper class for jakarta.persistence.StoredProcedyreQyery objects returned from
* non-transactional access of a container-managed transactional
* EntityManager.
*
diff --git a/appserver/common/pom.xml b/appserver/common/pom.xml
index f4e6e02..15e8e8e 100755
--- a/appserver/common/pom.xml
+++ b/appserver/common/pom.xml
@@ -31,6 +31,7 @@
<name>GlassFish Common modules</name>
<modules>
<module>stats77</module>
+ <module>amx-javaee</module>
<module>glassfish-ee-api</module>
<module>annotation-framework</module>
<module>container-common</module>
diff --git a/appserver/core/api-exporter-fragment/pom.xml b/appserver/core/api-exporter-fragment/pom.xml
index 2ea1107..a88aba6 100755
--- a/appserver/core/api-exporter-fragment/pom.xml
+++ b/appserver/core/api-exporter-fragment/pom.xml
@@ -186,10 +186,10 @@
javax.naming.spi; \
javax.net; \
javax.net.ssl; \
-javax.persistence; \
-javax.persistence.criteria; \
-javax.persistence.metamodel; \
-javax.persistence.spi; \
+jakarta.persistence; \
+jakarta.persistence.criteria; \
+jakarta.persistence.metamodel; \
+jakarta.persistence.spi; \
javax.print; \
javax.print.attribute; \
javax.print.attribute.standard; \
diff --git a/appserver/deployment/dol/src/main/java/com/sun/enterprise/deployment/EntityManagerFactoryReferenceDescriptor.java b/appserver/deployment/dol/src/main/java/com/sun/enterprise/deployment/EntityManagerFactoryReferenceDescriptor.java
index 0704696..f6e9e44 100644
--- a/appserver/deployment/dol/src/main/java/com/sun/enterprise/deployment/EntityManagerFactoryReferenceDescriptor.java
+++ b/appserver/deployment/dol/src/main/java/com/sun/enterprise/deployment/EntityManagerFactoryReferenceDescriptor.java
@@ -51,7 +51,7 @@
}
public String getInjectResourceType() {
- return "javax.persistence.EntityManagerFactory";
+ return "jakarta.persistence.EntityManagerFactory";
}
public void setInjectResourceType(String resourceType) {
diff --git a/appserver/deployment/dol/src/main/java/com/sun/enterprise/deployment/EntityManagerReferenceDescriptor.java b/appserver/deployment/dol/src/main/java/com/sun/enterprise/deployment/EntityManagerReferenceDescriptor.java
index e315be6..3f24a3e 100644
--- a/appserver/deployment/dol/src/main/java/com/sun/enterprise/deployment/EntityManagerReferenceDescriptor.java
+++ b/appserver/deployment/dol/src/main/java/com/sun/enterprise/deployment/EntityManagerReferenceDescriptor.java
@@ -62,7 +62,7 @@
}
public String getInjectResourceType() {
- return "javax.persistence.EntityManager";
+ return "jakarta.persistence.EntityManager";
}
public void setInjectResourceType(String resourceType) {
diff --git a/appserver/deployment/dol/src/main/java/com/sun/enterprise/deployment/annotation/handlers/EntityManagerFactoryReferenceHandler.java b/appserver/deployment/dol/src/main/java/com/sun/enterprise/deployment/annotation/handlers/EntityManagerFactoryReferenceHandler.java
index 9c63cf2..d42a340 100644
--- a/appserver/deployment/dol/src/main/java/com/sun/enterprise/deployment/annotation/handlers/EntityManagerFactoryReferenceHandler.java
+++ b/appserver/deployment/dol/src/main/java/com/sun/enterprise/deployment/annotation/handlers/EntityManagerFactoryReferenceHandler.java
@@ -34,7 +34,7 @@
/**
* This handler is responsible for handling the
- * javax.persistence.PersistenceUnit annotation.
+ * jakarta.persistence.PersistenceUnit annotation.
*
*/
@Service
diff --git a/appserver/deployment/dol/src/main/java/com/sun/enterprise/deployment/annotation/handlers/EntityManagerFactoryReferencesHandler.java b/appserver/deployment/dol/src/main/java/com/sun/enterprise/deployment/annotation/handlers/EntityManagerFactoryReferencesHandler.java
index 37e9589..85cc267 100644
--- a/appserver/deployment/dol/src/main/java/com/sun/enterprise/deployment/annotation/handlers/EntityManagerFactoryReferencesHandler.java
+++ b/appserver/deployment/dol/src/main/java/com/sun/enterprise/deployment/annotation/handlers/EntityManagerFactoryReferencesHandler.java
@@ -30,7 +30,7 @@
/**
* This handler is responsible for handling the
- * javax.persistence.PersistenceUnits annotation.
+ * jakarta.persistence.PersistenceUnits annotation.
*
*/
@Service
diff --git a/appserver/deployment/dol/src/main/java/com/sun/enterprise/deployment/annotation/handlers/EntityManagerReferenceHandler.java b/appserver/deployment/dol/src/main/java/com/sun/enterprise/deployment/annotation/handlers/EntityManagerReferenceHandler.java
index 87418da..da97f91 100644
--- a/appserver/deployment/dol/src/main/java/com/sun/enterprise/deployment/annotation/handlers/EntityManagerReferenceHandler.java
+++ b/appserver/deployment/dol/src/main/java/com/sun/enterprise/deployment/annotation/handlers/EntityManagerReferenceHandler.java
@@ -34,7 +34,7 @@
/**
* This handler is responsible for handling the
- * javax.persistence.PersistenceUnit annotation.
+ * jakarta.persistence.PersistenceUnit annotation.
*
*/
@Service
diff --git a/appserver/deployment/dol/src/main/java/com/sun/enterprise/deployment/annotation/handlers/EntityManagerReferencesHandler.java b/appserver/deployment/dol/src/main/java/com/sun/enterprise/deployment/annotation/handlers/EntityManagerReferencesHandler.java
index 7526b32..3be62fc 100644
--- a/appserver/deployment/dol/src/main/java/com/sun/enterprise/deployment/annotation/handlers/EntityManagerReferencesHandler.java
+++ b/appserver/deployment/dol/src/main/java/com/sun/enterprise/deployment/annotation/handlers/EntityManagerReferencesHandler.java
@@ -30,7 +30,7 @@
/**
* This handler is responsible for handling the
- * javax.persistence.PersistenceContexts annotation.
+ * jakarta.persistence.PersistenceContexts annotation.
*
*/
@Service
diff --git a/appserver/persistence/jpa-container/src/main/java/org/glassfish/persistence/jpa/PersistenceUnitLoader.java b/appserver/persistence/jpa-container/src/main/java/org/glassfish/persistence/jpa/PersistenceUnitLoader.java
index 5955487..8423653 100644
--- a/appserver/persistence/jpa-container/src/main/java/org/glassfish/persistence/jpa/PersistenceUnitLoader.java
+++ b/appserver/persistence/jpa-container/src/main/java/org/glassfish/persistence/jpa/PersistenceUnitLoader.java
@@ -65,10 +65,10 @@
private static final String ECLIPSELINK_WEAVING_PROPERTY = "eclipselink.weaving"; // NOI18N
/** Name of property used to specify validation mode */
- private static final String VALIDATION_MODE_PROPERTY = "javax.persistence.validation.mode";
+ private static final String VALIDATION_MODE_PROPERTY = "jakarta.persistence.validation.mode";
/** Name of property used to specify validator factory */
- private static final String VALIDATOR_FACTORY = "javax.persistence.validation.factory";
+ private static final String VALIDATOR_FACTORY = "jakarta.persistence.validation.factory";
private static final String DISABLE_UPGRADE_FROM_TOPLINK_ESSENTIALS = "org.glassfish.persistence.jpa.disable.upgrade.from.toplink.essentials";
diff --git a/appserver/persistence/jpa-container/src/main/java/org/glassfish/persistence/jpa/ServerProviderContainerContractInfo.java b/appserver/persistence/jpa-container/src/main/java/org/glassfish/persistence/jpa/ServerProviderContainerContractInfo.java
index 33206b8..e9024e8 100644
--- a/appserver/persistence/jpa-container/src/main/java/org/glassfish/persistence/jpa/ServerProviderContainerContractInfo.java
+++ b/appserver/persistence/jpa-container/src/main/java/org/glassfish/persistence/jpa/ServerProviderContainerContractInfo.java
@@ -66,7 +66,7 @@
@Override
public void addTransformer(final ClassTransformer transformer) {
// Bridge between java.lang.instrument.ClassFileTransformer that DeploymentContext accepts
- // and javax.persistence.spi.ClassTransformer that JPA supplies.
+ // and jakarta.persistence.spi.ClassTransformer that JPA supplies.
deploymentContext.addTransformer(new ClassFileTransformer() {
public byte[] transform(ClassLoader loader, String className, Class<?> classBeingRedefined,
ProtectionDomain protectionDomain, byte[] classfileBuffer)
diff --git a/appserver/persistence/jpa-container/src/main/java/org/glassfish/persistence/jpa/schemageneration/JPAStandardSchemaGenerationProcessor.java b/appserver/persistence/jpa-container/src/main/java/org/glassfish/persistence/jpa/schemageneration/JPAStandardSchemaGenerationProcessor.java
index ac13680..5fc8d53 100644
--- a/appserver/persistence/jpa-container/src/main/java/org/glassfish/persistence/jpa/schemageneration/JPAStandardSchemaGenerationProcessor.java
+++ b/appserver/persistence/jpa-container/src/main/java/org/glassfish/persistence/jpa/schemageneration/JPAStandardSchemaGenerationProcessor.java
@@ -29,9 +29,9 @@
* @author Mitesh Meswani
*/
public class JPAStandardSchemaGenerationProcessor implements SchemaGenerationProcessor {
- private static final String SCHEMA_GENERATION_DATABASE_ACTION_PROPERTY = "javax.persistence.schema-generation.database.action";
- private static final String SCHEMA_GENERATION_SCRIPTS_ACTION_PROPERTY = "javax.persistence.schema-generation.scripts.action";
- private static final String SQL_LOAD_SCRIPT_SOURCE = "javax.persistence.sql_load-script-source";
+ private static final String SCHEMA_GENERATION_DATABASE_ACTION_PROPERTY = "jakarta.persistence.schema-generation.database.action";
+ private static final String SCHEMA_GENERATION_SCRIPTS_ACTION_PROPERTY = "jakarta.persistence.schema-generation.scripts.action";
+ private static final String SQL_LOAD_SCRIPT_SOURCE = "jakarta.persistence.sql_load-script-source";
private static final String SCHEMA_GENERATION_ACTION_NONE = "none";
diff --git a/appserver/persistence/jpa-container/src/main/java/org/glassfish/persistence/jpa/schemageneration/SchemaGenerationProcessorFactory.java b/appserver/persistence/jpa-container/src/main/java/org/glassfish/persistence/jpa/schemageneration/SchemaGenerationProcessorFactory.java
index 2c0828a..276bc16 100644
--- a/appserver/persistence/jpa-container/src/main/java/org/glassfish/persistence/jpa/schemageneration/SchemaGenerationProcessorFactory.java
+++ b/appserver/persistence/jpa-container/src/main/java/org/glassfish/persistence/jpa/schemageneration/SchemaGenerationProcessorFactory.java
@@ -46,7 +46,7 @@
return useJPA21Processor ? new JPAStandardSchemaGenerationProcessor() : new EclipseLinkSchemaGenerationProcessor(providerClassName);
}
- private static final String STANDARD_SCHEMA_GENERATION_PREFIX = "javax.persistence.schema-generation";
+ private static final String STANDARD_SCHEMA_GENERATION_PREFIX = "jakarta.persistence.schema-generation";
/**
* @return true if the given <code>pud</code> contains a JPA standard property for schema generation
diff --git a/appserver/tests/appserv-tests/devtests/cdi/javaee-component-resources/em-injection-no-interface-ejb/servlet/test/ejb/TestNoInterfaceEJB.java b/appserver/tests/appserv-tests/devtests/cdi/javaee-component-resources/em-injection-no-interface-ejb/servlet/test/ejb/TestNoInterfaceEJB.java
index 7de9921..0157f7b 100644
--- a/appserver/tests/appserv-tests/devtests/cdi/javaee-component-resources/em-injection-no-interface-ejb/servlet/test/ejb/TestNoInterfaceEJB.java
+++ b/appserver/tests/appserv-tests/devtests/cdi/javaee-component-resources/em-injection-no-interface-ejb/servlet/test/ejb/TestNoInterfaceEJB.java
@@ -17,7 +17,7 @@
package test.ejb;
import jakarta.ejb.Stateless;
-import javax.persistence.EntityManager;
+import jakarta.persistence.EntityManager;
import javax.inject.Inject;
@Stateless
diff --git a/appserver/tests/appserv-tests/devtests/cdi/javaee-component-resources/em-injection-no-interface-ejb/servlet/test/entity/Department.java b/appserver/tests/appserv-tests/devtests/cdi/javaee-component-resources/em-injection-no-interface-ejb/servlet/test/entity/Department.java
index 14191ec..e072378 100644
--- a/appserver/tests/appserv-tests/devtests/cdi/javaee-component-resources/em-injection-no-interface-ejb/servlet/test/entity/Department.java
+++ b/appserver/tests/appserv-tests/devtests/cdi/javaee-component-resources/em-injection-no-interface-ejb/servlet/test/entity/Department.java
@@ -18,12 +18,12 @@
import java.util.Set;
-import javax.persistence.CascadeType;
-import javax.persistence.Column;
-import javax.persistence.Entity;
-import javax.persistence.Id;
-import javax.persistence.OneToMany;
-import javax.persistence.Table;
+import jakarta.persistence.CascadeType;
+import jakarta.persistence.Column;
+import jakarta.persistence.Entity;
+import jakarta.persistence.Id;
+import jakarta.persistence.OneToMany;
+import jakarta.persistence.Table;
@Entity
@Table(name = "DEPARTMENT")
diff --git a/appserver/tests/appserv-tests/devtests/cdi/javaee-component-resources/em-injection-no-interface-ejb/servlet/test/entity/Employee.java b/appserver/tests/appserv-tests/devtests/cdi/javaee-component-resources/em-injection-no-interface-ejb/servlet/test/entity/Employee.java
index a1820e8..e6cb158 100644
--- a/appserver/tests/appserv-tests/devtests/cdi/javaee-component-resources/em-injection-no-interface-ejb/servlet/test/entity/Employee.java
+++ b/appserver/tests/appserv-tests/devtests/cdi/javaee-component-resources/em-injection-no-interface-ejb/servlet/test/entity/Employee.java
@@ -16,14 +16,14 @@
package test.entity;
-import javax.persistence.Column;
-import javax.persistence.Entity;
-import javax.persistence.FetchType;
-import javax.persistence.Id;
-import javax.persistence.JoinColumn;
-import javax.persistence.ManyToOne;
-import javax.persistence.Table;
-import javax.persistence.Transient;
+import jakarta.persistence.Column;
+import jakarta.persistence.Entity;
+import jakarta.persistence.FetchType;
+import jakarta.persistence.Id;
+import jakarta.persistence.JoinColumn;
+import jakarta.persistence.ManyToOne;
+import jakarta.persistence.Table;
+import jakarta.persistence.Transient;
@Entity
@Table(name = "EMPLOYEE")
diff --git a/appserver/tests/appserv-tests/devtests/cdi/javaee-component-resources/em-injection-no-interface-ejb/servlet/test/servlet/NoInterfaceEJBTestServlet.java b/appserver/tests/appserv-tests/devtests/cdi/javaee-component-resources/em-injection-no-interface-ejb/servlet/test/servlet/NoInterfaceEJBTestServlet.java
index ef10dc2..976bbd3 100644
--- a/appserver/tests/appserv-tests/devtests/cdi/javaee-component-resources/em-injection-no-interface-ejb/servlet/test/servlet/NoInterfaceEJBTestServlet.java
+++ b/appserver/tests/appserv-tests/devtests/cdi/javaee-component-resources/em-injection-no-interface-ejb/servlet/test/servlet/NoInterfaceEJBTestServlet.java
@@ -27,9 +27,9 @@
import javax.servlet.http.HttpServletResponse;
import jakarta.annotation.Resource;
import javax.inject.Inject;
-import javax.persistence.EntityManager;
-import javax.persistence.EntityManagerFactory;
-import javax.persistence.PersistenceUnit;
+import jakarta.persistence.EntityManager;
+import jakarta.persistence.EntityManagerFactory;
+import jakarta.persistence.PersistenceUnit;
import javax.servlet.ServletException;
import javax.servlet.annotation.WebServlet;
import javax.servlet.http.HttpServlet;
diff --git a/appserver/tests/appserv-tests/devtests/cdi/javaee-component-resources/em-injection-no-interface-ejb/servlet/test/util/JPAResourceProducer.java b/appserver/tests/appserv-tests/devtests/cdi/javaee-component-resources/em-injection-no-interface-ejb/servlet/test/util/JPAResourceProducer.java
index b029006..f2434e6 100644
--- a/appserver/tests/appserv-tests/devtests/cdi/javaee-component-resources/em-injection-no-interface-ejb/servlet/test/util/JPAResourceProducer.java
+++ b/appserver/tests/appserv-tests/devtests/cdi/javaee-component-resources/em-injection-no-interface-ejb/servlet/test/util/JPAResourceProducer.java
@@ -18,8 +18,8 @@
import javax.enterprise.inject.Produces;
import javax.inject.Singleton;
-import javax.persistence.EntityManager;
-import javax.persistence.PersistenceContext;
+import jakarta.persistence.EntityManager;
+import jakarta.persistence.PersistenceContext;
@Singleton
diff --git a/appserver/tests/appserv-tests/devtests/cdi/javaee-component-resources/em-injection-no-interface-ejb/servlet/test/util/JpaTest.java b/appserver/tests/appserv-tests/devtests/cdi/javaee-component-resources/em-injection-no-interface-ejb/servlet/test/util/JpaTest.java
index 3d47448..ce5f261 100644
--- a/appserver/tests/appserv-tests/devtests/cdi/javaee-component-resources/em-injection-no-interface-ejb/servlet/test/util/JpaTest.java
+++ b/appserver/tests/appserv-tests/devtests/cdi/javaee-component-resources/em-injection-no-interface-ejb/servlet/test/util/JpaTest.java
@@ -16,9 +16,9 @@
package test.util;
-import javax.persistence.EntityManager;
-import javax.persistence.EntityManagerFactory;
-import javax.persistence.Query;
+import jakarta.persistence.EntityManager;
+import jakarta.persistence.EntityManagerFactory;
+import jakarta.persistence.Query;
import javax.transaction.UserTransaction;
import test.entity.Department;
diff --git a/appserver/tests/appserv-tests/devtests/cdi/javaee-component-resources/em-resource-injection-extended-transaction-context/servlet/test/beans/nonmock/TestBean.java b/appserver/tests/appserv-tests/devtests/cdi/javaee-component-resources/em-resource-injection-extended-transaction-context/servlet/test/beans/nonmock/TestBean.java
index 2363d68..97b9e1d 100644
--- a/appserver/tests/appserv-tests/devtests/cdi/javaee-component-resources/em-resource-injection-extended-transaction-context/servlet/test/beans/nonmock/TestBean.java
+++ b/appserver/tests/appserv-tests/devtests/cdi/javaee-component-resources/em-resource-injection-extended-transaction-context/servlet/test/beans/nonmock/TestBean.java
@@ -18,8 +18,8 @@
import javax.enterprise.context.RequestScoped;
import javax.inject.Inject;
-import javax.persistence.EntityManager;
-import javax.persistence.EntityManagerFactory;
+import jakarta.persistence.EntityManager;
+import jakarta.persistence.EntityManagerFactory;
import test.beans.TestBeanInterface;
import test.beans.artifacts.Preferred;
diff --git a/appserver/tests/appserv-tests/devtests/cdi/javaee-component-resources/em-resource-injection-extended-transaction-context/servlet/test/entity/Department.java b/appserver/tests/appserv-tests/devtests/cdi/javaee-component-resources/em-resource-injection-extended-transaction-context/servlet/test/entity/Department.java
index 14191ec..e072378 100644
--- a/appserver/tests/appserv-tests/devtests/cdi/javaee-component-resources/em-resource-injection-extended-transaction-context/servlet/test/entity/Department.java
+++ b/appserver/tests/appserv-tests/devtests/cdi/javaee-component-resources/em-resource-injection-extended-transaction-context/servlet/test/entity/Department.java
@@ -18,12 +18,12 @@
import java.util.Set;
-import javax.persistence.CascadeType;
-import javax.persistence.Column;
-import javax.persistence.Entity;
-import javax.persistence.Id;
-import javax.persistence.OneToMany;
-import javax.persistence.Table;
+import jakarta.persistence.CascadeType;
+import jakarta.persistence.Column;
+import jakarta.persistence.Entity;
+import jakarta.persistence.Id;
+import jakarta.persistence.OneToMany;
+import jakarta.persistence.Table;
@Entity
@Table(name = "DEPARTMENT")
diff --git a/appserver/tests/appserv-tests/devtests/cdi/javaee-component-resources/em-resource-injection-extended-transaction-context/servlet/test/entity/Employee.java b/appserver/tests/appserv-tests/devtests/cdi/javaee-component-resources/em-resource-injection-extended-transaction-context/servlet/test/entity/Employee.java
index a1820e8..e6cb158 100644
--- a/appserver/tests/appserv-tests/devtests/cdi/javaee-component-resources/em-resource-injection-extended-transaction-context/servlet/test/entity/Employee.java
+++ b/appserver/tests/appserv-tests/devtests/cdi/javaee-component-resources/em-resource-injection-extended-transaction-context/servlet/test/entity/Employee.java
@@ -16,14 +16,14 @@
package test.entity;
-import javax.persistence.Column;
-import javax.persistence.Entity;
-import javax.persistence.FetchType;
-import javax.persistence.Id;
-import javax.persistence.JoinColumn;
-import javax.persistence.ManyToOne;
-import javax.persistence.Table;
-import javax.persistence.Transient;
+import jakarta.persistence.Column;
+import jakarta.persistence.Entity;
+import jakarta.persistence.FetchType;
+import jakarta.persistence.Id;
+import jakarta.persistence.JoinColumn;
+import jakarta.persistence.ManyToOne;
+import jakarta.persistence.Table;
+import jakarta.persistence.Transient;
@Entity
@Table(name = "EMPLOYEE")
diff --git a/appserver/tests/appserv-tests/devtests/cdi/javaee-component-resources/em-resource-injection-extended-transaction-context/servlet/test/servlet/JPAResourceInjectionServlet.java b/appserver/tests/appserv-tests/devtests/cdi/javaee-component-resources/em-resource-injection-extended-transaction-context/servlet/test/servlet/JPAResourceInjectionServlet.java
index 69a7e65..0571200 100644
--- a/appserver/tests/appserv-tests/devtests/cdi/javaee-component-resources/em-resource-injection-extended-transaction-context/servlet/test/servlet/JPAResourceInjectionServlet.java
+++ b/appserver/tests/appserv-tests/devtests/cdi/javaee-component-resources/em-resource-injection-extended-transaction-context/servlet/test/servlet/JPAResourceInjectionServlet.java
@@ -21,9 +21,9 @@
import jakarta.annotation.Resource;
import javax.inject.Inject;
-import javax.persistence.EntityManager;
-import javax.persistence.EntityManagerFactory;
-import javax.persistence.PersistenceUnit;
+import jakarta.persistence.EntityManager;
+import jakarta.persistence.EntityManagerFactory;
+import jakarta.persistence.PersistenceUnit;
import javax.servlet.ServletException;
import javax.servlet.annotation.WebServlet;
import javax.servlet.http.HttpServlet;
diff --git a/appserver/tests/appserv-tests/devtests/cdi/javaee-component-resources/em-resource-injection-extended-transaction-context/servlet/test/util/JPAResourceProducer.java b/appserver/tests/appserv-tests/devtests/cdi/javaee-component-resources/em-resource-injection-extended-transaction-context/servlet/test/util/JPAResourceProducer.java
index 1d6fd04..7c5961e 100644
--- a/appserver/tests/appserv-tests/devtests/cdi/javaee-component-resources/em-resource-injection-extended-transaction-context/servlet/test/util/JPAResourceProducer.java
+++ b/appserver/tests/appserv-tests/devtests/cdi/javaee-component-resources/em-resource-injection-extended-transaction-context/servlet/test/util/JPAResourceProducer.java
@@ -18,9 +18,9 @@
import javax.enterprise.inject.Produces;
import javax.inject.Singleton;
-import javax.persistence.EntityManager;
-import javax.persistence.PersistenceContext;
-import javax.persistence.PersistenceContextType;
+import jakarta.persistence.EntityManager;
+import jakarta.persistence.PersistenceContext;
+import jakarta.persistence.PersistenceContextType;
@Singleton
public class JPAResourceProducer {
diff --git a/appserver/tests/appserv-tests/devtests/cdi/javaee-component-resources/em-resource-injection-extended-transaction-context/servlet/test/util/JpaTest.java b/appserver/tests/appserv-tests/devtests/cdi/javaee-component-resources/em-resource-injection-extended-transaction-context/servlet/test/util/JpaTest.java
index 3d47448..ce5f261 100644
--- a/appserver/tests/appserv-tests/devtests/cdi/javaee-component-resources/em-resource-injection-extended-transaction-context/servlet/test/util/JpaTest.java
+++ b/appserver/tests/appserv-tests/devtests/cdi/javaee-component-resources/em-resource-injection-extended-transaction-context/servlet/test/util/JpaTest.java
@@ -16,9 +16,9 @@
package test.util;
-import javax.persistence.EntityManager;
-import javax.persistence.EntityManagerFactory;
-import javax.persistence.Query;
+import jakarta.persistence.EntityManager;
+import jakarta.persistence.EntityManagerFactory;
+import jakarta.persistence.Query;
import javax.transaction.UserTransaction;
import test.entity.Department;
diff --git a/appserver/tests/appserv-tests/devtests/cdi/javaee-component-resources/em-resource-injection-with-resource-declaration-in-another-jar/ejb/com/acme/ejb/impl/HelloSingleton.java b/appserver/tests/appserv-tests/devtests/cdi/javaee-component-resources/em-resource-injection-with-resource-declaration-in-another-jar/ejb/com/acme/ejb/impl/HelloSingleton.java
index 8a461aa..d22dc82 100644
--- a/appserver/tests/appserv-tests/devtests/cdi/javaee-component-resources/em-resource-injection-with-resource-declaration-in-another-jar/ejb/com/acme/ejb/impl/HelloSingleton.java
+++ b/appserver/tests/appserv-tests/devtests/cdi/javaee-component-resources/em-resource-injection-with-resource-declaration-in-another-jar/ejb/com/acme/ejb/impl/HelloSingleton.java
@@ -23,8 +23,8 @@
import jakarta.ejb.SessionContext;
import jakarta.ejb.Singleton;
import jakarta.ejb.Startup;
-import javax.persistence.EntityManagerFactory;
-import javax.persistence.PersistenceUnit;
+import jakarta.persistence.EntityManagerFactory;
+import jakarta.persistence.PersistenceUnit;
import com.acme.ejb.api.Hello;
import com.acme.util.TestDatabase;
diff --git a/appserver/tests/appserv-tests/devtests/cdi/javaee-component-resources/em-resource-injection-with-resource-declaration-in-another-jar/lib/com/acme/util/ResourcesProducer.java b/appserver/tests/appserv-tests/devtests/cdi/javaee-component-resources/em-resource-injection-with-resource-declaration-in-another-jar/lib/com/acme/util/ResourcesProducer.java
index fdc079b..a3f8034 100644
--- a/appserver/tests/appserv-tests/devtests/cdi/javaee-component-resources/em-resource-injection-with-resource-declaration-in-another-jar/lib/com/acme/util/ResourcesProducer.java
+++ b/appserver/tests/appserv-tests/devtests/cdi/javaee-component-resources/em-resource-injection-with-resource-declaration-in-another-jar/lib/com/acme/util/ResourcesProducer.java
@@ -19,8 +19,8 @@
import javax.enterprise.inject.Produces;
import javax.inject.Inject;
import javax.inject.Singleton;
-import javax.persistence.EntityManager;
-import javax.persistence.PersistenceContext;
+import jakarta.persistence.EntityManager;
+import jakarta.persistence.PersistenceContext;
@Singleton
public class ResourcesProducer {
diff --git a/appserver/tests/appserv-tests/devtests/cdi/javaee-component-resources/em-resource-injection-with-resource-declaration-in-another-jar/war/com/acme/servlet/HelloServlet.java b/appserver/tests/appserv-tests/devtests/cdi/javaee-component-resources/em-resource-injection-with-resource-declaration-in-another-jar/war/com/acme/servlet/HelloServlet.java
index b2b2878..afb12dc 100644
--- a/appserver/tests/appserv-tests/devtests/cdi/javaee-component-resources/em-resource-injection-with-resource-declaration-in-another-jar/war/com/acme/servlet/HelloServlet.java
+++ b/appserver/tests/appserv-tests/devtests/cdi/javaee-component-resources/em-resource-injection-with-resource-declaration-in-another-jar/war/com/acme/servlet/HelloServlet.java
@@ -22,8 +22,8 @@
import jakarta.ejb.EJB;
import javax.inject.Inject;
-import javax.persistence.EntityManagerFactory;
-import javax.persistence.PersistenceUnit;
+import jakarta.persistence.EntityManagerFactory;
+import jakarta.persistence.PersistenceUnit;
import javax.servlet.ServletException;
import javax.servlet.annotation.WebServlet;
import javax.servlet.http.HttpServlet;
diff --git a/appserver/tests/appserv-tests/devtests/cdi/javaee-component-resources/em-resource-injection/servlet/test/beans/nonmock/TestBean.java b/appserver/tests/appserv-tests/devtests/cdi/javaee-component-resources/em-resource-injection/servlet/test/beans/nonmock/TestBean.java
index 2363d68..97b9e1d 100644
--- a/appserver/tests/appserv-tests/devtests/cdi/javaee-component-resources/em-resource-injection/servlet/test/beans/nonmock/TestBean.java
+++ b/appserver/tests/appserv-tests/devtests/cdi/javaee-component-resources/em-resource-injection/servlet/test/beans/nonmock/TestBean.java
@@ -18,8 +18,8 @@
import javax.enterprise.context.RequestScoped;
import javax.inject.Inject;
-import javax.persistence.EntityManager;
-import javax.persistence.EntityManagerFactory;
+import jakarta.persistence.EntityManager;
+import jakarta.persistence.EntityManagerFactory;
import test.beans.TestBeanInterface;
import test.beans.artifacts.Preferred;
diff --git a/appserver/tests/appserv-tests/devtests/cdi/javaee-component-resources/em-resource-injection/servlet/test/entity/Department.java b/appserver/tests/appserv-tests/devtests/cdi/javaee-component-resources/em-resource-injection/servlet/test/entity/Department.java
index 14191ec..e072378 100644
--- a/appserver/tests/appserv-tests/devtests/cdi/javaee-component-resources/em-resource-injection/servlet/test/entity/Department.java
+++ b/appserver/tests/appserv-tests/devtests/cdi/javaee-component-resources/em-resource-injection/servlet/test/entity/Department.java
@@ -18,12 +18,12 @@
import java.util.Set;
-import javax.persistence.CascadeType;
-import javax.persistence.Column;
-import javax.persistence.Entity;
-import javax.persistence.Id;
-import javax.persistence.OneToMany;
-import javax.persistence.Table;
+import jakarta.persistence.CascadeType;
+import jakarta.persistence.Column;
+import jakarta.persistence.Entity;
+import jakarta.persistence.Id;
+import jakarta.persistence.OneToMany;
+import jakarta.persistence.Table;
@Entity
@Table(name = "DEPARTMENT")
diff --git a/appserver/tests/appserv-tests/devtests/cdi/javaee-component-resources/em-resource-injection/servlet/test/entity/Employee.java b/appserver/tests/appserv-tests/devtests/cdi/javaee-component-resources/em-resource-injection/servlet/test/entity/Employee.java
index a1820e8..e6cb158 100644
--- a/appserver/tests/appserv-tests/devtests/cdi/javaee-component-resources/em-resource-injection/servlet/test/entity/Employee.java
+++ b/appserver/tests/appserv-tests/devtests/cdi/javaee-component-resources/em-resource-injection/servlet/test/entity/Employee.java
@@ -16,14 +16,14 @@
package test.entity;
-import javax.persistence.Column;
-import javax.persistence.Entity;
-import javax.persistence.FetchType;
-import javax.persistence.Id;
-import javax.persistence.JoinColumn;
-import javax.persistence.ManyToOne;
-import javax.persistence.Table;
-import javax.persistence.Transient;
+import jakarta.persistence.Column;
+import jakarta.persistence.Entity;
+import jakarta.persistence.FetchType;
+import jakarta.persistence.Id;
+import jakarta.persistence.JoinColumn;
+import jakarta.persistence.ManyToOne;
+import jakarta.persistence.Table;
+import jakarta.persistence.Transient;
@Entity
@Table(name = "EMPLOYEE")
diff --git a/appserver/tests/appserv-tests/devtests/cdi/javaee-component-resources/em-resource-injection/servlet/test/servlet/JPAResourceInjectionServlet.java b/appserver/tests/appserv-tests/devtests/cdi/javaee-component-resources/em-resource-injection/servlet/test/servlet/JPAResourceInjectionServlet.java
index d4dd451..34b0fbe 100644
--- a/appserver/tests/appserv-tests/devtests/cdi/javaee-component-resources/em-resource-injection/servlet/test/servlet/JPAResourceInjectionServlet.java
+++ b/appserver/tests/appserv-tests/devtests/cdi/javaee-component-resources/em-resource-injection/servlet/test/servlet/JPAResourceInjectionServlet.java
@@ -21,9 +21,9 @@
import jakarta.annotation.Resource;
import javax.inject.Inject;
-import javax.persistence.EntityManager;
-import javax.persistence.EntityManagerFactory;
-import javax.persistence.PersistenceUnit;
+import jakarta.persistence.EntityManager;
+import jakarta.persistence.EntityManagerFactory;
+import jakarta.persistence.PersistenceUnit;
import javax.servlet.ServletException;
import javax.servlet.annotation.WebServlet;
import javax.servlet.http.HttpServlet;
diff --git a/appserver/tests/appserv-tests/devtests/cdi/javaee-component-resources/em-resource-injection/servlet/test/util/JPAResourceProducer.java b/appserver/tests/appserv-tests/devtests/cdi/javaee-component-resources/em-resource-injection/servlet/test/util/JPAResourceProducer.java
index dc70909..a37a4a5 100644
--- a/appserver/tests/appserv-tests/devtests/cdi/javaee-component-resources/em-resource-injection/servlet/test/util/JPAResourceProducer.java
+++ b/appserver/tests/appserv-tests/devtests/cdi/javaee-component-resources/em-resource-injection/servlet/test/util/JPAResourceProducer.java
@@ -18,8 +18,8 @@
import javax.enterprise.inject.Produces;
import javax.inject.Singleton;
-import javax.persistence.EntityManager;
-import javax.persistence.PersistenceContext;
+import jakarta.persistence.EntityManager;
+import jakarta.persistence.PersistenceContext;
import test.beans.artifacts.TestDatabase;
diff --git a/appserver/tests/appserv-tests/devtests/cdi/javaee-component-resources/em-resource-injection/servlet/test/util/JpaTest.java b/appserver/tests/appserv-tests/devtests/cdi/javaee-component-resources/em-resource-injection/servlet/test/util/JpaTest.java
index 3d47448..ce5f261 100644
--- a/appserver/tests/appserv-tests/devtests/cdi/javaee-component-resources/em-resource-injection/servlet/test/util/JpaTest.java
+++ b/appserver/tests/appserv-tests/devtests/cdi/javaee-component-resources/em-resource-injection/servlet/test/util/JpaTest.java
@@ -16,9 +16,9 @@
package test.util;
-import javax.persistence.EntityManager;
-import javax.persistence.EntityManagerFactory;
-import javax.persistence.Query;
+import jakarta.persistence.EntityManager;
+import jakarta.persistence.EntityManagerFactory;
+import jakarta.persistence.Query;
import javax.transaction.UserTransaction;
import test.entity.Department;
diff --git a/appserver/tests/appserv-tests/devtests/cdi/javaee-component-resources/jpa-resource-injection-non-serializable/servlet/test/beans/nonmock/TestBean.java b/appserver/tests/appserv-tests/devtests/cdi/javaee-component-resources/jpa-resource-injection-non-serializable/servlet/test/beans/nonmock/TestBean.java
index e2d6110..2d315d0 100644
--- a/appserver/tests/appserv-tests/devtests/cdi/javaee-component-resources/jpa-resource-injection-non-serializable/servlet/test/beans/nonmock/TestBean.java
+++ b/appserver/tests/appserv-tests/devtests/cdi/javaee-component-resources/jpa-resource-injection-non-serializable/servlet/test/beans/nonmock/TestBean.java
@@ -20,8 +20,8 @@
import javax.enterprise.context.SessionScoped;
import javax.inject.Inject;
-import javax.persistence.EntityManagerFactory;
-import javax.persistence.EntityManager;
+import jakarta.persistence.EntityManagerFactory;
+import jakarta.persistence.EntityManager;
import test.beans.TestBeanInterface;
import test.beans.artifacts.Preferred;
diff --git a/appserver/tests/appserv-tests/devtests/cdi/javaee-component-resources/jpa-resource-injection-non-serializable/servlet/test/entity/Department.java b/appserver/tests/appserv-tests/devtests/cdi/javaee-component-resources/jpa-resource-injection-non-serializable/servlet/test/entity/Department.java
index 14191ec..e072378 100644
--- a/appserver/tests/appserv-tests/devtests/cdi/javaee-component-resources/jpa-resource-injection-non-serializable/servlet/test/entity/Department.java
+++ b/appserver/tests/appserv-tests/devtests/cdi/javaee-component-resources/jpa-resource-injection-non-serializable/servlet/test/entity/Department.java
@@ -18,12 +18,12 @@
import java.util.Set;
-import javax.persistence.CascadeType;
-import javax.persistence.Column;
-import javax.persistence.Entity;
-import javax.persistence.Id;
-import javax.persistence.OneToMany;
-import javax.persistence.Table;
+import jakarta.persistence.CascadeType;
+import jakarta.persistence.Column;
+import jakarta.persistence.Entity;
+import jakarta.persistence.Id;
+import jakarta.persistence.OneToMany;
+import jakarta.persistence.Table;
@Entity
@Table(name = "DEPARTMENT")
diff --git a/appserver/tests/appserv-tests/devtests/cdi/javaee-component-resources/jpa-resource-injection-non-serializable/servlet/test/entity/Employee.java b/appserver/tests/appserv-tests/devtests/cdi/javaee-component-resources/jpa-resource-injection-non-serializable/servlet/test/entity/Employee.java
index a1820e8..e6cb158 100644
--- a/appserver/tests/appserv-tests/devtests/cdi/javaee-component-resources/jpa-resource-injection-non-serializable/servlet/test/entity/Employee.java
+++ b/appserver/tests/appserv-tests/devtests/cdi/javaee-component-resources/jpa-resource-injection-non-serializable/servlet/test/entity/Employee.java
@@ -16,14 +16,14 @@
package test.entity;
-import javax.persistence.Column;
-import javax.persistence.Entity;
-import javax.persistence.FetchType;
-import javax.persistence.Id;
-import javax.persistence.JoinColumn;
-import javax.persistence.ManyToOne;
-import javax.persistence.Table;
-import javax.persistence.Transient;
+import jakarta.persistence.Column;
+import jakarta.persistence.Entity;
+import jakarta.persistence.FetchType;
+import jakarta.persistence.Id;
+import jakarta.persistence.JoinColumn;
+import jakarta.persistence.ManyToOne;
+import jakarta.persistence.Table;
+import jakarta.persistence.Transient;
@Entity
@Table(name = "EMPLOYEE")
diff --git a/appserver/tests/appserv-tests/devtests/cdi/javaee-component-resources/jpa-resource-injection-non-serializable/servlet/test/servlet/JPAResourceInjectionServlet.java b/appserver/tests/appserv-tests/devtests/cdi/javaee-component-resources/jpa-resource-injection-non-serializable/servlet/test/servlet/JPAResourceInjectionServlet.java
index 47b85ff..80c89af 100644
--- a/appserver/tests/appserv-tests/devtests/cdi/javaee-component-resources/jpa-resource-injection-non-serializable/servlet/test/servlet/JPAResourceInjectionServlet.java
+++ b/appserver/tests/appserv-tests/devtests/cdi/javaee-component-resources/jpa-resource-injection-non-serializable/servlet/test/servlet/JPAResourceInjectionServlet.java
@@ -21,9 +21,9 @@
import jakarta.annotation.Resource;
import javax.inject.Inject;
-import javax.persistence.EntityManager;
-import javax.persistence.EntityManagerFactory;
-import javax.persistence.PersistenceUnit;
+import jakarta.persistence.EntityManager;
+import jakarta.persistence.EntityManagerFactory;
+import jakarta.persistence.PersistenceUnit;
import javax.servlet.ServletException;
import javax.servlet.annotation.WebServlet;
import javax.servlet.http.HttpServlet;
diff --git a/appserver/tests/appserv-tests/devtests/cdi/javaee-component-resources/jpa-resource-injection-non-serializable/servlet/test/util/JPAResourceProducer.java b/appserver/tests/appserv-tests/devtests/cdi/javaee-component-resources/jpa-resource-injection-non-serializable/servlet/test/util/JPAResourceProducer.java
index 3623e19..701697d 100644
--- a/appserver/tests/appserv-tests/devtests/cdi/javaee-component-resources/jpa-resource-injection-non-serializable/servlet/test/util/JPAResourceProducer.java
+++ b/appserver/tests/appserv-tests/devtests/cdi/javaee-component-resources/jpa-resource-injection-non-serializable/servlet/test/util/JPAResourceProducer.java
@@ -18,10 +18,10 @@
import javax.enterprise.inject.Produces;
import javax.inject.Singleton;
-import javax.persistence.EntityManager;
-import javax.persistence.EntityManagerFactory;
-import javax.persistence.PersistenceContext;
-import javax.persistence.PersistenceUnit;
+import jakarta.persistence.EntityManager;
+import jakarta.persistence.EntityManagerFactory;
+import jakarta.persistence.PersistenceContext;
+import jakarta.persistence.PersistenceUnit;
import test.beans.artifacts.TestDatabase;
diff --git a/appserver/tests/appserv-tests/devtests/cdi/javaee-component-resources/jpa-resource-injection-non-serializable/servlet/test/util/JpaTest.java b/appserver/tests/appserv-tests/devtests/cdi/javaee-component-resources/jpa-resource-injection-non-serializable/servlet/test/util/JpaTest.java
index 3d47448..ce5f261 100644
--- a/appserver/tests/appserv-tests/devtests/cdi/javaee-component-resources/jpa-resource-injection-non-serializable/servlet/test/util/JpaTest.java
+++ b/appserver/tests/appserv-tests/devtests/cdi/javaee-component-resources/jpa-resource-injection-non-serializable/servlet/test/util/JpaTest.java
@@ -16,9 +16,9 @@
package test.util;
-import javax.persistence.EntityManager;
-import javax.persistence.EntityManagerFactory;
-import javax.persistence.Query;
+import jakarta.persistence.EntityManager;
+import jakarta.persistence.EntityManagerFactory;
+import jakarta.persistence.Query;
import javax.transaction.UserTransaction;
import test.entity.Department;
diff --git a/appserver/tests/appserv-tests/devtests/cdi/javaee-component-resources/jpa-resource-injection-passivating-scope/servlet/test/ejb/TestEJB.java b/appserver/tests/appserv-tests/devtests/cdi/javaee-component-resources/jpa-resource-injection-passivating-scope/servlet/test/ejb/TestEJB.java
index faf3af0..678c693 100644
--- a/appserver/tests/appserv-tests/devtests/cdi/javaee-component-resources/jpa-resource-injection-passivating-scope/servlet/test/ejb/TestEJB.java
+++ b/appserver/tests/appserv-tests/devtests/cdi/javaee-component-resources/jpa-resource-injection-passivating-scope/servlet/test/ejb/TestEJB.java
@@ -18,7 +18,7 @@
import jakarta.ejb.Stateful;
import javax.inject.Inject;
-import javax.persistence.EntityManager;
+import jakarta.persistence.EntityManager;
import test.beans.artifacts.TestDatabase;
diff --git a/appserver/tests/appserv-tests/devtests/cdi/javaee-component-resources/jpa-resource-injection-passivating-scope/servlet/test/entity/Department.java b/appserver/tests/appserv-tests/devtests/cdi/javaee-component-resources/jpa-resource-injection-passivating-scope/servlet/test/entity/Department.java
index 14191ec..e072378 100644
--- a/appserver/tests/appserv-tests/devtests/cdi/javaee-component-resources/jpa-resource-injection-passivating-scope/servlet/test/entity/Department.java
+++ b/appserver/tests/appserv-tests/devtests/cdi/javaee-component-resources/jpa-resource-injection-passivating-scope/servlet/test/entity/Department.java
@@ -18,12 +18,12 @@
import java.util.Set;
-import javax.persistence.CascadeType;
-import javax.persistence.Column;
-import javax.persistence.Entity;
-import javax.persistence.Id;
-import javax.persistence.OneToMany;
-import javax.persistence.Table;
+import jakarta.persistence.CascadeType;
+import jakarta.persistence.Column;
+import jakarta.persistence.Entity;
+import jakarta.persistence.Id;
+import jakarta.persistence.OneToMany;
+import jakarta.persistence.Table;
@Entity
@Table(name = "DEPARTMENT")
diff --git a/appserver/tests/appserv-tests/devtests/cdi/javaee-component-resources/jpa-resource-injection-passivating-scope/servlet/test/entity/Employee.java b/appserver/tests/appserv-tests/devtests/cdi/javaee-component-resources/jpa-resource-injection-passivating-scope/servlet/test/entity/Employee.java
index a1820e8..e6cb158 100644
--- a/appserver/tests/appserv-tests/devtests/cdi/javaee-component-resources/jpa-resource-injection-passivating-scope/servlet/test/entity/Employee.java
+++ b/appserver/tests/appserv-tests/devtests/cdi/javaee-component-resources/jpa-resource-injection-passivating-scope/servlet/test/entity/Employee.java
@@ -16,14 +16,14 @@
package test.entity;
-import javax.persistence.Column;
-import javax.persistence.Entity;
-import javax.persistence.FetchType;
-import javax.persistence.Id;
-import javax.persistence.JoinColumn;
-import javax.persistence.ManyToOne;
-import javax.persistence.Table;
-import javax.persistence.Transient;
+import jakarta.persistence.Column;
+import jakarta.persistence.Entity;
+import jakarta.persistence.FetchType;
+import jakarta.persistence.Id;
+import jakarta.persistence.JoinColumn;
+import jakarta.persistence.ManyToOne;
+import jakarta.persistence.Table;
+import jakarta.persistence.Transient;
@Entity
@Table(name = "EMPLOYEE")
diff --git a/appserver/tests/appserv-tests/devtests/cdi/javaee-component-resources/jpa-resource-injection-passivating-scope/servlet/test/servlet/JPAResourceInjectionServlet.java b/appserver/tests/appserv-tests/devtests/cdi/javaee-component-resources/jpa-resource-injection-passivating-scope/servlet/test/servlet/JPAResourceInjectionServlet.java
index b84ea1f..d322a6f 100644
--- a/appserver/tests/appserv-tests/devtests/cdi/javaee-component-resources/jpa-resource-injection-passivating-scope/servlet/test/servlet/JPAResourceInjectionServlet.java
+++ b/appserver/tests/appserv-tests/devtests/cdi/javaee-component-resources/jpa-resource-injection-passivating-scope/servlet/test/servlet/JPAResourceInjectionServlet.java
@@ -21,9 +21,9 @@
import jakarta.annotation.Resource;
import javax.inject.Inject;
-import javax.persistence.EntityManager;
-import javax.persistence.EntityManagerFactory;
-import javax.persistence.PersistenceUnit;
+import jakarta.persistence.EntityManager;
+import jakarta.persistence.EntityManagerFactory;
+import jakarta.persistence.PersistenceUnit;
import javax.servlet.ServletException;
import javax.servlet.annotation.WebServlet;
import javax.servlet.http.HttpServlet;
diff --git a/appserver/tests/appserv-tests/devtests/cdi/javaee-component-resources/jpa-resource-injection-passivating-scope/servlet/test/util/JPAResourceProducer.java b/appserver/tests/appserv-tests/devtests/cdi/javaee-component-resources/jpa-resource-injection-passivating-scope/servlet/test/util/JPAResourceProducer.java
index 4714b5d..e66eb9d 100644
--- a/appserver/tests/appserv-tests/devtests/cdi/javaee-component-resources/jpa-resource-injection-passivating-scope/servlet/test/util/JPAResourceProducer.java
+++ b/appserver/tests/appserv-tests/devtests/cdi/javaee-component-resources/jpa-resource-injection-passivating-scope/servlet/test/util/JPAResourceProducer.java
@@ -19,10 +19,10 @@
import javax.enterprise.context.ConversationScoped;
import javax.enterprise.inject.Produces;
import javax.inject.Singleton;
-import javax.persistence.EntityManager;
-import javax.persistence.EntityManagerFactory;
-import javax.persistence.PersistenceContext;
-import javax.persistence.PersistenceUnit;
+import jakarta.persistence.EntityManager;
+import jakarta.persistence.EntityManagerFactory;
+import jakarta.persistence.PersistenceContext;
+import jakarta.persistence.PersistenceUnit;
import test.beans.artifacts.TestDatabase;
diff --git a/appserver/tests/appserv-tests/devtests/cdi/javaee-component-resources/jpa-resource-injection-passivating-scope/servlet/test/util/JpaTest.java b/appserver/tests/appserv-tests/devtests/cdi/javaee-component-resources/jpa-resource-injection-passivating-scope/servlet/test/util/JpaTest.java
index 3d47448..ce5f261 100644
--- a/appserver/tests/appserv-tests/devtests/cdi/javaee-component-resources/jpa-resource-injection-passivating-scope/servlet/test/util/JpaTest.java
+++ b/appserver/tests/appserv-tests/devtests/cdi/javaee-component-resources/jpa-resource-injection-passivating-scope/servlet/test/util/JpaTest.java
@@ -16,9 +16,9 @@
package test.util;
-import javax.persistence.EntityManager;
-import javax.persistence.EntityManagerFactory;
-import javax.persistence.Query;
+import jakarta.persistence.EntityManager;
+import jakarta.persistence.EntityManagerFactory;
+import jakarta.persistence.Query;
import javax.transaction.UserTransaction;
import test.entity.Department;
diff --git a/appserver/tests/appserv-tests/devtests/cdi/javaee-component-resources/jpa-resource-injection-with-singleton-ejb-producer/servlet/test/beans/nonmock/TestBean.java b/appserver/tests/appserv-tests/devtests/cdi/javaee-component-resources/jpa-resource-injection-with-singleton-ejb-producer/servlet/test/beans/nonmock/TestBean.java
index f61ec1b..1f90832 100644
--- a/appserver/tests/appserv-tests/devtests/cdi/javaee-component-resources/jpa-resource-injection-with-singleton-ejb-producer/servlet/test/beans/nonmock/TestBean.java
+++ b/appserver/tests/appserv-tests/devtests/cdi/javaee-component-resources/jpa-resource-injection-with-singleton-ejb-producer/servlet/test/beans/nonmock/TestBean.java
@@ -18,7 +18,7 @@
import javax.enterprise.context.RequestScoped;
import javax.inject.Inject;
-import javax.persistence.EntityManagerFactory;
+import jakarta.persistence.EntityManagerFactory;
import test.beans.TestBeanInterface;
import test.beans.artifacts.Preferred;
diff --git a/appserver/tests/appserv-tests/devtests/cdi/javaee-component-resources/jpa-resource-injection-with-singleton-ejb-producer/servlet/test/ejb/JPAResourceProducerSingletonEJB_BusinessMethodProducer.java b/appserver/tests/appserv-tests/devtests/cdi/javaee-component-resources/jpa-resource-injection-with-singleton-ejb-producer/servlet/test/ejb/JPAResourceProducerSingletonEJB_BusinessMethodProducer.java
index dd118e7..424cba9 100644
--- a/appserver/tests/appserv-tests/devtests/cdi/javaee-component-resources/jpa-resource-injection-with-singleton-ejb-producer/servlet/test/ejb/JPAResourceProducerSingletonEJB_BusinessMethodProducer.java
+++ b/appserver/tests/appserv-tests/devtests/cdi/javaee-component-resources/jpa-resource-injection-with-singleton-ejb-producer/servlet/test/ejb/JPAResourceProducerSingletonEJB_BusinessMethodProducer.java
@@ -17,8 +17,8 @@
package test.ejb;
import javax.enterprise.inject.Produces;
-import javax.persistence.EntityManagerFactory;
-import javax.persistence.PersistenceUnit;
+import jakarta.persistence.EntityManagerFactory;
+import jakarta.persistence.PersistenceUnit;
import test.beans.artifacts.ProducedViaProducerMethod;
import test.beans.artifacts.ProducedViaStaticField;
diff --git a/appserver/tests/appserv-tests/devtests/cdi/javaee-component-resources/jpa-resource-injection-with-singleton-ejb-producer/servlet/test/ejb/JPAResourceProducerSingletonEJB_StaticField.java b/appserver/tests/appserv-tests/devtests/cdi/javaee-component-resources/jpa-resource-injection-with-singleton-ejb-producer/servlet/test/ejb/JPAResourceProducerSingletonEJB_StaticField.java
index 79c781e..65fe2d7 100644
--- a/appserver/tests/appserv-tests/devtests/cdi/javaee-component-resources/jpa-resource-injection-with-singleton-ejb-producer/servlet/test/ejb/JPAResourceProducerSingletonEJB_StaticField.java
+++ b/appserver/tests/appserv-tests/devtests/cdi/javaee-component-resources/jpa-resource-injection-with-singleton-ejb-producer/servlet/test/ejb/JPAResourceProducerSingletonEJB_StaticField.java
@@ -17,8 +17,8 @@
package test.ejb;
import javax.enterprise.inject.Produces;
-import javax.persistence.EntityManagerFactory;
-import javax.persistence.PersistenceUnit;
+import jakarta.persistence.EntityManagerFactory;
+import jakarta.persistence.PersistenceUnit;
import test.beans.artifacts.ProducedViaStaticField;
diff --git a/appserver/tests/appserv-tests/devtests/cdi/javaee-component-resources/jpa-resource-injection-with-singleton-ejb-producer/servlet/test/entity/Department.java b/appserver/tests/appserv-tests/devtests/cdi/javaee-component-resources/jpa-resource-injection-with-singleton-ejb-producer/servlet/test/entity/Department.java
index 14191ec..e072378 100644
--- a/appserver/tests/appserv-tests/devtests/cdi/javaee-component-resources/jpa-resource-injection-with-singleton-ejb-producer/servlet/test/entity/Department.java
+++ b/appserver/tests/appserv-tests/devtests/cdi/javaee-component-resources/jpa-resource-injection-with-singleton-ejb-producer/servlet/test/entity/Department.java
@@ -18,12 +18,12 @@
import java.util.Set;
-import javax.persistence.CascadeType;
-import javax.persistence.Column;
-import javax.persistence.Entity;
-import javax.persistence.Id;
-import javax.persistence.OneToMany;
-import javax.persistence.Table;
+import jakarta.persistence.CascadeType;
+import jakarta.persistence.Column;
+import jakarta.persistence.Entity;
+import jakarta.persistence.Id;
+import jakarta.persistence.OneToMany;
+import jakarta.persistence.Table;
@Entity
@Table(name = "DEPARTMENT")
diff --git a/appserver/tests/appserv-tests/devtests/cdi/javaee-component-resources/jpa-resource-injection-with-singleton-ejb-producer/servlet/test/entity/Employee.java b/appserver/tests/appserv-tests/devtests/cdi/javaee-component-resources/jpa-resource-injection-with-singleton-ejb-producer/servlet/test/entity/Employee.java
index a1820e8..e6cb158 100644
--- a/appserver/tests/appserv-tests/devtests/cdi/javaee-component-resources/jpa-resource-injection-with-singleton-ejb-producer/servlet/test/entity/Employee.java
+++ b/appserver/tests/appserv-tests/devtests/cdi/javaee-component-resources/jpa-resource-injection-with-singleton-ejb-producer/servlet/test/entity/Employee.java
@@ -16,14 +16,14 @@
package test.entity;
-import javax.persistence.Column;
-import javax.persistence.Entity;
-import javax.persistence.FetchType;
-import javax.persistence.Id;
-import javax.persistence.JoinColumn;
-import javax.persistence.ManyToOne;
-import javax.persistence.Table;
-import javax.persistence.Transient;
+import jakarta.persistence.Column;
+import jakarta.persistence.Entity;
+import jakarta.persistence.FetchType;
+import jakarta.persistence.Id;
+import jakarta.persistence.JoinColumn;
+import jakarta.persistence.ManyToOne;
+import jakarta.persistence.Table;
+import jakarta.persistence.Transient;
@Entity
@Table(name = "EMPLOYEE")
diff --git a/appserver/tests/appserv-tests/devtests/cdi/javaee-component-resources/jpa-resource-injection-with-singleton-ejb-producer/servlet/test/servlet/JPAResourceInjectionServletFromSingletonEJB.java b/appserver/tests/appserv-tests/devtests/cdi/javaee-component-resources/jpa-resource-injection-with-singleton-ejb-producer/servlet/test/servlet/JPAResourceInjectionServletFromSingletonEJB.java
index 4bd6f96..2185422 100644
--- a/appserver/tests/appserv-tests/devtests/cdi/javaee-component-resources/jpa-resource-injection-with-singleton-ejb-producer/servlet/test/servlet/JPAResourceInjectionServletFromSingletonEJB.java
+++ b/appserver/tests/appserv-tests/devtests/cdi/javaee-component-resources/jpa-resource-injection-with-singleton-ejb-producer/servlet/test/servlet/JPAResourceInjectionServletFromSingletonEJB.java
@@ -21,9 +21,9 @@
import jakarta.annotation.Resource;
import javax.inject.Inject;
-import javax.persistence.EntityManager;
-import javax.persistence.EntityManagerFactory;
-import javax.persistence.PersistenceUnit;
+import jakarta.persistence.EntityManager;
+import jakarta.persistence.EntityManagerFactory;
+import jakarta.persistence.PersistenceUnit;
import javax.servlet.ServletException;
import javax.servlet.annotation.WebServlet;
import javax.servlet.http.HttpServlet;
diff --git a/appserver/tests/appserv-tests/devtests/cdi/javaee-component-resources/jpa-resource-injection-with-singleton-ejb-producer/servlet/test/util/JpaTest.java b/appserver/tests/appserv-tests/devtests/cdi/javaee-component-resources/jpa-resource-injection-with-singleton-ejb-producer/servlet/test/util/JpaTest.java
index 3d47448..ce5f261 100644
--- a/appserver/tests/appserv-tests/devtests/cdi/javaee-component-resources/jpa-resource-injection-with-singleton-ejb-producer/servlet/test/util/JpaTest.java
+++ b/appserver/tests/appserv-tests/devtests/cdi/javaee-component-resources/jpa-resource-injection-with-singleton-ejb-producer/servlet/test/util/JpaTest.java
@@ -16,9 +16,9 @@
package test.util;
-import javax.persistence.EntityManager;
-import javax.persistence.EntityManagerFactory;
-import javax.persistence.Query;
+import jakarta.persistence.EntityManager;
+import jakarta.persistence.EntityManagerFactory;
+import jakarta.persistence.Query;
import javax.transaction.UserTransaction;
import test.entity.Department;
diff --git a/appserver/tests/appserv-tests/devtests/cdi/javaee-component-resources/jpa-resource-injection/servlet/test/beans/nonmock/TestBean.java b/appserver/tests/appserv-tests/devtests/cdi/javaee-component-resources/jpa-resource-injection/servlet/test/beans/nonmock/TestBean.java
index 4fe1ded..33de2a7 100644
--- a/appserver/tests/appserv-tests/devtests/cdi/javaee-component-resources/jpa-resource-injection/servlet/test/beans/nonmock/TestBean.java
+++ b/appserver/tests/appserv-tests/devtests/cdi/javaee-component-resources/jpa-resource-injection/servlet/test/beans/nonmock/TestBean.java
@@ -18,7 +18,7 @@
import javax.enterprise.context.RequestScoped;
import javax.inject.Inject;
-import javax.persistence.EntityManagerFactory;
+import jakarta.persistence.EntityManagerFactory;
import test.beans.TestBeanInterface;
import test.beans.artifacts.Preferred;
diff --git a/appserver/tests/appserv-tests/devtests/cdi/javaee-component-resources/jpa-resource-injection/servlet/test/entity/Department.java b/appserver/tests/appserv-tests/devtests/cdi/javaee-component-resources/jpa-resource-injection/servlet/test/entity/Department.java
index 14191ec..e072378 100644
--- a/appserver/tests/appserv-tests/devtests/cdi/javaee-component-resources/jpa-resource-injection/servlet/test/entity/Department.java
+++ b/appserver/tests/appserv-tests/devtests/cdi/javaee-component-resources/jpa-resource-injection/servlet/test/entity/Department.java
@@ -18,12 +18,12 @@
import java.util.Set;
-import javax.persistence.CascadeType;
-import javax.persistence.Column;
-import javax.persistence.Entity;
-import javax.persistence.Id;
-import javax.persistence.OneToMany;
-import javax.persistence.Table;
+import jakarta.persistence.CascadeType;
+import jakarta.persistence.Column;
+import jakarta.persistence.Entity;
+import jakarta.persistence.Id;
+import jakarta.persistence.OneToMany;
+import jakarta.persistence.Table;
@Entity
@Table(name = "DEPARTMENT")
diff --git a/appserver/tests/appserv-tests/devtests/cdi/javaee-component-resources/jpa-resource-injection/servlet/test/entity/Employee.java b/appserver/tests/appserv-tests/devtests/cdi/javaee-component-resources/jpa-resource-injection/servlet/test/entity/Employee.java
index a1820e8..e6cb158 100644
--- a/appserver/tests/appserv-tests/devtests/cdi/javaee-component-resources/jpa-resource-injection/servlet/test/entity/Employee.java
+++ b/appserver/tests/appserv-tests/devtests/cdi/javaee-component-resources/jpa-resource-injection/servlet/test/entity/Employee.java
@@ -16,14 +16,14 @@
package test.entity;
-import javax.persistence.Column;
-import javax.persistence.Entity;
-import javax.persistence.FetchType;
-import javax.persistence.Id;
-import javax.persistence.JoinColumn;
-import javax.persistence.ManyToOne;
-import javax.persistence.Table;
-import javax.persistence.Transient;
+import jakarta.persistence.Column;
+import jakarta.persistence.Entity;
+import jakarta.persistence.FetchType;
+import jakarta.persistence.Id;
+import jakarta.persistence.JoinColumn;
+import jakarta.persistence.ManyToOne;
+import jakarta.persistence.Table;
+import jakarta.persistence.Transient;
@Entity
@Table(name = "EMPLOYEE")
diff --git a/appserver/tests/appserv-tests/devtests/cdi/javaee-component-resources/jpa-resource-injection/servlet/test/servlet/JPAResourceInjectionServlet.java b/appserver/tests/appserv-tests/devtests/cdi/javaee-component-resources/jpa-resource-injection/servlet/test/servlet/JPAResourceInjectionServlet.java
index 03bcdcf..d30d0f0 100644
--- a/appserver/tests/appserv-tests/devtests/cdi/javaee-component-resources/jpa-resource-injection/servlet/test/servlet/JPAResourceInjectionServlet.java
+++ b/appserver/tests/appserv-tests/devtests/cdi/javaee-component-resources/jpa-resource-injection/servlet/test/servlet/JPAResourceInjectionServlet.java
@@ -21,9 +21,9 @@
import jakarta.annotation.Resource;
import javax.inject.Inject;
-import javax.persistence.EntityManager;
-import javax.persistence.EntityManagerFactory;
-import javax.persistence.PersistenceUnit;
+import jakarta.persistence.EntityManager;
+import jakarta.persistence.EntityManagerFactory;
+import jakarta.persistence.PersistenceUnit;
import javax.servlet.ServletException;
import javax.servlet.annotation.WebServlet;
import javax.servlet.http.HttpServlet;
diff --git a/appserver/tests/appserv-tests/devtests/cdi/javaee-component-resources/jpa-resource-injection/servlet/test/util/JPAResourceProducer.java b/appserver/tests/appserv-tests/devtests/cdi/javaee-component-resources/jpa-resource-injection/servlet/test/util/JPAResourceProducer.java
index cf38fab..6da48fe 100644
--- a/appserver/tests/appserv-tests/devtests/cdi/javaee-component-resources/jpa-resource-injection/servlet/test/util/JPAResourceProducer.java
+++ b/appserver/tests/appserv-tests/devtests/cdi/javaee-component-resources/jpa-resource-injection/servlet/test/util/JPAResourceProducer.java
@@ -18,8 +18,8 @@
import javax.enterprise.inject.Produces;
import javax.inject.Singleton;
-import javax.persistence.EntityManagerFactory;
-import javax.persistence.PersistenceUnit;
+import jakarta.persistence.EntityManagerFactory;
+import jakarta.persistence.PersistenceUnit;
import test.beans.artifacts.TestDatabase;
diff --git a/appserver/tests/appserv-tests/devtests/cdi/javaee-component-resources/jpa-resource-injection/servlet/test/util/JpaTest.java b/appserver/tests/appserv-tests/devtests/cdi/javaee-component-resources/jpa-resource-injection/servlet/test/util/JpaTest.java
index 3d47448..ce5f261 100644
--- a/appserver/tests/appserv-tests/devtests/cdi/javaee-component-resources/jpa-resource-injection/servlet/test/util/JpaTest.java
+++ b/appserver/tests/appserv-tests/devtests/cdi/javaee-component-resources/jpa-resource-injection/servlet/test/util/JpaTest.java
@@ -16,9 +16,9 @@
package test.util;
-import javax.persistence.EntityManager;
-import javax.persistence.EntityManagerFactory;
-import javax.persistence.Query;
+import jakarta.persistence.EntityManager;
+import jakarta.persistence.EntityManagerFactory;
+import jakarta.persistence.Query;
import javax.transaction.UserTransaction;
import test.entity.Department;
diff --git a/appserver/tests/appserv-tests/devtests/cdi/javaee-integration/bean-in-lib-dir-used-by-ejb-in-ear/ejb/com/acme/ejb/impl/HelloSingleton.java b/appserver/tests/appserv-tests/devtests/cdi/javaee-integration/bean-in-lib-dir-used-by-ejb-in-ear/ejb/com/acme/ejb/impl/HelloSingleton.java
index 27ba611..add5220 100644
--- a/appserver/tests/appserv-tests/devtests/cdi/javaee-integration/bean-in-lib-dir-used-by-ejb-in-ear/ejb/com/acme/ejb/impl/HelloSingleton.java
+++ b/appserver/tests/appserv-tests/devtests/cdi/javaee-integration/bean-in-lib-dir-used-by-ejb-in-ear/ejb/com/acme/ejb/impl/HelloSingleton.java
@@ -24,8 +24,8 @@
import jakarta.ejb.Singleton;
import jakarta.ejb.Startup;
import javax.inject.Inject;
-import javax.persistence.EntityManagerFactory;
-import javax.persistence.PersistenceUnit;
+import jakarta.persistence.EntityManagerFactory;
+import jakarta.persistence.PersistenceUnit;
import com.acme.ejb.api.Hello;
import com.acme.util.TestDatabase;
diff --git a/appserver/tests/appserv-tests/devtests/cdi/javaee-integration/bean-in-lib-dir-used-by-ejb-in-ear/lib/com/acme/util/ResourcesProducer.java b/appserver/tests/appserv-tests/devtests/cdi/javaee-integration/bean-in-lib-dir-used-by-ejb-in-ear/lib/com/acme/util/ResourcesProducer.java
index fdc079b..a3f8034 100644
--- a/appserver/tests/appserv-tests/devtests/cdi/javaee-integration/bean-in-lib-dir-used-by-ejb-in-ear/lib/com/acme/util/ResourcesProducer.java
+++ b/appserver/tests/appserv-tests/devtests/cdi/javaee-integration/bean-in-lib-dir-used-by-ejb-in-ear/lib/com/acme/util/ResourcesProducer.java
@@ -19,8 +19,8 @@
import javax.enterprise.inject.Produces;
import javax.inject.Inject;
import javax.inject.Singleton;
-import javax.persistence.EntityManager;
-import javax.persistence.PersistenceContext;
+import jakarta.persistence.EntityManager;
+import jakarta.persistence.PersistenceContext;
@Singleton
public class ResourcesProducer {
diff --git a/appserver/tests/appserv-tests/devtests/cdi/javaee-integration/bean-in-lib-dir-used-by-ejb-in-ear/war/com/acme/servlet/HelloServlet.java b/appserver/tests/appserv-tests/devtests/cdi/javaee-integration/bean-in-lib-dir-used-by-ejb-in-ear/war/com/acme/servlet/HelloServlet.java
index c7d69ac..c1b8749 100644
--- a/appserver/tests/appserv-tests/devtests/cdi/javaee-integration/bean-in-lib-dir-used-by-ejb-in-ear/war/com/acme/servlet/HelloServlet.java
+++ b/appserver/tests/appserv-tests/devtests/cdi/javaee-integration/bean-in-lib-dir-used-by-ejb-in-ear/war/com/acme/servlet/HelloServlet.java
@@ -21,8 +21,8 @@
import java.io.PrintWriter;
import jakarta.ejb.EJB;
-import javax.persistence.EntityManagerFactory;
-import javax.persistence.PersistenceUnit;
+import jakarta.persistence.EntityManagerFactory;
+import jakarta.persistence.PersistenceUnit;
import javax.servlet.ServletException;
import javax.servlet.annotation.WebServlet;
import javax.servlet.http.HttpServlet;
diff --git a/appserver/tests/appserv-tests/devtests/cdi/javaee-integration/cdi-servlet-3.0-annotation-with-web-inf-lib-extension-alternative/servlet/test/beans/TestBean.java b/appserver/tests/appserv-tests/devtests/cdi/javaee-integration/cdi-servlet-3.0-annotation-with-web-inf-lib-extension-alternative/servlet/test/beans/TestBean.java
index 34ae7eb..0dd31a9 100644
--- a/appserver/tests/appserv-tests/devtests/cdi/javaee-integration/cdi-servlet-3.0-annotation-with-web-inf-lib-extension-alternative/servlet/test/beans/TestBean.java
+++ b/appserver/tests/appserv-tests/devtests/cdi/javaee-integration/cdi-servlet-3.0-annotation-with-web-inf-lib-extension-alternative/servlet/test/beans/TestBean.java
@@ -18,7 +18,7 @@
import javax.enterprise.context.RequestScoped;
import javax.inject.Inject;
-import javax.persistence.EntityManager;
+import jakarta.persistence.EntityManager;
import test.beans.artifacts.Preferred;
diff --git a/appserver/tests/appserv-tests/devtests/cdi/javaee-integration/cdi-servlet-3.0-annotation-with-web-inf-lib-extension-alternative/servlet/test/entity/Department.java b/appserver/tests/appserv-tests/devtests/cdi/javaee-integration/cdi-servlet-3.0-annotation-with-web-inf-lib-extension-alternative/servlet/test/entity/Department.java
index 14191ec..e072378 100644
--- a/appserver/tests/appserv-tests/devtests/cdi/javaee-integration/cdi-servlet-3.0-annotation-with-web-inf-lib-extension-alternative/servlet/test/entity/Department.java
+++ b/appserver/tests/appserv-tests/devtests/cdi/javaee-integration/cdi-servlet-3.0-annotation-with-web-inf-lib-extension-alternative/servlet/test/entity/Department.java
@@ -18,12 +18,12 @@
import java.util.Set;
-import javax.persistence.CascadeType;
-import javax.persistence.Column;
-import javax.persistence.Entity;
-import javax.persistence.Id;
-import javax.persistence.OneToMany;
-import javax.persistence.Table;
+import jakarta.persistence.CascadeType;
+import jakarta.persistence.Column;
+import jakarta.persistence.Entity;
+import jakarta.persistence.Id;
+import jakarta.persistence.OneToMany;
+import jakarta.persistence.Table;
@Entity
@Table(name = "DEPARTMENT")
diff --git a/appserver/tests/appserv-tests/devtests/cdi/javaee-integration/cdi-servlet-3.0-annotation-with-web-inf-lib-extension-alternative/servlet/test/entity/Employee.java b/appserver/tests/appserv-tests/devtests/cdi/javaee-integration/cdi-servlet-3.0-annotation-with-web-inf-lib-extension-alternative/servlet/test/entity/Employee.java
index a1820e8..e6cb158 100644
--- a/appserver/tests/appserv-tests/devtests/cdi/javaee-integration/cdi-servlet-3.0-annotation-with-web-inf-lib-extension-alternative/servlet/test/entity/Employee.java
+++ b/appserver/tests/appserv-tests/devtests/cdi/javaee-integration/cdi-servlet-3.0-annotation-with-web-inf-lib-extension-alternative/servlet/test/entity/Employee.java
@@ -16,14 +16,14 @@
package test.entity;
-import javax.persistence.Column;
-import javax.persistence.Entity;
-import javax.persistence.FetchType;
-import javax.persistence.Id;
-import javax.persistence.JoinColumn;
-import javax.persistence.ManyToOne;
-import javax.persistence.Table;
-import javax.persistence.Transient;
+import jakarta.persistence.Column;
+import jakarta.persistence.Entity;
+import jakarta.persistence.FetchType;
+import jakarta.persistence.Id;
+import jakarta.persistence.JoinColumn;
+import jakarta.persistence.ManyToOne;
+import jakarta.persistence.Table;
+import jakarta.persistence.Transient;
@Entity
@Table(name = "EMPLOYEE")
diff --git a/appserver/tests/appserv-tests/devtests/cdi/javaee-integration/cdi-servlet-3.0-annotation-with-web-inf-lib-extension-alternative/servlet/test/servlet/TestServlet.java b/appserver/tests/appserv-tests/devtests/cdi/javaee-integration/cdi-servlet-3.0-annotation-with-web-inf-lib-extension-alternative/servlet/test/servlet/TestServlet.java
index 54e8cdb..23a4c44 100644
--- a/appserver/tests/appserv-tests/devtests/cdi/javaee-integration/cdi-servlet-3.0-annotation-with-web-inf-lib-extension-alternative/servlet/test/servlet/TestServlet.java
+++ b/appserver/tests/appserv-tests/devtests/cdi/javaee-integration/cdi-servlet-3.0-annotation-with-web-inf-lib-extension-alternative/servlet/test/servlet/TestServlet.java
@@ -26,9 +26,9 @@
import javax.enterprise.util.AnnotationLiteral;
import javax.inject.Inject;
import javax.naming.InitialContext;
-import javax.persistence.EntityManager;
-import javax.persistence.EntityManagerFactory;
-import javax.persistence.PersistenceUnit;
+import jakarta.persistence.EntityManager;
+import jakarta.persistence.EntityManagerFactory;
+import jakarta.persistence.PersistenceUnit;
import javax.servlet.ServletException;
import javax.servlet.annotation.WebInitParam;
import javax.servlet.annotation.WebServlet;
diff --git a/appserver/tests/appserv-tests/devtests/cdi/javaee-integration/cdi-servlet-3.0-annotation-with-web-inf-lib-extension-alternative/servlet/test/util/JPAResourceProducer.java b/appserver/tests/appserv-tests/devtests/cdi/javaee-integration/cdi-servlet-3.0-annotation-with-web-inf-lib-extension-alternative/servlet/test/util/JPAResourceProducer.java
index 2cf2827..470fcbf 100644
--- a/appserver/tests/appserv-tests/devtests/cdi/javaee-integration/cdi-servlet-3.0-annotation-with-web-inf-lib-extension-alternative/servlet/test/util/JPAResourceProducer.java
+++ b/appserver/tests/appserv-tests/devtests/cdi/javaee-integration/cdi-servlet-3.0-annotation-with-web-inf-lib-extension-alternative/servlet/test/util/JPAResourceProducer.java
@@ -18,8 +18,8 @@
import javax.enterprise.inject.Produces;
import javax.inject.Singleton;
-import javax.persistence.EntityManager;
-import javax.persistence.PersistenceContext;
+import jakarta.persistence.EntityManager;
+import jakarta.persistence.PersistenceContext;
@Singleton
public class JPAResourceProducer {
diff --git a/appserver/tests/appserv-tests/devtests/cdi/javaee-integration/cdi-servlet-3.0-annotation-with-web-inf-lib-extension-alternative/servlet/test/util/JpaTest.java b/appserver/tests/appserv-tests/devtests/cdi/javaee-integration/cdi-servlet-3.0-annotation-with-web-inf-lib-extension-alternative/servlet/test/util/JpaTest.java
index 3d47448..ce5f261 100644
--- a/appserver/tests/appserv-tests/devtests/cdi/javaee-integration/cdi-servlet-3.0-annotation-with-web-inf-lib-extension-alternative/servlet/test/util/JpaTest.java
+++ b/appserver/tests/appserv-tests/devtests/cdi/javaee-integration/cdi-servlet-3.0-annotation-with-web-inf-lib-extension-alternative/servlet/test/util/JpaTest.java
@@ -16,9 +16,9 @@
package test.util;
-import javax.persistence.EntityManager;
-import javax.persistence.EntityManagerFactory;
-import javax.persistence.Query;
+import jakarta.persistence.EntityManager;
+import jakarta.persistence.EntityManagerFactory;
+import jakarta.persistence.Query;
import javax.transaction.UserTransaction;
import test.entity.Department;
diff --git a/appserver/tests/appserv-tests/devtests/cdi/javaee-integration/cdi-servlet-3.0-annotation-with-web-inf-lib-extension-alternative/util/test/beans/wbinflib/TestBeanInWebInfLib.java b/appserver/tests/appserv-tests/devtests/cdi/javaee-integration/cdi-servlet-3.0-annotation-with-web-inf-lib-extension-alternative/util/test/beans/wbinflib/TestBeanInWebInfLib.java
index ccc108f..061a146 100644
--- a/appserver/tests/appserv-tests/devtests/cdi/javaee-integration/cdi-servlet-3.0-annotation-with-web-inf-lib-extension-alternative/util/test/beans/wbinflib/TestBeanInWebInfLib.java
+++ b/appserver/tests/appserv-tests/devtests/cdi/javaee-integration/cdi-servlet-3.0-annotation-with-web-inf-lib-extension-alternative/util/test/beans/wbinflib/TestBeanInWebInfLib.java
@@ -22,8 +22,8 @@
import javax.enterprise.inject.spi.BeanManager;
import javax.enterprise.util.AnnotationLiteral;
import javax.inject.Inject;
-import javax.persistence.EntityManager;
-import javax.persistence.PersistenceContext;
+import jakarta.persistence.EntityManager;
+import jakarta.persistence.PersistenceContext;
public class TestBeanInWebInfLib {
@Inject
diff --git a/appserver/tests/appserv-tests/devtests/cdi/javaee-integration/cdi-servlet-3.0-annotation-with-web-inf-lib-javaee-injection/servlet/test/beans/TestBean.java b/appserver/tests/appserv-tests/devtests/cdi/javaee-integration/cdi-servlet-3.0-annotation-with-web-inf-lib-javaee-injection/servlet/test/beans/TestBean.java
index 787108a..019486c 100644
--- a/appserver/tests/appserv-tests/devtests/cdi/javaee-integration/cdi-servlet-3.0-annotation-with-web-inf-lib-javaee-injection/servlet/test/beans/TestBean.java
+++ b/appserver/tests/appserv-tests/devtests/cdi/javaee-integration/cdi-servlet-3.0-annotation-with-web-inf-lib-javaee-injection/servlet/test/beans/TestBean.java
@@ -18,7 +18,7 @@
import javax.enterprise.context.RequestScoped;
import javax.inject.Inject;
-import javax.persistence.EntityManager;
+import jakarta.persistence.EntityManager;
import test.beans.artifacts.Preferred;
diff --git a/appserver/tests/appserv-tests/devtests/cdi/javaee-integration/cdi-servlet-3.0-annotation-with-web-inf-lib-javaee-injection/servlet/test/entity/Department.java b/appserver/tests/appserv-tests/devtests/cdi/javaee-integration/cdi-servlet-3.0-annotation-with-web-inf-lib-javaee-injection/servlet/test/entity/Department.java
index 14191ec..e072378 100644
--- a/appserver/tests/appserv-tests/devtests/cdi/javaee-integration/cdi-servlet-3.0-annotation-with-web-inf-lib-javaee-injection/servlet/test/entity/Department.java
+++ b/appserver/tests/appserv-tests/devtests/cdi/javaee-integration/cdi-servlet-3.0-annotation-with-web-inf-lib-javaee-injection/servlet/test/entity/Department.java
@@ -18,12 +18,12 @@
import java.util.Set;
-import javax.persistence.CascadeType;
-import javax.persistence.Column;
-import javax.persistence.Entity;
-import javax.persistence.Id;
-import javax.persistence.OneToMany;
-import javax.persistence.Table;
+import jakarta.persistence.CascadeType;
+import jakarta.persistence.Column;
+import jakarta.persistence.Entity;
+import jakarta.persistence.Id;
+import jakarta.persistence.OneToMany;
+import jakarta.persistence.Table;
@Entity
@Table(name = "DEPARTMENT")
diff --git a/appserver/tests/appserv-tests/devtests/cdi/javaee-integration/cdi-servlet-3.0-annotation-with-web-inf-lib-javaee-injection/servlet/test/entity/Employee.java b/appserver/tests/appserv-tests/devtests/cdi/javaee-integration/cdi-servlet-3.0-annotation-with-web-inf-lib-javaee-injection/servlet/test/entity/Employee.java
index a1820e8..e6cb158 100644
--- a/appserver/tests/appserv-tests/devtests/cdi/javaee-integration/cdi-servlet-3.0-annotation-with-web-inf-lib-javaee-injection/servlet/test/entity/Employee.java
+++ b/appserver/tests/appserv-tests/devtests/cdi/javaee-integration/cdi-servlet-3.0-annotation-with-web-inf-lib-javaee-injection/servlet/test/entity/Employee.java
@@ -16,14 +16,14 @@
package test.entity;
-import javax.persistence.Column;
-import javax.persistence.Entity;
-import javax.persistence.FetchType;
-import javax.persistence.Id;
-import javax.persistence.JoinColumn;
-import javax.persistence.ManyToOne;
-import javax.persistence.Table;
-import javax.persistence.Transient;
+import jakarta.persistence.Column;
+import jakarta.persistence.Entity;
+import jakarta.persistence.FetchType;
+import jakarta.persistence.Id;
+import jakarta.persistence.JoinColumn;
+import jakarta.persistence.ManyToOne;
+import jakarta.persistence.Table;
+import jakarta.persistence.Transient;
@Entity
@Table(name = "EMPLOYEE")
diff --git a/appserver/tests/appserv-tests/devtests/cdi/javaee-integration/cdi-servlet-3.0-annotation-with-web-inf-lib-javaee-injection/servlet/test/servlet/TestServlet.java b/appserver/tests/appserv-tests/devtests/cdi/javaee-integration/cdi-servlet-3.0-annotation-with-web-inf-lib-javaee-injection/servlet/test/servlet/TestServlet.java
index 72c3853..5ecb6a4 100644
--- a/appserver/tests/appserv-tests/devtests/cdi/javaee-integration/cdi-servlet-3.0-annotation-with-web-inf-lib-javaee-injection/servlet/test/servlet/TestServlet.java
+++ b/appserver/tests/appserv-tests/devtests/cdi/javaee-integration/cdi-servlet-3.0-annotation-with-web-inf-lib-javaee-injection/servlet/test/servlet/TestServlet.java
@@ -26,9 +26,9 @@
import javax.enterprise.util.AnnotationLiteral;
import javax.inject.Inject;
import javax.naming.InitialContext;
-import javax.persistence.EntityManager;
-import javax.persistence.EntityManagerFactory;
-import javax.persistence.PersistenceUnit;
+import jakarta.persistence.EntityManager;
+import jakarta.persistence.EntityManagerFactory;
+import jakarta.persistence.PersistenceUnit;
import javax.servlet.ServletException;
import javax.servlet.annotation.WebInitParam;
import javax.servlet.annotation.WebServlet;
diff --git a/appserver/tests/appserv-tests/devtests/cdi/javaee-integration/cdi-servlet-3.0-annotation-with-web-inf-lib-javaee-injection/servlet/test/util/JPAResourceProducer.java b/appserver/tests/appserv-tests/devtests/cdi/javaee-integration/cdi-servlet-3.0-annotation-with-web-inf-lib-javaee-injection/servlet/test/util/JPAResourceProducer.java
index 2cf2827..470fcbf 100644
--- a/appserver/tests/appserv-tests/devtests/cdi/javaee-integration/cdi-servlet-3.0-annotation-with-web-inf-lib-javaee-injection/servlet/test/util/JPAResourceProducer.java
+++ b/appserver/tests/appserv-tests/devtests/cdi/javaee-integration/cdi-servlet-3.0-annotation-with-web-inf-lib-javaee-injection/servlet/test/util/JPAResourceProducer.java
@@ -18,8 +18,8 @@
import javax.enterprise.inject.Produces;
import javax.inject.Singleton;
-import javax.persistence.EntityManager;
-import javax.persistence.PersistenceContext;
+import jakarta.persistence.EntityManager;
+import jakarta.persistence.PersistenceContext;
@Singleton
public class JPAResourceProducer {
diff --git a/appserver/tests/appserv-tests/devtests/cdi/javaee-integration/cdi-servlet-3.0-annotation-with-web-inf-lib-javaee-injection/servlet/test/util/JpaTest.java b/appserver/tests/appserv-tests/devtests/cdi/javaee-integration/cdi-servlet-3.0-annotation-with-web-inf-lib-javaee-injection/servlet/test/util/JpaTest.java
index 3d47448..ce5f261 100644
--- a/appserver/tests/appserv-tests/devtests/cdi/javaee-integration/cdi-servlet-3.0-annotation-with-web-inf-lib-javaee-injection/servlet/test/util/JpaTest.java
+++ b/appserver/tests/appserv-tests/devtests/cdi/javaee-integration/cdi-servlet-3.0-annotation-with-web-inf-lib-javaee-injection/servlet/test/util/JpaTest.java
@@ -16,9 +16,9 @@
package test.util;
-import javax.persistence.EntityManager;
-import javax.persistence.EntityManagerFactory;
-import javax.persistence.Query;
+import jakarta.persistence.EntityManager;
+import jakarta.persistence.EntityManagerFactory;
+import jakarta.persistence.Query;
import javax.transaction.UserTransaction;
import test.entity.Department;
diff --git a/appserver/tests/appserv-tests/devtests/cdi/javaee-integration/cdi-servlet-3.0-annotation-with-web-inf-lib-javaee-injection/util/test/beans/wbinflib/TestBeanInWebInfLib.java b/appserver/tests/appserv-tests/devtests/cdi/javaee-integration/cdi-servlet-3.0-annotation-with-web-inf-lib-javaee-injection/util/test/beans/wbinflib/TestBeanInWebInfLib.java
index 8e89576..f7395a6 100644
--- a/appserver/tests/appserv-tests/devtests/cdi/javaee-integration/cdi-servlet-3.0-annotation-with-web-inf-lib-javaee-injection/util/test/beans/wbinflib/TestBeanInWebInfLib.java
+++ b/appserver/tests/appserv-tests/devtests/cdi/javaee-integration/cdi-servlet-3.0-annotation-with-web-inf-lib-javaee-injection/util/test/beans/wbinflib/TestBeanInWebInfLib.java
@@ -23,8 +23,8 @@
import javax.enterprise.inject.spi.BeanManager;
import javax.enterprise.util.AnnotationLiteral;
import javax.inject.Inject;
-import javax.persistence.EntityManager;
-import javax.persistence.PersistenceContext;
+import jakarta.persistence.EntityManager;
+import jakarta.persistence.PersistenceContext;
public class TestBeanInWebInfLib {
@Inject
diff --git a/appserver/tests/appserv-tests/devtests/cdi/smoke-tests/simple-ear/ejb/FooManagedBean.java b/appserver/tests/appserv-tests/devtests/cdi/smoke-tests/simple-ear/ejb/FooManagedBean.java
index e7bca3e..5ee1488 100644
--- a/appserver/tests/appserv-tests/devtests/cdi/smoke-tests/simple-ear/ejb/FooManagedBean.java
+++ b/appserver/tests/appserv-tests/devtests/cdi/smoke-tests/simple-ear/ejb/FooManagedBean.java
@@ -21,8 +21,8 @@
import jakarta.ejb.EJB;
import jakarta.annotation.Resource;
import org.omg.CORBA.ORB;
-import javax.persistence.PersistenceContext;
-import javax.persistence.EntityManager;
+import jakarta.persistence.PersistenceContext;
+import jakarta.persistence.EntityManager;
@ManagedBean("somemanagedbean")
public class FooManagedBean extends ManagedSuper implements Foo {
diff --git a/appserver/tests/appserv-tests/devtests/cdi/smoke-tests/simple-ear/war/Foo2ManagedBean.java b/appserver/tests/appserv-tests/devtests/cdi/smoke-tests/simple-ear/war/Foo2ManagedBean.java
index 5f538ad..134e7a8 100644
--- a/appserver/tests/appserv-tests/devtests/cdi/smoke-tests/simple-ear/war/Foo2ManagedBean.java
+++ b/appserver/tests/appserv-tests/devtests/cdi/smoke-tests/simple-ear/war/Foo2ManagedBean.java
@@ -21,8 +21,8 @@
import jakarta.ejb.EJB;
import jakarta.annotation.Resource;
import org.omg.CORBA.ORB;
-import javax.persistence.PersistenceContext;
-import javax.persistence.EntityManager;
+import jakarta.persistence.PersistenceContext;
+import jakarta.persistence.EntityManager;
@ManagedBean("somemanagedbean")
public class Foo2ManagedBean {
diff --git a/appserver/tests/appserv-tests/devtests/connector/v3/datasource-definition/ejb/HelloEJB.java b/appserver/tests/appserv-tests/devtests/connector/v3/datasource-definition/ejb/HelloEJB.java
index e7eb489..9adb9a2 100644
--- a/appserver/tests/appserv-tests/devtests/connector/v3/datasource-definition/ejb/HelloEJB.java
+++ b/appserver/tests/appserv-tests/devtests/connector/v3/datasource-definition/ejb/HelloEJB.java
@@ -18,12 +18,12 @@
import jakarta.ejb.Stateless;
-import javax.persistence.EntityManagerFactory;
-import javax.persistence.PersistenceUnit;
+import jakarta.persistence.EntityManagerFactory;
+import jakarta.persistence.PersistenceUnit;
-import javax.persistence.PersistenceContext;
-import javax.persistence.PersistenceContextType;
-import javax.persistence.EntityManager;
+import jakarta.persistence.PersistenceContext;
+import jakarta.persistence.PersistenceContextType;
+import jakarta.persistence.EntityManager;
import javax.naming.InitialContext;
import jakarta.annotation.sql.*;
import javax.sql.DataSource;
diff --git a/appserver/tests/appserv-tests/devtests/connector/v3/jpa-tx-propagation-gf-resources-xml/ejb/Person.java b/appserver/tests/appserv-tests/devtests/connector/v3/jpa-tx-propagation-gf-resources-xml/ejb/Person.java
index ebc9749..14358ff 100644
--- a/appserver/tests/appserv-tests/devtests/connector/v3/jpa-tx-propagation-gf-resources-xml/ejb/Person.java
+++ b/appserver/tests/appserv-tests/devtests/connector/v3/jpa-tx-propagation-gf-resources-xml/ejb/Person.java
@@ -16,9 +16,9 @@
package com.sun.s1asdev.ejb.ejb30.persistence.tx_propagation;
-import javax.persistence.Entity;
-import javax.persistence.Table;
-import javax.persistence.Id;
+import jakarta.persistence.Entity;
+import jakarta.persistence.Table;
+import jakarta.persistence.Id;
@Entity
@Table(name = "EJB30_PERSISTENCE_EEM_INJECTION_PERSON")
diff --git a/appserver/tests/appserv-tests/devtests/connector/v3/jpa-tx-propagation-gf-resources-xml/ejb/SfulBean.java b/appserver/tests/appserv-tests/devtests/connector/v3/jpa-tx-propagation-gf-resources-xml/ejb/SfulBean.java
index c873b9f..3d4f30b 100644
--- a/appserver/tests/appserv-tests/devtests/connector/v3/jpa-tx-propagation-gf-resources-xml/ejb/SfulBean.java
+++ b/appserver/tests/appserv-tests/devtests/connector/v3/jpa-tx-propagation-gf-resources-xml/ejb/SfulBean.java
@@ -23,11 +23,11 @@
import jakarta.ejb.Stateful;
import jakarta.ejb.EJB;
-import javax.persistence.PersistenceContextType;
-import javax.persistence.PersistenceContext;
-import javax.persistence.EntityNotFoundException;
+import jakarta.persistence.PersistenceContextType;
+import jakarta.persistence.PersistenceContext;
+import jakarta.persistence.EntityNotFoundException;
-import javax.persistence.EntityManager;
+import jakarta.persistence.EntityManager;
import jakarta.ejb.TransactionAttribute;
import jakarta.ejb.TransactionAttributeType;
diff --git a/appserver/tests/appserv-tests/devtests/connector/v3/jpa-tx-propagation-gf-resources-xml/ejb/SfulDelegate.java b/appserver/tests/appserv-tests/devtests/connector/v3/jpa-tx-propagation-gf-resources-xml/ejb/SfulDelegate.java
index de756e7..62d2097 100644
--- a/appserver/tests/appserv-tests/devtests/connector/v3/jpa-tx-propagation-gf-resources-xml/ejb/SfulDelegate.java
+++ b/appserver/tests/appserv-tests/devtests/connector/v3/jpa-tx-propagation-gf-resources-xml/ejb/SfulDelegate.java
@@ -18,7 +18,7 @@
import jakarta.ejb.Local;
-import javax.persistence.EntityManager;
+import jakarta.persistence.EntityManager;
@Local
public interface SfulDelegate {
diff --git a/appserver/tests/appserv-tests/devtests/connector/v3/jpa-tx-propagation-gf-resources-xml/ejb/SfulDelegateBean.java b/appserver/tests/appserv-tests/devtests/connector/v3/jpa-tx-propagation-gf-resources-xml/ejb/SfulDelegateBean.java
index 714510f..8a96e20 100644
--- a/appserver/tests/appserv-tests/devtests/connector/v3/jpa-tx-propagation-gf-resources-xml/ejb/SfulDelegateBean.java
+++ b/appserver/tests/appserv-tests/devtests/connector/v3/jpa-tx-propagation-gf-resources-xml/ejb/SfulDelegateBean.java
@@ -17,11 +17,11 @@
package com.sun.s1asdev.ejb.ejb30.persistence.tx_propagation;
import jakarta.ejb.Stateful;
-import javax.persistence.PersistenceContextType;
-import javax.persistence.PersistenceContext;
-import javax.persistence.EntityNotFoundException;
+import jakarta.persistence.PersistenceContextType;
+import jakarta.persistence.PersistenceContext;
+import jakarta.persistence.EntityNotFoundException;
-import javax.persistence.EntityManager;
+import jakarta.persistence.EntityManager;
import jakarta.ejb.TransactionAttribute;
import jakarta.ejb.TransactionAttributeType;
diff --git a/appserver/tests/appserv-tests/devtests/deployment/ejb30/ear/session3/client/Client.java b/appserver/tests/appserv-tests/devtests/deployment/ejb30/ear/session3/client/Client.java
index 472bfa2..e4ffd48 100644
--- a/appserver/tests/appserv-tests/devtests/deployment/ejb30/ear/session3/client/Client.java
+++ b/appserver/tests/appserv-tests/devtests/deployment/ejb30/ear/session3/client/Client.java
@@ -21,12 +21,12 @@
import java.util.*;
import javax.naming.*;
-import javax.persistence.EntityManagerFactory;
-import javax.persistence.PersistenceUnit;
+import jakarta.persistence.EntityManagerFactory;
+import jakarta.persistence.PersistenceUnit;
-import javax.persistence.PersistenceContext;
-import javax.persistence.PersistenceContextType;
-import javax.persistence.EntityManager;
+import jakarta.persistence.PersistenceContext;
+import jakarta.persistence.PersistenceContextType;
+import jakarta.persistence.EntityManager;
public class Client {
diff --git a/appserver/tests/appserv-tests/devtests/deployment/ejb30/ear/session3/ejb/HelloEJB.java b/appserver/tests/appserv-tests/devtests/deployment/ejb30/ear/session3/ejb/HelloEJB.java
index 2ac549f..f77af03 100644
--- a/appserver/tests/appserv-tests/devtests/deployment/ejb30/ear/session3/ejb/HelloEJB.java
+++ b/appserver/tests/appserv-tests/devtests/deployment/ejb30/ear/session3/ejb/HelloEJB.java
@@ -18,12 +18,12 @@
import jakarta.ejb.Stateless;
-import javax.persistence.EntityManagerFactory;
-import javax.persistence.PersistenceUnit;
+import jakarta.persistence.EntityManagerFactory;
+import jakarta.persistence.PersistenceUnit;
-import javax.persistence.PersistenceContext;
-import javax.persistence.PersistenceContextType;
-import javax.persistence.EntityManager;
+import jakarta.persistence.PersistenceContext;
+import jakarta.persistence.PersistenceContextType;
+import jakarta.persistence.EntityManager;
import javax.naming.InitialContext;
@Stateless public class HelloEJB implements Hello {
diff --git a/appserver/tests/appserv-tests/devtests/deployment/ejb30/ear/session3/persistence/Person.java b/appserver/tests/appserv-tests/devtests/deployment/ejb30/ear/session3/persistence/Person.java
index c9c9c05..f0f17b0 100644
--- a/appserver/tests/appserv-tests/devtests/deployment/ejb30/ear/session3/persistence/Person.java
+++ b/appserver/tests/appserv-tests/devtests/deployment/ejb30/ear/session3/persistence/Person.java
@@ -16,7 +16,7 @@
package com.sun.s1asdev.ejb.ejb30.hello.session3;
-import javax.persistence.*;
+import jakarta.persistence.*;
@Entity
@Table(name="EJB30_HELLO_SESSION3_PERSON")
diff --git a/appserver/tests/appserv-tests/devtests/deployment/ejb30/ear/session3/servlet/Servlet.java b/appserver/tests/appserv-tests/devtests/deployment/ejb30/ear/session3/servlet/Servlet.java
index 046eb0b..00c159d 100644
--- a/appserver/tests/appserv-tests/devtests/deployment/ejb30/ear/session3/servlet/Servlet.java
+++ b/appserver/tests/appserv-tests/devtests/deployment/ejb30/ear/session3/servlet/Servlet.java
@@ -33,12 +33,12 @@
import org.omg.CORBA.ORB;
import org.omg.PortableServer.POA;
-import javax.persistence.EntityManagerFactory;
-import javax.persistence.PersistenceUnit;
+import jakarta.persistence.EntityManagerFactory;
+import jakarta.persistence.PersistenceUnit;
-import javax.persistence.PersistenceContext;
-import javax.persistence.PersistenceContextType;
-import javax.persistence.EntityManager;
+import jakarta.persistence.PersistenceContext;
+import jakarta.persistence.PersistenceContextType;
+import jakarta.persistence.EntityManager;
@EJB(name="helloStateless3", beanInterface=Hello.class)
@EJBs({ @EJB(name="helloStateless4", beanName="HelloEJB",
diff --git a/appserver/tests/appserv-tests/devtests/deployment/ejb31/ejblite/javamodule/war/FooManagedBean.java b/appserver/tests/appserv-tests/devtests/deployment/ejb31/ejblite/javamodule/war/FooManagedBean.java
index 460a386..0af74c2 100644
--- a/appserver/tests/appserv-tests/devtests/deployment/ejb31/ejblite/javamodule/war/FooManagedBean.java
+++ b/appserver/tests/appserv-tests/devtests/deployment/ejb31/ejblite/javamodule/war/FooManagedBean.java
@@ -21,8 +21,8 @@
import jakarta.ejb.EJB;
import jakarta.annotation.Resource;
import org.omg.CORBA.ORB;
-import javax.persistence.PersistenceContext;
-import javax.persistence.EntityManager;
+import jakarta.persistence.PersistenceContext;
+import jakarta.persistence.EntityManager;
import javax.interceptor.Interceptors;
import javax.interceptor.AroundInvoke;
import javax.interceptor.InvocationContext;
diff --git a/appserver/tests/appserv-tests/devtests/deployment/ejb31/ejblite/javamodule/war/InterceptorA.java b/appserver/tests/appserv-tests/devtests/deployment/ejb31/ejblite/javamodule/war/InterceptorA.java
index 9308e5f..067d8f3 100644
--- a/appserver/tests/appserv-tests/devtests/deployment/ejb31/ejblite/javamodule/war/InterceptorA.java
+++ b/appserver/tests/appserv-tests/devtests/deployment/ejb31/ejblite/javamodule/war/InterceptorA.java
@@ -21,8 +21,8 @@
import jakarta.ejb.EJB;
import jakarta.annotation.Resource;
import org.omg.CORBA.ORB;
-import javax.persistence.PersistenceContext;
-import javax.persistence.EntityManager;
+import jakarta.persistence.PersistenceContext;
+import jakarta.persistence.EntityManager;
import javax.interceptor.InvocationContext;
import javax.interceptor.AroundInvoke;
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb30/hello/session3/client/Client.java b/appserver/tests/appserv-tests/devtests/ejb/ejb30/hello/session3/client/Client.java
index 3634f77..491c71b 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb30/hello/session3/client/Client.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb30/hello/session3/client/Client.java
@@ -23,12 +23,12 @@
import com.sun.ejte.ccl.reporter.SimpleReporterAdapter;
-import javax.persistence.EntityManagerFactory;
-import javax.persistence.PersistenceUnit;
+import jakarta.persistence.EntityManagerFactory;
+import jakarta.persistence.PersistenceUnit;
-import javax.persistence.PersistenceContext;
-import javax.persistence.PersistenceContextType;
-import javax.persistence.EntityManager;
+import jakarta.persistence.PersistenceContext;
+import jakarta.persistence.PersistenceContextType;
+import jakarta.persistence.EntityManager;
public class Client {
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb30/hello/session3/client/Person.java b/appserver/tests/appserv-tests/devtests/ejb/ejb30/hello/session3/client/Person.java
index c9c9c05..f0f17b0 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb30/hello/session3/client/Person.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb30/hello/session3/client/Person.java
@@ -16,7 +16,7 @@
package com.sun.s1asdev.ejb.ejb30.hello.session3;
-import javax.persistence.*;
+import jakarta.persistence.*;
@Entity
@Table(name="EJB30_HELLO_SESSION3_PERSON")
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb30/hello/session3/ejb/HelloEJB.java b/appserver/tests/appserv-tests/devtests/ejb/ejb30/hello/session3/ejb/HelloEJB.java
index 0ac9fe6..af957f0 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb30/hello/session3/ejb/HelloEJB.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb30/hello/session3/ejb/HelloEJB.java
@@ -18,12 +18,12 @@
import jakarta.ejb.Stateless;
-import javax.persistence.EntityManagerFactory;
-import javax.persistence.PersistenceUnit;
+import jakarta.persistence.EntityManagerFactory;
+import jakarta.persistence.PersistenceUnit;
-import javax.persistence.PersistenceContext;
-import javax.persistence.PersistenceContextType;
-import javax.persistence.EntityManager;
+import jakarta.persistence.PersistenceContext;
+import jakarta.persistence.PersistenceContextType;
+import jakarta.persistence.EntityManager;
import javax.naming.InitialContext;
@Stateless public class HelloEJB implements Hello {
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb30/hello/session3/ejb/HelloStatefulEJB.java b/appserver/tests/appserv-tests/devtests/ejb/ejb30/hello/session3/ejb/HelloStatefulEJB.java
index e2d34ba..a3d7e90 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb30/hello/session3/ejb/HelloStatefulEJB.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb30/hello/session3/ejb/HelloStatefulEJB.java
@@ -20,9 +20,9 @@
import jakarta.ejb.AccessTimeout;
import jakarta.annotation.PostConstruct;
-import javax.persistence.PersistenceContext;
-import javax.persistence.PersistenceContextType;
-import javax.persistence.EntityManager;
+import jakarta.persistence.PersistenceContext;
+import jakarta.persistence.PersistenceContextType;
+import jakarta.persistence.EntityManager;
@AccessTimeout(0)
@Stateful public class HelloStatefulEJB implements HelloStateful {
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb30/hello/session3/servlet/Servlet.java b/appserver/tests/appserv-tests/devtests/ejb/ejb30/hello/session3/servlet/Servlet.java
index a82863b..676f7db 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb30/hello/session3/servlet/Servlet.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb30/hello/session3/servlet/Servlet.java
@@ -33,12 +33,12 @@
import org.omg.CORBA.ORB;
import org.omg.PortableServer.POA;
-import javax.persistence.EntityManagerFactory;
-import javax.persistence.PersistenceUnit;
+import jakarta.persistence.EntityManagerFactory;
+import jakarta.persistence.PersistenceUnit;
-import javax.persistence.PersistenceContext;
-import javax.persistence.PersistenceContextType;
-import javax.persistence.EntityManager;
+import jakarta.persistence.PersistenceContext;
+import jakarta.persistence.PersistenceContextType;
+import jakarta.persistence.EntityManager;
@EJB(name="helloStateless3", beanInterface=Hello.class)
@EJBs({ @EJB(name="helloStateless4", beanName="HelloEJB",
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb30/persistence/context/ejb/Person.java b/appserver/tests/appserv-tests/devtests/ejb/ejb30/persistence/context/ejb/Person.java
index 9a08175..0f6c7ec 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb30/persistence/context/ejb/Person.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb30/persistence/context/ejb/Person.java
@@ -16,7 +16,7 @@
package com.sun.s1asdev.ejb.ejb30.persistence.context;
-import javax.persistence.*;
+import jakarta.persistence.*;
@Entity
@NamedQuery(name="findPersonByName",
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb30/persistence/context/ejb/SlessBean.java b/appserver/tests/appserv-tests/devtests/ejb/ejb30/persistence/context/ejb/SlessBean.java
index 0478556..4abbdd6 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb30/persistence/context/ejb/SlessBean.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb30/persistence/context/ejb/SlessBean.java
@@ -20,11 +20,11 @@
import java.util.List;
import jakarta.ejb.Stateless;
import jakarta.ejb.EJBException;
-import javax.persistence.PersistenceContext;
-import javax.persistence.PersistenceProperty;
-import javax.persistence.TransactionRequiredException;
-import javax.persistence.Query;
-import javax.persistence.EntityManager;
+import jakarta.persistence.PersistenceContext;
+import jakarta.persistence.PersistenceProperty;
+import jakarta.persistence.TransactionRequiredException;
+import jakarta.persistence.Query;
+import jakarta.persistence.EntityManager;
import jakarta.ejb.TransactionAttribute;
import jakarta.ejb.TransactionAttributeType;
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb30/persistence/eem_1slsb_2sfsbs/ejb/Person.java b/appserver/tests/appserv-tests/devtests/ejb/ejb30/persistence/eem_1slsb_2sfsbs/ejb/Person.java
index dc54934..f05f5b2 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb30/persistence/eem_1slsb_2sfsbs/ejb/Person.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb30/persistence/eem_1slsb_2sfsbs/ejb/Person.java
@@ -16,9 +16,9 @@
package com.sun.s1asdev.ejb.ejb30.persistence.eem_1slsb_2sfsbs;
-import javax.persistence.Entity;
-import javax.persistence.Table;
-import javax.persistence.Id;
+import jakarta.persistence.Entity;
+import jakarta.persistence.Table;
+import jakarta.persistence.Id;
@Entity
@Table(name = "EJB30_PERSISTENCE_EEM_1SLSB_2SFSBS_PERSON")
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb30/persistence/eem_1slsb_2sfsbs/ejb/SfulBean.java b/appserver/tests/appserv-tests/devtests/ejb/ejb30/persistence/eem_1slsb_2sfsbs/ejb/SfulBean.java
index 0339f7a..3dd92ff 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb30/persistence/eem_1slsb_2sfsbs/ejb/SfulBean.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb30/persistence/eem_1slsb_2sfsbs/ejb/SfulBean.java
@@ -23,11 +23,11 @@
import jakarta.ejb.Stateful;
import jakarta.ejb.EJB;
-import javax.persistence.PersistenceContextType;
-import javax.persistence.PersistenceContext;
-import javax.persistence.EntityNotFoundException;
+import jakarta.persistence.PersistenceContextType;
+import jakarta.persistence.PersistenceContext;
+import jakarta.persistence.EntityNotFoundException;
-import javax.persistence.EntityManager;
+import jakarta.persistence.EntityManager;
import jakarta.ejb.TransactionAttribute;
import jakarta.ejb.TransactionAttributeType;
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb30/persistence/eem_1slsb_2sfsbs/ejb/SfulDelegate.java b/appserver/tests/appserv-tests/devtests/ejb/ejb30/persistence/eem_1slsb_2sfsbs/ejb/SfulDelegate.java
index c4184a5..361c2a1 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb30/persistence/eem_1slsb_2sfsbs/ejb/SfulDelegate.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb30/persistence/eem_1slsb_2sfsbs/ejb/SfulDelegate.java
@@ -18,7 +18,7 @@
import jakarta.ejb.Local;
-import javax.persistence.EntityManager;
+import jakarta.persistence.EntityManager;
@Local
public interface SfulDelegate {
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb30/persistence/eem_1slsb_2sfsbs/ejb/SfulDelegateBean.java b/appserver/tests/appserv-tests/devtests/ejb/ejb30/persistence/eem_1slsb_2sfsbs/ejb/SfulDelegateBean.java
index 8aeda75..fcf2f1c 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb30/persistence/eem_1slsb_2sfsbs/ejb/SfulDelegateBean.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb30/persistence/eem_1slsb_2sfsbs/ejb/SfulDelegateBean.java
@@ -18,11 +18,11 @@
import jakarta.ejb.Stateful;
import jakarta.ejb.EJB;
-import javax.persistence.PersistenceContextType;
-import javax.persistence.PersistenceContext;
-import javax.persistence.EntityNotFoundException;
+import jakarta.persistence.PersistenceContextType;
+import jakarta.persistence.PersistenceContext;
+import jakarta.persistence.EntityNotFoundException;
-import javax.persistence.EntityManager;
+import jakarta.persistence.EntityManager;
import jakarta.ejb.TransactionAttribute;
import jakarta.ejb.TransactionAttributeType;
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb30/persistence/eem_1slsb_2sfsbs/ejb/SfulPeer.java b/appserver/tests/appserv-tests/devtests/ejb/ejb30/persistence/eem_1slsb_2sfsbs/ejb/SfulPeer.java
index 6e824d2..c43f287 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb30/persistence/eem_1slsb_2sfsbs/ejb/SfulPeer.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb30/persistence/eem_1slsb_2sfsbs/ejb/SfulPeer.java
@@ -18,7 +18,7 @@
import jakarta.ejb.Local;
-import javax.persistence.EntityManager;
+import jakarta.persistence.EntityManager;
@Local
public interface SfulPeer {
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb30/persistence/eem_1slsb_2sfsbs/ejb/SfulPeerBean.java b/appserver/tests/appserv-tests/devtests/ejb/ejb30/persistence/eem_1slsb_2sfsbs/ejb/SfulPeerBean.java
index 4a6f788..d1f6407 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb30/persistence/eem_1slsb_2sfsbs/ejb/SfulPeerBean.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb30/persistence/eem_1slsb_2sfsbs/ejb/SfulPeerBean.java
@@ -17,11 +17,11 @@
package com.sun.s1asdev.ejb.ejb30.persistence.eem_1slsb_2sfsbs;
import jakarta.ejb.Stateful;
-import javax.persistence.PersistenceContextType;
-import javax.persistence.PersistenceContext;
-import javax.persistence.EntityNotFoundException;
+import jakarta.persistence.PersistenceContextType;
+import jakarta.persistence.PersistenceContext;
+import jakarta.persistence.EntityNotFoundException;
-import javax.persistence.EntityManager;
+import jakarta.persistence.EntityManager;
import jakarta.ejb.TransactionAttribute;
import jakarta.ejb.TransactionAttributeType;
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb30/persistence/eem_1slsb_2sfsbs/ejb/Sless.java b/appserver/tests/appserv-tests/devtests/ejb/ejb30/persistence/eem_1slsb_2sfsbs/ejb/Sless.java
index 44e19fc..1d9f774 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb30/persistence/eem_1slsb_2sfsbs/ejb/Sless.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb30/persistence/eem_1slsb_2sfsbs/ejb/Sless.java
@@ -18,7 +18,7 @@
import jakarta.ejb.Local;
-import javax.persistence.EntityManager;
+import jakarta.persistence.EntityManager;
@Local
public interface Sless {
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb30/persistence/eem_1slsb_2sfsbs/ejb/SlessBean.java b/appserver/tests/appserv-tests/devtests/ejb/ejb30/persistence/eem_1slsb_2sfsbs/ejb/SlessBean.java
index 7c8b947..5c31bc6 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb30/persistence/eem_1slsb_2sfsbs/ejb/SlessBean.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb30/persistence/eem_1slsb_2sfsbs/ejb/SlessBean.java
@@ -18,11 +18,11 @@
import jakarta.ejb.Stateless;
import jakarta.ejb.EJB;
-import javax.persistence.PersistenceContextType;
-import javax.persistence.PersistenceContext;
-import javax.persistence.EntityNotFoundException;
+import jakarta.persistence.PersistenceContextType;
+import jakarta.persistence.PersistenceContext;
+import jakarta.persistence.EntityNotFoundException;
-import javax.persistence.EntityManager;
+import jakarta.persistence.EntityManager;
import jakarta.ejb.TransactionAttribute;
import jakarta.ejb.TransactionAttributeType;
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb30/persistence/eem_3sfsbs/ejb/Person.java b/appserver/tests/appserv-tests/devtests/ejb/ejb30/persistence/eem_3sfsbs/ejb/Person.java
index a786d91..3c2958e 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb30/persistence/eem_3sfsbs/ejb/Person.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb30/persistence/eem_3sfsbs/ejb/Person.java
@@ -16,9 +16,9 @@
package com.sun.s1asdev.ejb.ejb30.persistence.eem_3sfsbs;
-import javax.persistence.Entity;
-import javax.persistence.Table;
-import javax.persistence.Id;
+import jakarta.persistence.Entity;
+import jakarta.persistence.Table;
+import jakarta.persistence.Id;
@Entity
@Table(name = "EJB30_PERSISTENCE_EEM_3SFSBS_PERSON")
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb30/persistence/eem_3sfsbs/ejb/SfulBean.java b/appserver/tests/appserv-tests/devtests/ejb/ejb30/persistence/eem_3sfsbs/ejb/SfulBean.java
index 62867a8..7a5dab9 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb30/persistence/eem_3sfsbs/ejb/SfulBean.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb30/persistence/eem_3sfsbs/ejb/SfulBean.java
@@ -23,11 +23,11 @@
import jakarta.ejb.Stateful;
import jakarta.ejb.EJB;
-import javax.persistence.PersistenceContextType;
-import javax.persistence.PersistenceContext;
-import javax.persistence.EntityNotFoundException;
+import jakarta.persistence.PersistenceContextType;
+import jakarta.persistence.PersistenceContext;
+import jakarta.persistence.EntityNotFoundException;
-import javax.persistence.EntityManager;
+import jakarta.persistence.EntityManager;
import jakarta.ejb.TransactionAttribute;
import jakarta.ejb.TransactionAttributeType;
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb30/persistence/eem_3sfsbs/ejb/SfulDelegate.java b/appserver/tests/appserv-tests/devtests/ejb/ejb30/persistence/eem_3sfsbs/ejb/SfulDelegate.java
index 5fd2e87..0f45807 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb30/persistence/eem_3sfsbs/ejb/SfulDelegate.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb30/persistence/eem_3sfsbs/ejb/SfulDelegate.java
@@ -18,7 +18,7 @@
import jakarta.ejb.Local;
-import javax.persistence.EntityManager;
+import jakarta.persistence.EntityManager;
@Local
public interface SfulDelegate {
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb30/persistence/eem_3sfsbs/ejb/SfulDelegateBean.java b/appserver/tests/appserv-tests/devtests/ejb/ejb30/persistence/eem_3sfsbs/ejb/SfulDelegateBean.java
index dd800fc..7cb3711 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb30/persistence/eem_3sfsbs/ejb/SfulDelegateBean.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb30/persistence/eem_3sfsbs/ejb/SfulDelegateBean.java
@@ -18,11 +18,11 @@
import jakarta.ejb.Stateful;
import jakarta.ejb.EJB;
-import javax.persistence.PersistenceContextType;
-import javax.persistence.PersistenceContext;
-import javax.persistence.EntityNotFoundException;
+import jakarta.persistence.PersistenceContextType;
+import jakarta.persistence.PersistenceContext;
+import jakarta.persistence.EntityNotFoundException;
-import javax.persistence.EntityManager;
+import jakarta.persistence.EntityManager;
import jakarta.ejb.TransactionAttribute;
import jakarta.ejb.TransactionAttributeType;
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb30/persistence/eem_3sfsbs/ejb/SfulPeer.java b/appserver/tests/appserv-tests/devtests/ejb/ejb30/persistence/eem_3sfsbs/ejb/SfulPeer.java
index 3dcd1c9..ae051d5 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb30/persistence/eem_3sfsbs/ejb/SfulPeer.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb30/persistence/eem_3sfsbs/ejb/SfulPeer.java
@@ -18,7 +18,7 @@
import jakarta.ejb.Local;
-import javax.persistence.EntityManager;
+import jakarta.persistence.EntityManager;
@Local
public interface SfulPeer {
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb30/persistence/eem_3sfsbs/ejb/SfulPeerBean.java b/appserver/tests/appserv-tests/devtests/ejb/ejb30/persistence/eem_3sfsbs/ejb/SfulPeerBean.java
index 87b7bad..6678ac9 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb30/persistence/eem_3sfsbs/ejb/SfulPeerBean.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb30/persistence/eem_3sfsbs/ejb/SfulPeerBean.java
@@ -17,11 +17,11 @@
package com.sun.s1asdev.ejb.ejb30.persistence.eem_3sfsbs;
import jakarta.ejb.Stateful;
-import javax.persistence.PersistenceContextType;
-import javax.persistence.PersistenceContext;
-import javax.persistence.EntityNotFoundException;
+import jakarta.persistence.PersistenceContextType;
+import jakarta.persistence.PersistenceContext;
+import jakarta.persistence.EntityNotFoundException;
-import javax.persistence.EntityManager;
+import jakarta.persistence.EntityManager;
import jakarta.ejb.TransactionAttribute;
import jakarta.ejb.TransactionAttributeType;
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb30/persistence/eem_adapted/ejb/Person.java b/appserver/tests/appserv-tests/devtests/ejb/ejb30/persistence/eem_adapted/ejb/Person.java
index e500f91..7603c7d 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb30/persistence/eem_adapted/ejb/Person.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb30/persistence/eem_adapted/ejb/Person.java
@@ -16,9 +16,9 @@
package com.sun.s1asdev.ejb.ejb30.persistence.eem_adapted;
-import javax.persistence.Entity;
-import javax.persistence.Table;
-import javax.persistence.Id;
+import jakarta.persistence.Entity;
+import jakarta.persistence.Table;
+import jakarta.persistence.Id;
@Entity
@Table(name = "EJB30_PERSISTENCE_EEM_ADAPTED_PERSON")
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb30/persistence/eem_adapted/ejb/SfulBean.java b/appserver/tests/appserv-tests/devtests/ejb/ejb30/persistence/eem_adapted/ejb/SfulBean.java
index 62c0964..c4fe546 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb30/persistence/eem_adapted/ejb/SfulBean.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb30/persistence/eem_adapted/ejb/SfulBean.java
@@ -25,11 +25,11 @@
import jakarta.ejb.EJB;
import jakarta.ejb.LocalHome;
-import javax.persistence.PersistenceContextType;
-import javax.persistence.PersistenceContext;
-import javax.persistence.EntityNotFoundException;
+import jakarta.persistence.PersistenceContextType;
+import jakarta.persistence.PersistenceContext;
+import jakarta.persistence.EntityNotFoundException;
-import javax.persistence.EntityManager;
+import jakarta.persistence.EntityManager;
import jakarta.ejb.TransactionAttribute;
import jakarta.ejb.TransactionAttributeType;
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb30/persistence/eem_adapted/ejb/SfulDelegate.java b/appserver/tests/appserv-tests/devtests/ejb/ejb30/persistence/eem_adapted/ejb/SfulDelegate.java
index 7151fce..e2cd88f 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb30/persistence/eem_adapted/ejb/SfulDelegate.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb30/persistence/eem_adapted/ejb/SfulDelegate.java
@@ -18,7 +18,7 @@
import jakarta.ejb.EJBLocalObject;
-import javax.persistence.EntityManager;
+import jakarta.persistence.EntityManager;
public interface SfulDelegate
extends EJBLocalObject {
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb30/persistence/eem_adapted/ejb/SfulDelegateBean.java b/appserver/tests/appserv-tests/devtests/ejb/ejb30/persistence/eem_adapted/ejb/SfulDelegateBean.java
index 962eedf..f258617 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb30/persistence/eem_adapted/ejb/SfulDelegateBean.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb30/persistence/eem_adapted/ejb/SfulDelegateBean.java
@@ -20,11 +20,11 @@
import jakarta.ejb.Init;
import jakarta.ejb.LocalHome;
-import javax.persistence.PersistenceContextType;
-import javax.persistence.PersistenceContext;
-import javax.persistence.EntityNotFoundException;
+import jakarta.persistence.PersistenceContextType;
+import jakarta.persistence.PersistenceContext;
+import jakarta.persistence.EntityNotFoundException;
-import javax.persistence.EntityManager;
+import jakarta.persistence.EntityManager;
import jakarta.ejb.TransactionAttribute;
import jakarta.ejb.TransactionAttributeType;
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb30/persistence/eem_injection/ejb/Person.java b/appserver/tests/appserv-tests/devtests/ejb/ejb30/persistence/eem_injection/ejb/Person.java
index 4af970e..683f5a3 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb30/persistence/eem_injection/ejb/Person.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb30/persistence/eem_injection/ejb/Person.java
@@ -16,9 +16,9 @@
package com.sun.s1asdev.ejb.ejb30.persistence.eem_injection;
-import javax.persistence.Entity;
-import javax.persistence.Table;
-import javax.persistence.Id;
+import jakarta.persistence.Entity;
+import jakarta.persistence.Table;
+import jakarta.persistence.Id;
@Entity
@Table(name = "EJB30_PERSISTENCE_EEM_INJECTION_PERSON")
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb30/persistence/eem_injection/ejb/SfulBean.java b/appserver/tests/appserv-tests/devtests/ejb/ejb30/persistence/eem_injection/ejb/SfulBean.java
index bdbe1ae..8eef986 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb30/persistence/eem_injection/ejb/SfulBean.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb30/persistence/eem_injection/ejb/SfulBean.java
@@ -23,11 +23,11 @@
import jakarta.ejb.Stateful;
import jakarta.ejb.EJB;
-import javax.persistence.PersistenceContextType;
-import javax.persistence.PersistenceContext;
-import javax.persistence.EntityNotFoundException;
+import jakarta.persistence.PersistenceContextType;
+import jakarta.persistence.PersistenceContext;
+import jakarta.persistence.EntityNotFoundException;
-import javax.persistence.EntityManager;
+import jakarta.persistence.EntityManager;
import jakarta.ejb.TransactionAttribute;
import jakarta.ejb.TransactionAttributeType;
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb30/persistence/eem_injection/ejb/SfulDelegate.java b/appserver/tests/appserv-tests/devtests/ejb/ejb30/persistence/eem_injection/ejb/SfulDelegate.java
index 4977c00..5b72c73 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb30/persistence/eem_injection/ejb/SfulDelegate.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb30/persistence/eem_injection/ejb/SfulDelegate.java
@@ -18,7 +18,7 @@
import jakarta.ejb.Local;
-import javax.persistence.EntityManager;
+import jakarta.persistence.EntityManager;
@Local
public interface SfulDelegate {
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb30/persistence/eem_injection/ejb/SfulDelegateBean.java b/appserver/tests/appserv-tests/devtests/ejb/ejb30/persistence/eem_injection/ejb/SfulDelegateBean.java
index 6ec4b18..52f920c 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb30/persistence/eem_injection/ejb/SfulDelegateBean.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb30/persistence/eem_injection/ejb/SfulDelegateBean.java
@@ -17,11 +17,11 @@
package com.sun.s1asdev.ejb.ejb30.persistence.eem_injection;
import jakarta.ejb.Stateful;
-import javax.persistence.PersistenceContextType;
-import javax.persistence.PersistenceContext;
-import javax.persistence.EntityNotFoundException;
+import jakarta.persistence.PersistenceContextType;
+import jakarta.persistence.PersistenceContext;
+import jakarta.persistence.EntityNotFoundException;
-import javax.persistence.EntityManager;
+import jakarta.persistence.EntityManager;
import jakarta.ejb.TransactionAttribute;
import jakarta.ejb.TransactionAttributeType;
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb30/persistence/eempassivation/ejb/src/com/sun/s1asdev/ejb30/eempassivation/Person.java b/appserver/tests/appserv-tests/devtests/ejb/ejb30/persistence/eempassivation/ejb/src/com/sun/s1asdev/ejb30/eempassivation/Person.java
index d88bba5..b83a3aa 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb30/persistence/eempassivation/ejb/src/com/sun/s1asdev/ejb30/eempassivation/Person.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb30/persistence/eempassivation/ejb/src/com/sun/s1asdev/ejb30/eempassivation/Person.java
@@ -16,11 +16,11 @@
package com.sun.s1asdev.ejb30.eempassivation;
-import javax.persistence.Entity;
+import jakarta.persistence.Entity;
-import javax.persistence.Table;
+import jakarta.persistence.Table;
-import javax.persistence.Id;
+import jakarta.persistence.Id;
@Entity
@Table(name = "EJB30_PERSISTENCE_EEMPASSIVATION_PERSON")
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb30/persistence/eempassivation/ejb/src/com/sun/s1asdev/ejb30/eempassivation/SfulBean.java b/appserver/tests/appserv-tests/devtests/ejb/ejb30/persistence/eempassivation/ejb/src/com/sun/s1asdev/ejb30/eempassivation/SfulBean.java
index 01455df..43eca90 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb30/persistence/eempassivation/ejb/src/com/sun/s1asdev/ejb30/eempassivation/SfulBean.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb30/persistence/eempassivation/ejb/src/com/sun/s1asdev/ejb30/eempassivation/SfulBean.java
@@ -21,10 +21,10 @@
import javax.naming.InitialContext;
import jakarta.ejb.Stateful;
import jakarta.ejb.EJB;
-import javax.persistence.PersistenceContextType;
-import javax.persistence.PersistenceContext;
-import javax.persistence.EntityNotFoundException;
-import javax.persistence.EntityManager;
+import jakarta.persistence.PersistenceContextType;
+import jakarta.persistence.PersistenceContext;
+import jakarta.persistence.EntityNotFoundException;
+import jakarta.persistence.EntityManager;
import jakarta.ejb.TransactionAttribute;
import jakarta.ejb.TransactionAttributeType;
import jakarta.ejb.EJBException;
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb30/persistence/eempassivation/ejb/src/com/sun/s1asdev/ejb30/eempassivation/SfulDelegate.java b/appserver/tests/appserv-tests/devtests/ejb/ejb30/persistence/eempassivation/ejb/src/com/sun/s1asdev/ejb30/eempassivation/SfulDelegate.java
index fa1846c..b2073b8 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb30/persistence/eempassivation/ejb/src/com/sun/s1asdev/ejb30/eempassivation/SfulDelegate.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb30/persistence/eempassivation/ejb/src/com/sun/s1asdev/ejb30/eempassivation/SfulDelegate.java
@@ -18,7 +18,7 @@
import jakarta.ejb.Local;
-import javax.persistence.EntityManager;
+import jakarta.persistence.EntityManager;
@Local
public interface SfulDelegate {
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb30/persistence/eempassivation/ejb/src/com/sun/s1asdev/ejb30/eempassivation/SfulDelegateBean.java b/appserver/tests/appserv-tests/devtests/ejb/ejb30/persistence/eempassivation/ejb/src/com/sun/s1asdev/ejb30/eempassivation/SfulDelegateBean.java
index 28f80a7..8766ec9 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb30/persistence/eempassivation/ejb/src/com/sun/s1asdev/ejb30/eempassivation/SfulDelegateBean.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb30/persistence/eempassivation/ejb/src/com/sun/s1asdev/ejb30/eempassivation/SfulDelegateBean.java
@@ -20,10 +20,10 @@
import jakarta.ejb.PostActivate;
import jakarta.ejb.PrePassivate;
-import javax.persistence.PersistenceContextType;
-import javax.persistence.PersistenceContext;
-import javax.persistence.EntityNotFoundException;
-import javax.persistence.EntityManager;
+import jakarta.persistence.PersistenceContextType;
+import jakarta.persistence.PersistenceContext;
+import jakarta.persistence.EntityNotFoundException;
+import jakarta.persistence.EntityManager;
import jakarta.ejb.TransactionAttribute;
import jakarta.ejb.TransactionAttributeType;
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb30/persistence/eempropagation/ejb/Person.java b/appserver/tests/appserv-tests/devtests/ejb/ejb30/persistence/eempropagation/ejb/Person.java
index 48095d8..4c166d5 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb30/persistence/eempropagation/ejb/Person.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb30/persistence/eempropagation/ejb/Person.java
@@ -16,9 +16,9 @@
package com.sun.s1asdev.ejb.ejb30.persistence.eempropagation;
-import javax.persistence.Entity;
-import javax.persistence.Table;
-import javax.persistence.Id;
+import jakarta.persistence.Entity;
+import jakarta.persistence.Table;
+import jakarta.persistence.Id;
@Entity
@Table(name = "EJB30_PERSISTENCE_EEMPROPAGATION_PERSON")
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb30/persistence/eempropagation/ejb/SfulBean.java b/appserver/tests/appserv-tests/devtests/ejb/ejb30/persistence/eempropagation/ejb/SfulBean.java
index c014560..06e2cb5 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb30/persistence/eempropagation/ejb/SfulBean.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb30/persistence/eempropagation/ejb/SfulBean.java
@@ -23,11 +23,11 @@
import jakarta.ejb.Stateful;
import jakarta.ejb.EJB;
-import javax.persistence.PersistenceContextType;
-import javax.persistence.PersistenceContext;
-import javax.persistence.EntityNotFoundException;
+import jakarta.persistence.PersistenceContextType;
+import jakarta.persistence.PersistenceContext;
+import jakarta.persistence.EntityNotFoundException;
-import javax.persistence.EntityManager;
+import jakarta.persistence.EntityManager;
import jakarta.ejb.TransactionAttribute;
import jakarta.ejb.TransactionAttributeType;
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb30/persistence/eempropagation/ejb/SfulDelegate.java b/appserver/tests/appserv-tests/devtests/ejb/ejb30/persistence/eempropagation/ejb/SfulDelegate.java
index 24c4bb3..e3292ac 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb30/persistence/eempropagation/ejb/SfulDelegate.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb30/persistence/eempropagation/ejb/SfulDelegate.java
@@ -18,7 +18,7 @@
import jakarta.ejb.Local;
-import javax.persistence.EntityManager;
+import jakarta.persistence.EntityManager;
@Local
public interface SfulDelegate {
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb30/persistence/eempropagation/ejb/SfulDelegateBean.java b/appserver/tests/appserv-tests/devtests/ejb/ejb30/persistence/eempropagation/ejb/SfulDelegateBean.java
index 1a0e0bc..a495e98 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb30/persistence/eempropagation/ejb/SfulDelegateBean.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb30/persistence/eempropagation/ejb/SfulDelegateBean.java
@@ -17,11 +17,11 @@
package com.sun.s1asdev.ejb.ejb30.persistence.eempropagation;
import jakarta.ejb.Stateful;
-import javax.persistence.PersistenceContextType;
-import javax.persistence.PersistenceContext;
-import javax.persistence.EntityNotFoundException;
+import jakarta.persistence.PersistenceContextType;
+import jakarta.persistence.PersistenceContext;
+import jakarta.persistence.EntityNotFoundException;
-import javax.persistence.EntityManager;
+import jakarta.persistence.EntityManager;
import jakarta.ejb.TransactionAttribute;
import jakarta.ejb.TransactionAttributeType;
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb30/persistence/eemsfsbpassivation/ejb/src/com/sun/s1asdev/ejb30/eemsfsbpassivation/Person.java b/appserver/tests/appserv-tests/devtests/ejb/ejb30/persistence/eemsfsbpassivation/ejb/src/com/sun/s1asdev/ejb30/eemsfsbpassivation/Person.java
index 3faf1d0..cf8de65 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb30/persistence/eemsfsbpassivation/ejb/src/com/sun/s1asdev/ejb30/eemsfsbpassivation/Person.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb30/persistence/eemsfsbpassivation/ejb/src/com/sun/s1asdev/ejb30/eemsfsbpassivation/Person.java
@@ -16,11 +16,11 @@
package com.sun.s1asdev.ejb30.eemsfsbpassivation;
-import javax.persistence.Entity;
+import jakarta.persistence.Entity;
-import javax.persistence.Table;
+import jakarta.persistence.Table;
-import javax.persistence.Id;
+import jakarta.persistence.Id;
@Entity
@Table(name = "EJB30_PERSISTENCE_EEMPASSIVATION_PERSON")
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb30/persistence/eemsfsbpassivation/ejb/src/com/sun/s1asdev/ejb30/eemsfsbpassivation/SfulBean.java b/appserver/tests/appserv-tests/devtests/ejb/ejb30/persistence/eemsfsbpassivation/ejb/src/com/sun/s1asdev/ejb30/eemsfsbpassivation/SfulBean.java
index 53924de..d4b680c 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb30/persistence/eemsfsbpassivation/ejb/src/com/sun/s1asdev/ejb30/eemsfsbpassivation/SfulBean.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb30/persistence/eemsfsbpassivation/ejb/src/com/sun/s1asdev/ejb30/eemsfsbpassivation/SfulBean.java
@@ -21,10 +21,10 @@
import javax.naming.InitialContext;
import jakarta.ejb.Stateful;
import jakarta.ejb.EJB;
-import javax.persistence.PersistenceContextType;
-import javax.persistence.PersistenceContext;
-import javax.persistence.EntityNotFoundException;
-import javax.persistence.EntityManager;
+import jakarta.persistence.PersistenceContextType;
+import jakarta.persistence.PersistenceContext;
+import jakarta.persistence.EntityNotFoundException;
+import jakarta.persistence.EntityManager;
import jakarta.ejb.TransactionAttribute;
import jakarta.ejb.TransactionAttributeType;
import jakarta.ejb.EJBException;
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb30/persistence/extendedem/ejb/Person.java b/appserver/tests/appserv-tests/devtests/ejb/ejb30/persistence/extendedem/ejb/Person.java
index 17ccc09..7650477 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb30/persistence/extendedem/ejb/Person.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb30/persistence/extendedem/ejb/Person.java
@@ -17,7 +17,7 @@
package com.sun.s1asdev.ejb.ejb30.persistence.extendedem;
import jakarta.ejb.*;
-import javax.persistence.*;
+import jakarta.persistence.*;
@Entity
@Table(name="EJB30_PERSISTENCE_EXTENDEDEM_PERSON")
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb30/persistence/extendedem/ejb/SfulBean.java b/appserver/tests/appserv-tests/devtests/ejb/ejb30/persistence/extendedem/ejb/SfulBean.java
index 1f0d7d8..2d0fa86 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb30/persistence/extendedem/ejb/SfulBean.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb30/persistence/extendedem/ejb/SfulBean.java
@@ -17,11 +17,11 @@
package com.sun.s1asdev.ejb.ejb30.persistence.extendedem;
import jakarta.ejb.Stateful;
-import javax.persistence.PersistenceContextType;
-import javax.persistence.PersistenceContext;
-import javax.persistence.EntityNotFoundException;
+import jakarta.persistence.PersistenceContextType;
+import jakarta.persistence.PersistenceContext;
+import jakarta.persistence.EntityNotFoundException;
-import javax.persistence.EntityManager;
+import jakarta.persistence.EntityManager;
import jakarta.ejb.TransactionAttribute;
import jakarta.ejb.TransactionAttributeType;
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb30/persistence/tx_propagation/ejb/Person.java b/appserver/tests/appserv-tests/devtests/ejb/ejb30/persistence/tx_propagation/ejb/Person.java
index ebc9749..14358ff 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb30/persistence/tx_propagation/ejb/Person.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb30/persistence/tx_propagation/ejb/Person.java
@@ -16,9 +16,9 @@
package com.sun.s1asdev.ejb.ejb30.persistence.tx_propagation;
-import javax.persistence.Entity;
-import javax.persistence.Table;
-import javax.persistence.Id;
+import jakarta.persistence.Entity;
+import jakarta.persistence.Table;
+import jakarta.persistence.Id;
@Entity
@Table(name = "EJB30_PERSISTENCE_EEM_INJECTION_PERSON")
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb30/persistence/tx_propagation/ejb/SfulBean.java b/appserver/tests/appserv-tests/devtests/ejb/ejb30/persistence/tx_propagation/ejb/SfulBean.java
index c873b9f..3d4f30b 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb30/persistence/tx_propagation/ejb/SfulBean.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb30/persistence/tx_propagation/ejb/SfulBean.java
@@ -23,11 +23,11 @@
import jakarta.ejb.Stateful;
import jakarta.ejb.EJB;
-import javax.persistence.PersistenceContextType;
-import javax.persistence.PersistenceContext;
-import javax.persistence.EntityNotFoundException;
+import jakarta.persistence.PersistenceContextType;
+import jakarta.persistence.PersistenceContext;
+import jakarta.persistence.EntityNotFoundException;
-import javax.persistence.EntityManager;
+import jakarta.persistence.EntityManager;
import jakarta.ejb.TransactionAttribute;
import jakarta.ejb.TransactionAttributeType;
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb30/persistence/tx_propagation/ejb/SfulDelegate.java b/appserver/tests/appserv-tests/devtests/ejb/ejb30/persistence/tx_propagation/ejb/SfulDelegate.java
index de756e7..62d2097 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb30/persistence/tx_propagation/ejb/SfulDelegate.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb30/persistence/tx_propagation/ejb/SfulDelegate.java
@@ -18,7 +18,7 @@
import jakarta.ejb.Local;
-import javax.persistence.EntityManager;
+import jakarta.persistence.EntityManager;
@Local
public interface SfulDelegate {
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb30/persistence/tx_propagation/ejb/SfulDelegateBean.java b/appserver/tests/appserv-tests/devtests/ejb/ejb30/persistence/tx_propagation/ejb/SfulDelegateBean.java
index 714510f..8a96e20 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb30/persistence/tx_propagation/ejb/SfulDelegateBean.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb30/persistence/tx_propagation/ejb/SfulDelegateBean.java
@@ -17,11 +17,11 @@
package com.sun.s1asdev.ejb.ejb30.persistence.tx_propagation;
import jakarta.ejb.Stateful;
-import javax.persistence.PersistenceContextType;
-import javax.persistence.PersistenceContext;
-import javax.persistence.EntityNotFoundException;
+import jakarta.persistence.PersistenceContextType;
+import jakarta.persistence.PersistenceContext;
+import jakarta.persistence.EntityNotFoundException;
-import javax.persistence.EntityManager;
+import jakarta.persistence.EntityManager;
import jakarta.ejb.TransactionAttribute;
import jakarta.ejb.TransactionAttributeType;
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb31/ejblite/javamodule/war/FooManagedBean.java b/appserver/tests/appserv-tests/devtests/ejb/ejb31/ejblite/javamodule/war/FooManagedBean.java
index 807efa1..a596bee 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb31/ejblite/javamodule/war/FooManagedBean.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb31/ejblite/javamodule/war/FooManagedBean.java
@@ -20,8 +20,8 @@
import jakarta.ejb.EJB;
import jakarta.annotation.Resource;
-import javax.persistence.PersistenceContext;
-import javax.persistence.EntityManager;
+import jakarta.persistence.PersistenceContext;
+import jakarta.persistence.EntityManager;
import javax.interceptor.Interceptors;
import javax.interceptor.AroundInvoke;
import javax.interceptor.InvocationContext;
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb31/ejblite/javamodule/war/InterceptorA.java b/appserver/tests/appserv-tests/devtests/ejb/ejb31/ejblite/javamodule/war/InterceptorA.java
index c1bd9b6..d3122ca 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb31/ejblite/javamodule/war/InterceptorA.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb31/ejblite/javamodule/war/InterceptorA.java
@@ -20,8 +20,8 @@
import jakarta.ejb.EJB;
import jakarta.annotation.Resource;
-import javax.persistence.PersistenceContext;
-import javax.persistence.EntityManager;
+import jakarta.persistence.PersistenceContext;
+import jakarta.persistence.EntityManager;
import javax.interceptor.InvocationContext;
import javax.interceptor.AroundInvoke;
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb31/ejblite/managedbean/war/InterceptorA.java b/appserver/tests/appserv-tests/devtests/ejb/ejb31/ejblite/managedbean/war/InterceptorA.java
index 9b0680a..f2c0a92 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb31/ejblite/managedbean/war/InterceptorA.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb31/ejblite/managedbean/war/InterceptorA.java
@@ -21,8 +21,8 @@
import jakarta.ejb.EJB;
import jakarta.annotation.Resource;
import javax.transaction.UserTransaction;
-import javax.persistence.PersistenceContext;
-import javax.persistence.EntityManager;
+import jakarta.persistence.PersistenceContext;
+import jakarta.persistence.EntityManager;
import javax.interceptor.InvocationContext;
import javax.interceptor.AroundInvoke;
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb31/ejblite/managedbean/war/InterceptorB.java b/appserver/tests/appserv-tests/devtests/ejb/ejb31/ejblite/managedbean/war/InterceptorB.java
index 7f9ce06..5be352f 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb31/ejblite/managedbean/war/InterceptorB.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb31/ejblite/managedbean/war/InterceptorB.java
@@ -21,8 +21,8 @@
import jakarta.ejb.EJB;
import jakarta.annotation.Resource;
import javax.transaction.UserTransaction;
-import javax.persistence.PersistenceContext;
-import javax.persistence.EntityManager;
+import jakarta.persistence.PersistenceContext;
+import jakarta.persistence.EntityManager;
import javax.interceptor.InvocationContext;
import javax.interceptor.AroundInvoke;
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb31/embedded/basic/ejb/SimpleEjb.java b/appserver/tests/appserv-tests/devtests/ejb/ejb31/embedded/basic/ejb/SimpleEjb.java
index a56f2f5..37002b1 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb31/embedded/basic/ejb/SimpleEjb.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb31/embedded/basic/ejb/SimpleEjb.java
@@ -21,9 +21,9 @@
import jakarta.ejb.Stateless;
-import javax.persistence.PersistenceContext;
-import javax.persistence.EntityManager;
-import javax.persistence.Query;
+import jakarta.persistence.PersistenceContext;
+import jakarta.persistence.EntityManager;
+import jakarta.persistence.Query;
/**
* @author Jerome Dochez
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb31/embedded/basic/ejb/SimpleEntity.java b/appserver/tests/appserv-tests/devtests/ejb/ejb31/embedded/basic/ejb/SimpleEntity.java
index 8bbf7a3..959b556 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb31/embedded/basic/ejb/SimpleEntity.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb31/embedded/basic/ejb/SimpleEntity.java
@@ -22,9 +22,9 @@
package org.glassfish.tests.ejb.sample;
-import javax.persistence.*;
-import static javax.persistence.CascadeType.*;
-import static javax.persistence.FetchType.*;
+import jakarta.persistence.*;
+import static jakarta.persistence.CascadeType.*;
+import static jakarta.persistence.FetchType.*;
@Entity
@NamedQueries({
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb31/embedded/basic/ejb/SimpleRelated.java b/appserver/tests/appserv-tests/devtests/ejb/ejb31/embedded/basic/ejb/SimpleRelated.java
index d938169..9abf98f 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb31/embedded/basic/ejb/SimpleRelated.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb31/embedded/basic/ejb/SimpleRelated.java
@@ -22,8 +22,8 @@
package org.glassfish.tests.ejb.sample;
-import javax.persistence.*;
-import static javax.persistence.FetchType.*;
+import jakarta.persistence.*;
+import static jakarta.persistence.FetchType.*;
@Entity
public class SimpleRelated {
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb31/embedded/datasourcedef/client/Client.java b/appserver/tests/appserv-tests/devtests/ejb/ejb31/embedded/datasourcedef/client/Client.java
index 0136dfb..e29811b 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb31/embedded/datasourcedef/client/Client.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb31/embedded/datasourcedef/client/Client.java
@@ -26,7 +26,7 @@
import jakarta.ejb.embeddable.EJBContainer;
import javax.naming.Context;
import javax.naming.NamingException;
-import javax.persistence.EntityManager;
+import jakarta.persistence.EntityManager;
import com.sun.ejte.ccl.reporter.SimpleReporterAdapter;
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb31/embedded/datasourcedef/ejb/SimpleEjb.java b/appserver/tests/appserv-tests/devtests/ejb/ejb31/embedded/datasourcedef/ejb/SimpleEjb.java
index df9341d..5ae7186 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb31/embedded/datasourcedef/ejb/SimpleEjb.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb31/embedded/datasourcedef/ejb/SimpleEjb.java
@@ -22,9 +22,9 @@
import jakarta.ejb.Stateless;
import jakarta.annotation.sql.DataSourceDefinition;
-import javax.persistence.PersistenceContext;
-import javax.persistence.EntityManager;
-import javax.persistence.Query;
+import jakarta.persistence.PersistenceContext;
+import jakarta.persistence.EntityManager;
+import jakarta.persistence.Query;
/**
* @author Jerome Dochez
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb31/embedded/datasourcedef/ejb/SimpleEntity.java b/appserver/tests/appserv-tests/devtests/ejb/ejb31/embedded/datasourcedef/ejb/SimpleEntity.java
index 8bbf7a3..959b556 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb31/embedded/datasourcedef/ejb/SimpleEntity.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb31/embedded/datasourcedef/ejb/SimpleEntity.java
@@ -22,9 +22,9 @@
package org.glassfish.tests.ejb.sample;
-import javax.persistence.*;
-import static javax.persistence.CascadeType.*;
-import static javax.persistence.FetchType.*;
+import jakarta.persistence.*;
+import static jakarta.persistence.CascadeType.*;
+import static jakarta.persistence.FetchType.*;
@Entity
@NamedQueries({
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb31/embedded/datasourcedef/ejb/SimpleRelated.java b/appserver/tests/appserv-tests/devtests/ejb/ejb31/embedded/datasourcedef/ejb/SimpleRelated.java
index d938169..9abf98f 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb31/embedded/datasourcedef/ejb/SimpleRelated.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb31/embedded/datasourcedef/ejb/SimpleRelated.java
@@ -22,8 +22,8 @@
package org.glassfish.tests.ejb.sample;
-import javax.persistence.*;
-import static javax.persistence.FetchType.*;
+import jakarta.persistence.*;
+import static jakarta.persistence.FetchType.*;
@Entity
public class SimpleRelated {
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb31/embedded/ejbandwar/ejb/SimpleEjb.java b/appserver/tests/appserv-tests/devtests/ejb/ejb31/embedded/ejbandwar/ejb/SimpleEjb.java
index 2f1ebf9..ed26f55 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb31/embedded/ejbandwar/ejb/SimpleEjb.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb31/embedded/ejbandwar/ejb/SimpleEjb.java
@@ -20,7 +20,7 @@
import java.util.Date;
import jakarta.ejb.*;
-import javax.persistence.*;
+import jakarta.persistence.*;
/**
* @author Jerome Dochez
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb31/embedded/ejbandwar/ejb/SimpleEntity.java b/appserver/tests/appserv-tests/devtests/ejb/ejb31/embedded/ejbandwar/ejb/SimpleEntity.java
index 0f2bf56..b2bd250 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb31/embedded/ejbandwar/ejb/SimpleEntity.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb31/embedded/ejbandwar/ejb/SimpleEntity.java
@@ -22,9 +22,9 @@
package org.glassfish.tests.ejb.sample;
-import javax.persistence.*;
-import static javax.persistence.CascadeType.*;
-import static javax.persistence.FetchType.*;
+import jakarta.persistence.*;
+import static jakarta.persistence.CascadeType.*;
+import static jakarta.persistence.FetchType.*;
@Entity
@NamedQueries({
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb31/embedded/ejbinwar/ejb/SimpleEjb.java b/appserver/tests/appserv-tests/devtests/ejb/ejb31/embedded/ejbinwar/ejb/SimpleEjb.java
index 5110a44..9295b86 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb31/embedded/ejbinwar/ejb/SimpleEjb.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb31/embedded/ejbinwar/ejb/SimpleEjb.java
@@ -20,7 +20,7 @@
import java.util.Date;
import jakarta.ejb.*;
-import javax.persistence.*;
+import jakarta.persistence.*;
/**
* @author Jerome Dochez
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb31/embedded/ejbinwar/ejb/SimpleEntity.java b/appserver/tests/appserv-tests/devtests/ejb/ejb31/embedded/ejbinwar/ejb/SimpleEntity.java
index 0f2bf56..b2bd250 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb31/embedded/ejbinwar/ejb/SimpleEntity.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb31/embedded/ejbinwar/ejb/SimpleEntity.java
@@ -22,9 +22,9 @@
package org.glassfish.tests.ejb.sample;
-import javax.persistence.*;
-import static javax.persistence.CascadeType.*;
-import static javax.persistence.FetchType.*;
+import jakarta.persistence.*;
+import static jakarta.persistence.CascadeType.*;
+import static jakarta.persistence.FetchType.*;
@Entity
@NamedQueries({
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb31/embedded/jaxrs/ejb/SimpleEjb.java b/appserver/tests/appserv-tests/devtests/ejb/ejb31/embedded/jaxrs/ejb/SimpleEjb.java
index 5ecfbd9..5760934 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb31/embedded/jaxrs/ejb/SimpleEjb.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb31/embedded/jaxrs/ejb/SimpleEjb.java
@@ -17,7 +17,7 @@
package org.glassfish.tests.ejb.sample;
import jakarta.ejb.*;
-import javax.persistence.*;
+import jakarta.persistence.*;
import jakarta.ws.rs.*;
import java.util.Collection;
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb31/embedded/jaxrs/ejb/SimpleEntity.java b/appserver/tests/appserv-tests/devtests/ejb/ejb31/embedded/jaxrs/ejb/SimpleEntity.java
index 0f2bf56..b2bd250 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb31/embedded/jaxrs/ejb/SimpleEntity.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb31/embedded/jaxrs/ejb/SimpleEntity.java
@@ -22,9 +22,9 @@
package org.glassfish.tests.ejb.sample;
-import javax.persistence.*;
-import static javax.persistence.CascadeType.*;
-import static javax.persistence.FetchType.*;
+import jakarta.persistence.*;
+import static jakarta.persistence.CascadeType.*;
+import static jakarta.persistence.FetchType.*;
@Entity
@NamedQueries({
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb31/embedded/manifestonly/ejb/SimpleEjb.java b/appserver/tests/appserv-tests/devtests/ejb/ejb31/embedded/manifestonly/ejb/SimpleEjb.java
index a56f2f5..37002b1 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb31/embedded/manifestonly/ejb/SimpleEjb.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb31/embedded/manifestonly/ejb/SimpleEjb.java
@@ -21,9 +21,9 @@
import jakarta.ejb.Stateless;
-import javax.persistence.PersistenceContext;
-import javax.persistence.EntityManager;
-import javax.persistence.Query;
+import jakarta.persistence.PersistenceContext;
+import jakarta.persistence.EntityManager;
+import jakarta.persistence.Query;
/**
* @author Jerome Dochez
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb31/embedded/manifestonly/ejb/SimpleEntity.java b/appserver/tests/appserv-tests/devtests/ejb/ejb31/embedded/manifestonly/ejb/SimpleEntity.java
index 8bbf7a3..959b556 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb31/embedded/manifestonly/ejb/SimpleEntity.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb31/embedded/manifestonly/ejb/SimpleEntity.java
@@ -22,9 +22,9 @@
package org.glassfish.tests.ejb.sample;
-import javax.persistence.*;
-import static javax.persistence.CascadeType.*;
-import static javax.persistence.FetchType.*;
+import jakarta.persistence.*;
+import static jakarta.persistence.CascadeType.*;
+import static jakarta.persistence.FetchType.*;
@Entity
@NamedQueries({
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb31/embedded/manifestonly/ejb/SimpleRelated.java b/appserver/tests/appserv-tests/devtests/ejb/ejb31/embedded/manifestonly/ejb/SimpleRelated.java
index d938169..9abf98f 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb31/embedded/manifestonly/ejb/SimpleRelated.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb31/embedded/manifestonly/ejb/SimpleRelated.java
@@ -22,8 +22,8 @@
package org.glassfish.tests.ejb.sample;
-import javax.persistence.*;
-import static javax.persistence.FetchType.*;
+import jakarta.persistence.*;
+import static jakarta.persistence.FetchType.*;
@Entity
public class SimpleRelated {
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb31/embedded/modulewithappname/ejb/SimpleEjb.java b/appserver/tests/appserv-tests/devtests/ejb/ejb31/embedded/modulewithappname/ejb/SimpleEjb.java
index a56f2f5..37002b1 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb31/embedded/modulewithappname/ejb/SimpleEjb.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb31/embedded/modulewithappname/ejb/SimpleEjb.java
@@ -21,9 +21,9 @@
import jakarta.ejb.Stateless;
-import javax.persistence.PersistenceContext;
-import javax.persistence.EntityManager;
-import javax.persistence.Query;
+import jakarta.persistence.PersistenceContext;
+import jakarta.persistence.EntityManager;
+import jakarta.persistence.Query;
/**
* @author Jerome Dochez
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb31/embedded/modulewithappname/ejb/SimpleEntity.java b/appserver/tests/appserv-tests/devtests/ejb/ejb31/embedded/modulewithappname/ejb/SimpleEntity.java
index 8bbf7a3..959b556 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb31/embedded/modulewithappname/ejb/SimpleEntity.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb31/embedded/modulewithappname/ejb/SimpleEntity.java
@@ -22,9 +22,9 @@
package org.glassfish.tests.ejb.sample;
-import javax.persistence.*;
-import static javax.persistence.CascadeType.*;
-import static javax.persistence.FetchType.*;
+import jakarta.persistence.*;
+import static jakarta.persistence.CascadeType.*;
+import static jakarta.persistence.FetchType.*;
@Entity
@NamedQueries({
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb31/embedded/modulewithappname/ejb/SimpleRelated.java b/appserver/tests/appserv-tests/devtests/ejb/ejb31/embedded/modulewithappname/ejb/SimpleRelated.java
index d938169..9abf98f 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb31/embedded/modulewithappname/ejb/SimpleRelated.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb31/embedded/modulewithappname/ejb/SimpleRelated.java
@@ -22,8 +22,8 @@
package org.glassfish.tests.ejb.sample;
-import javax.persistence.*;
-import static javax.persistence.FetchType.*;
+import jakarta.persistence.*;
+import static jakarta.persistence.FetchType.*;
@Entity
public class SimpleRelated {
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb31/embedded/modulewithinheritance/ejb/SimpleEjb.java b/appserver/tests/appserv-tests/devtests/ejb/ejb31/embedded/modulewithinheritance/ejb/SimpleEjb.java
index ad1af2c..2eec6a0 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb31/embedded/modulewithinheritance/ejb/SimpleEjb.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb31/embedded/modulewithinheritance/ejb/SimpleEjb.java
@@ -21,9 +21,9 @@
import jakarta.ejb.Stateless;
-import javax.persistence.PersistenceContext;
-import javax.persistence.EntityManager;
-import javax.persistence.Query;
+import jakarta.persistence.PersistenceContext;
+import jakarta.persistence.EntityManager;
+import jakarta.persistence.Query;
/**
* @author Jerome Dochez
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb31/embedded/modulewithinheritance/ejb/SimpleEntity.java b/appserver/tests/appserv-tests/devtests/ejb/ejb31/embedded/modulewithinheritance/ejb/SimpleEntity.java
index 8bbf7a3..959b556 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb31/embedded/modulewithinheritance/ejb/SimpleEntity.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb31/embedded/modulewithinheritance/ejb/SimpleEntity.java
@@ -22,9 +22,9 @@
package org.glassfish.tests.ejb.sample;
-import javax.persistence.*;
-import static javax.persistence.CascadeType.*;
-import static javax.persistence.FetchType.*;
+import jakarta.persistence.*;
+import static jakarta.persistence.CascadeType.*;
+import static jakarta.persistence.FetchType.*;
@Entity
@NamedQueries({
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb31/embedded/modulewithinheritance/ejb/SimpleRelated.java b/appserver/tests/appserv-tests/devtests/ejb/ejb31/embedded/modulewithinheritance/ejb/SimpleRelated.java
index d938169..9abf98f 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb31/embedded/modulewithinheritance/ejb/SimpleRelated.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb31/embedded/modulewithinheritance/ejb/SimpleRelated.java
@@ -22,8 +22,8 @@
package org.glassfish.tests.ejb.sample;
-import javax.persistence.*;
-import static javax.persistence.FetchType.*;
+import jakarta.persistence.*;
+import static jakarta.persistence.FetchType.*;
@Entity
public class SimpleRelated {
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb31/embedded/modulewithlibs/ejb/SimpleEjb.java b/appserver/tests/appserv-tests/devtests/ejb/ejb31/embedded/modulewithlibs/ejb/SimpleEjb.java
index ad1af2c..2eec6a0 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb31/embedded/modulewithlibs/ejb/SimpleEjb.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb31/embedded/modulewithlibs/ejb/SimpleEjb.java
@@ -21,9 +21,9 @@
import jakarta.ejb.Stateless;
-import javax.persistence.PersistenceContext;
-import javax.persistence.EntityManager;
-import javax.persistence.Query;
+import jakarta.persistence.PersistenceContext;
+import jakarta.persistence.EntityManager;
+import jakarta.persistence.Query;
/**
* @author Jerome Dochez
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb31/embedded/modulewithlibs/ejb/SimpleEntity.java b/appserver/tests/appserv-tests/devtests/ejb/ejb31/embedded/modulewithlibs/ejb/SimpleEntity.java
index 8bbf7a3..959b556 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb31/embedded/modulewithlibs/ejb/SimpleEntity.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb31/embedded/modulewithlibs/ejb/SimpleEntity.java
@@ -22,9 +22,9 @@
package org.glassfish.tests.ejb.sample;
-import javax.persistence.*;
-import static javax.persistence.CascadeType.*;
-import static javax.persistence.FetchType.*;
+import jakarta.persistence.*;
+import static jakarta.persistence.CascadeType.*;
+import static jakarta.persistence.FetchType.*;
@Entity
@NamedQueries({
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb31/embedded/modulewithlibs/ejb/SimpleRelated.java b/appserver/tests/appserv-tests/devtests/ejb/ejb31/embedded/modulewithlibs/ejb/SimpleRelated.java
index d938169..9abf98f 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb31/embedded/modulewithlibs/ejb/SimpleRelated.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb31/embedded/modulewithlibs/ejb/SimpleRelated.java
@@ -22,8 +22,8 @@
package org.glassfish.tests.ejb.sample;
-import javax.persistence.*;
-import static javax.persistence.FetchType.*;
+import jakarta.persistence.*;
+import static jakarta.persistence.FetchType.*;
@Entity
public class SimpleRelated {
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb31/embedded/modulewithmanifest/ejb/SimpleEjb.java b/appserver/tests/appserv-tests/devtests/ejb/ejb31/embedded/modulewithmanifest/ejb/SimpleEjb.java
index a56f2f5..37002b1 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb31/embedded/modulewithmanifest/ejb/SimpleEjb.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb31/embedded/modulewithmanifest/ejb/SimpleEjb.java
@@ -21,9 +21,9 @@
import jakarta.ejb.Stateless;
-import javax.persistence.PersistenceContext;
-import javax.persistence.EntityManager;
-import javax.persistence.Query;
+import jakarta.persistence.PersistenceContext;
+import jakarta.persistence.EntityManager;
+import jakarta.persistence.Query;
/**
* @author Jerome Dochez
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb31/embedded/modulewithmanifest/ejb/SimpleEntity.java b/appserver/tests/appserv-tests/devtests/ejb/ejb31/embedded/modulewithmanifest/ejb/SimpleEntity.java
index 8bbf7a3..959b556 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb31/embedded/modulewithmanifest/ejb/SimpleEntity.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb31/embedded/modulewithmanifest/ejb/SimpleEntity.java
@@ -22,9 +22,9 @@
package org.glassfish.tests.ejb.sample;
-import javax.persistence.*;
-import static javax.persistence.CascadeType.*;
-import static javax.persistence.FetchType.*;
+import jakarta.persistence.*;
+import static jakarta.persistence.CascadeType.*;
+import static jakarta.persistence.FetchType.*;
@Entity
@NamedQueries({
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb31/embedded/modulewithmanifest/ejb/SimpleRelated.java b/appserver/tests/appserv-tests/devtests/ejb/ejb31/embedded/modulewithmanifest/ejb/SimpleRelated.java
index d938169..9abf98f 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb31/embedded/modulewithmanifest/ejb/SimpleRelated.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb31/embedded/modulewithmanifest/ejb/SimpleRelated.java
@@ -22,8 +22,8 @@
package org.glassfish.tests.ejb.sample;
-import javax.persistence.*;
-import static javax.persistence.FetchType.*;
+import jakarta.persistence.*;
+import static jakarta.persistence.FetchType.*;
@Entity
public class SimpleRelated {
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb31/embedded/skipjar/ejb/SimpleEjb.java b/appserver/tests/appserv-tests/devtests/ejb/ejb31/embedded/skipjar/ejb/SimpleEjb.java
index a56f2f5..37002b1 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb31/embedded/skipjar/ejb/SimpleEjb.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb31/embedded/skipjar/ejb/SimpleEjb.java
@@ -21,9 +21,9 @@
import jakarta.ejb.Stateless;
-import javax.persistence.PersistenceContext;
-import javax.persistence.EntityManager;
-import javax.persistence.Query;
+import jakarta.persistence.PersistenceContext;
+import jakarta.persistence.EntityManager;
+import jakarta.persistence.Query;
/**
* @author Jerome Dochez
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb31/embedded/skipjar/ejb/SimpleEntity.java b/appserver/tests/appserv-tests/devtests/ejb/ejb31/embedded/skipjar/ejb/SimpleEntity.java
index 8bbf7a3..959b556 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb31/embedded/skipjar/ejb/SimpleEntity.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb31/embedded/skipjar/ejb/SimpleEntity.java
@@ -22,9 +22,9 @@
package org.glassfish.tests.ejb.sample;
-import javax.persistence.*;
-import static javax.persistence.CascadeType.*;
-import static javax.persistence.FetchType.*;
+import jakarta.persistence.*;
+import static jakarta.persistence.CascadeType.*;
+import static jakarta.persistence.FetchType.*;
@Entity
@NamedQueries({
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb31/embedded/skipjar/ejb/SimpleRelated.java b/appserver/tests/appserv-tests/devtests/ejb/ejb31/embedded/skipjar/ejb/SimpleRelated.java
index d938169..9abf98f 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb31/embedded/skipjar/ejb/SimpleRelated.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb31/embedded/skipjar/ejb/SimpleRelated.java
@@ -22,8 +22,8 @@
package org.glassfish.tests.ejb.sample;
-import javax.persistence.*;
-import static javax.persistence.FetchType.*;
+import jakarta.persistence.*;
+import static jakarta.persistence.FetchType.*;
@Entity
public class SimpleRelated {
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb31/embedded/testclose/ejb/SimpleEjb.java b/appserver/tests/appserv-tests/devtests/ejb/ejb31/embedded/testclose/ejb/SimpleEjb.java
index 860d7b8..f3a1d9e 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb31/embedded/testclose/ejb/SimpleEjb.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb31/embedded/testclose/ejb/SimpleEjb.java
@@ -21,9 +21,9 @@
import jakarta.ejb.Stateless;
-import javax.persistence.PersistenceContext;
-import javax.persistence.EntityManager;
-import javax.persistence.Query;
+import jakarta.persistence.PersistenceContext;
+import jakarta.persistence.EntityManager;
+import jakarta.persistence.Query;
/**
* @author Jerome Dochez
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb31/embedded/testclose/ejb/SimpleEntity.java b/appserver/tests/appserv-tests/devtests/ejb/ejb31/embedded/testclose/ejb/SimpleEntity.java
index 2b80777..0a41546 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb31/embedded/testclose/ejb/SimpleEntity.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb31/embedded/testclose/ejb/SimpleEntity.java
@@ -22,9 +22,9 @@
package org.glassfish.tests.ejb.sample;
-import javax.persistence.*;
-import static javax.persistence.CascadeType.*;
-import static javax.persistence.FetchType.*;
+import jakarta.persistence.*;
+import static jakarta.persistence.CascadeType.*;
+import static jakarta.persistence.FetchType.*;
@Entity
@NamedQueries({
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb31/embedded/twocontainers/ejb/SimpleEjb.java b/appserver/tests/appserv-tests/devtests/ejb/ejb31/embedded/twocontainers/ejb/SimpleEjb.java
index 2960843..d3f721c 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb31/embedded/twocontainers/ejb/SimpleEjb.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb31/embedded/twocontainers/ejb/SimpleEjb.java
@@ -21,9 +21,9 @@
import jakarta.ejb.Stateless;
-import javax.persistence.PersistenceContext;
-import javax.persistence.EntityManager;
-import javax.persistence.Query;
+import jakarta.persistence.PersistenceContext;
+import jakarta.persistence.EntityManager;
+import jakarta.persistence.Query;
/**
* @author Jerome Dochez
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb31/embedded/twocontainers/ejb/SimpleEntity.java b/appserver/tests/appserv-tests/devtests/ejb/ejb31/embedded/twocontainers/ejb/SimpleEntity.java
index 0f2bf56..b2bd250 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb31/embedded/twocontainers/ejb/SimpleEntity.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb31/embedded/twocontainers/ejb/SimpleEntity.java
@@ -22,9 +22,9 @@
package org.glassfish.tests.ejb.sample;
-import javax.persistence.*;
-import static javax.persistence.CascadeType.*;
-import static javax.persistence.FetchType.*;
+import jakarta.persistence.*;
+import static jakarta.persistence.CascadeType.*;
+import static jakarta.persistence.FetchType.*;
@Entity
@NamedQueries({
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb31/embedded/twomodules/ejb/SimpleEjb.java b/appserver/tests/appserv-tests/devtests/ejb/ejb31/embedded/twomodules/ejb/SimpleEjb.java
index efa0b55..b9b2fe0 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb31/embedded/twomodules/ejb/SimpleEjb.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb31/embedded/twomodules/ejb/SimpleEjb.java
@@ -24,9 +24,9 @@
import jakarta.annotation.security.PermitAll;
import jakarta.annotation.security.DenyAll;
-import javax.persistence.PersistenceContext;
-import javax.persistence.EntityManager;
-import javax.persistence.Query;
+import jakarta.persistence.PersistenceContext;
+import jakarta.persistence.EntityManager;
+import jakarta.persistence.Query;
/**
* @author Jerome Dochez
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb31/embedded/twomodules/ejb/SimpleEntity.java b/appserver/tests/appserv-tests/devtests/ejb/ejb31/embedded/twomodules/ejb/SimpleEntity.java
index 8bbf7a3..959b556 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb31/embedded/twomodules/ejb/SimpleEntity.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb31/embedded/twomodules/ejb/SimpleEntity.java
@@ -22,9 +22,9 @@
package org.glassfish.tests.ejb.sample;
-import javax.persistence.*;
-import static javax.persistence.CascadeType.*;
-import static javax.persistence.FetchType.*;
+import jakarta.persistence.*;
+import static jakarta.persistence.CascadeType.*;
+import static jakarta.persistence.FetchType.*;
@Entity
@NamedQueries({
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb31/embedded/twomodules/ejb/SimpleRelated.java b/appserver/tests/appserv-tests/devtests/ejb/ejb31/embedded/twomodules/ejb/SimpleRelated.java
index d938169..9abf98f 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb31/embedded/twomodules/ejb/SimpleRelated.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb31/embedded/twomodules/ejb/SimpleRelated.java
@@ -22,8 +22,8 @@
package org.glassfish.tests.ejb.sample;
-import javax.persistence.*;
-import static javax.persistence.FetchType.*;
+import jakarta.persistence.*;
+import static jakarta.persistence.FetchType.*;
@Entity
public class SimpleRelated {
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb31/embedded/twomoduleswithlibs/ejb/SimpleEjb.java b/appserver/tests/appserv-tests/devtests/ejb/ejb31/embedded/twomoduleswithlibs/ejb/SimpleEjb.java
index c456c66..da30942 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb31/embedded/twomoduleswithlibs/ejb/SimpleEjb.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb31/embedded/twomoduleswithlibs/ejb/SimpleEjb.java
@@ -24,9 +24,9 @@
import jakarta.annotation.security.PermitAll;
import jakarta.annotation.security.DenyAll;
-import javax.persistence.PersistenceContext;
-import javax.persistence.EntityManager;
-import javax.persistence.Query;
+import jakarta.persistence.PersistenceContext;
+import jakarta.persistence.EntityManager;
+import jakarta.persistence.Query;
/**
* @author Jerome Dochez
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb31/embedded/twomoduleswithlibs/ejb/SimpleEntity.java b/appserver/tests/appserv-tests/devtests/ejb/ejb31/embedded/twomoduleswithlibs/ejb/SimpleEntity.java
index 8bbf7a3..959b556 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb31/embedded/twomoduleswithlibs/ejb/SimpleEntity.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb31/embedded/twomoduleswithlibs/ejb/SimpleEntity.java
@@ -22,9 +22,9 @@
package org.glassfish.tests.ejb.sample;
-import javax.persistence.*;
-import static javax.persistence.CascadeType.*;
-import static javax.persistence.FetchType.*;
+import jakarta.persistence.*;
+import static jakarta.persistence.CascadeType.*;
+import static jakarta.persistence.FetchType.*;
@Entity
@NamedQueries({
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb31/embedded/twomoduleswithlibs/ejb/SimpleRelated.java b/appserver/tests/appserv-tests/devtests/ejb/ejb31/embedded/twomoduleswithlibs/ejb/SimpleRelated.java
index d938169..9abf98f 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb31/embedded/twomoduleswithlibs/ejb/SimpleRelated.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb31/embedded/twomoduleswithlibs/ejb/SimpleRelated.java
@@ -22,8 +22,8 @@
package org.glassfish.tests.ejb.sample;
-import javax.persistence.*;
-import static javax.persistence.FetchType.*;
+import jakarta.persistence.*;
+import static jakarta.persistence.FetchType.*;
@Entity
public class SimpleRelated {
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/ear/ejb/FooManagedBean.java b/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/ear/ejb/FooManagedBean.java
index 51a1269..3b80cd2 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/ear/ejb/FooManagedBean.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/ear/ejb/FooManagedBean.java
@@ -22,8 +22,8 @@
import jakarta.annotation.Resource;
import javax.interceptor.Interceptors;
import org.omg.CORBA.ORB;
-import javax.persistence.PersistenceContext;
-import javax.persistence.EntityManager;
+import jakarta.persistence.PersistenceContext;
+import jakarta.persistence.EntityManager;
@ManagedBean("somemanagedbean")
@Interceptors(InterceptorA.class)
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/ear/ejb/InterceptorA.java b/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/ear/ejb/InterceptorA.java
index 94276bc..e5165e8 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/ear/ejb/InterceptorA.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/ear/ejb/InterceptorA.java
@@ -21,8 +21,8 @@
import jakarta.ejb.EJB;
import org.omg.CORBA.ORB;
import jakarta.annotation.Resource;
-import javax.persistence.PersistenceContext;
-import javax.persistence.EntityManager;
+import jakarta.persistence.PersistenceContext;
+import jakarta.persistence.EntityManager;
import javax.interceptor.InvocationContext;
import javax.interceptor.AroundInvoke;
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/ear/war/Foo2ManagedBean.java b/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/ear/war/Foo2ManagedBean.java
index a3e6b45..9bfc8b0 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/ear/war/Foo2ManagedBean.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/ear/war/Foo2ManagedBean.java
@@ -21,8 +21,8 @@
import jakarta.ejb.EJB;
import jakarta.annotation.Resource;
import org.omg.CORBA.ORB;
-import javax.persistence.PersistenceContext;
-import javax.persistence.EntityManager;
+import jakarta.persistence.PersistenceContext;
+import jakarta.persistence.EntityManager;
@ManagedBean("somemanagedbean")
public class Foo2ManagedBean {
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb31/singleton/hello/ejb/FooEntity.java b/appserver/tests/appserv-tests/devtests/ejb/ejb31/singleton/hello/ejb/FooEntity.java
index 9caaa30..2bdd2ab 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb31/singleton/hello/ejb/FooEntity.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb31/singleton/hello/ejb/FooEntity.java
@@ -20,7 +20,7 @@
package com.acme;
-import javax.persistence.*;
+import jakarta.persistence.*;
@Entity
public class FooEntity {
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb31/singleton/hello/ejb/SingletonBean.java b/appserver/tests/appserv-tests/devtests/ejb/ejb31/singleton/hello/ejb/SingletonBean.java
index 94aab9c..752e52b 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb31/singleton/hello/ejb/SingletonBean.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb31/singleton/hello/ejb/SingletonBean.java
@@ -17,7 +17,7 @@
package com.acme;
import jakarta.ejb.*;
-import javax.persistence.*;
+import jakarta.persistence.*;
import jakarta.annotation.*;
import org.omg.CORBA.ORB;
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/aroundconstruct/annotation/ejb/SomeManagedBean.java b/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/aroundconstruct/annotation/ejb/SomeManagedBean.java
index 64fe03c..f85c917 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/aroundconstruct/annotation/ejb/SomeManagedBean.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/aroundconstruct/annotation/ejb/SomeManagedBean.java
@@ -22,8 +22,8 @@
import jakarta.annotation.Resource;
import javax.interceptor.Interceptors;
import org.omg.CORBA.ORB;
-import javax.persistence.PersistenceContext;
-import javax.persistence.EntityManager;
+import jakarta.persistence.PersistenceContext;
+import jakarta.persistence.EntityManager;
@ManagedBean("somemanagedbean")
@Interceptors(InterceptorA.class)
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/aroundconstruct/annotation/ejb/SomeManagedBean2.java b/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/aroundconstruct/annotation/ejb/SomeManagedBean2.java
index 92e4927..6305d95 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/aroundconstruct/annotation/ejb/SomeManagedBean2.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/aroundconstruct/annotation/ejb/SomeManagedBean2.java
@@ -22,8 +22,8 @@
import jakarta.annotation.Resource;
import javax.interceptor.Interceptors;
import org.omg.CORBA.ORB;
-import javax.persistence.PersistenceContext;
-import javax.persistence.EntityManager;
+import jakarta.persistence.PersistenceContext;
+import jakarta.persistence.EntityManager;
@ManagedBean("someothermanagedbean")
public class SomeManagedBean2 extends BaseBean {
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/aroundconstruct/annotation/ejb/SomeManagedBean3.java b/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/aroundconstruct/annotation/ejb/SomeManagedBean3.java
index fcc7358..b31e17a 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/aroundconstruct/annotation/ejb/SomeManagedBean3.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/aroundconstruct/annotation/ejb/SomeManagedBean3.java
@@ -22,8 +22,8 @@
import jakarta.annotation.Resource;
import javax.interceptor.Interceptors;
import org.omg.CORBA.ORB;
-import javax.persistence.PersistenceContext;
-import javax.persistence.EntityManager;
+import jakarta.persistence.PersistenceContext;
+import jakarta.persistence.EntityManager;
@ManagedBean("onemoremanagedbean")
public class SomeManagedBean3 extends BaseBean {
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/constructor-level/annotation/ejb/SomeManagedBean.java b/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/constructor-level/annotation/ejb/SomeManagedBean.java
index a314c5a..bfdc0ec 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/constructor-level/annotation/ejb/SomeManagedBean.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/constructor-level/annotation/ejb/SomeManagedBean.java
@@ -22,8 +22,8 @@
import jakarta.annotation.Resource;
import javax.interceptor.Interceptors;
import org.omg.CORBA.ORB;
-import javax.persistence.PersistenceContext;
-import javax.persistence.EntityManager;
+import jakarta.persistence.PersistenceContext;
+import jakarta.persistence.EntityManager;
@ManagedBean("somemanagedbean")
public class SomeManagedBean extends BaseBean {
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/constructor-level/annotation/ejb/SomeManagedBean2.java b/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/constructor-level/annotation/ejb/SomeManagedBean2.java
index fff6454..d8d9fbf 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/constructor-level/annotation/ejb/SomeManagedBean2.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/constructor-level/annotation/ejb/SomeManagedBean2.java
@@ -23,8 +23,8 @@
import javax.interceptor.ExcludeClassInterceptors;
import javax.interceptor.Interceptors;
import org.omg.CORBA.ORB;
-import javax.persistence.PersistenceContext;
-import javax.persistence.EntityManager;
+import jakarta.persistence.PersistenceContext;
+import jakarta.persistence.EntityManager;
@Interceptors(InterceptorC.class)
@ManagedBean("somemanagedbean2")
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/constructor-level/annotation/ejb/SomeManagedBean3.java b/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/constructor-level/annotation/ejb/SomeManagedBean3.java
index e726baf..44e9af4 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/constructor-level/annotation/ejb/SomeManagedBean3.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/constructor-level/annotation/ejb/SomeManagedBean3.java
@@ -23,8 +23,8 @@
import javax.interceptor.ExcludeClassInterceptors;
import javax.interceptor.Interceptors;
import org.omg.CORBA.ORB;
-import javax.persistence.PersistenceContext;
-import javax.persistence.EntityManager;
+import jakarta.persistence.PersistenceContext;
+import jakarta.persistence.EntityManager;
@Interceptors(InterceptorC.class)
@ManagedBean("somemanagedbean3")
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/get_method_lc/annotation/ejb/SomeManagedBean.java b/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/get_method_lc/annotation/ejb/SomeManagedBean.java
index 2cc4208..5afae1c 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/get_method_lc/annotation/ejb/SomeManagedBean.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/get_method_lc/annotation/ejb/SomeManagedBean.java
@@ -22,8 +22,8 @@
import jakarta.annotation.Resource;
import javax.interceptor.Interceptors;
import org.omg.CORBA.ORB;
-import javax.persistence.PersistenceContext;
-import javax.persistence.EntityManager;
+import jakarta.persistence.PersistenceContext;
+import jakarta.persistence.EntityManager;
@ManagedBean("somemanagedbean")
public class SomeManagedBean extends SomeManagedBeanBase {
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/get_method_lc/annotation/ejb/SomeManagedBeanBase.java b/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/get_method_lc/annotation/ejb/SomeManagedBeanBase.java
index e13e0e5..af86180 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/get_method_lc/annotation/ejb/SomeManagedBeanBase.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/get_method_lc/annotation/ejb/SomeManagedBeanBase.java
@@ -22,8 +22,8 @@
import jakarta.annotation.Resource;
import javax.interceptor.Interceptors;
import org.omg.CORBA.ORB;
-import javax.persistence.PersistenceContext;
-import javax.persistence.EntityManager;
+import jakarta.persistence.PersistenceContext;
+import jakarta.persistence.EntityManager;
public class SomeManagedBeanBase extends BaseBean {
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/lc-method-constructor-level/annotation/ejb/SomeManagedBean.java b/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/lc-method-constructor-level/annotation/ejb/SomeManagedBean.java
index b66e326..4a0f5d2 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/lc-method-constructor-level/annotation/ejb/SomeManagedBean.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/lc-method-constructor-level/annotation/ejb/SomeManagedBean.java
@@ -22,8 +22,8 @@
import jakarta.annotation.Resource;
import javax.interceptor.Interceptors;
import org.omg.CORBA.ORB;
-import javax.persistence.PersistenceContext;
-import javax.persistence.EntityManager;
+import jakarta.persistence.PersistenceContext;
+import jakarta.persistence.EntityManager;
@ManagedBean("somemanagedbean")
public class SomeManagedBean extends BaseBean {
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/lc-method-constructor-level/annotation/ejb/SomeManagedBean2.java b/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/lc-method-constructor-level/annotation/ejb/SomeManagedBean2.java
index 87f55cb..38e62bc 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/lc-method-constructor-level/annotation/ejb/SomeManagedBean2.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/lc-method-constructor-level/annotation/ejb/SomeManagedBean2.java
@@ -23,8 +23,8 @@
import javax.interceptor.ExcludeClassInterceptors;
import javax.interceptor.Interceptors;
import org.omg.CORBA.ORB;
-import javax.persistence.PersistenceContext;
-import javax.persistence.EntityManager;
+import jakarta.persistence.PersistenceContext;
+import jakarta.persistence.EntityManager;
@Interceptors(InterceptorC.class)
@ManagedBean("somemanagedbean2")
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/lc-method-constructor-level/annotation/ejb/SomeManagedBean3.java b/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/lc-method-constructor-level/annotation/ejb/SomeManagedBean3.java
index 3ca7de0..562a2e3 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/lc-method-constructor-level/annotation/ejb/SomeManagedBean3.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/lc-method-constructor-level/annotation/ejb/SomeManagedBean3.java
@@ -23,8 +23,8 @@
import javax.interceptor.ExcludeClassInterceptors;
import javax.interceptor.Interceptors;
import org.omg.CORBA.ORB;
-import javax.persistence.PersistenceContext;
-import javax.persistence.EntityManager;
+import jakarta.persistence.PersistenceContext;
+import jakarta.persistence.EntityManager;
@Interceptors(InterceptorC.class)
@ManagedBean("somemanagedbean3")
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb32/persistence/unsynchronizedPC/disallowed_methods/ejb/Person.java b/appserver/tests/appserv-tests/devtests/ejb/ejb32/persistence/unsynchronizedPC/disallowed_methods/ejb/Person.java
index 86f9773..83470e3 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb32/persistence/unsynchronizedPC/disallowed_methods/ejb/Person.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb32/persistence/unsynchronizedPC/disallowed_methods/ejb/Person.java
@@ -16,7 +16,7 @@
package com.sun.s1asdev.ejb.ejb32.persistence.unsynchronizedPC.disallowed_methods.ejb;
-import javax.persistence.*;
+import jakarta.persistence.*;
@Entity
@Table(name = "EJB32_PERSISTENCE_CONTEXT_PERSON")
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb32/persistence/unsynchronizedPC/disallowed_methods/ejb/SlessBean.java b/appserver/tests/appserv-tests/devtests/ejb/ejb32/persistence/unsynchronizedPC/disallowed_methods/ejb/SlessBean.java
index ad2464c..82e1b6b 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb32/persistence/unsynchronizedPC/disallowed_methods/ejb/SlessBean.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb32/persistence/unsynchronizedPC/disallowed_methods/ejb/SlessBean.java
@@ -20,12 +20,12 @@
import java.util.Map;
import jakarta.ejb.Stateless;
-import javax.persistence.EntityManager;
-import javax.persistence.LockModeType;
-import javax.persistence.PersistenceContext;
-import javax.persistence.Query;
-import javax.persistence.SynchronizationType;
-import javax.persistence.TransactionRequiredException;
+import jakarta.persistence.EntityManager;
+import jakarta.persistence.LockModeType;
+import jakarta.persistence.PersistenceContext;
+import jakarta.persistence.Query;
+import jakarta.persistence.SynchronizationType;
+import jakarta.persistence.TransactionRequiredException;
@Stateless
public class SlessBean implements Tester{
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb32/persistence/unsynchronizedPC/extendedscope_cross_sfsb/ejb/Person.java b/appserver/tests/appserv-tests/devtests/ejb/ejb32/persistence/unsynchronizedPC/extendedscope_cross_sfsb/ejb/Person.java
index d4498ef..165c8c0 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb32/persistence/unsynchronizedPC/extendedscope_cross_sfsb/ejb/Person.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb32/persistence/unsynchronizedPC/extendedscope_cross_sfsb/ejb/Person.java
@@ -16,7 +16,7 @@
package com.sun.s1asdev.ejb.ejb32.persistence.unsynchronizedPC.extendedscope_cross_sfsb.ejb;
-import javax.persistence.*;
+import jakarta.persistence.*;
@Entity
@Table(name = "EJB32_PERSISTENCE_CONTEXT_PERSON")
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb32/persistence/unsynchronizedPC/extendedscope_cross_sfsb/ejb/TC1SfsbWithSynchPC.java b/appserver/tests/appserv-tests/devtests/ejb/ejb32/persistence/unsynchronizedPC/extendedscope_cross_sfsb/ejb/TC1SfsbWithSynchPC.java
index 7b24a9e..c855092 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb32/persistence/unsynchronizedPC/extendedscope_cross_sfsb/ejb/TC1SfsbWithSynchPC.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb32/persistence/unsynchronizedPC/extendedscope_cross_sfsb/ejb/TC1SfsbWithSynchPC.java
@@ -19,10 +19,10 @@
import jakarta.ejb.Init;
import jakarta.ejb.LocalHome;
import jakarta.ejb.Stateful;
-import javax.persistence.EntityManager;
-import javax.persistence.PersistenceContext;
-import javax.persistence.PersistenceContextType;
-import javax.persistence.SynchronizationType;
+import jakarta.persistence.EntityManager;
+import jakarta.persistence.PersistenceContext;
+import jakarta.persistence.PersistenceContextType;
+import jakarta.persistence.SynchronizationType;
import com.sun.s1asdev.ejb.ejb32.persistence.unsynchronizedPC.extendedscope_cross_sfsb.ejb.Person;
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb32/persistence/unsynchronizedPC/extendedscope_cross_sfsb/ejb/TC1SfsbWithUnsynchPC.java b/appserver/tests/appserv-tests/devtests/ejb/ejb32/persistence/unsynchronizedPC/extendedscope_cross_sfsb/ejb/TC1SfsbWithUnsynchPC.java
index ff14458..6c48c90 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb32/persistence/unsynchronizedPC/extendedscope_cross_sfsb/ejb/TC1SfsbWithUnsynchPC.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb32/persistence/unsynchronizedPC/extendedscope_cross_sfsb/ejb/TC1SfsbWithUnsynchPC.java
@@ -19,10 +19,10 @@
import jakarta.ejb.EJB;
import jakarta.ejb.EJBException;
import jakarta.ejb.Stateful;
-import javax.persistence.EntityManager;
-import javax.persistence.PersistenceContext;
-import javax.persistence.PersistenceContextType;
-import javax.persistence.SynchronizationType;
+import jakarta.persistence.EntityManager;
+import jakarta.persistence.PersistenceContext;
+import jakarta.persistence.PersistenceContextType;
+import jakarta.persistence.SynchronizationType;
@Stateful
public class TC1SfsbWithUnsynchPC implements Tester{
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb32/persistence/unsynchronizedPC/extendedscope_cross_sfsb/ejb/TC2SfsbWithSynchPC.java b/appserver/tests/appserv-tests/devtests/ejb/ejb32/persistence/unsynchronizedPC/extendedscope_cross_sfsb/ejb/TC2SfsbWithSynchPC.java
index d3c3080..9628065 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb32/persistence/unsynchronizedPC/extendedscope_cross_sfsb/ejb/TC2SfsbWithSynchPC.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb32/persistence/unsynchronizedPC/extendedscope_cross_sfsb/ejb/TC2SfsbWithSynchPC.java
@@ -19,10 +19,10 @@
import jakarta.ejb.EJB;
import jakarta.ejb.EJBException;
import jakarta.ejb.Stateful;
-import javax.persistence.EntityManager;
-import javax.persistence.PersistenceContext;
-import javax.persistence.PersistenceContextType;
-import javax.persistence.SynchronizationType;
+import jakarta.persistence.EntityManager;
+import jakarta.persistence.PersistenceContext;
+import jakarta.persistence.PersistenceContextType;
+import jakarta.persistence.SynchronizationType;
@Stateful
public class TC2SfsbWithSynchPC implements Tester{
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb32/persistence/unsynchronizedPC/extendedscope_cross_sfsb/ejb/TC2SfsbWithUnsynchPC.java b/appserver/tests/appserv-tests/devtests/ejb/ejb32/persistence/unsynchronizedPC/extendedscope_cross_sfsb/ejb/TC2SfsbWithUnsynchPC.java
index 41ae2a9..05decb4 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb32/persistence/unsynchronizedPC/extendedscope_cross_sfsb/ejb/TC2SfsbWithUnsynchPC.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb32/persistence/unsynchronizedPC/extendedscope_cross_sfsb/ejb/TC2SfsbWithUnsynchPC.java
@@ -19,10 +19,10 @@
import jakarta.ejb.Init;
import jakarta.ejb.LocalHome;
import jakarta.ejb.Stateful;
-import javax.persistence.EntityManager;
-import javax.persistence.PersistenceContext;
-import javax.persistence.PersistenceContextType;
-import javax.persistence.SynchronizationType;
+import jakarta.persistence.EntityManager;
+import jakarta.persistence.PersistenceContext;
+import jakarta.persistence.PersistenceContextType;
+import jakarta.persistence.SynchronizationType;
@Stateful
@LocalHome(TC2FinderHome.class)
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb32/persistence/unsynchronizedPC/rollback_notclear_unsynchPC/ejb/Person.java b/appserver/tests/appserv-tests/devtests/ejb/ejb32/persistence/unsynchronizedPC/rollback_notclear_unsynchPC/ejb/Person.java
index f50d0b4..49cecc3 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb32/persistence/unsynchronizedPC/rollback_notclear_unsynchPC/ejb/Person.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb32/persistence/unsynchronizedPC/rollback_notclear_unsynchPC/ejb/Person.java
@@ -16,7 +16,7 @@
package com.sun.s1asdev.ejb.ejb32.persistence.unsynchronizedPC.rollback_notclear_unsynchPC.ejb;
-import javax.persistence.*;
+import jakarta.persistence.*;
@Entity
@Table(name = "EJB32_PERSISTENCE_CONTEXT_PERSON")
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb32/persistence/unsynchronizedPC/rollback_notclear_unsynchPC/ejb/SlessBean.java b/appserver/tests/appserv-tests/devtests/ejb/ejb32/persistence/unsynchronizedPC/rollback_notclear_unsynchPC/ejb/SlessBean.java
index 8cf3554..497aa92 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb32/persistence/unsynchronizedPC/rollback_notclear_unsynchPC/ejb/SlessBean.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb32/persistence/unsynchronizedPC/rollback_notclear_unsynchPC/ejb/SlessBean.java
@@ -19,9 +19,9 @@
import jakarta.ejb.Stateless;
import jakarta.ejb.TransactionManagement;
import jakarta.ejb.TransactionManagementType;
-import javax.persistence.EntityManager;
-import javax.persistence.PersistenceContext;
-import javax.persistence.SynchronizationType;
+import jakarta.persistence.EntityManager;
+import jakarta.persistence.PersistenceContext;
+import jakarta.persistence.SynchronizationType;
import javax.transaction.UserTransaction;
@Stateless
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb32/persistence/unsynchronizedPC/txscope_synctype_mismatch/ejb/Person.java b/appserver/tests/appserv-tests/devtests/ejb/ejb32/persistence/unsynchronizedPC/txscope_synctype_mismatch/ejb/Person.java
index 1f5bf68..732c601 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb32/persistence/unsynchronizedPC/txscope_synctype_mismatch/ejb/Person.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb32/persistence/unsynchronizedPC/txscope_synctype_mismatch/ejb/Person.java
@@ -16,7 +16,7 @@
package com.sun.s1asdev.ejb.ejb32.persistence.unsynchronizedPC.txscope_synctype_mismatch.ejb;
-import javax.persistence.*;
+import jakarta.persistence.*;
@Entity
@Table(name = "EJB32_PERSISTENCE_CONTEXT_PERSON")
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb32/persistence/unsynchronizedPC/txscope_synctype_mismatch/ejb/SlsbWithSynchPC.java b/appserver/tests/appserv-tests/devtests/ejb/ejb32/persistence/unsynchronizedPC/txscope_synctype_mismatch/ejb/SlsbWithSynchPC.java
index 22494e3..96d4a47 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb32/persistence/unsynchronizedPC/txscope_synctype_mismatch/ejb/SlsbWithSynchPC.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb32/persistence/unsynchronizedPC/txscope_synctype_mismatch/ejb/SlsbWithSynchPC.java
@@ -17,9 +17,9 @@
package com.sun.s1asdev.ejb.ejb32.persistence.unsynchronizedPC.txscope_synctype_mismatch.ejb;
import jakarta.ejb.Stateless;
-import javax.persistence.EntityManager;
-import javax.persistence.PersistenceContext;
-import javax.persistence.SynchronizationType;
+import jakarta.persistence.EntityManager;
+import jakarta.persistence.PersistenceContext;
+import jakarta.persistence.SynchronizationType;
@Stateless
public class SlsbWithSynchPC implements Finder {
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb32/persistence/unsynchronizedPC/txscope_synctype_mismatch/ejb/TC1SfsbWithUnsynchPC.java b/appserver/tests/appserv-tests/devtests/ejb/ejb32/persistence/unsynchronizedPC/txscope_synctype_mismatch/ejb/TC1SfsbWithUnsynchPC.java
index 0ac7247..cce2504 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb32/persistence/unsynchronizedPC/txscope_synctype_mismatch/ejb/TC1SfsbWithUnsynchPC.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb32/persistence/unsynchronizedPC/txscope_synctype_mismatch/ejb/TC1SfsbWithUnsynchPC.java
@@ -19,9 +19,9 @@
import jakarta.ejb.EJB;
import jakarta.ejb.EJBException;
import jakarta.ejb.Stateful;
-import javax.persistence.EntityManager;
-import javax.persistence.PersistenceContext;
-import javax.persistence.SynchronizationType;
+import jakarta.persistence.EntityManager;
+import jakarta.persistence.PersistenceContext;
+import jakarta.persistence.SynchronizationType;
@Stateful
public class TC1SfsbWithUnsynchPC implements Tester {
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb32/persistence/unsynchronizedPC/txscope_synctype_mismatch/ejb/TC2SlsbWithUnsynchPC.java b/appserver/tests/appserv-tests/devtests/ejb/ejb32/persistence/unsynchronizedPC/txscope_synctype_mismatch/ejb/TC2SlsbWithUnsynchPC.java
index 3c95c3b..5d844df 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb32/persistence/unsynchronizedPC/txscope_synctype_mismatch/ejb/TC2SlsbWithUnsynchPC.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb32/persistence/unsynchronizedPC/txscope_synctype_mismatch/ejb/TC2SlsbWithUnsynchPC.java
@@ -19,9 +19,9 @@
import jakarta.ejb.EJB;
import jakarta.ejb.EJBException;
import jakarta.ejb.Stateless;
-import javax.persistence.EntityManager;
-import javax.persistence.PersistenceContext;
-import javax.persistence.SynchronizationType;
+import jakarta.persistence.EntityManager;
+import jakarta.persistence.PersistenceContext;
+import jakarta.persistence.SynchronizationType;
@Stateless
public class TC2SlsbWithUnsynchPC implements Tester{
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb32/persistence/unsynchronizedPC/txscope_synctype_mismatch/ejb/TC3SlsbWithSynchPC.java b/appserver/tests/appserv-tests/devtests/ejb/ejb32/persistence/unsynchronizedPC/txscope_synctype_mismatch/ejb/TC3SlsbWithSynchPC.java
index ce84ab6..3a74e1e 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb32/persistence/unsynchronizedPC/txscope_synctype_mismatch/ejb/TC3SlsbWithSynchPC.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb32/persistence/unsynchronizedPC/txscope_synctype_mismatch/ejb/TC3SlsbWithSynchPC.java
@@ -18,9 +18,9 @@
import jakarta.ejb.EJB;
import jakarta.ejb.Stateless;
-import javax.persistence.EntityManager;
-import javax.persistence.PersistenceContext;
-import javax.persistence.SynchronizationType;
+import jakarta.persistence.EntityManager;
+import jakarta.persistence.PersistenceContext;
+import jakarta.persistence.SynchronizationType;
@Stateless
public class TC3SlsbWithSynchPC implements Tester{
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb32/persistence/unsynchronizedPC/txscope_synctype_mismatch/ejb/TC3SlsbWithUnSynchPC.java b/appserver/tests/appserv-tests/devtests/ejb/ejb32/persistence/unsynchronizedPC/txscope_synctype_mismatch/ejb/TC3SlsbWithUnSynchPC.java
index bc127df..9085481 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb32/persistence/unsynchronizedPC/txscope_synctype_mismatch/ejb/TC3SlsbWithUnSynchPC.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb32/persistence/unsynchronizedPC/txscope_synctype_mismatch/ejb/TC3SlsbWithUnSynchPC.java
@@ -17,9 +17,9 @@
package com.sun.s1asdev.ejb.ejb32.persistence.unsynchronizedPC.txscope_synctype_mismatch.ejb;
import jakarta.ejb.Stateless;
-import javax.persistence.EntityManager;
-import javax.persistence.PersistenceContext;
-import javax.persistence.SynchronizationType;
+import jakarta.persistence.EntityManager;
+import jakarta.persistence.PersistenceContext;
+import jakarta.persistence.SynchronizationType;
@Stateless
public class TC3SlsbWithUnSynchPC implements Finder{
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb32/persistence/unsynchronizedPC/txscope_synctype_mismatch/ejb/TC4SfsbWithUnsynchPC.java b/appserver/tests/appserv-tests/devtests/ejb/ejb32/persistence/unsynchronizedPC/txscope_synctype_mismatch/ejb/TC4SfsbWithUnsynchPC.java
index 78e943d..2084d7d 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb32/persistence/unsynchronizedPC/txscope_synctype_mismatch/ejb/TC4SfsbWithUnsynchPC.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb32/persistence/unsynchronizedPC/txscope_synctype_mismatch/ejb/TC4SfsbWithUnsynchPC.java
@@ -17,9 +17,9 @@
package com.sun.s1asdev.ejb.ejb32.persistence.unsynchronizedPC.txscope_synctype_mismatch.ejb;
import jakarta.ejb.Stateful;
-import javax.persistence.EntityManager;
-import javax.persistence.PersistenceContext;
-import javax.persistence.SynchronizationType;
+import jakarta.persistence.EntityManager;
+import jakarta.persistence.PersistenceContext;
+import jakarta.persistence.SynchronizationType;
@Stateful
public class TC4SfsbWithUnsynchPC implements Finder{
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb32/persistence/unsynchronizedPC/txscope_synctype_mismatch/ejb/TC4SlsbWithSynchPC.java b/appserver/tests/appserv-tests/devtests/ejb/ejb32/persistence/unsynchronizedPC/txscope_synctype_mismatch/ejb/TC4SlsbWithSynchPC.java
index d35d203..d50c70d 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb32/persistence/unsynchronizedPC/txscope_synctype_mismatch/ejb/TC4SlsbWithSynchPC.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb32/persistence/unsynchronizedPC/txscope_synctype_mismatch/ejb/TC4SlsbWithSynchPC.java
@@ -18,9 +18,9 @@
import jakarta.ejb.EJB;
import jakarta.ejb.Stateless;
-import javax.persistence.EntityManager;
-import javax.persistence.PersistenceContext;
-import javax.persistence.SynchronizationType;
+import jakarta.persistence.EntityManager;
+import jakarta.persistence.PersistenceContext;
+import jakarta.persistence.SynchronizationType;
@Stateless
public class TC4SlsbWithSynchPC implements Tester{
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb32/persistence/unsynchronizedPC/unsynchpc_flush/ejb/Person.java b/appserver/tests/appserv-tests/devtests/ejb/ejb32/persistence/unsynchronizedPC/unsynchpc_flush/ejb/Person.java
index b064b54..50dc830 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb32/persistence/unsynchronizedPC/unsynchpc_flush/ejb/Person.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb32/persistence/unsynchronizedPC/unsynchpc_flush/ejb/Person.java
@@ -16,7 +16,7 @@
package com.sun.s1asdev.ejb.ejb32.persistence.unsynchronizedPC.unsynchpc_flush.ejb;
-import javax.persistence.*;
+import jakarta.persistence.*;
@Entity
@Table(name = "EJB32_PERSISTENCE_CONTEXT_PERSON")
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb32/persistence/unsynchronizedPC/unsynchpc_flush/ejb/SLSBWithUnsynchPC.java b/appserver/tests/appserv-tests/devtests/ejb/ejb32/persistence/unsynchronizedPC/unsynchpc_flush/ejb/SLSBWithUnsynchPC.java
index 627eb63..b80cc3c 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb32/persistence/unsynchronizedPC/unsynchpc_flush/ejb/SLSBWithUnsynchPC.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb32/persistence/unsynchronizedPC/unsynchpc_flush/ejb/SLSBWithUnsynchPC.java
@@ -17,10 +17,10 @@
package com.sun.s1asdev.ejb.ejb32.persistence.unsynchronizedPC.unsynchpc_flush.ejb;
import jakarta.ejb.Stateless;
-import javax.persistence.EntityManager;
-import javax.persistence.PersistenceContext;
-import javax.persistence.SynchronizationType;
-import javax.persistence.TransactionRequiredException;
+import jakarta.persistence.EntityManager;
+import jakarta.persistence.PersistenceContext;
+import jakarta.persistence.SynchronizationType;
+import jakarta.persistence.TransactionRequiredException;
@Stateless
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb32/persistence/unsynchronizedPC/use_nonjtadatasource/ejb/Person.java b/appserver/tests/appserv-tests/devtests/ejb/ejb32/persistence/unsynchronizedPC/use_nonjtadatasource/ejb/Person.java
index 914d917..aba6a34 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb32/persistence/unsynchronizedPC/use_nonjtadatasource/ejb/Person.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb32/persistence/unsynchronizedPC/use_nonjtadatasource/ejb/Person.java
@@ -16,7 +16,7 @@
package com.sun.s1asdev.ejb.ejb32.persistence.unsynchronizedPC.use_nonjtadatasource.ejb;
-import javax.persistence.*;
+import jakarta.persistence.*;
@Entity
@Table(name = "EJB32_PERSISTENCE_CONTEXT_PERSON")
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb32/persistence/unsynchronizedPC/use_nonjtadatasource/ejb/SfulBean.java b/appserver/tests/appserv-tests/devtests/ejb/ejb32/persistence/unsynchronizedPC/use_nonjtadatasource/ejb/SfulBean.java
index 26d6f50..5b455b1 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb32/persistence/unsynchronizedPC/use_nonjtadatasource/ejb/SfulBean.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb32/persistence/unsynchronizedPC/use_nonjtadatasource/ejb/SfulBean.java
@@ -19,10 +19,10 @@
import java.util.Map;
import jakarta.ejb.Stateful;
-import javax.persistence.EntityManager;
-import javax.persistence.PersistenceContext;
-import javax.persistence.PersistenceContextType;
-import javax.persistence.SynchronizationType;
+import jakarta.persistence.EntityManager;
+import jakarta.persistence.PersistenceContext;
+import jakarta.persistence.PersistenceContextType;
+import jakarta.persistence.SynchronizationType;
@Stateful
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb32/sfsb/basic/ejb/FooEntity.java b/appserver/tests/appserv-tests/devtests/ejb/ejb32/sfsb/basic/ejb/FooEntity.java
index 9caaa30..2bdd2ab 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb32/sfsb/basic/ejb/FooEntity.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb32/sfsb/basic/ejb/FooEntity.java
@@ -20,7 +20,7 @@
package com.acme;
-import javax.persistence.*;
+import jakarta.persistence.*;
@Entity
public class FooEntity {
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb32/sfsb/basic/ejb/SFSB.java b/appserver/tests/appserv-tests/devtests/ejb/ejb32/sfsb/basic/ejb/SFSB.java
index 0f41ca6..faaa175 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb32/sfsb/basic/ejb/SFSB.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb32/sfsb/basic/ejb/SFSB.java
@@ -17,7 +17,7 @@
package com.acme;
import jakarta.ejb.*;
-import javax.persistence.*;
+import jakarta.persistence.*;
import jakarta.annotation.*;
import javax.naming.InitialContext;
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb32/sfsb/descriptor/ejb/FooEntity.java b/appserver/tests/appserv-tests/devtests/ejb/ejb32/sfsb/descriptor/ejb/FooEntity.java
index 9caaa30..2bdd2ab 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb32/sfsb/descriptor/ejb/FooEntity.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb32/sfsb/descriptor/ejb/FooEntity.java
@@ -20,7 +20,7 @@
package com.acme;
-import javax.persistence.*;
+import jakarta.persistence.*;
@Entity
public class FooEntity {
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb32/sfsb/descriptor/ejb/SFSB.java b/appserver/tests/appserv-tests/devtests/ejb/ejb32/sfsb/descriptor/ejb/SFSB.java
index a99a8f6..e06936c 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb32/sfsb/descriptor/ejb/SFSB.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb32/sfsb/descriptor/ejb/SFSB.java
@@ -17,7 +17,7 @@
package com.acme;
import jakarta.ejb.*;
-import javax.persistence.*;
+import jakarta.persistence.*;
import jakarta.annotation.*;
import javax.naming.InitialContext;
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb32/sfsb/lifecycle_cb_txattr/ejb/SFSB.java b/appserver/tests/appserv-tests/devtests/ejb/ejb32/sfsb/lifecycle_cb_txattr/ejb/SFSB.java
index 6d6dffd..1bcf730 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb32/sfsb/lifecycle_cb_txattr/ejb/SFSB.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb32/sfsb/lifecycle_cb_txattr/ejb/SFSB.java
@@ -17,7 +17,7 @@
package com.acme;
import jakarta.ejb.*;
-import javax.persistence.*;
+import jakarta.persistence.*;
import jakarta.annotation.*;
import javax.naming.InitialContext;
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb32/sfsb/lifecycle_cb_txattr/ejb/SFSB1.java b/appserver/tests/appserv-tests/devtests/ejb/ejb32/sfsb/lifecycle_cb_txattr/ejb/SFSB1.java
index b0c8bcc..68b543d 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb32/sfsb/lifecycle_cb_txattr/ejb/SFSB1.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb32/sfsb/lifecycle_cb_txattr/ejb/SFSB1.java
@@ -17,7 +17,7 @@
package com.acme;
import jakarta.ejb.*;
-import javax.persistence.*;
+import jakarta.persistence.*;
import jakarta.annotation.*;
import javax.naming.InitialContext;
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb32/sfsb/lifecycle_cb_txattr/ejb/SFSB2.java b/appserver/tests/appserv-tests/devtests/ejb/ejb32/sfsb/lifecycle_cb_txattr/ejb/SFSB2.java
index 4b21f22..e7b9e7d 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb32/sfsb/lifecycle_cb_txattr/ejb/SFSB2.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb32/sfsb/lifecycle_cb_txattr/ejb/SFSB2.java
@@ -17,7 +17,7 @@
package com.acme;
import jakarta.ejb.*;
-import javax.persistence.*;
+import jakarta.persistence.*;
import jakarta.annotation.*;
import javax.naming.InitialContext;
diff --git a/appserver/tests/appserv-tests/devtests/jdbc/jpa-dsd/ejb/Person.java b/appserver/tests/appserv-tests/devtests/jdbc/jpa-dsd/ejb/Person.java
index ebc9749..14358ff 100644
--- a/appserver/tests/appserv-tests/devtests/jdbc/jpa-dsd/ejb/Person.java
+++ b/appserver/tests/appserv-tests/devtests/jdbc/jpa-dsd/ejb/Person.java
@@ -16,9 +16,9 @@
package com.sun.s1asdev.ejb.ejb30.persistence.tx_propagation;
-import javax.persistence.Entity;
-import javax.persistence.Table;
-import javax.persistence.Id;
+import jakarta.persistence.Entity;
+import jakarta.persistence.Table;
+import jakarta.persistence.Id;
@Entity
@Table(name = "EJB30_PERSISTENCE_EEM_INJECTION_PERSON")
diff --git a/appserver/tests/appserv-tests/devtests/jdbc/jpa-dsd/ejb/SfulBean.java b/appserver/tests/appserv-tests/devtests/jdbc/jpa-dsd/ejb/SfulBean.java
index 7702526..a8b68a3 100644
--- a/appserver/tests/appserv-tests/devtests/jdbc/jpa-dsd/ejb/SfulBean.java
+++ b/appserver/tests/appserv-tests/devtests/jdbc/jpa-dsd/ejb/SfulBean.java
@@ -23,12 +23,12 @@
import jakarta.ejb.Stateful;
import jakarta.ejb.EJB;
-import javax.persistence.PersistenceContextType;
-import javax.persistence.PersistenceContext;
-import javax.persistence.EntityNotFoundException;
+import jakarta.persistence.PersistenceContextType;
+import jakarta.persistence.PersistenceContext;
+import jakarta.persistence.EntityNotFoundException;
import jakarta.annotation.sql.*;
-import javax.persistence.EntityManager;
+import jakarta.persistence.EntityManager;
import jakarta.ejb.TransactionAttribute;
import jakarta.ejb.TransactionAttributeType;
diff --git a/appserver/tests/appserv-tests/devtests/jdbc/jpa-dsd/ejb/SfulDelegate.java b/appserver/tests/appserv-tests/devtests/jdbc/jpa-dsd/ejb/SfulDelegate.java
index de756e7..62d2097 100644
--- a/appserver/tests/appserv-tests/devtests/jdbc/jpa-dsd/ejb/SfulDelegate.java
+++ b/appserver/tests/appserv-tests/devtests/jdbc/jpa-dsd/ejb/SfulDelegate.java
@@ -18,7 +18,7 @@
import jakarta.ejb.Local;
-import javax.persistence.EntityManager;
+import jakarta.persistence.EntityManager;
@Local
public interface SfulDelegate {
diff --git a/appserver/tests/appserv-tests/devtests/jdbc/jpa-dsd/ejb/SfulDelegateBean.java b/appserver/tests/appserv-tests/devtests/jdbc/jpa-dsd/ejb/SfulDelegateBean.java
index 714510f..8a96e20 100644
--- a/appserver/tests/appserv-tests/devtests/jdbc/jpa-dsd/ejb/SfulDelegateBean.java
+++ b/appserver/tests/appserv-tests/devtests/jdbc/jpa-dsd/ejb/SfulDelegateBean.java
@@ -17,11 +17,11 @@
package com.sun.s1asdev.ejb.ejb30.persistence.tx_propagation;
import jakarta.ejb.Stateful;
-import javax.persistence.PersistenceContextType;
-import javax.persistence.PersistenceContext;
-import javax.persistence.EntityNotFoundException;
+import jakarta.persistence.PersistenceContextType;
+import jakarta.persistence.PersistenceContext;
+import jakarta.persistence.EntityNotFoundException;
-import javax.persistence.EntityManager;
+import jakarta.persistence.EntityManager;
import jakarta.ejb.TransactionAttribute;
import jakarta.ejb.TransactionAttributeType;
diff --git a/appserver/tests/appserv-tests/devtests/persistence/tests/packaging/pkgEarLibTest/ejb/TestBean.java b/appserver/tests/appserv-tests/devtests/persistence/tests/packaging/pkgEarLibTest/ejb/TestBean.java
index a23e512..0f2e355 100755
--- a/appserver/tests/appserv-tests/devtests/persistence/tests/packaging/pkgEarLibTest/ejb/TestBean.java
+++ b/appserver/tests/appserv-tests/devtests/persistence/tests/packaging/pkgEarLibTest/ejb/TestBean.java
@@ -18,9 +18,9 @@
import jakarta.ejb.Remote;
import jakarta.ejb.Stateless;
-import javax.persistence.EntityManager;
-import javax.persistence.PersistenceContext;
-import javax.persistence.Query;
+import jakarta.persistence.EntityManager;
+import jakarta.persistence.PersistenceContext;
+import jakarta.persistence.Query;
import java.util.Collection;
import java.util.List;
diff --git a/appserver/tests/appserv-tests/devtests/persistence/tests/packaging/pkgEarLibTest/entity/Customer.java b/appserver/tests/appserv-tests/devtests/persistence/tests/packaging/pkgEarLibTest/entity/Customer.java
index 4f3edbf..bb10994 100755
--- a/appserver/tests/appserv-tests/devtests/persistence/tests/packaging/pkgEarLibTest/entity/Customer.java
+++ b/appserver/tests/appserv-tests/devtests/persistence/tests/packaging/pkgEarLibTest/entity/Customer.java
@@ -17,8 +17,8 @@
package entity;
import java.io.Serializable;
-import javax.persistence.*;
-import static javax.persistence.CascadeType.*;
+import jakarta.persistence.*;
+import static jakarta.persistence.CascadeType.*;
import java.util.Collection;
import java.util.ArrayList;
diff --git a/appserver/tests/appserv-tests/devtests/persistence/tests/packaging/pkgEarLibTest/entity/Order.java b/appserver/tests/appserv-tests/devtests/persistence/tests/packaging/pkgEarLibTest/entity/Order.java
index c589e2e..c751b96 100755
--- a/appserver/tests/appserv-tests/devtests/persistence/tests/packaging/pkgEarLibTest/entity/Order.java
+++ b/appserver/tests/appserv-tests/devtests/persistence/tests/packaging/pkgEarLibTest/entity/Order.java
@@ -16,7 +16,7 @@
package entity;
-import javax.persistence.*;
+import jakarta.persistence.*;
/**
* @author Marina Vatkina
diff --git a/appserver/tests/appserv-tests/devtests/persistence/tests/packaging/pkgEjbTest/ejb/TestBean.java b/appserver/tests/appserv-tests/devtests/persistence/tests/packaging/pkgEjbTest/ejb/TestBean.java
index a23e512..0f2e355 100755
--- a/appserver/tests/appserv-tests/devtests/persistence/tests/packaging/pkgEjbTest/ejb/TestBean.java
+++ b/appserver/tests/appserv-tests/devtests/persistence/tests/packaging/pkgEjbTest/ejb/TestBean.java
@@ -18,9 +18,9 @@
import jakarta.ejb.Remote;
import jakarta.ejb.Stateless;
-import javax.persistence.EntityManager;
-import javax.persistence.PersistenceContext;
-import javax.persistence.Query;
+import jakarta.persistence.EntityManager;
+import jakarta.persistence.PersistenceContext;
+import jakarta.persistence.Query;
import java.util.Collection;
import java.util.List;
diff --git a/appserver/tests/appserv-tests/devtests/persistence/tests/packaging/pkgEjbTest/entity/Customer.java b/appserver/tests/appserv-tests/devtests/persistence/tests/packaging/pkgEjbTest/entity/Customer.java
index 4f3edbf..bb10994 100755
--- a/appserver/tests/appserv-tests/devtests/persistence/tests/packaging/pkgEjbTest/entity/Customer.java
+++ b/appserver/tests/appserv-tests/devtests/persistence/tests/packaging/pkgEjbTest/entity/Customer.java
@@ -17,8 +17,8 @@
package entity;
import java.io.Serializable;
-import javax.persistence.*;
-import static javax.persistence.CascadeType.*;
+import jakarta.persistence.*;
+import static jakarta.persistence.CascadeType.*;
import java.util.Collection;
import java.util.ArrayList;
diff --git a/appserver/tests/appserv-tests/devtests/persistence/tests/packaging/pkgEjbTest/entity/Order.java b/appserver/tests/appserv-tests/devtests/persistence/tests/packaging/pkgEjbTest/entity/Order.java
index c589e2e..c751b96 100755
--- a/appserver/tests/appserv-tests/devtests/persistence/tests/packaging/pkgEjbTest/entity/Order.java
+++ b/appserver/tests/appserv-tests/devtests/persistence/tests/packaging/pkgEjbTest/entity/Order.java
@@ -16,7 +16,7 @@
package entity;
-import javax.persistence.*;
+import jakarta.persistence.*;
/**
* @author Marina Vatkina
diff --git a/appserver/tests/appserv-tests/devtests/persistence/tests/packaging/pkgWarTest/src/entity/Customer.java b/appserver/tests/appserv-tests/devtests/persistence/tests/packaging/pkgWarTest/src/entity/Customer.java
index 4f3edbf..bb10994 100755
--- a/appserver/tests/appserv-tests/devtests/persistence/tests/packaging/pkgWarTest/src/entity/Customer.java
+++ b/appserver/tests/appserv-tests/devtests/persistence/tests/packaging/pkgWarTest/src/entity/Customer.java
@@ -17,8 +17,8 @@
package entity;
import java.io.Serializable;
-import javax.persistence.*;
-import static javax.persistence.CascadeType.*;
+import jakarta.persistence.*;
+import static jakarta.persistence.CascadeType.*;
import java.util.Collection;
import java.util.ArrayList;
diff --git a/appserver/tests/appserv-tests/devtests/persistence/tests/packaging/pkgWarTest/src/entity/Order.java b/appserver/tests/appserv-tests/devtests/persistence/tests/packaging/pkgWarTest/src/entity/Order.java
index e9dd22b..39461c6 100755
--- a/appserver/tests/appserv-tests/devtests/persistence/tests/packaging/pkgWarTest/src/entity/Order.java
+++ b/appserver/tests/appserv-tests/devtests/persistence/tests/packaging/pkgWarTest/src/entity/Order.java
@@ -16,7 +16,7 @@
package entity;
-import javax.persistence.*;
+import jakarta.persistence.*;
@Entity
@Table(name="PKG_ORDER")
diff --git a/appserver/tests/appserv-tests/devtests/persistence/tests/packaging/pkgWarTest/src/web/JpaServlet.java b/appserver/tests/appserv-tests/devtests/persistence/tests/packaging/pkgWarTest/src/web/JpaServlet.java
index 0319507..39a19dc 100755
--- a/appserver/tests/appserv-tests/devtests/persistence/tests/packaging/pkgWarTest/src/web/JpaServlet.java
+++ b/appserver/tests/appserv-tests/devtests/persistence/tests/packaging/pkgWarTest/src/web/JpaServlet.java
@@ -25,7 +25,7 @@
import java.util.*;
import java.io.*;
-import javax.persistence.*;
+import jakarta.persistence.*;
import javax.transaction.*;
import jakarta.annotation.*;
diff --git a/appserver/tests/appserv-tests/devtests/persistence/tests/packaging/pkgWarTest1/src/entity/Customer.java b/appserver/tests/appserv-tests/devtests/persistence/tests/packaging/pkgWarTest1/src/entity/Customer.java
index 4f3edbf..bb10994 100755
--- a/appserver/tests/appserv-tests/devtests/persistence/tests/packaging/pkgWarTest1/src/entity/Customer.java
+++ b/appserver/tests/appserv-tests/devtests/persistence/tests/packaging/pkgWarTest1/src/entity/Customer.java
@@ -17,8 +17,8 @@
package entity;
import java.io.Serializable;
-import javax.persistence.*;
-import static javax.persistence.CascadeType.*;
+import jakarta.persistence.*;
+import static jakarta.persistence.CascadeType.*;
import java.util.Collection;
import java.util.ArrayList;
diff --git a/appserver/tests/appserv-tests/devtests/persistence/tests/packaging/pkgWarTest1/src/entity/Order.java b/appserver/tests/appserv-tests/devtests/persistence/tests/packaging/pkgWarTest1/src/entity/Order.java
index e9dd22b..39461c6 100755
--- a/appserver/tests/appserv-tests/devtests/persistence/tests/packaging/pkgWarTest1/src/entity/Order.java
+++ b/appserver/tests/appserv-tests/devtests/persistence/tests/packaging/pkgWarTest1/src/entity/Order.java
@@ -16,7 +16,7 @@
package entity;
-import javax.persistence.*;
+import jakarta.persistence.*;
@Entity
@Table(name="PKG_ORDER")
diff --git a/appserver/tests/appserv-tests/devtests/persistence/tests/packaging/pkgWarTest1/src/web/JpaServlet.java b/appserver/tests/appserv-tests/devtests/persistence/tests/packaging/pkgWarTest1/src/web/JpaServlet.java
index 2cbfe22..05f3af9 100755
--- a/appserver/tests/appserv-tests/devtests/persistence/tests/packaging/pkgWarTest1/src/web/JpaServlet.java
+++ b/appserver/tests/appserv-tests/devtests/persistence/tests/packaging/pkgWarTest1/src/web/JpaServlet.java
@@ -25,7 +25,7 @@
import java.util.*;
import java.io.*;
-import javax.persistence.*;
+import jakarta.persistence.*;
import javax.transaction.*;
import jakarta.annotation.*;
diff --git a/appserver/tests/appserv-tests/devtests/persistence/util/ServletUtil.java b/appserver/tests/appserv-tests/devtests/persistence/util/ServletUtil.java
index 77ccec9..2dbd103 100755
--- a/appserver/tests/appserv-tests/devtests/persistence/util/ServletUtil.java
+++ b/appserver/tests/appserv-tests/devtests/persistence/util/ServletUtil.java
@@ -21,7 +21,7 @@
import java.util.*;
import java.io.*;
-import javax.persistence.*;
+import jakarta.persistence.*;
import javax.transaction.*;
import jakarta.annotation.*;
diff --git a/appserver/tests/appserv-tests/devtests/security/ejb-auth-async/scheduler-service/src/main/java/org/glassfish/test/auth-propagation/AuthGroup.java b/appserver/tests/appserv-tests/devtests/security/ejb-auth-async/scheduler-service/src/main/java/org/glassfish/test/auth-propagation/AuthGroup.java
index fec004c..34d3a3f 100644
--- a/appserver/tests/appserv-tests/devtests/security/ejb-auth-async/scheduler-service/src/main/java/org/glassfish/test/auth-propagation/AuthGroup.java
+++ b/appserver/tests/appserv-tests/devtests/security/ejb-auth-async/scheduler-service/src/main/java/org/glassfish/test/auth-propagation/AuthGroup.java
@@ -16,7 +16,7 @@
package org.glassfish.test.authpropagation;
-import javax.persistence.*;
+import jakarta.persistence.*;
import java.io.Serializable;
import java.util.List;
diff --git a/appserver/tests/appserv-tests/devtests/security/ejb-auth-async/scheduler-service/src/main/java/org/glassfish/test/auth-propagation/DataSourceInitializer.java b/appserver/tests/appserv-tests/devtests/security/ejb-auth-async/scheduler-service/src/main/java/org/glassfish/test/auth-propagation/DataSourceInitializer.java
index 25b9968..43cc53b 100644
--- a/appserver/tests/appserv-tests/devtests/security/ejb-auth-async/scheduler-service/src/main/java/org/glassfish/test/auth-propagation/DataSourceInitializer.java
+++ b/appserver/tests/appserv-tests/devtests/security/ejb-auth-async/scheduler-service/src/main/java/org/glassfish/test/auth-propagation/DataSourceInitializer.java
@@ -20,8 +20,8 @@
import jakarta.annotation.sql.DataSourceDefinition;
import jakarta.ejb.Singleton;
import jakarta.ejb.Startup;
-import javax.persistence.EntityManager;
-import javax.persistence.PersistenceContext;
+import jakarta.persistence.EntityManager;
+import jakarta.persistence.PersistenceContext;
import javax.sql.DataSource;
import java.nio.charset.StandardCharsets;
import java.security.MessageDigest;
diff --git a/appserver/tests/appserv-tests/devtests/security/ejb-auth-async/scheduler-service/src/main/java/org/glassfish/test/auth-propagation/MyUser.java b/appserver/tests/appserv-tests/devtests/security/ejb-auth-async/scheduler-service/src/main/java/org/glassfish/test/auth-propagation/MyUser.java
index 8242a9b..18ccf2c 100644
--- a/appserver/tests/appserv-tests/devtests/security/ejb-auth-async/scheduler-service/src/main/java/org/glassfish/test/auth-propagation/MyUser.java
+++ b/appserver/tests/appserv-tests/devtests/security/ejb-auth-async/scheduler-service/src/main/java/org/glassfish/test/auth-propagation/MyUser.java
@@ -16,7 +16,7 @@
package org.glassfish.test.authpropagation;
-import javax.persistence.*;
+import jakarta.persistence.*;
import java.io.Serializable;
import java.util.List;
diff --git a/appserver/tests/appserv-tests/devtests/security/ejb-auth-async/scheduler-service/src/main/resources/META-INF/persistence.xml b/appserver/tests/appserv-tests/devtests/security/ejb-auth-async/scheduler-service/src/main/resources/META-INF/persistence.xml
index ed00e80..13f1938 100644
--- a/appserver/tests/appserv-tests/devtests/security/ejb-auth-async/scheduler-service/src/main/resources/META-INF/persistence.xml
+++ b/appserver/tests/appserv-tests/devtests/security/ejb-auth-async/scheduler-service/src/main/resources/META-INF/persistence.xml
@@ -26,7 +26,7 @@
<jta-data-source>java:app/primaryDS</jta-data-source>
<exclude-unlisted-classes>false</exclude-unlisted-classes>
<properties>
- <property name="javax.persistence.schema-generation.database.action" value="create"/>
+ <property name="jakarta.persistence.schema-generation.database.action" value="create"/>
</properties>
</persistence-unit>
diff --git a/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/bigint/endpoint/Customer.java b/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/bigint/endpoint/Customer.java
index 451194d..13b8127 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/bigint/endpoint/Customer.java
+++ b/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/bigint/endpoint/Customer.java
@@ -17,7 +17,7 @@
package endpoint;
import java.math.BigInteger;
-import javax.persistence.*;
+import jakarta.persistence.*;
@Entity public class Customer implements java.io.Serializable {
BigInteger bigInteger;
diff --git a/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/bigint/endpoint/CustomerManager.java b/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/bigint/endpoint/CustomerManager.java
index 5a057d2..27427f1 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/bigint/endpoint/CustomerManager.java
+++ b/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/bigint/endpoint/CustomerManager.java
@@ -20,7 +20,7 @@
import java.util.*;
import jakarta.jws.*;
import jakarta.ejb.*;
-import javax.persistence.*;
+import jakarta.persistence.*;
@Stateless
@WebService
diff --git a/appserver/tests/community/persistence/servlet-jpa-app/src/java/persistence/WebCustomer.java b/appserver/tests/community/persistence/servlet-jpa-app/src/java/persistence/WebCustomer.java
index 9851737..1d7081f 100644
--- a/appserver/tests/community/persistence/servlet-jpa-app/src/java/persistence/WebCustomer.java
+++ b/appserver/tests/community/persistence/servlet-jpa-app/src/java/persistence/WebCustomer.java
@@ -26,12 +26,12 @@
package persistence;
import java.io.Serializable;
-import javax.persistence.Column;
-import javax.persistence.Entity;
-import javax.persistence.Id;
-import javax.persistence.NamedQueries;
-import javax.persistence.NamedQuery;
-import javax.persistence.Table;
+import jakarta.persistence.Column;
+import jakarta.persistence.Entity;
+import jakarta.persistence.Id;
+import jakarta.persistence.NamedQueries;
+import jakarta.persistence.NamedQuery;
+import jakarta.persistence.Table;
/**
diff --git a/appserver/tests/community/persistence/servlet-jpa-app/src/java/web/CustomerDetails.java b/appserver/tests/community/persistence/servlet-jpa-app/src/java/web/CustomerDetails.java
index 4005583..9b0212c 100644
--- a/appserver/tests/community/persistence/servlet-jpa-app/src/java/web/CustomerDetails.java
+++ b/appserver/tests/community/persistence/servlet-jpa-app/src/java/web/CustomerDetails.java
@@ -29,8 +29,8 @@
import jakarta.annotation.Resource;
import javax.naming.Context;
import javax.naming.InitialContext;
-import javax.persistence.EntityManager;
-import javax.persistence.PersistenceContext;
+import jakarta.persistence.EntityManager;
+import jakarta.persistence.PersistenceContext;
import javax.servlet.*;
import javax.servlet.http.*;
diff --git a/appserver/tests/embedded/cdi_ejb_jpa/src/main/java/org/glassfish/tests/embedded/cdi_ejb_jpa/Person.java b/appserver/tests/embedded/cdi_ejb_jpa/src/main/java/org/glassfish/tests/embedded/cdi_ejb_jpa/Person.java
index b2187ed..49cf0e0 100644
--- a/appserver/tests/embedded/cdi_ejb_jpa/src/main/java/org/glassfish/tests/embedded/cdi_ejb_jpa/Person.java
+++ b/appserver/tests/embedded/cdi_ejb_jpa/src/main/java/org/glassfish/tests/embedded/cdi_ejb_jpa/Person.java
@@ -17,11 +17,11 @@
package org.glassfish.tests.embedded.cdi_ejb_jpa;
import java.io.Serializable;
-import javax.persistence.Basic;
-import javax.persistence.Entity;
-import javax.persistence.GeneratedValue;
-import javax.persistence.GenerationType;
-import javax.persistence.Id;
+import jakarta.persistence.Basic;
+import jakarta.persistence.Entity;
+import jakarta.persistence.GeneratedValue;
+import jakarta.persistence.GenerationType;
+import jakarta.persistence.Id;
@Entity
public class Person implements Serializable {
diff --git a/appserver/tests/embedded/cdi_ejb_jpa/src/main/java/org/glassfish/tests/embedded/cdi_ejb_jpa/TestBean.java b/appserver/tests/embedded/cdi_ejb_jpa/src/main/java/org/glassfish/tests/embedded/cdi_ejb_jpa/TestBean.java
index 83b3484..4423e18 100644
--- a/appserver/tests/embedded/cdi_ejb_jpa/src/main/java/org/glassfish/tests/embedded/cdi_ejb_jpa/TestBean.java
+++ b/appserver/tests/embedded/cdi_ejb_jpa/src/main/java/org/glassfish/tests/embedded/cdi_ejb_jpa/TestBean.java
@@ -18,8 +18,8 @@
//Simple TestBean to test CDI.
import jakarta.ejb.Stateless;
-import javax.persistence.EntityManager;
-import javax.persistence.PersistenceContext;
+import jakarta.persistence.EntityManager;
+import jakarta.persistence.PersistenceContext;
//This bean implements Serializable as it needs to be placed into a Stateful Bean
@Stateless
diff --git a/appserver/tests/embedded/glassfish_resources_xml/src/main/java/org/glassfish/tests/embedded/cdi_ejb_jpa/Person.java b/appserver/tests/embedded/glassfish_resources_xml/src/main/java/org/glassfish/tests/embedded/cdi_ejb_jpa/Person.java
index b2187ed..49cf0e0 100644
--- a/appserver/tests/embedded/glassfish_resources_xml/src/main/java/org/glassfish/tests/embedded/cdi_ejb_jpa/Person.java
+++ b/appserver/tests/embedded/glassfish_resources_xml/src/main/java/org/glassfish/tests/embedded/cdi_ejb_jpa/Person.java
@@ -17,11 +17,11 @@
package org.glassfish.tests.embedded.cdi_ejb_jpa;
import java.io.Serializable;
-import javax.persistence.Basic;
-import javax.persistence.Entity;
-import javax.persistence.GeneratedValue;
-import javax.persistence.GenerationType;
-import javax.persistence.Id;
+import jakarta.persistence.Basic;
+import jakarta.persistence.Entity;
+import jakarta.persistence.GeneratedValue;
+import jakarta.persistence.GenerationType;
+import jakarta.persistence.Id;
@Entity
public class Person implements Serializable {
diff --git a/appserver/tests/embedded/glassfish_resources_xml/src/main/java/org/glassfish/tests/embedded/cdi_ejb_jpa/TestBean.java b/appserver/tests/embedded/glassfish_resources_xml/src/main/java/org/glassfish/tests/embedded/cdi_ejb_jpa/TestBean.java
index 83b3484..4423e18 100644
--- a/appserver/tests/embedded/glassfish_resources_xml/src/main/java/org/glassfish/tests/embedded/cdi_ejb_jpa/TestBean.java
+++ b/appserver/tests/embedded/glassfish_resources_xml/src/main/java/org/glassfish/tests/embedded/cdi_ejb_jpa/TestBean.java
@@ -18,8 +18,8 @@
//Simple TestBean to test CDI.
import jakarta.ejb.Stateless;
-import javax.persistence.EntityManager;
-import javax.persistence.PersistenceContext;
+import jakarta.persistence.EntityManager;
+import jakarta.persistence.PersistenceContext;
//This bean implements Serializable as it needs to be placed into a Stateful Bean
@Stateless
diff --git a/appserver/tests/embedded/mysql/src/main/java/org/glassfish/tests/embedded/web/MySqlTestServlet.java b/appserver/tests/embedded/mysql/src/main/java/org/glassfish/tests/embedded/web/MySqlTestServlet.java
index 31d9aa6..4898aca 100644
--- a/appserver/tests/embedded/mysql/src/main/java/org/glassfish/tests/embedded/web/MySqlTestServlet.java
+++ b/appserver/tests/embedded/mysql/src/main/java/org/glassfish/tests/embedded/web/MySqlTestServlet.java
@@ -19,8 +19,8 @@
import jakarta.annotation.Resource;
import jakarta.annotation.sql.DataSourceDefinition;
import jakarta.annotation.sql.DataSourceDefinitions;
-import javax.persistence.EntityManager;
-import javax.persistence.PersistenceContext;
+import jakarta.persistence.EntityManager;
+import jakarta.persistence.PersistenceContext;
import javax.servlet.ServletException;
import javax.servlet.annotation.WebServlet;
import javax.servlet.http.HttpServlet;
diff --git a/appserver/tests/embedded/mysql/src/main/java/org/glassfish/tests/embedded/web/Person.java b/appserver/tests/embedded/mysql/src/main/java/org/glassfish/tests/embedded/web/Person.java
index c1e1cdd..bc470bc 100644
--- a/appserver/tests/embedded/mysql/src/main/java/org/glassfish/tests/embedded/web/Person.java
+++ b/appserver/tests/embedded/mysql/src/main/java/org/glassfish/tests/embedded/web/Person.java
@@ -16,10 +16,10 @@
package org.glassfish.tests.embedded.web;
-import javax.persistence.Column;
-import javax.persistence.Entity;
-import javax.persistence.Id;
-import javax.persistence.Table;
+import jakarta.persistence.Column;
+import jakarta.persistence.Entity;
+import jakarta.persistence.Id;
+import jakarta.persistence.Table;
/**
* @author bhavanishankar@java.net
diff --git a/appserver/tests/paas/basic-jpa/pom.xml b/appserver/tests/paas/basic-jpa/pom.xml
index b52a798..c674274 100644
--- a/appserver/tests/paas/basic-jpa/pom.xml
+++ b/appserver/tests/paas/basic-jpa/pom.xml
@@ -71,11 +71,11 @@
<scope>test</scope>
</dependency>
<dependency>
- <groupId>javax.persistence</groupId>
- <artifactId>persistence-api</artifactId>
- <version>1.0</version>
+ <groupId>jakarta.persistence</groupId>
+ <artifactId>jakarta.persistence-api</artifactId>
+ <version>3.0.0-RC2</version>
</dependency>
- <dependency>
+ <dependency>
<groupId>org.glassfish.extras</groupId>
<artifactId>glassfish-embedded-static-shell</artifactId>
<version>${project.version}</version>
diff --git a/appserver/tests/paas/basic-jpa/src/main/java/org/glassfish/tests/paas/basicjpa/Animal.java b/appserver/tests/paas/basic-jpa/src/main/java/org/glassfish/tests/paas/basicjpa/Animal.java
index 02c25ec..81430f5 100644
--- a/appserver/tests/paas/basic-jpa/src/main/java/org/glassfish/tests/paas/basicjpa/Animal.java
+++ b/appserver/tests/paas/basic-jpa/src/main/java/org/glassfish/tests/paas/basicjpa/Animal.java
@@ -17,12 +17,12 @@
package org.glassfish.tests.paas.basicjpa;
import java.io.Serializable;
-import javax.persistence.Entity;
-import javax.persistence.GeneratedValue;
-import javax.persistence.GenerationType;
-import javax.persistence.Id;
-import javax.persistence.IdClass;
-import javax.persistence.Table;
+import jakarta.persistence.Entity;
+import jakarta.persistence.GeneratedValue;
+import jakarta.persistence.GenerationType;
+import jakarta.persistence.Id;
+import jakarta.persistence.IdClass;
+import jakarta.persistence.Table;
diff --git a/appserver/tests/paas/basic-jpa/src/main/java/org/glassfish/tests/paas/basicjpa/BasicJPAPaaSServlet.java b/appserver/tests/paas/basic-jpa/src/main/java/org/glassfish/tests/paas/basicjpa/BasicJPAPaaSServlet.java
index 4050a26..52a77b9 100644
--- a/appserver/tests/paas/basic-jpa/src/main/java/org/glassfish/tests/paas/basicjpa/BasicJPAPaaSServlet.java
+++ b/appserver/tests/paas/basic-jpa/src/main/java/org/glassfish/tests/paas/basicjpa/BasicJPAPaaSServlet.java
@@ -18,8 +18,8 @@
import java.io.IOException;
import java.io.PrintWriter;
-import javax.persistence.EntityManagerFactory;
-import javax.persistence.PersistenceUnit;
+import jakarta.persistence.EntityManagerFactory;
+import jakarta.persistence.PersistenceUnit;
import javax.servlet.ServletException;
import javax.servlet.http.HttpServlet;
import javax.servlet.http.HttpServletRequest;
@@ -29,23 +29,23 @@
import java.util.Date;
import java.util.Iterator;
//import javax.management.*;
-import static javax.persistence.CascadeType.ALL;
-import javax.persistence.Entity;
-import javax.persistence.EntityManager;
-import javax.persistence.Id;
-import javax.persistence.NamedQuery;
-import javax.persistence.OneToMany;
-import javax.persistence.Table;
-import javax.persistence.Temporal;
-import static javax.persistence.TemporalType.TIMESTAMP;
-import javax.persistence.Transient;
-import javax.persistence.EntityManager;
+import static jakarta.persistence.CascadeType.ALL;
+import jakarta.persistence.Entity;
+import jakarta.persistence.EntityManager;
+import jakarta.persistence.Id;
+import jakarta.persistence.NamedQuery;
+import jakarta.persistence.OneToMany;
+import jakarta.persistence.Table;
+import jakarta.persistence.Temporal;
+import static jakarta.persistence.TemporalType.TIMESTAMP;
+import jakarta.persistence.Transient;
+import jakarta.persistence.EntityManager;
-import javax.persistence.EntityManagerFactory;
+import jakarta.persistence.EntityManagerFactory;
-import javax.persistence.EntityTransaction;
+import jakarta.persistence.EntityTransaction;
-import javax.persistence.Persistence;
+import jakarta.persistence.Persistence;
@@ -54,7 +54,7 @@
import java.util.List;
import jakarta.annotation.Resource;
-import javax.persistence.Query;
+import jakarta.persistence.Query;
import javax.transaction.UserTransaction;
/**
diff --git a/appserver/tests/paas/basic-shared-service-test/pom.xml b/appserver/tests/paas/basic-shared-service-test/pom.xml
index 8bc0167..3b67a23 100644
--- a/appserver/tests/paas/basic-shared-service-test/pom.xml
+++ b/appserver/tests/paas/basic-shared-service-test/pom.xml
@@ -71,11 +71,11 @@
<scope>test</scope>
</dependency>
<dependency>
- <groupId>javax.persistence</groupId>
- <artifactId>persistence-api</artifactId>
- <version>1.0</version>
+ <groupId>jakarta.persistence</groupId>
+ <artifactId>jakarta.persistence-api</artifactId>
+ <version>3.0.0-RC2</version>
</dependency>
- <dependency>
+ <dependency>
<groupId>org.glassfish.extras</groupId>
<artifactId>glassfish-embedded-static-shell</artifactId>
<version>${project.version}</version>
diff --git a/appserver/tests/paas/basic-shared-service-test/src/main/java/org/glassfish/tests/paas/basicjpa/Animal.java b/appserver/tests/paas/basic-shared-service-test/src/main/java/org/glassfish/tests/paas/basicjpa/Animal.java
index ce2ee45..1a06f4f 100644
--- a/appserver/tests/paas/basic-shared-service-test/src/main/java/org/glassfish/tests/paas/basicjpa/Animal.java
+++ b/appserver/tests/paas/basic-shared-service-test/src/main/java/org/glassfish/tests/paas/basicjpa/Animal.java
@@ -16,9 +16,9 @@
package org.glassfish.tests.paas.basicjpa;
-import javax.persistence.Entity;
-import javax.persistence.Id;
-import javax.persistence.Table;
+import jakarta.persistence.Entity;
+import jakarta.persistence.Id;
+import jakarta.persistence.Table;
import java.io.Serializable;
diff --git a/appserver/tests/paas/basic-shared-service-test/src/main/java/org/glassfish/tests/paas/basicjpa/BasicJPAPaaSServlet.java b/appserver/tests/paas/basic-shared-service-test/src/main/java/org/glassfish/tests/paas/basicjpa/BasicJPAPaaSServlet.java
index b16a12f..4658539 100644
--- a/appserver/tests/paas/basic-shared-service-test/src/main/java/org/glassfish/tests/paas/basicjpa/BasicJPAPaaSServlet.java
+++ b/appserver/tests/paas/basic-shared-service-test/src/main/java/org/glassfish/tests/paas/basicjpa/BasicJPAPaaSServlet.java
@@ -17,10 +17,10 @@
package org.glassfish.tests.paas.basicjpa;
import jakarta.annotation.Resource;
-import javax.persistence.EntityManager;
-import javax.persistence.EntityManagerFactory;
-import javax.persistence.PersistenceUnit;
-import javax.persistence.Query;
+import jakarta.persistence.EntityManager;
+import jakarta.persistence.EntityManagerFactory;
+import jakarta.persistence.PersistenceUnit;
+import jakarta.persistence.Query;
import javax.servlet.ServletException;
import javax.servlet.http.HttpServlet;
import javax.servlet.http.HttpServletRequest;
diff --git a/appserver/tests/paas/ext-shared-service-enable-disable-test/pom.xml b/appserver/tests/paas/ext-shared-service-enable-disable-test/pom.xml
index ec29e92..e1b30da 100644
--- a/appserver/tests/paas/ext-shared-service-enable-disable-test/pom.xml
+++ b/appserver/tests/paas/ext-shared-service-enable-disable-test/pom.xml
@@ -71,11 +71,11 @@
<scope>test</scope>
</dependency>
<dependency>
- <groupId>javax.persistence</groupId>
- <artifactId>persistence-api</artifactId>
- <version>1.0</version>
+ <groupId>jakarta.persistence</groupId>
+ <artifactId>jakarta.persistence-api</artifactId>
+ <version>3.0.0-RC2</version>
</dependency>
- <dependency>
+ <dependency>
<groupId>org.glassfish.extras</groupId>
<artifactId>glassfish-embedded-static-shell</artifactId>
<version>${project.version}</version>
diff --git a/appserver/tests/paas/ext-shared-service-enable-disable-test/src/main/java/org/glassfish/tests/paas/enabledisable/Animal.java b/appserver/tests/paas/ext-shared-service-enable-disable-test/src/main/java/org/glassfish/tests/paas/enabledisable/Animal.java
index 5a32b54..bc6233b 100644
--- a/appserver/tests/paas/ext-shared-service-enable-disable-test/src/main/java/org/glassfish/tests/paas/enabledisable/Animal.java
+++ b/appserver/tests/paas/ext-shared-service-enable-disable-test/src/main/java/org/glassfish/tests/paas/enabledisable/Animal.java
@@ -16,9 +16,9 @@
package org.glassfish.tests.paas.enabledisable;
-import javax.persistence.Entity;
-import javax.persistence.Id;
-import javax.persistence.Table;
+import jakarta.persistence.Entity;
+import jakarta.persistence.Id;
+import jakarta.persistence.Table;
import java.io.Serializable;
diff --git a/appserver/tests/paas/ext-shared-service-enable-disable-test/src/main/java/org/glassfish/tests/paas/enabledisable/ExtSharedServiceEnableDisableServlet.java b/appserver/tests/paas/ext-shared-service-enable-disable-test/src/main/java/org/glassfish/tests/paas/enabledisable/ExtSharedServiceEnableDisableServlet.java
index a6873ed..01deed4 100644
--- a/appserver/tests/paas/ext-shared-service-enable-disable-test/src/main/java/org/glassfish/tests/paas/enabledisable/ExtSharedServiceEnableDisableServlet.java
+++ b/appserver/tests/paas/ext-shared-service-enable-disable-test/src/main/java/org/glassfish/tests/paas/enabledisable/ExtSharedServiceEnableDisableServlet.java
@@ -17,10 +17,10 @@
package org.glassfish.tests.paas.enabledisable;
import jakarta.annotation.Resource;
-import javax.persistence.EntityManager;
-import javax.persistence.EntityManagerFactory;
-import javax.persistence.PersistenceUnit;
-import javax.persistence.Query;
+import jakarta.persistence.EntityManager;
+import jakarta.persistence.EntityManagerFactory;
+import jakarta.persistence.PersistenceUnit;
+import jakarta.persistence.Query;
import javax.servlet.ServletException;
import javax.servlet.http.HttpServlet;
import javax.servlet.http.HttpServletRequest;
diff --git a/appserver/tests/paas/external-and-shared-service/pom.xml b/appserver/tests/paas/external-and-shared-service/pom.xml
index 668d2ff..200bd29 100644
--- a/appserver/tests/paas/external-and-shared-service/pom.xml
+++ b/appserver/tests/paas/external-and-shared-service/pom.xml
@@ -71,11 +71,11 @@
<scope>test</scope>
</dependency>
<dependency>
- <groupId>javax.persistence</groupId>
- <artifactId>persistence-api</artifactId>
- <version>1.0</version>
+ <groupId>jakarta.persistence</groupId>
+ <artifactId>jakarta.persistence-api</artifactId>
+ <version>3.0.0-RC2</version>
</dependency>
- <dependency>
+ <dependency>
<groupId>org.glassfish.extras</groupId>
<artifactId>glassfish-embedded-static-shell</artifactId>
<version>${project.version}</version>
diff --git a/appserver/tests/paas/external-and-shared-service/src/main/java/org/glassfish/tests/paas/external_and_shared_service/Animal.java b/appserver/tests/paas/external-and-shared-service/src/main/java/org/glassfish/tests/paas/external_and_shared_service/Animal.java
index 08c9fbf..6f3bc2c 100644
--- a/appserver/tests/paas/external-and-shared-service/src/main/java/org/glassfish/tests/paas/external_and_shared_service/Animal.java
+++ b/appserver/tests/paas/external-and-shared-service/src/main/java/org/glassfish/tests/paas/external_and_shared_service/Animal.java
@@ -16,9 +16,9 @@
package org.glassfish.tests.paas.external_and_shared_service;
-import javax.persistence.Entity;
-import javax.persistence.Id;
-import javax.persistence.Table;
+import jakarta.persistence.Entity;
+import jakarta.persistence.Id;
+import jakarta.persistence.Table;
import java.io.Serializable;
diff --git a/appserver/tests/paas/external-and-shared-service/src/main/java/org/glassfish/tests/paas/external_and_shared_service/ExternalAndSharedServiceTestServlet.java b/appserver/tests/paas/external-and-shared-service/src/main/java/org/glassfish/tests/paas/external_and_shared_service/ExternalAndSharedServiceTestServlet.java
index 0a3b282..dd284d1 100644
--- a/appserver/tests/paas/external-and-shared-service/src/main/java/org/glassfish/tests/paas/external_and_shared_service/ExternalAndSharedServiceTestServlet.java
+++ b/appserver/tests/paas/external-and-shared-service/src/main/java/org/glassfish/tests/paas/external_and_shared_service/ExternalAndSharedServiceTestServlet.java
@@ -17,10 +17,10 @@
package org.glassfish.tests.paas.external_and_shared_service;
import jakarta.annotation.Resource;
-import javax.persistence.EntityManager;
-import javax.persistence.EntityManagerFactory;
-import javax.persistence.PersistenceUnit;
-import javax.persistence.Query;
+import jakarta.persistence.EntityManager;
+import jakarta.persistence.EntityManagerFactory;
+import jakarta.persistence.PersistenceUnit;
+import jakarta.persistence.Query;
import javax.servlet.ServletException;
import javax.servlet.http.HttpServlet;
import javax.servlet.http.HttpServletRequest;
diff --git a/appserver/tests/paas/lazy-shared-service-test/pom.xml b/appserver/tests/paas/lazy-shared-service-test/pom.xml
index e4dbde6..f0f42c7 100644
--- a/appserver/tests/paas/lazy-shared-service-test/pom.xml
+++ b/appserver/tests/paas/lazy-shared-service-test/pom.xml
@@ -71,11 +71,11 @@
<scope>test</scope>
</dependency>
<dependency>
- <groupId>javax.persistence</groupId>
- <artifactId>persistence-api</artifactId>
- <version>1.0</version>
+ <groupId>jakarta.persistence</groupId>
+ <artifactId>jakarta.persistence-api</artifactId>
+ <version>3.0.0-RC2</version>
</dependency>
- <dependency>
+ <dependency>
<groupId>org.glassfish.extras</groupId>
<artifactId>glassfish-embedded-static-shell</artifactId>
<version>${project.version}</version>
diff --git a/appserver/tests/paas/multiple-spe-test/spetest/pom.xml b/appserver/tests/paas/multiple-spe-test/spetest/pom.xml
index f24252b..beb58ee 100644
--- a/appserver/tests/paas/multiple-spe-test/spetest/pom.xml
+++ b/appserver/tests/paas/multiple-spe-test/spetest/pom.xml
@@ -87,9 +87,9 @@
<scope>test</scope>
</dependency>
<dependency>
- <groupId>javax.persistence</groupId>
- <artifactId>persistence-api</artifactId>
- <version>1.0</version>
+ <groupId>jakarta.persistence</groupId>
+ <artifactId>jakarta.persistence-api</artifactId>
+ <version>3.0.0-RC2</version>
</dependency>
<dependency>
<groupId>org.glassfish.extras</groupId>
diff --git a/appserver/tests/paas/multiple-spe-test/spetest/src/main/java/org/glassfish/tests/paas/spetest/Animal.java b/appserver/tests/paas/multiple-spe-test/spetest/src/main/java/org/glassfish/tests/paas/spetest/Animal.java
index 1589603..866db65 100644
--- a/appserver/tests/paas/multiple-spe-test/spetest/src/main/java/org/glassfish/tests/paas/spetest/Animal.java
+++ b/appserver/tests/paas/multiple-spe-test/spetest/src/main/java/org/glassfish/tests/paas/spetest/Animal.java
@@ -16,9 +16,9 @@
package org.glassfish.tests.paas.spetest;
-import javax.persistence.Entity;
-import javax.persistence.Id;
-import javax.persistence.Table;
+import jakarta.persistence.Entity;
+import jakarta.persistence.Id;
+import jakarta.persistence.Table;
import java.io.Serializable;
diff --git a/appserver/tests/paas/multiple-spe-test/spetest/src/main/java/org/glassfish/tests/paas/spetest/BasicJPAPaaSServlet.java b/appserver/tests/paas/multiple-spe-test/spetest/src/main/java/org/glassfish/tests/paas/spetest/BasicJPAPaaSServlet.java
index 1fed6d5..17954a3 100644
--- a/appserver/tests/paas/multiple-spe-test/spetest/src/main/java/org/glassfish/tests/paas/spetest/BasicJPAPaaSServlet.java
+++ b/appserver/tests/paas/multiple-spe-test/spetest/src/main/java/org/glassfish/tests/paas/spetest/BasicJPAPaaSServlet.java
@@ -17,10 +17,10 @@
package org.glassfish.tests.paas.spetest;
import jakarta.annotation.Resource;
-import javax.persistence.EntityManager;
-import javax.persistence.EntityManagerFactory;
-import javax.persistence.PersistenceUnit;
-import javax.persistence.Query;
+import jakarta.persistence.EntityManager;
+import jakarta.persistence.EntityManagerFactory;
+import jakarta.persistence.PersistenceUnit;
+import jakarta.persistence.Query;
import javax.servlet.ServletException;
import javax.servlet.http.HttpServlet;
import javax.servlet.http.HttpServletRequest;
diff --git a/appserver/tests/quicklook/ejb/slsbnicmt/src/java/AnnotatedEJB.java b/appserver/tests/quicklook/ejb/slsbnicmt/src/java/AnnotatedEJB.java
index c91ddd0..f71b38c 100644
--- a/appserver/tests/quicklook/ejb/slsbnicmt/src/java/AnnotatedEJB.java
+++ b/appserver/tests/quicklook/ejb/slsbnicmt/src/java/AnnotatedEJB.java
@@ -18,7 +18,7 @@
import jakarta.annotation.Resource;
import jakarta.ejb.Stateless;
-import javax.persistence.*;
+import jakarta.persistence.*;
import javax.transaction.*;
@Stateless
diff --git a/appserver/tests/quicklook/ejb/slsbnicmt/src/java/JpaBean.java b/appserver/tests/quicklook/ejb/slsbnicmt/src/java/JpaBean.java
index 4dded84..99c6ba7 100644
--- a/appserver/tests/quicklook/ejb/slsbnicmt/src/java/JpaBean.java
+++ b/appserver/tests/quicklook/ejb/slsbnicmt/src/java/JpaBean.java
@@ -16,12 +16,12 @@
package slsbnicmt;
-import javax.persistence.Entity;
-import javax.persistence.Id;
-import javax.persistence.GeneratedValue;
-import javax.persistence.GenerationType;
-import javax.persistence.Table;
-import javax.persistence.Column;
+import jakarta.persistence.Entity;
+import jakarta.persistence.Id;
+import jakarta.persistence.GeneratedValue;
+import jakarta.persistence.GenerationType;
+import jakarta.persistence.Table;
+import jakarta.persistence.Column;
@Entity
@Table(name="JPABEAN")
diff --git a/appserver/tests/quicklook/persistence/jpainjectemf/src/java/Department.java b/appserver/tests/quicklook/persistence/jpainjectemf/src/java/Department.java
index 552e9a6..42d5ab3 100644
--- a/appserver/tests/quicklook/persistence/jpainjectemf/src/java/Department.java
+++ b/appserver/tests/quicklook/persistence/jpainjectemf/src/java/Department.java
@@ -17,7 +17,7 @@
package myapp;
-import javax.persistence.*;
+import jakarta.persistence.*;
import java.util.*;
diff --git a/appserver/tests/quicklook/persistence/jpainjectemf/src/java/Employee.java b/appserver/tests/quicklook/persistence/jpainjectemf/src/java/Employee.java
index 5c9de4d..9157293 100644
--- a/appserver/tests/quicklook/persistence/jpainjectemf/src/java/Employee.java
+++ b/appserver/tests/quicklook/persistence/jpainjectemf/src/java/Employee.java
@@ -16,7 +16,7 @@
package myapp;
-import javax.persistence.*;
+import jakarta.persistence.*;
@Entity
@Table(name="EMPLOYEE")
diff --git a/appserver/tests/quicklook/persistence/jpainjectemf/src/java/JpaServlet.java b/appserver/tests/quicklook/persistence/jpainjectemf/src/java/JpaServlet.java
index 8a32904..28c6295 100644
--- a/appserver/tests/quicklook/persistence/jpainjectemf/src/java/JpaServlet.java
+++ b/appserver/tests/quicklook/persistence/jpainjectemf/src/java/JpaServlet.java
@@ -16,7 +16,7 @@
package myapp;
-import javax.persistence.*;
+import jakarta.persistence.*;
import javax.transaction.*;
import jakarta.annotation.*;
import javax.servlet.*;
diff --git a/appserver/tests/quicklook/persistence/jpainjectemf/src/java/JpaTest.java b/appserver/tests/quicklook/persistence/jpainjectemf/src/java/JpaTest.java
index 63f47d3..82f3c6b 100644
--- a/appserver/tests/quicklook/persistence/jpainjectemf/src/java/JpaTest.java
+++ b/appserver/tests/quicklook/persistence/jpainjectemf/src/java/JpaTest.java
@@ -16,7 +16,7 @@
package myapp;
-import javax.persistence.*;
+import jakarta.persistence.*;
import javax.transaction.*;
import java.io.*;
diff --git a/appserver/tests/quicklook/persistence/jpavalidation/src/java/Employee.java b/appserver/tests/quicklook/persistence/jpavalidation/src/java/Employee.java
index 4ebe6de..3230dd7 100644
--- a/appserver/tests/quicklook/persistence/jpavalidation/src/java/Employee.java
+++ b/appserver/tests/quicklook/persistence/jpavalidation/src/java/Employee.java
@@ -16,7 +16,7 @@
package myapp;
-import javax.persistence.*;
+import jakarta.persistence.*;
import jakarta.validation.constraints.Size;
import java.util.Collection;
diff --git a/appserver/tests/quicklook/persistence/jpavalidation/src/java/Project.java b/appserver/tests/quicklook/persistence/jpavalidation/src/java/Project.java
index 9cd9542..b21094b 100644
--- a/appserver/tests/quicklook/persistence/jpavalidation/src/java/Project.java
+++ b/appserver/tests/quicklook/persistence/jpavalidation/src/java/Project.java
@@ -16,7 +16,7 @@
package myapp;
-import javax.persistence.*;
+import jakarta.persistence.*;
import java.util.Collection;
diff --git a/appserver/tests/quicklook/persistence/jpavalidation/src/java/TestEJB.java b/appserver/tests/quicklook/persistence/jpavalidation/src/java/TestEJB.java
index 2bfae16..2d8c2f9 100644
--- a/appserver/tests/quicklook/persistence/jpavalidation/src/java/TestEJB.java
+++ b/appserver/tests/quicklook/persistence/jpavalidation/src/java/TestEJB.java
@@ -17,7 +17,7 @@
package myapp;
import jakarta.ejb.Stateless;
-import javax.persistence.*;
+import jakarta.persistence.*;
import java.util.*;
@Stateless
diff --git a/appserver/tests/quicklook/weld/osgiweld/metadata/weld-osgi.properties b/appserver/tests/quicklook/weld/osgiweld/metadata/weld-osgi.properties
index 766e108..8d7a7a3 100644
--- a/appserver/tests/quicklook/weld/osgiweld/metadata/weld-osgi.properties
+++ b/appserver/tests/quicklook/weld/osgiweld/metadata/weld-osgi.properties
@@ -63,4 +63,4 @@
#exports = javax.inject;version="1.0",javax.decorator;uses:="javax.enterprise.inject";version="1.0",javax.enterprise.inject;uses:="javax.inject,javax.enterprise.util,javax.enterprise.context";version="1.0",javax.enterprise.inject.spi;uses:="javax.enterprise.context.spi,javax.el,javax.enterprise.inject,javax.interceptor,javax.enterprise.event";version="1.0",javax.enterprise.context.spi;version="1.0",javax.enterprise.context;uses:="javax.inject";version="1.0",javax.enterprise.util;version="1.0",javax.enterprise.event;uses:="javax.enterprise.util";version="1.0",org.jboss.weld.context;uses:="org.jboss.weld.bootstrap.api,org.jboss.weld,org.jboss.weld.context.api,org.jboss.weld.serialization.spi,javax.enterprise.context.spi,javax.enterprise.context,org.jboss.weld.manager,org.jboss.weld.event,javax.enterprise.inject,org.jboss.weld.injection.spi,org.jboss.weld.construction.api,org.jboss.weld.util,org.jboss.weld.serialization.spi.helpers,javax.enterprise.inject.spi";version="1.0",org.jboss.weld.ejb;uses:="org.jboss.weld.manager,org.jboss.weld.event,org.jboss.weld.context,javax.enterprise.inject,javax.interceptor,org.jboss.weld.bootstrap.api,javax.enterprise.inject.spi,org.jboss.weld.util,org.jboss.weld.resources.spi,org.jboss.weld.bean,org.jboss.weld.ejb.spi,org.jboss.weld.ejb.spi.helpers,org.jboss.weld.injection,org.jboss.weld";version="1.0",org.jboss.weld.bean;uses:="org.jboss.weld.bootstrap.api,javax.enterprise.inject.spi,org.jboss.weld.manager,javax.enterprise.context,org.jboss.weld.bootstrap,javax.enterprise.inject,javax.inject,org.jboss.weld.interceptor.spi.model,org.jboss.weld.util,javax.enterprise.context.spi,org.jboss.weld.injection,javax.enterprise.event,org.jboss.weld.interceptor.spi.metadata,javax.interceptor,org.jboss.weld.context,org.jboss.weld.ejb,org.jboss.weld.bean.proxy,org.jboss.weld.ejb.spi,org.jboss.weld.ejb.api,javax.decorator";version="1.0",org.jboss.weld.bean.builtin;uses:="javax.enterprise.context,javax.enterprise.inject,org.jboss.weld.bootstrap.api,javax.enterprise.inject.spi,org.jboss.weld.bootstrap,org.jboss.weld.manager,org.jboss.weld.bean,org.jboss.weld.context,org.jboss.weld.injection,javax.enterprise.context.spi,org.jboss.weld.util,org.jboss.weld.bean.proxy,org.jboss.weld,javax.enterprise.util,org.jboss.weld.event,javax.enterprise.event,org.jboss.weld.bootstrap.spi,org.jboss.weld.ejb";version="1.0",org.jboss.weld.bean.proxy;uses:="javax.enterprise.inject.spi,org.jboss.weld.util,org.jboss.weld,org.jboss.weld.bootstrap.api,org.jboss.weld.serialization.spi,javax.enterprise.context.spi,javax.enterprise.context,org.jboss.weld.manager,org.jboss.weld.context,org.jboss.weld.injection,org.jboss.weld.serialization.spi.helpers,javax.inject,org.jboss.weld.bean,org.jboss.weld.ejb,org.jboss.weld.ejb.api";version="1.0",org.jboss.weld.servlet.api;uses:="javax.servlet,javax.servlet.http";version="1.0",org.jboss.weld.bootstrap.api;uses:="org.jboss.weld.bootstrap.spi,javax.enterprise.inject.spi,org.jboss.weld.manager.api,org.jboss.weld.ejb.spi,org.jboss.weld.transaction.spi,org.jboss.weld.injection.spi,org.jboss.weld.security.spi,org.jboss.weld.resources.spi,org.jboss.weld.bootstrap.api.helpers";version="1.0",org.jboss.weld.context.api;uses:="javax.enterprise.context.spi";version="1.0",org.jboss.weld.servlet.api.helpers;uses:="org.jboss.weld.servlet.api,javax.servlet,javax.servlet.http";version="1.0",org.jboss.weld.bootstrap.api.helpers;uses:="org.jboss.weld.bootstrap.api,org.jboss.weld.bootstrap.spi,org.jboss.weld.manager.api";version="1.0",org.jboss.weld.ejb.api;version="1.0",org.jboss.weld.manager.api;uses:="org.jboss.weld.bootstrap.api,javax.enterprise.inject.spi,org.jboss.weld.ejb.spi,javax.enterprise.inject,org.jboss.weld.construction.api,javax.enterprise.context.spi";version="1.0",org.jboss.weld.construction.api;uses:="javax.enterprise.inject.spi,javax.enterprise.context.spi";version="1.0",org.jboss.weld.interceptor.spi.model;uses:="org.jboss.weld.interceptor.spi.metadata,javax.enterprise.inject.spi";version="1.0",org.jboss.weld.ejb.spi.helpers;uses:="org.jboss.weld.ejb.spi,org.jboss.weld.ejb.api";version="1.0",org.jboss.weld.validation.spi;uses:="org.jboss.weld.bootstrap.api,jakarta.validation";version="1.0",org.jboss.weld.serialization.spi;uses:="org.jboss.weld.bootstrap.api,org.jboss.weld.serialization.spi.helpers,javax.enterprise.context.spi";version="1.0",org.jboss.weld.interceptor.spi.context;uses:="javax.interceptor";version="1.0",org.jboss.weld.interceptor.spi.metadata;uses:="org.jboss.weld.manager,javax.enterprise.context.spi,org.jboss.weld.interceptor.spi.model";version="1.0",org.jboss.weld.transaction.spi;uses:="org.jboss.weld.bootstrap.api,javax.transaction";version="1.0",org.jboss.weld.injection.spi.helpers;uses:="javax.enterprise.inject.spi,org.jboss.weld.injection.spi,javax.annotation,javax.naming,org.jboss.weld.bootstrap.api,javax.persistence";version="1.0",org.jboss.weld.serialization.spi.helpers;uses:="javax.enterprise.context.spi,org.jboss.weld.context.api";version="1.0",org.jboss.weld.bootstrap.spi;uses:="org.jboss.weld.ejb.spi,org.jboss.weld.bootstrap.api,javax.enterprise.inject.spi";version="1.0",org.jboss.weld.injection.spi;uses:="org.jboss.weld.bootstrap.api,javax.enterprise.inject.spi,javax.persistence";version="1.0",org.jboss.weld.resources.spi;uses:="org.jboss.weld.bootstrap.api";version="1.0",org.jboss.weld.interceptor.spi.instance;uses:="org.jboss.weld.interceptor.spi.metadata";version="1.0",org.jboss.weld.resources.spi.helpers;uses:="org.jboss.weld.resources.spi";version="1.0",org.jboss.weld.bootstrap.spi.helpers;uses:="org.jboss.weld.bootstrap.spi,org.jboss.weld.resources.spi,org.jboss.weld.ejb.spi";version="1.0",org.jboss.weld.ejb.spi;uses:="org.jboss.weld.bootstrap.api,org.jboss.weld.ejb.api,javax.enterprise.inject.spi";version="1.0",org.jboss.weld.security.spi;uses:="org.jboss.weld.bootstrap.api";version="1.0",org.jboss.weld;uses:="org.jboss.weld.bootstrap.spi,org.jboss.weld.bootstrap.api,org.jboss.weld.bootstrap,org.jboss.weld.manager,org.jboss.weld.bean.builtin,javax.enterprise.inject.spi,javax.enterprise.util,javax.enterprise.inject";version="1.0",org.jboss.weld.bootstrap;uses:="org.jboss.weld.bootstrap.api,org.jboss.weld.manager,org.jboss.weld.util,javax.enterprise.inject,org.jboss.weld.bean.builtin,org.jboss.weld,javax.enterprise.inject.spi,org.jboss.weld.event,org.jboss.weld.ejb,org.jboss.weld.bean,org.jboss.weld.interceptor.spi.model,javax.annotation,javax.interceptor,org.jboss.weld.ejb.spi,javax.decorator,org.jboss.weld.resources.spi,javax.enterprise.event,org.jboss.weld.bootstrap.spi,org.jboss.weld.transaction.spi,org.jboss.weld.bootstrap.api.helpers,javax.enterprise.context.spi,org.jboss.weld.security.spi,org.jboss.weld.manager.api,org.jboss.weld.interceptor.spi.metadata,javax.enterprise.context,javax.inject,org.jboss.weld.serialization.spi,org.jboss.weld.bootstrap.spi.helpers,org.jboss.weld.injection,org.jboss.weld.context";version="1.0",org.jboss.weld.event;uses:="org.jboss.weld.injection,javax.enterprise.inject.spi,org.jboss.weld,org.jboss.weld.manager,org.jboss.weld.context,javax.enterprise.inject,org.jboss.weld.bean.builtin,javax.enterprise.util,javax.enterprise.event,javax.enterprise.context.spi,org.jboss.weld.util,org.jboss.weld.bean,org.jboss.weld.bootstrap.api,javax.enterprise.context,javax.inject,org.jboss.weld.transaction.spi,javax.transaction";version="1.0",org.jboss.weld.injection;uses:="javax.enterprise.inject.spi,org.jboss.weld.manager,org.jboss.weld.util,org.jboss.weld.context,org.jboss.weld.injection.spi,javax.enterprise.context.spi,org.jboss.weld.construction.api,javax.enterprise.inject,org.jboss.weld,org.jboss.weld.bootstrap.api,org.jboss.weld.bean.proxy,javax.enterprise.event,javax.inject,org.jboss.weld.ejb";version="1.0",org.jboss.weld.manager;uses:="org.jboss.weld.bootstrap.api,javax.enterprise.inject.spi,org.jboss.weld.bean,javax.enterprise.util,org.jboss.weld.interceptor.spi.model,org.jboss.weld.bean.proxy,org.jboss.weld.bootstrap,org.jboss.weld.util,javax.enterprise.inject,org.jboss.weld.injection,org.jboss.weld.ejb.spi,org.jboss.weld.bean.builtin,javax.el,org.jboss.weld,org.jboss.weld.interceptor.spi.metadata,org.jboss.weld.event,org.jboss.weld.context,org.jboss.weld.ejb,org.jboss.weld.serialization.spi,javax.enterprise.context.spi,org.jboss.weld.el,org.jboss.weld.manager.api,org.jboss.weld.construction.api,org.jboss.weld.bootstrap.spi,org.jboss.weld.injection.spi,javax.decorator";version="1.0",org.jboss.weld.servlet;uses:="org.jboss.weld.manager,org.jboss.weld.context,org.jboss.weld.event,javax.enterprise.inject,javax.servlet.http,javax.servlet,javax.inject,javax.enterprise.context,javax.faces.context,org.jboss.weld.jsf,org.jboss.weld,javax.enterprise.context.spi,org.jboss.weld.bootstrap.api,javax.enterprise.inject.spi,org.jboss.weld.bean.builtin,org.jboss.weld.servlet.api.helpers";version="1.0",org.jboss.weld.util;uses:="javax.enterprise.inject.spi,org.jboss.weld.resources.spi,javax.annotation,org.jboss.weld.manager,javax.enterprise.event,javax.enterprise.inject,org.jboss.weld.injection,javax.inject,org.jboss.weld.bootstrap,org.jboss.weld.interceptor.spi.model,org.jboss.weld.bootstrap.api,javax.interceptor,org.jboss.weld.ejb.spi,org.jboss.weld,javax.enterprise.context.spi,javax.decorator,org.jboss.weld.bean,org.jboss.weld.serialization.spi,org.jboss.weld.bean.proxy,org.jboss.weld.bootstrap.spi,javax.el,org.jboss.weld.event";version="1.0",org.jboss.weld.el;uses:="javax.el,javax.enterprise.inject.spi,org.jboss.weld.manager,org.jboss.weld.context,javax.enterprise.context.spi,javax.enterprise.context,org.jboss.weld.bean.proxy";version="1.0",org.jboss.weld.jsf;uses:="javax.enterprise.context,org.jboss.weld,javax.faces.application,javax.faces.context,org.jboss.weld.manager,org.jboss.weld.context,javax.enterprise.inject,org.jboss.weld.bootstrap.api,org.jboss.weld.util,org.jboss.weld.resources.spi";version="1.0"
#exports for 2.2.9.Final:
-exports = org.jboss.weld.bootstrap.api.helpers;uses:="org.jboss.weld.bootstrap.api,org.jboss.weld.bootstrap.spi,org.jboss.weld.manager.api";version="2.2.9.Final",org.jboss.weld.servlet.api.helpers;uses:="javax.servlet,javax.servlet.http,org.jboss.weld.servlet.api";version="2.2.9.Final",org.jboss.weld.context.api;uses:="javax.enterprise.context.spi";version="2.2.9.Final",org.jboss.weld.construction.api;uses:="javax.enterprise.inject.spi,javax.enterprise.context.spi";version="2.2.9.Final",org.jboss.weld.ejb.api;version="2.2.9.Final",org.jboss.weld.bootstrap.api;uses:="javax.enterprise.inject.spi,org.jboss.weld.bootstrap.spi,org.jboss.weld.manager.api,org.jboss.weld.transaction.spi,org.jboss.weld.resources.spi,org.jboss.weld.security.spi,org.jboss.weld.injection.spi,org.jboss.weld.bootstrap.api.helpers";version="2.2.9.Final",org.jboss.weld.servlet.api;uses:="javax.servlet,javax.servlet.http";version="2.2.9.Final",org.jboss.weld.manager.api;uses:="org.jboss.weld.bootstrap.api,javax.enterprise.inject.spi,org.jboss.weld.serialization.spi,javax.enterprise.inject,org.jboss.weld.construction.api,org.jboss.weld.ejb.spi,javax.enterprise.context.spi";version="2.2.9.Final",org.jboss.weld.ejb.spi;uses:="org.jboss.weld.bootstrap.api,org.jboss.weld.ejb.api,javax.enterprise.inject.spi";version="2.2.9.Final",org.jboss.weld.serialization.spi.helpers;uses:="javax.enterprise.context.spi,org.jboss.weld.context.api";version="2.2.9.Final",org.jboss.weld.injection.spi.helpers;uses:="javax.enterprise.inject.spi,org.jboss.weld.injection.spi,javax.annotation,org.jboss.weld.bootstrap.api,javax.naming,javax.persistence";version="2.2.9.Final",org.jboss.weld.servlet.spi;uses:="org.jboss.weld.bootstrap.api,javax.servlet.http";version="2.2.9.Final",org.jboss.weld.security.spi;uses:="org.jboss.weld.bootstrap.api";version="2.2.9.Final",org.jboss.weld.interceptor.spi.metadata;uses:="org.jboss.weld.manager,javax.enterprise.context.spi,org.jboss.weld.interceptor.spi.model";version="2.2.9.Final",org.jboss.weld.bootstrap.spi;uses:="org.jboss.weld.bootstrap.api,org.jboss.weld.ejb.spi,javax.enterprise.inject.spi";version="2.2.9.Final",org.jboss.weld.interceptor.spi.model;uses:="org.jboss.weld.interceptor.spi.metadata,javax.enterprise.inject.spi";version="2.2.9.Final",org.jboss.weld.injection.spi;uses:="org.jboss.weld.bootstrap.api,javax.enterprise.inject.spi,javax.persistence";version="2.2.9.Final",org.jboss.weld.transaction.spi;uses:="org.jboss.weld.bootstrap.api,javax.transaction";version="2.2.9.Final",org.jboss.weld.ejb.spi.helpers;uses:="org.jboss.weld.ejb.spi,org.jboss.weld.ejb.api";version="2.2.9.Final",org.jboss.weld.servlet.spi.helpers;uses:="javax.servlet.http,org.jboss.weld.servlet.spi";version="2.2.9.Final",org.jboss.weld.bootstrap.spi.helpers;uses:="org.jboss.weld.bootstrap.spi,org.jboss.weld.resources.spi,org.jboss.weld.ejb.spi";version="2.2.9.Final",org.jboss.weld.serialization.spi;uses:="org.jboss.weld.serialization.spi.helpers,org.jboss.weld.bootstrap.api,javax.enterprise.context.spi";version="2.2.9.Final",org.jboss.weld.resources.spi;uses:="org.jboss.weld.bootstrap.api";version="2.2.9.Final",org.jboss.weld.resources.spi.helpers;uses:="org.jboss.weld.resources.spi";version="2.2.9.Final",org.jboss.weld.validation.spi;uses:="org.jboss.weld.bootstrap.api,jakarta.validation";version="2.2.9.Final",org.jboss.weld;uses:="javax.enterprise.inject.spi,javax.enterprise.util,javax.enterprise.inject,org.jboss.weld.manager,org.jboss.weld.bean.builtin,com.google.common.collect,org.jboss.weld.bootstrap,org.jboss.weld.bootstrap.api,org.jboss.weld.bootstrap.spi,org.jboss.weld.bootstrap.api.helpers,com.google.common.cache";version="2.2.9.Final",org.jboss.weld.bean;uses:="javax.enterprise.inject.spi,org.jboss.weld.manager,javax.enterprise.inject,org.jboss.weld.bootstrap,org.jboss.weld.serialization.spi,org.jboss.weld.bootstrap.api,javax.enterprise.context,javax.inject,org.jboss.weld.interceptor.spi.model,org.jboss.weld.util,com.google.common.base,javax.enterprise.context.spi,org.jboss.weld.injection,org.jboss.weld.ejb.spi,javax.enterprise.event,javax.interceptor,org.jboss.weld.interceptor.spi.metadata,org.jboss.weld.context,org.jboss.weld.ejb,org.jboss.weld.ejb.api,javax.decorator,org.jboss.weld.bean.proxy";version="2.2.9.Final",org.jboss.weld.bean.builtin;uses:="javax.enterprise.inject,javax.enterprise.context,com.google.common.collect,org.jboss.weld.bootstrap,org.jboss.weld.serialization.spi,org.jboss.weld.bean,javax.enterprise.inject.spi,org.jboss.weld.manager,org.jboss.weld.bootstrap.api,org.jboss.weld.context,javax.enterprise.context.spi,org.jboss.weld.injection,org.jboss.weld.util,org.jboss.weld.bean.proxy,org.jboss.weld.bootstrap.spi,org.jboss.weld.construction.api,org.jboss.weld.ejb.spi,org.jboss.weld.manager.api,org.jboss.weld,javax.enterprise.util,org.jboss.weld.event,javax.enterprise.event,org.jboss.weld.ejb,com.google.common.base";version="2.2.9.Final",org.jboss.weld.bean.proxy;uses:="javax.enterprise.inject.spi,org.jboss.weld.util,javax.enterprise.context,com.google.common.collect,javax.enterprise.context.spi,org.jboss.weld.serialization.spi,org.jboss.weld.bootstrap.api,org.jboss.weld,com.google.common.cache,org.jboss.weld.manager,org.jboss.weld.injection,org.jboss.weld.context,org.jboss.weld.serialization.spi.helpers,org.jboss.weld.bean,javax.inject,org.jboss.weld.ejb,org.jboss.weld.ejb.api,org.jboss.weld.resources.spi,org.jboss.weld.bootstrap.api.helpers";version="2.2.9.Final",org.jboss.weld.bootstrap;uses:="org.jboss.weld.ejb,javax.enterprise.inject.spi,org.jboss.weld.manager,javax.enterprise.inject,org.jboss.weld.bootstrap.api,org.jboss.weld.util,org.jboss.weld.event,org.jboss.weld.bean,org.jboss.weld.bean.builtin,javax.annotation,org.jboss.weld.bootstrap.spi,org.jboss.weld.resources.spi,javax.interceptor,org.jboss.weld.interceptor.spi.model,javax.decorator,org.jboss.weld.ejb.spi,com.google.common.cache,org.jboss.weld,com.google.common.collect,javax.enterprise.event,com.google.common.base,org.jboss.weld.security.spi,javax.enterprise.context.spi,org.jboss.weld.transaction.spi,org.jboss.weld.servlet,org.jboss.weld.bootstrap.api.helpers,org.jboss.weld.manager.api,org.jboss.weld.interceptor.spi.metadata,javax.enterprise.context,javax.inject,org.jboss.weld.context,org.jboss.weld.servlet.spi.helpers,org.jboss.weld.bootstrap.spi.helpers,org.jboss.weld.servlet.spi,org.jboss.weld.serialization.spi,org.jboss.weld.injection,org.jboss.weld.bean.proxy";version="2.2.9.Final",org.jboss.weld.context;uses:="org.jboss.weld.bean,org.jboss.weld.context.api,javax.enterprise.context.spi,org.jboss.weld.serialization.spi,org.jboss.weld.bootstrap.api,javax.enterprise.context,org.jboss.weld,org.jboss.weld.manager,org.jboss.weld.event,org.jboss.weld.injection.spi,org.jboss.weld.construction.api,org.jboss.weld.serialization.spi.helpers,org.jboss.weld.util,javax.enterprise.inject.spi";version="2.2.9.Final",org.jboss.weld.ejb;uses:="javax.interceptor,org.jboss.weld.manager,javax.enterprise.inject,org.jboss.weld.event,org.jboss.weld.context,org.jboss.weld.bootstrap.api,org.jboss.weld.bean,org.jboss.weld.util,javax.enterprise.inject.spi,org.jboss.weld.resources.spi,com.google.common.base,org.jboss.weld.ejb.spi,com.google.common.collect,org.jboss.weld.ejb.spi.helpers,org.jboss.weld.injection,org.jboss.weld.bootstrap.api.helpers,org.jboss.weld";version="2.2.9.Final",org.jboss.weld.el;uses:="javax.enterprise.inject.spi,org.jboss.weld.manager,javax.enterprise.context,org.jboss.weld.context,javax.enterprise.context.spi,javax.el";version="2.2.9.Final",org.jboss.weld.event;uses:="org.jboss.weld.injection,javax.enterprise.inject.spi,org.jboss.weld.manager,javax.enterprise.inject,org.jboss.weld.context,org.jboss.weld,org.jboss.weld.bean.builtin,javax.enterprise.util,javax.enterprise.context.spi,org.jboss.weld.util,javax.enterprise.event,com.google.common.collect,org.jboss.weld.bean,org.jboss.weld.bootstrap.api,com.google.common.base,javax.enterprise.context,javax.inject,com.google.common.cache,org.jboss.weld.transaction.spi,javax.transaction";version="2.2.9.Final",org.jboss.weld.injection;uses:="javax.enterprise.inject.spi,org.jboss.weld.manager,javax.enterprise.inject,org.jboss.weld.util,org.jboss.weld.injection.spi,org.jboss.weld.context,javax.enterprise.context.spi,org.jboss.weld.construction.api,org.jboss.weld.bootstrap.api,org.jboss.weld,org.jboss.weld.bean.proxy,javax.enterprise.event,javax.inject,org.jboss.weld.bean.builtin,org.jboss.weld.event,org.jboss.weld.ejb,com.google.common.collect";version="2.2.9.Final",org.jboss.weld.jsf;uses:="org.jboss.weld.manager,javax.enterprise.inject,jakarta.faces.application,org.jboss.weld.bootstrap.api.helpers,org.jboss.weld.context,org.jboss.weld,jakarta.faces.context,org.jboss.weld.bootstrap.api,org.jboss.weld.util,org.jboss.weld.resources.spi";version="2.2.9.Final",org.jboss.weld.manager;uses:="org.jboss.weld.bootstrap.api,org.jboss.weld.bean,javax.enterprise.inject.spi,com.google.common.base,com.google.common.collect,javax.enterprise.util,org.jboss.weld.ejb,javax.enterprise.inject,org.jboss.weld.interceptor.spi.model,javax.enterprise.context.spi,org.jboss.weld.injection,org.jboss.weld.util,javax.enterprise.context,org.jboss.weld.ejb.spi,org.jboss.weld.event,javax.el,org.jboss.weld.bean.proxy,org.jboss.weld.construction.api,org.jboss.weld.bootstrap,org.jboss.weld.serialization.spi,org.jboss.weld.el,org.jboss.weld.bean.builtin,org.jboss.weld.context,org.jboss.weld,org.jboss.weld.manager.api,org.jboss.weld.bootstrap.spi,javax.interceptor,org.jboss.weld.injection.spi,javax.decorator";version="2.2.9.Final",org.jboss.weld.servlet;uses:="javax.servlet.http,org.jboss.weld.util,org.jboss.weld.manager,org.jboss.weld.event,javax.enterprise.inject,org.jboss.weld.context,javax.servlet,org.jboss.weld.servlet.spi,javax.inject,org.jboss.weld.jsf,javax.enterprise.context,jakarta.faces.context,org.jboss.weld.bootstrap.api.helpers,javax.enterprise.context.spi,org.jboss.weld,org.jboss.weld.bootstrap.api,org.jboss.weld.resources.spi,javax.enterprise.inject.spi,org.jboss.weld.bean.builtin,org.jboss.weld.servlet.api,org.jboss.weld.servlet.api.helpers";version="2.2.9.Final",org.jboss.weld.util;uses:="javax.enterprise.inject.spi,org.jboss.weld.bootstrap.api,org.jboss.weld.resources.spi,com.google.common.base,javax.annotation,org.jboss.weld.interceptor.spi.model,com.google.common.collect,org.jboss.weld.manager,javax.enterprise.inject,org.jboss.weld.injection,javax.inject,javax.enterprise.event,javax.interceptor,org.jboss.weld.ejb,javax.enterprise.context.spi,javax.decorator,javax.enterprise.context,org.jboss.weld.ejb.spi,org.jboss.weld.bean,org.jboss.weld.bootstrap,org.jboss.weld.bean.proxy,org.jboss.weld.serialization.spi,org.jboss.weld.bootstrap.spi,javax.el,org.jboss.weld.event";version="2.2.9.Final"
\ No newline at end of file
+exports = org.jboss.weld.bootstrap.api.helpers;uses:="org.jboss.weld.bootstrap.api,org.jboss.weld.bootstrap.spi,org.jboss.weld.manager.api";version="2.2.9.Final",org.jboss.weld.servlet.api.helpers;uses:="javax.servlet,javax.servlet.http,org.jboss.weld.servlet.api";version="2.2.9.Final",org.jboss.weld.context.api;uses:="javax.enterprise.context.spi";version="2.2.9.Final",org.jboss.weld.construction.api;uses:="javax.enterprise.inject.spi,javax.enterprise.context.spi";version="2.2.9.Final",org.jboss.weld.ejb.api;version="2.2.9.Final",org.jboss.weld.bootstrap.api;uses:="javax.enterprise.inject.spi,org.jboss.weld.bootstrap.spi,org.jboss.weld.manager.api,org.jboss.weld.transaction.spi,org.jboss.weld.resources.spi,org.jboss.weld.security.spi,org.jboss.weld.injection.spi,org.jboss.weld.bootstrap.api.helpers";version="2.2.9.Final",org.jboss.weld.servlet.api;uses:="javax.servlet,javax.servlet.http";version="2.2.9.Final",org.jboss.weld.manager.api;uses:="org.jboss.weld.bootstrap.api,javax.enterprise.inject.spi,org.jboss.weld.serialization.spi,javax.enterprise.inject,org.jboss.weld.construction.api,org.jboss.weld.ejb.spi,javax.enterprise.context.spi";version="2.2.9.Final",org.jboss.weld.ejb.spi;uses:="org.jboss.weld.bootstrap.api,org.jboss.weld.ejb.api,javax.enterprise.inject.spi";version="2.2.9.Final",org.jboss.weld.serialization.spi.helpers;uses:="javax.enterprise.context.spi,org.jboss.weld.context.api";version="2.2.9.Final",org.jboss.weld.injection.spi.helpers;uses:="javax.enterprise.inject.spi,org.jboss.weld.injection.spi,javax.annotation,org.jboss.weld.bootstrap.api,javax.naming,jakarta.persistence";version="2.2.9.Final",org.jboss.weld.servlet.spi;uses:="org.jboss.weld.bootstrap.api,javax.servlet.http";version="2.2.9.Final",org.jboss.weld.security.spi;uses:="org.jboss.weld.bootstrap.api";version="2.2.9.Final",org.jboss.weld.interceptor.spi.metadata;uses:="org.jboss.weld.manager,javax.enterprise.context.spi,org.jboss.weld.interceptor.spi.model";version="2.2.9.Final",org.jboss.weld.bootstrap.spi;uses:="org.jboss.weld.bootstrap.api,org.jboss.weld.ejb.spi,javax.enterprise.inject.spi";version="2.2.9.Final",org.jboss.weld.interceptor.spi.model;uses:="org.jboss.weld.interceptor.spi.metadata,javax.enterprise.inject.spi";version="2.2.9.Final",org.jboss.weld.injection.spi;uses:="org.jboss.weld.bootstrap.api,javax.enterprise.inject.spi,jakarta.persistence";version="2.2.9.Final",org.jboss.weld.transaction.spi;uses:="org.jboss.weld.bootstrap.api,javax.transaction";version="2.2.9.Final",org.jboss.weld.ejb.spi.helpers;uses:="org.jboss.weld.ejb.spi,org.jboss.weld.ejb.api";version="2.2.9.Final",org.jboss.weld.servlet.spi.helpers;uses:="javax.servlet.http,org.jboss.weld.servlet.spi";version="2.2.9.Final",org.jboss.weld.bootstrap.spi.helpers;uses:="org.jboss.weld.bootstrap.spi,org.jboss.weld.resources.spi,org.jboss.weld.ejb.spi";version="2.2.9.Final",org.jboss.weld.serialization.spi;uses:="org.jboss.weld.serialization.spi.helpers,org.jboss.weld.bootstrap.api,javax.enterprise.context.spi";version="2.2.9.Final",org.jboss.weld.resources.spi;uses:="org.jboss.weld.bootstrap.api";version="2.2.9.Final",org.jboss.weld.resources.spi.helpers;uses:="org.jboss.weld.resources.spi";version="2.2.9.Final",org.jboss.weld.validation.spi;uses:="org.jboss.weld.bootstrap.api,jakarta.validation";version="2.2.9.Final",org.jboss.weld;uses:="javax.enterprise.inject.spi,javax.enterprise.util,javax.enterprise.inject,org.jboss.weld.manager,org.jboss.weld.bean.builtin,com.google.common.collect,org.jboss.weld.bootstrap,org.jboss.weld.bootstrap.api,org.jboss.weld.bootstrap.spi,org.jboss.weld.bootstrap.api.helpers,com.google.common.cache";version="2.2.9.Final",org.jboss.weld.bean;uses:="javax.enterprise.inject.spi,org.jboss.weld.manager,javax.enterprise.inject,org.jboss.weld.bootstrap,org.jboss.weld.serialization.spi,org.jboss.weld.bootstrap.api,javax.enterprise.context,javax.inject,org.jboss.weld.interceptor.spi.model,org.jboss.weld.util,com.google.common.base,javax.enterprise.context.spi,org.jboss.weld.injection,org.jboss.weld.ejb.spi,javax.enterprise.event,javax.interceptor,org.jboss.weld.interceptor.spi.metadata,org.jboss.weld.context,org.jboss.weld.ejb,org.jboss.weld.ejb.api,javax.decorator,org.jboss.weld.bean.proxy";version="2.2.9.Final",org.jboss.weld.bean.builtin;uses:="javax.enterprise.inject,javax.enterprise.context,com.google.common.collect,org.jboss.weld.bootstrap,org.jboss.weld.serialization.spi,org.jboss.weld.bean,javax.enterprise.inject.spi,org.jboss.weld.manager,org.jboss.weld.bootstrap.api,org.jboss.weld.context,javax.enterprise.context.spi,org.jboss.weld.injection,org.jboss.weld.util,org.jboss.weld.bean.proxy,org.jboss.weld.bootstrap.spi,org.jboss.weld.construction.api,org.jboss.weld.ejb.spi,org.jboss.weld.manager.api,org.jboss.weld,javax.enterprise.util,org.jboss.weld.event,javax.enterprise.event,org.jboss.weld.ejb,com.google.common.base";version="2.2.9.Final",org.jboss.weld.bean.proxy;uses:="javax.enterprise.inject.spi,org.jboss.weld.util,javax.enterprise.context,com.google.common.collect,javax.enterprise.context.spi,org.jboss.weld.serialization.spi,org.jboss.weld.bootstrap.api,org.jboss.weld,com.google.common.cache,org.jboss.weld.manager,org.jboss.weld.injection,org.jboss.weld.context,org.jboss.weld.serialization.spi.helpers,org.jboss.weld.bean,javax.inject,org.jboss.weld.ejb,org.jboss.weld.ejb.api,org.jboss.weld.resources.spi,org.jboss.weld.bootstrap.api.helpers";version="2.2.9.Final",org.jboss.weld.bootstrap;uses:="org.jboss.weld.ejb,javax.enterprise.inject.spi,org.jboss.weld.manager,javax.enterprise.inject,org.jboss.weld.bootstrap.api,org.jboss.weld.util,org.jboss.weld.event,org.jboss.weld.bean,org.jboss.weld.bean.builtin,javax.annotation,org.jboss.weld.bootstrap.spi,org.jboss.weld.resources.spi,javax.interceptor,org.jboss.weld.interceptor.spi.model,javax.decorator,org.jboss.weld.ejb.spi,com.google.common.cache,org.jboss.weld,com.google.common.collect,javax.enterprise.event,com.google.common.base,org.jboss.weld.security.spi,javax.enterprise.context.spi,org.jboss.weld.transaction.spi,org.jboss.weld.servlet,org.jboss.weld.bootstrap.api.helpers,org.jboss.weld.manager.api,org.jboss.weld.interceptor.spi.metadata,javax.enterprise.context,javax.inject,org.jboss.weld.context,org.jboss.weld.servlet.spi.helpers,org.jboss.weld.bootstrap.spi.helpers,org.jboss.weld.servlet.spi,org.jboss.weld.serialization.spi,org.jboss.weld.injection,org.jboss.weld.bean.proxy";version="2.2.9.Final",org.jboss.weld.context;uses:="org.jboss.weld.bean,org.jboss.weld.context.api,javax.enterprise.context.spi,org.jboss.weld.serialization.spi,org.jboss.weld.bootstrap.api,javax.enterprise.context,org.jboss.weld,org.jboss.weld.manager,org.jboss.weld.event,org.jboss.weld.injection.spi,org.jboss.weld.construction.api,org.jboss.weld.serialization.spi.helpers,org.jboss.weld.util,javax.enterprise.inject.spi";version="2.2.9.Final",org.jboss.weld.ejb;uses:="javax.interceptor,org.jboss.weld.manager,javax.enterprise.inject,org.jboss.weld.event,org.jboss.weld.context,org.jboss.weld.bootstrap.api,org.jboss.weld.bean,org.jboss.weld.util,javax.enterprise.inject.spi,org.jboss.weld.resources.spi,com.google.common.base,org.jboss.weld.ejb.spi,com.google.common.collect,org.jboss.weld.ejb.spi.helpers,org.jboss.weld.injection,org.jboss.weld.bootstrap.api.helpers,org.jboss.weld";version="2.2.9.Final",org.jboss.weld.el;uses:="javax.enterprise.inject.spi,org.jboss.weld.manager,javax.enterprise.context,org.jboss.weld.context,javax.enterprise.context.spi,javax.el";version="2.2.9.Final",org.jboss.weld.event;uses:="org.jboss.weld.injection,javax.enterprise.inject.spi,org.jboss.weld.manager,javax.enterprise.inject,org.jboss.weld.context,org.jboss.weld,org.jboss.weld.bean.builtin,javax.enterprise.util,javax.enterprise.context.spi,org.jboss.weld.util,javax.enterprise.event,com.google.common.collect,org.jboss.weld.bean,org.jboss.weld.bootstrap.api,com.google.common.base,javax.enterprise.context,javax.inject,com.google.common.cache,org.jboss.weld.transaction.spi,javax.transaction";version="2.2.9.Final",org.jboss.weld.injection;uses:="javax.enterprise.inject.spi,org.jboss.weld.manager,javax.enterprise.inject,org.jboss.weld.util,org.jboss.weld.injection.spi,org.jboss.weld.context,javax.enterprise.context.spi,org.jboss.weld.construction.api,org.jboss.weld.bootstrap.api,org.jboss.weld,org.jboss.weld.bean.proxy,javax.enterprise.event,javax.inject,org.jboss.weld.bean.builtin,org.jboss.weld.event,org.jboss.weld.ejb,com.google.common.collect";version="2.2.9.Final",org.jboss.weld.jsf;uses:="org.jboss.weld.manager,javax.enterprise.inject,jakarta.faces.application,org.jboss.weld.bootstrap.api.helpers,org.jboss.weld.context,org.jboss.weld,jakarta.faces.context,org.jboss.weld.bootstrap.api,org.jboss.weld.util,org.jboss.weld.resources.spi";version="2.2.9.Final",org.jboss.weld.manager;uses:="org.jboss.weld.bootstrap.api,org.jboss.weld.bean,javax.enterprise.inject.spi,com.google.common.base,com.google.common.collect,javax.enterprise.util,org.jboss.weld.ejb,javax.enterprise.inject,org.jboss.weld.interceptor.spi.model,javax.enterprise.context.spi,org.jboss.weld.injection,org.jboss.weld.util,javax.enterprise.context,org.jboss.weld.ejb.spi,org.jboss.weld.event,javax.el,org.jboss.weld.bean.proxy,org.jboss.weld.construction.api,org.jboss.weld.bootstrap,org.jboss.weld.serialization.spi,org.jboss.weld.el,org.jboss.weld.bean.builtin,org.jboss.weld.context,org.jboss.weld,org.jboss.weld.manager.api,org.jboss.weld.bootstrap.spi,javax.interceptor,org.jboss.weld.injection.spi,javax.decorator";version="2.2.9.Final",org.jboss.weld.servlet;uses:="javax.servlet.http,org.jboss.weld.util,org.jboss.weld.manager,org.jboss.weld.event,javax.enterprise.inject,org.jboss.weld.context,javax.servlet,org.jboss.weld.servlet.spi,javax.inject,org.jboss.weld.jsf,javax.enterprise.context,jakarta.faces.context,org.jboss.weld.bootstrap.api.helpers,javax.enterprise.context.spi,org.jboss.weld,org.jboss.weld.bootstrap.api,org.jboss.weld.resources.spi,javax.enterprise.inject.spi,org.jboss.weld.bean.builtin,org.jboss.weld.servlet.api,org.jboss.weld.servlet.api.helpers";version="2.2.9.Final",org.jboss.weld.util;uses:="javax.enterprise.inject.spi,org.jboss.weld.bootstrap.api,org.jboss.weld.resources.spi,com.google.common.base,javax.annotation,org.jboss.weld.interceptor.spi.model,com.google.common.collect,org.jboss.weld.manager,javax.enterprise.inject,org.jboss.weld.injection,javax.inject,javax.enterprise.event,javax.interceptor,org.jboss.weld.ejb,javax.enterprise.context.spi,javax.decorator,javax.enterprise.context,org.jboss.weld.ejb.spi,org.jboss.weld.bean,org.jboss.weld.bootstrap,org.jboss.weld.bean.proxy,org.jboss.weld.serialization.spi,org.jboss.weld.bootstrap.spi,javax.el,org.jboss.weld.event";version="2.2.9.Final"
\ No newline at end of file
diff --git a/appserver/tests/v2-tests/appserv-tests/devtests/jpa-integration/toplink-essentials/advanced/client-ooc/EntityManagerTestNGTestCase.java b/appserver/tests/v2-tests/appserv-tests/devtests/jpa-integration/toplink-essentials/advanced/client-ooc/EntityManagerTestNGTestCase.java
index 9d1c276..8991559 100644
--- a/appserver/tests/v2-tests/appserv-tests/devtests/jpa-integration/toplink-essentials/advanced/client-ooc/EntityManagerTestNGTestCase.java
+++ b/appserver/tests/v2-tests/appserv-tests/devtests/jpa-integration/toplink-essentials/advanced/client-ooc/EntityManagerTestNGTestCase.java
@@ -25,9 +25,9 @@
import org.testng.annotations.Configuration;
import org.testng.annotations.Test;
-import javax.persistence.EntityManager;
-import javax.persistence.EntityNotFoundException;
-import javax.persistence.Query;
+import jakarta.persistence.EntityManager;
+import jakarta.persistence.EntityNotFoundException;
+import jakarta.persistence.Query;
import java.util.List;
/**
diff --git a/appserver/tests/v2-tests/appserv-tests/devtests/jpa-integration/toplink-essentials/advanced/ejb/Address.java b/appserver/tests/v2-tests/appserv-tests/devtests/jpa-integration/toplink-essentials/advanced/ejb/Address.java
index 3769dd6..899a7de 100755
--- a/appserver/tests/v2-tests/appserv-tests/devtests/jpa-integration/toplink-essentials/advanced/ejb/Address.java
+++ b/appserver/tests/v2-tests/appserv-tests/devtests/jpa-integration/toplink-essentials/advanced/ejb/Address.java
@@ -19,10 +19,10 @@
package oracle.toplink.essentials.testing.models.cmp3.advanced;
import java.io.Serializable;
-import javax.persistence.*;
-import static javax.persistence.GenerationType.*;
+import jakarta.persistence.*;
+import static jakarta.persistence.GenerationType.*;
import java.util.*;
-import static javax.persistence.CascadeType.*;
+import static jakarta.persistence.CascadeType.*;
/**
* <p><b>Purpose</b>: Represents the mailing address on an Employee
diff --git a/appserver/tests/v2-tests/appserv-tests/devtests/jpa-integration/toplink-essentials/advanced/ejb/Employee.java b/appserver/tests/v2-tests/appserv-tests/devtests/jpa-integration/toplink-essentials/advanced/ejb/Employee.java
index 66d5c80..8cf7695 100755
--- a/appserver/tests/v2-tests/appserv-tests/devtests/jpa-integration/toplink-essentials/advanced/ejb/Employee.java
+++ b/appserver/tests/v2-tests/appserv-tests/devtests/jpa-integration/toplink-essentials/advanced/ejb/Employee.java
@@ -20,10 +20,10 @@
import java.util.*;
import java.io.Serializable;
-import javax.persistence.*;
-import static javax.persistence.GenerationType.*;
-import static javax.persistence.CascadeType.*;
-import static javax.persistence.FetchType.*;
+import jakarta.persistence.*;
+import static jakarta.persistence.GenerationType.*;
+import static jakarta.persistence.CascadeType.*;
+import static jakarta.persistence.FetchType.*;
/**
* Bean class: EmployeeBean
diff --git a/appserver/tests/v2-tests/appserv-tests/devtests/jpa-integration/toplink-essentials/advanced/ejb/EmployeeListener.java b/appserver/tests/v2-tests/appserv-tests/devtests/jpa-integration/toplink-essentials/advanced/ejb/EmployeeListener.java
index e566ddf..f01b206 100755
--- a/appserver/tests/v2-tests/appserv-tests/devtests/jpa-integration/toplink-essentials/advanced/ejb/EmployeeListener.java
+++ b/appserver/tests/v2-tests/appserv-tests/devtests/jpa-integration/toplink-essentials/advanced/ejb/EmployeeListener.java
@@ -16,7 +16,7 @@
package oracle.toplink.essentials.testing.models.cmp3.advanced;
-import javax.persistence.*;
+import jakarta.persistence.*;
import java.util.EventListener;
public class EmployeeListener implements EventListener {
diff --git a/appserver/tests/v2-tests/appserv-tests/devtests/jpa-integration/toplink-essentials/advanced/ejb/EmploymentPeriod.java b/appserver/tests/v2-tests/appserv-tests/devtests/jpa-integration/toplink-essentials/advanced/ejb/EmploymentPeriod.java
index 184b1e8..62f9503 100755
--- a/appserver/tests/v2-tests/appserv-tests/devtests/jpa-integration/toplink-essentials/advanced/ejb/EmploymentPeriod.java
+++ b/appserver/tests/v2-tests/appserv-tests/devtests/jpa-integration/toplink-essentials/advanced/ejb/EmploymentPeriod.java
@@ -18,7 +18,7 @@
import java.sql.Date;
import java.io.*;
-import javax.persistence.*;
+import jakarta.persistence.*;
/**
* <p><b>Purpose</b>: Defines the period an Employee worked for the organization
diff --git a/appserver/tests/v2-tests/appserv-tests/devtests/jpa-integration/toplink-essentials/advanced/ejb/LargeProject.java b/appserver/tests/v2-tests/appserv-tests/devtests/jpa-integration/toplink-essentials/advanced/ejb/LargeProject.java
index 8f0a662..bf6cad9 100755
--- a/appserver/tests/v2-tests/appserv-tests/devtests/jpa-integration/toplink-essentials/advanced/ejb/LargeProject.java
+++ b/appserver/tests/v2-tests/appserv-tests/devtests/jpa-integration/toplink-essentials/advanced/ejb/LargeProject.java
@@ -18,7 +18,7 @@
package oracle.toplink.essentials.testing.models.cmp3.advanced;
-import javax.persistence.*;
+import jakarta.persistence.*;
/**
* Local interface for the large project bean.
diff --git a/appserver/tests/v2-tests/appserv-tests/devtests/jpa-integration/toplink-essentials/advanced/ejb/PhoneNumber.java b/appserver/tests/v2-tests/appserv-tests/devtests/jpa-integration/toplink-essentials/advanced/ejb/PhoneNumber.java
index 2419b49..dce14e9 100755
--- a/appserver/tests/v2-tests/appserv-tests/devtests/jpa-integration/toplink-essentials/advanced/ejb/PhoneNumber.java
+++ b/appserver/tests/v2-tests/appserv-tests/devtests/jpa-integration/toplink-essentials/advanced/ejb/PhoneNumber.java
@@ -17,8 +17,8 @@
package oracle.toplink.essentials.testing.models.cmp3.advanced;
import java.io.*;
-import javax.persistence.*;
-import static javax.persistence.FetchType.*;
+import jakarta.persistence.*;
+import static jakarta.persistence.FetchType.*;
/**
* <p><b>Purpose</b>: Describes an Employee's phone number.
diff --git a/appserver/tests/v2-tests/appserv-tests/devtests/jpa-integration/toplink-essentials/advanced/ejb/Project.java b/appserver/tests/v2-tests/appserv-tests/devtests/jpa-integration/toplink-essentials/advanced/ejb/Project.java
index facde80..f92eed6 100755
--- a/appserver/tests/v2-tests/appserv-tests/devtests/jpa-integration/toplink-essentials/advanced/ejb/Project.java
+++ b/appserver/tests/v2-tests/appserv-tests/devtests/jpa-integration/toplink-essentials/advanced/ejb/Project.java
@@ -20,11 +20,11 @@
import java.util.*;
import java.io.Serializable;
-import javax.persistence.*;
-import static javax.persistence.GenerationType.*;
-import static javax.persistence.CascadeType.*;
-import static javax.persistence.InheritanceType.*;
-import static javax.persistence.FetchType.*;
+import jakarta.persistence.*;
+import static jakarta.persistence.GenerationType.*;
+import static jakarta.persistence.CascadeType.*;
+import static jakarta.persistence.InheritanceType.*;
+import static jakarta.persistence.FetchType.*;
/**
* Bean class: ProjectBean
diff --git a/appserver/tests/v2-tests/appserv-tests/devtests/jpa-integration/toplink-essentials/advanced/ejb/SmallProject.java b/appserver/tests/v2-tests/appserv-tests/devtests/jpa-integration/toplink-essentials/advanced/ejb/SmallProject.java
index c0995f0..a7998f8 100755
--- a/appserver/tests/v2-tests/appserv-tests/devtests/jpa-integration/toplink-essentials/advanced/ejb/SmallProject.java
+++ b/appserver/tests/v2-tests/appserv-tests/devtests/jpa-integration/toplink-essentials/advanced/ejb/SmallProject.java
@@ -18,7 +18,7 @@
package oracle.toplink.essentials.testing.models.cmp3.advanced;
-import javax.persistence.*;
+import jakarta.persistence.*;
/**
* Local interface for the small project bean.
diff --git a/appserver/tests/v2-tests/appserv-tests/devtests/jpa-integration/toplink-essentials/framework/TestNGTestCase.java b/appserver/tests/v2-tests/appserv-tests/devtests/jpa-integration/toplink-essentials/framework/TestNGTestCase.java
index 5c27887..698a5f4 100644
--- a/appserver/tests/v2-tests/appserv-tests/devtests/jpa-integration/toplink-essentials/framework/TestNGTestCase.java
+++ b/appserver/tests/v2-tests/appserv-tests/devtests/jpa-integration/toplink-essentials/framework/TestNGTestCase.java
@@ -24,9 +24,9 @@
import org.testng.annotations.Configuration;
import org.testng.annotations.Test;
-import javax.persistence.EntityManager;
-import javax.persistence.EntityManagerFactory;
-import javax.persistence.Persistence;
+import jakarta.persistence.EntityManager;
+import jakarta.persistence.EntityManagerFactory;
+import jakarta.persistence.Persistence;
import java.net.URL;
import java.util.HashMap;
diff --git a/appserver/tests/v2-tests/appserv-tests/devtests/persistence-annotation/ejb30/ejb/Address.java b/appserver/tests/v2-tests/appserv-tests/devtests/persistence-annotation/ejb30/ejb/Address.java
index 1e10e1c..f8bf5dc 100644
--- a/appserver/tests/v2-tests/appserv-tests/devtests/persistence-annotation/ejb30/ejb/Address.java
+++ b/appserver/tests/v2-tests/appserv-tests/devtests/persistence-annotation/ejb30/ejb/Address.java
@@ -22,9 +22,9 @@
package com.acme;
-import javax.persistence.*;
-import static javax.persistence.GeneratorType.*;
-import static javax.persistence.AccessType.*;
+import jakarta.persistence.*;
+import static jakarta.persistence.GeneratorType.*;
+import static jakarta.persistence.AccessType.*;
/**
*
diff --git a/appserver/tests/v2-tests/appserv-tests/devtests/persistence-annotation/ejb30/ejb/Customer.java b/appserver/tests/v2-tests/appserv-tests/devtests/persistence-annotation/ejb30/ejb/Customer.java
index ca7b505..64e26ea 100644
--- a/appserver/tests/v2-tests/appserv-tests/devtests/persistence-annotation/ejb30/ejb/Customer.java
+++ b/appserver/tests/v2-tests/appserv-tests/devtests/persistence-annotation/ejb30/ejb/Customer.java
@@ -26,9 +26,9 @@
import java.util.HashSet;
import java.util.Set;
import java.util.Vector;
-import javax.persistence.*;
-import static javax.persistence.GeneratorType.*;
-import static javax.persistence.AccessType.*;
+import jakarta.persistence.*;
+import static jakarta.persistence.GeneratorType.*;
+import static jakarta.persistence.AccessType.*;
/**
*
* @author ss141213
diff --git a/appserver/tests/v2-tests/appserv-tests/devtests/persistence-annotation/ejb30/ejb/DeliveryService.java b/appserver/tests/v2-tests/appserv-tests/devtests/persistence-annotation/ejb30/ejb/DeliveryService.java
index 249ef15..5f752a4 100644
--- a/appserver/tests/v2-tests/appserv-tests/devtests/persistence-annotation/ejb30/ejb/DeliveryService.java
+++ b/appserver/tests/v2-tests/appserv-tests/devtests/persistence-annotation/ejb30/ejb/DeliveryService.java
@@ -22,9 +22,9 @@
package com.acme;
import java.util.Collection;
-import javax.persistence.*;
-import static javax.persistence.GeneratorType.*;
-import static javax.persistence.AccessType.*;
+import jakarta.persistence.*;
+import static jakarta.persistence.GeneratorType.*;
+import static jakarta.persistence.AccessType.*;
/**
*
diff --git a/appserver/tests/v2-tests/appserv-tests/devtests/persistence-annotation/ejb30/ejb/EmploymentPeriod.java b/appserver/tests/v2-tests/appserv-tests/devtests/persistence-annotation/ejb30/ejb/EmploymentPeriod.java
index 32325a4..7616c24 100644
--- a/appserver/tests/v2-tests/appserv-tests/devtests/persistence-annotation/ejb30/ejb/EmploymentPeriod.java
+++ b/appserver/tests/v2-tests/appserv-tests/devtests/persistence-annotation/ejb30/ejb/EmploymentPeriod.java
@@ -27,9 +27,9 @@
import java.util.HashSet;
import java.util.Set;
import java.util.Vector;
-import javax.persistence.*;
-import static javax.persistence.GeneratorType.*;
-import static javax.persistence.AccessType.*;
+import jakarta.persistence.*;
+import static jakarta.persistence.GeneratorType.*;
+import static jakarta.persistence.AccessType.*;
/**
*
* @author ss141213
diff --git a/appserver/tests/v2-tests/appserv-tests/devtests/persistence-annotation/ejb30/ejb/Order.java b/appserver/tests/v2-tests/appserv-tests/devtests/persistence-annotation/ejb30/ejb/Order.java
index 4848e8d..c283eb2 100644
--- a/appserver/tests/v2-tests/appserv-tests/devtests/persistence-annotation/ejb30/ejb/Order.java
+++ b/appserver/tests/v2-tests/appserv-tests/devtests/persistence-annotation/ejb30/ejb/Order.java
@@ -21,9 +21,9 @@
*/
package com.acme;
-import javax.persistence.*;
-import static javax.persistence.GeneratorType.*;
-import static javax.persistence.AccessType.*;
+import jakarta.persistence.*;
+import static jakarta.persistence.GeneratorType.*;
+import static jakarta.persistence.AccessType.*;
/**
*
diff --git a/appserver/tests/v2-tests/appserv-tests/sqetests/ejb/ejb30/persistence/onetomany/ejb/CustomerEntity.java b/appserver/tests/v2-tests/appserv-tests/sqetests/ejb/ejb30/persistence/onetomany/ejb/CustomerEntity.java
index ba66e41..c175b13 100644
--- a/appserver/tests/v2-tests/appserv-tests/sqetests/ejb/ejb30/persistence/onetomany/ejb/CustomerEntity.java
+++ b/appserver/tests/v2-tests/appserv-tests/sqetests/ejb/ejb30/persistence/onetomany/ejb/CustomerEntity.java
@@ -16,7 +16,7 @@
package pe.ejb.ejb30.persistence.toplinksample.ejb;
-import javax.persistence.*;
+import jakarta.persistence.*;
import java.util.Collection;
@Entity
diff --git a/appserver/tests/v2-tests/appserv-tests/sqetests/ejb/ejb30/persistence/onetomany/ejb/ItemEntity.java b/appserver/tests/v2-tests/appserv-tests/sqetests/ejb/ejb30/persistence/onetomany/ejb/ItemEntity.java
index 21fa783..081185c 100644
--- a/appserver/tests/v2-tests/appserv-tests/sqetests/ejb/ejb30/persistence/onetomany/ejb/ItemEntity.java
+++ b/appserver/tests/v2-tests/appserv-tests/sqetests/ejb/ejb30/persistence/onetomany/ejb/ItemEntity.java
@@ -16,7 +16,7 @@
package pe.ejb.ejb30.persistence.toplinksample.ejb;
-import javax.persistence.*;
+import jakarta.persistence.*;
@Entity
@Table(name = "CMP3_ITEM")
diff --git a/appserver/tests/v2-tests/appserv-tests/sqetests/ejb/ejb30/persistence/onetomany/ejb/OrderEntity.java b/appserver/tests/v2-tests/appserv-tests/sqetests/ejb/ejb30/persistence/onetomany/ejb/OrderEntity.java
index 7fb2976..7275e12 100644
--- a/appserver/tests/v2-tests/appserv-tests/sqetests/ejb/ejb30/persistence/onetomany/ejb/OrderEntity.java
+++ b/appserver/tests/v2-tests/appserv-tests/sqetests/ejb/ejb30/persistence/onetomany/ejb/OrderEntity.java
@@ -16,7 +16,7 @@
package pe.ejb.ejb30.persistence.toplinksample.ejb;
-import javax.persistence.*;
+import jakarta.persistence.*;
@Entity(name="OrderBean")
@Table(name="CMP3_ORDER")
diff --git a/appserver/tests/v2-tests/appserv-tests/sqetests/ejb/ejb30/persistence/onetomany/ejb/StatelessBean.java b/appserver/tests/v2-tests/appserv-tests/sqetests/ejb/ejb30/persistence/onetomany/ejb/StatelessBean.java
index 6b7b38a..54468fd 100644
--- a/appserver/tests/v2-tests/appserv-tests/sqetests/ejb/ejb30/persistence/onetomany/ejb/StatelessBean.java
+++ b/appserver/tests/v2-tests/appserv-tests/sqetests/ejb/ejb30/persistence/onetomany/ejb/StatelessBean.java
@@ -17,7 +17,7 @@
package pe.ejb.ejb30.persistence.toplinksample.ejb;
import jakarta.ejb.*;
-import javax.persistence.*;
+import jakarta.persistence.*;
import jakarta.annotation.*;
import javax.sql.*;
import com.sun.ejte.ccl.reporter.SimpleReporterAdapter;
diff --git a/appserver/verifier/verifier-impl/src/main/java/com/sun/enterprise/tools/verifier/apiscan/stdapis/APIRepository.java b/appserver/verifier/verifier-impl/src/main/java/com/sun/enterprise/tools/verifier/apiscan/stdapis/APIRepository.java
index 6b0420d..ea3d3ea 100644
--- a/appserver/verifier/verifier-impl/src/main/java/com/sun/enterprise/tools/verifier/apiscan/stdapis/APIRepository.java
+++ b/appserver/verifier/verifier-impl/src/main/java/com/sun/enterprise/tools/verifier/apiscan/stdapis/APIRepository.java
@@ -133,9 +133,9 @@
/**
* This method is used to find out if a particular package is part of
* a standard API or not. e.g. to find out if an appclient (v 1.4) is
- * allowed to import javax.persistence.* , call this method as
+ * allowed to import jakarta.persistence.* , call this method as
* <blockquote><pre>
- * isPackagePartOf("javax.persistence","appclient_1.4")
+ * isPackagePartOf("jakarta.persistence","appclient_1.4")
* </pre></blockquote>
*
* @param pkg_name name of the package
diff --git a/appserver/web/weld-integration/src/main/java/org/glassfish/weld/InjectionPointHelper.java b/appserver/web/weld-integration/src/main/java/org/glassfish/weld/InjectionPointHelper.java
index 03b3c7a..7982f84 100644
--- a/appserver/web/weld-integration/src/main/java/org/glassfish/weld/InjectionPointHelper.java
+++ b/appserver/web/weld-integration/src/main/java/org/glassfish/weld/InjectionPointHelper.java
@@ -168,8 +168,8 @@
String className = next.annotationType().getName();
if( className.equals("jakarta.ejb.EJB") ||
className.equals("jakarta.annotation.Resource") ||
- className.equals("javax.persistence.PersistenceContext") ||
- className.equals("javax.persistence.PersistenceUnit") ||
+ className.equals("jakarta.persistence.PersistenceContext") ||
+ className.equals("jakarta.persistence.PersistenceUnit") ||
className.equals("jakarta.xml.ws.WebServiceRef") ) {
envAnnotation = next;
break;
diff --git a/nucleus/common/common-util/src/main/java/com/sun/enterprise/admin/monitor/callflow/Agent.java b/nucleus/common/common-util/src/main/java/com/sun/enterprise/admin/monitor/callflow/Agent.java
index bd95abe..cf69e0f 100755
--- a/nucleus/common/common-util/src/main/java/com/sun/enterprise/admin/monitor/callflow/Agent.java
+++ b/nucleus/common/common-util/src/main/java/com/sun/enterprise/admin/monitor/callflow/Agent.java
@@ -167,28 +167,28 @@
/**
* This method is called the persistence container on a request processor
* thread, before invoking a method on the
- * @see javax.persistence.EntityManager EntityManager interface
+ * @see jakarta.persistence.EntityManager EntityManager interface
*/
public void entityManagerMethodStart (EntityManagerMethod entityManagerMethod);
/**
* This method is called the persistence container on a request processor
* thread, after invoking a method on the
- * @see javax.persistence.EntityManager EntityManager interface
+ * @see jakarta.persistence.EntityManager EntityManager interface
*/
public void entityManagerMethodEnd ();
/**
* This method is called the persistence container on a request processor
* thread, before invoking a method on the
- * @see javax.persistence.Query Query interface
+ * @see jakarta.persistence.Query Query interface
*/
public void entityManagerQueryStart (EntityManagerQueryMethod queryMethod);
/**
* This method is called the persistence container on a request processor
* thread, after invoking a method on the
- * @see javax.persistence.Query Query interface
+ * @see jakarta.persistence.Query Query interface
*/
public void entityManagerQueryEnd ();
