diff --git a/appserver/core/api-exporter-fragment/pom.xml b/appserver/core/api-exporter-fragment/pom.xml
index fb51bbb..86955f6 100755
--- a/appserver/core/api-exporter-fragment/pom.xml
+++ b/appserver/core/api-exporter-fragment/pom.xml
@@ -86,15 +86,15 @@
 javax.crypto; \
 javax.crypto.interfaces; \
 javax.crypto.spec; \
-javax.decorator; \
+jakarta.decorator; \
 jakarta.ejb; \
 jakarta.ejb.embeddable; \
 jakarta.ejb.spi; \
 javax.el; \
 javax.enterprise.concurrent; \
-javax.enterprise.context; \
-javax.enterprise.context.control; \
-javax.enterprise.context.spi; \
+jakarta.enterprise.context; \
+jakarta.enterprise.context.control; \
+jakarta.enterprise.context.spi; \
 javax.enterprise.deploy.model; \
 javax.enterprise.deploy.model.exceptions; \
 javax.enterprise.deploy.shared; \
@@ -103,13 +103,13 @@
 javax.enterprise.deploy.spi.exceptions; \
 javax.enterprise.deploy.spi.factories; \
 javax.enterprise.deploy.spi.status; \
-javax.enterprise.event; \
-javax.enterprise.inject; \
-javax.enterprise.inject.literal; \
-javax.enterprise.inject.se; \
-javax.enterprise.inject.spi; \
-javax.enterprise.inject.spi.configurator; \
-javax.enterprise.util; \
+jakarta.enterprise.event; \
+jakarta.enterprise.inject; \
+jakarta.enterprise.inject.literal; \
+jakarta.enterprise.inject.se; \
+jakarta.enterprise.inject.spi; \
+jakarta.enterprise.inject.spi.configurator; \
+jakarta.enterprise.util; \
 jakarta.faces; \
 jakarta.faces.annotation; \
 jakarta.faces.application; \
diff --git a/appserver/deployment/dol/src/main/java/com/sun/enterprise/deployment/ResourceEnvReferenceDescriptor.java b/appserver/deployment/dol/src/main/java/com/sun/enterprise/deployment/ResourceEnvReferenceDescriptor.java
index 3721f9e..48c4c54 100644
--- a/appserver/deployment/dol/src/main/java/com/sun/enterprise/deployment/ResourceEnvReferenceDescriptor.java
+++ b/appserver/deployment/dol/src/main/java/com/sun/enterprise/deployment/ResourceEnvReferenceDescriptor.java
@@ -40,7 +40,7 @@
     private static final String VALIDATION_VALIDATOR ="jakarta.validation.Validator";
     private static final String VALIDATION_VALIDATOR_FACTORY ="jakarta.validation.ValidatorFactory";
 
-    private static final String CDI_BEAN_MANAGER_TYPE = "javax.enterprise.inject.spi.BeanManager";
+    private static final String CDI_BEAN_MANAGER_TYPE = "jakarta.enterprise.inject.spi.BeanManager";
 
     public ResourceEnvReferenceDescriptor() {
     }
diff --git a/appserver/jms/gf-jms-injection/osgi.bundle b/appserver/jms/gf-jms-injection/osgi.bundle
index d7645cc..22d191e 100644
--- a/appserver/jms/gf-jms-injection/osgi.bundle
+++ b/appserver/jms/gf-jms-injection/osgi.bundle
@@ -15,4 +15,4 @@
 #
 
 -exportcontents: org.glassfish.jms.injection; version=${project.osgi.version}
-Import-Package: javax.enterprise.inject;resolution:=optional, *
+Import-Package: jakarta.enterprise.inject;resolution:=optional, *
diff --git a/appserver/jms/gf-jms-injection/pom.xml b/appserver/jms/gf-jms-injection/pom.xml
index b500f46..e3d9069 100644
--- a/appserver/jms/gf-jms-injection/pom.xml
+++ b/appserver/jms/gf-jms-injection/pom.xml
@@ -92,7 +92,7 @@
             <resource>
                 <directory>src/main/resources</directory>
                 <includes>
-                    <include>**/javax.enterprise.inject.spi.Extension</include>
+                    <include>**/jakarta.enterprise.inject.spi.Extension</include>
                 </includes>
             </resource>
         </resources>
diff --git a/appserver/tests/appserv-tests/config/common.xml b/appserver/tests/appserv-tests/config/common.xml
index b90b445..15ee5f5 100644
--- a/appserver/tests/appserv-tests/config/common.xml
+++ b/appserver/tests/appserv-tests/config/common.xml
@@ -195,7 +195,7 @@
   <copy file="${context.xml}"
       tofile="${build.classes.dir}/tmp/META-INF/context.xml" failonerror="false"/>
   <copy file="${cdi-extension.service}"
-      tofile="${build.classes.dir}/tmp/WEB-INF/classes/META-INF/services/javax.enterprise.inject.spi.Extension" failonerror="false"/>
+      tofile="${build.classes.dir}/tmp/WEB-INF/classes/META-INF/services/jakarta.enterprise.inject.spi.Extension" failonerror="false"/>
       
   <copy todir="${build.classes.dir}/tmp/WEB-INF/classes">
       <fileset dir="${war.classes}">
@@ -241,7 +241,7 @@
       <include name="WEB-INF/wsdl/${wsdlfile.name}"/>
       <include name="${mappingfile.name}"/>
       <include name="META-INF/context.xml"/>
-      <include name="WEB-INF/classes/META-INF/services/javax.enterprise.inject.spi.Extension"/>
+      <include name="WEB-INF/classes/META-INF/services/jakarta.enterprise.inject.spi.Extension"/>
       <include name="WEB-INF/classes/META-INF/persistence.xml"/>
     </fileset>
   </jar>       
diff --git a/appserver/tests/appserv-tests/devtests/cdi/alternatives/servlet/test/artifacts/MockPaymentProcessor.java b/appserver/tests/appserv-tests/devtests/cdi/alternatives/servlet/test/artifacts/MockPaymentProcessor.java
index 8d736e2..4186886 100644
--- a/appserver/tests/appserv-tests/devtests/cdi/alternatives/servlet/test/artifacts/MockPaymentProcessor.java
+++ b/appserver/tests/appserv-tests/devtests/cdi/alternatives/servlet/test/artifacts/MockPaymentProcessor.java
@@ -16,7 +16,7 @@
 
 package test.artifacts;
 
-import javax.enterprise.inject.Alternative;
+import jakarta.enterprise.inject.Alternative;
 
 @Alternative @Asynchronous @Synchronous
 public class MockPaymentProcessor implements PaymentProcessor{
diff --git a/appserver/tests/appserv-tests/devtests/cdi/alternatives/servlet/test/artifacts/PayBy.java b/appserver/tests/appserv-tests/devtests/cdi/alternatives/servlet/test/artifacts/PayBy.java
index e8d9f1f..8d24977 100644
--- a/appserver/tests/appserv-tests/devtests/cdi/alternatives/servlet/test/artifacts/PayBy.java
+++ b/appserver/tests/appserv-tests/devtests/cdi/alternatives/servlet/test/artifacts/PayBy.java
@@ -21,7 +21,7 @@
 import java.lang.annotation.RetentionPolicy;
 import java.lang.annotation.Target;
 
-import javax.enterprise.util.Nonbinding;
+import jakarta.enterprise.util.Nonbinding;
 import jakarta.inject.Qualifier;
 
 @Qualifier
diff --git a/appserver/tests/appserv-tests/devtests/cdi/alternatives/servlet/test/beans/BeanToTestAlternatives.java b/appserver/tests/appserv-tests/devtests/cdi/alternatives/servlet/test/beans/BeanToTestAlternatives.java
index 4f07649..6e1bad6 100644
--- a/appserver/tests/appserv-tests/devtests/cdi/alternatives/servlet/test/beans/BeanToTestAlternatives.java
+++ b/appserver/tests/appserv-tests/devtests/cdi/alternatives/servlet/test/beans/BeanToTestAlternatives.java
@@ -16,8 +16,8 @@
 
 package test.beans;
 
-import javax.enterprise.inject.Any;
-import javax.enterprise.inject.Instance;
+import jakarta.enterprise.inject.Any;
+import jakarta.enterprise.inject.Instance;
 import jakarta.inject.Inject;
 
 import test.artifacts.Asynchronous;
diff --git a/appserver/tests/appserv-tests/devtests/cdi/ambiguous-deps/servlet/test/artifacts/DisabledMockPaymentProcessor.java b/appserver/tests/appserv-tests/devtests/cdi/ambiguous-deps/servlet/test/artifacts/DisabledMockPaymentProcessor.java
index 4f1a98f..a0ae218 100644
--- a/appserver/tests/appserv-tests/devtests/cdi/ambiguous-deps/servlet/test/artifacts/DisabledMockPaymentProcessor.java
+++ b/appserver/tests/appserv-tests/devtests/cdi/ambiguous-deps/servlet/test/artifacts/DisabledMockPaymentProcessor.java
@@ -16,7 +16,7 @@
 
 package test.artifacts;
 
-import javax.enterprise.inject.Alternative;
+import jakarta.enterprise.inject.Alternative;
 
 @Alternative
 @Asynchronous
diff --git a/appserver/tests/appserv-tests/devtests/cdi/ambiguous-deps/servlet/test/artifacts/MockCashReliablePaymentProcessor.java b/appserver/tests/appserv-tests/devtests/cdi/ambiguous-deps/servlet/test/artifacts/MockCashReliablePaymentProcessor.java
index a986225..12d7e7c 100644
--- a/appserver/tests/appserv-tests/devtests/cdi/ambiguous-deps/servlet/test/artifacts/MockCashReliablePaymentProcessor.java
+++ b/appserver/tests/appserv-tests/devtests/cdi/ambiguous-deps/servlet/test/artifacts/MockCashReliablePaymentProcessor.java
@@ -16,7 +16,7 @@
 
 package test.artifacts;
 
-import javax.enterprise.inject.Alternative;
+import jakarta.enterprise.inject.Alternative;
 
 
 @Alternative @PayBy(value=PaymentMethod.CASH) @Reliable
diff --git a/appserver/tests/appserv-tests/devtests/cdi/ambiguous-deps/servlet/test/artifacts/MockChequePaymentProcessor.java b/appserver/tests/appserv-tests/devtests/cdi/ambiguous-deps/servlet/test/artifacts/MockChequePaymentProcessor.java
index e00b802..b29895c 100644
--- a/appserver/tests/appserv-tests/devtests/cdi/ambiguous-deps/servlet/test/artifacts/MockChequePaymentProcessor.java
+++ b/appserver/tests/appserv-tests/devtests/cdi/ambiguous-deps/servlet/test/artifacts/MockChequePaymentProcessor.java
@@ -16,7 +16,7 @@
 
 package test.artifacts;
 
-import javax.enterprise.inject.Alternative;
+import jakarta.enterprise.inject.Alternative;
 
 @Alternative @PayBy(PaymentMethod.CHEQUE)
 //Not enabled via beans.xml
diff --git a/appserver/tests/appserv-tests/devtests/cdi/ambiguous-deps/servlet/test/artifacts/MockPaymentProcessor.java b/appserver/tests/appserv-tests/devtests/cdi/ambiguous-deps/servlet/test/artifacts/MockPaymentProcessor.java
index 8d736e2..4186886 100644
--- a/appserver/tests/appserv-tests/devtests/cdi/ambiguous-deps/servlet/test/artifacts/MockPaymentProcessor.java
+++ b/appserver/tests/appserv-tests/devtests/cdi/ambiguous-deps/servlet/test/artifacts/MockPaymentProcessor.java
@@ -16,7 +16,7 @@
 
 package test.artifacts;
 
-import javax.enterprise.inject.Alternative;
+import jakarta.enterprise.inject.Alternative;
 
 @Alternative @Asynchronous @Synchronous
 public class MockPaymentProcessor implements PaymentProcessor{
diff --git a/appserver/tests/appserv-tests/devtests/cdi/ambiguous-deps/servlet/test/artifacts/PayBy.java b/appserver/tests/appserv-tests/devtests/cdi/ambiguous-deps/servlet/test/artifacts/PayBy.java
index e8d9f1f..8d24977 100644
--- a/appserver/tests/appserv-tests/devtests/cdi/ambiguous-deps/servlet/test/artifacts/PayBy.java
+++ b/appserver/tests/appserv-tests/devtests/cdi/ambiguous-deps/servlet/test/artifacts/PayBy.java
@@ -21,7 +21,7 @@
 import java.lang.annotation.RetentionPolicy;
 import java.lang.annotation.Target;
 
-import javax.enterprise.util.Nonbinding;
+import jakarta.enterprise.util.Nonbinding;
 import jakarta.inject.Qualifier;
 
 @Qualifier
diff --git a/appserver/tests/appserv-tests/devtests/cdi/ambiguous-deps/servlet/test/beans/BeanToTestAmbiguousDependencies.java b/appserver/tests/appserv-tests/devtests/cdi/ambiguous-deps/servlet/test/beans/BeanToTestAmbiguousDependencies.java
index d109c73..58458e3 100644
--- a/appserver/tests/appserv-tests/devtests/cdi/ambiguous-deps/servlet/test/beans/BeanToTestAmbiguousDependencies.java
+++ b/appserver/tests/appserv-tests/devtests/cdi/ambiguous-deps/servlet/test/beans/BeanToTestAmbiguousDependencies.java
@@ -16,8 +16,8 @@
 
 package test.beans;
 
-import javax.enterprise.inject.Any;
-import javax.enterprise.inject.Instance;
+import jakarta.enterprise.inject.Any;
+import jakarta.enterprise.inject.Instance;
 import jakarta.inject.Inject;
 
 import test.artifacts.Asynchronous;
diff --git a/appserver/tests/appserv-tests/devtests/cdi/decorators/decorators-over-beans-from-producer-methods/servlet/test/beans/TestBeanDecorator.java b/appserver/tests/appserv-tests/devtests/cdi/decorators/decorators-over-beans-from-producer-methods/servlet/test/beans/TestBeanDecorator.java
index 9acb0c3..3c9f84f 100644
--- a/appserver/tests/appserv-tests/devtests/cdi/decorators/decorators-over-beans-from-producer-methods/servlet/test/beans/TestBeanDecorator.java
+++ b/appserver/tests/appserv-tests/devtests/cdi/decorators/decorators-over-beans-from-producer-methods/servlet/test/beans/TestBeanDecorator.java
@@ -16,8 +16,8 @@
 
 package test.beans;
 
-import javax.decorator.Decorator;
-import javax.decorator.Delegate;
+import jakarta.decorator.Decorator;
+import jakarta.decorator.Delegate;
 import jakarta.inject.Inject;
 
 @Decorator
diff --git a/appserver/tests/appserv-tests/devtests/cdi/decorators/decorators-over-beans-from-producer-methods/servlet/test/beans/TestBeanProducer.java b/appserver/tests/appserv-tests/devtests/cdi/decorators/decorators-over-beans-from-producer-methods/servlet/test/beans/TestBeanProducer.java
index a171c87..8412a46 100644
--- a/appserver/tests/appserv-tests/devtests/cdi/decorators/decorators-over-beans-from-producer-methods/servlet/test/beans/TestBeanProducer.java
+++ b/appserver/tests/appserv-tests/devtests/cdi/decorators/decorators-over-beans-from-producer-methods/servlet/test/beans/TestBeanProducer.java
@@ -16,9 +16,9 @@
 
 package test.beans;
 
-import javax.enterprise.context.RequestScoped;
-import javax.enterprise.inject.New;
-import javax.enterprise.inject.Produces;
+import jakarta.enterprise.context.RequestScoped;
+import jakarta.enterprise.inject.New;
+import jakarta.enterprise.inject.Produces;
 
 public class TestBeanProducer {
 
diff --git a/appserver/tests/appserv-tests/devtests/cdi/decorators/simple-decorator/servlet/test/beans/LargeTransactionDecorator.java b/appserver/tests/appserv-tests/devtests/cdi/decorators/simple-decorator/servlet/test/beans/LargeTransactionDecorator.java
index 565424a..f54e7bf 100644
--- a/appserver/tests/appserv-tests/devtests/cdi/decorators/simple-decorator/servlet/test/beans/LargeTransactionDecorator.java
+++ b/appserver/tests/appserv-tests/devtests/cdi/decorators/simple-decorator/servlet/test/beans/LargeTransactionDecorator.java
@@ -18,8 +18,8 @@
 
 import java.math.BigDecimal;
 
-import javax.decorator.Decorator;
-import javax.decorator.Delegate;
+import jakarta.decorator.Decorator;
+import jakarta.decorator.Delegate;
 import jakarta.inject.Inject;
 
 @Decorator
diff --git a/appserver/tests/appserv-tests/devtests/cdi/decorators/simple-decorator/servlet/test/beans/TestBean.java b/appserver/tests/appserv-tests/devtests/cdi/decorators/simple-decorator/servlet/test/beans/TestBean.java
index 4792d26..eec4d45 100644
--- a/appserver/tests/appserv-tests/devtests/cdi/decorators/simple-decorator/servlet/test/beans/TestBean.java
+++ b/appserver/tests/appserv-tests/devtests/cdi/decorators/simple-decorator/servlet/test/beans/TestBean.java
@@ -16,7 +16,7 @@
 
 package test.beans;
 
-import javax.enterprise.context.RequestScoped;
+import jakarta.enterprise.context.RequestScoped;
 
 @Transactional
 @RequestScoped
diff --git a/appserver/tests/appserv-tests/devtests/cdi/decorators/simple-decorator/servlet/test/beans/Transactional.java b/appserver/tests/appserv-tests/devtests/cdi/decorators/simple-decorator/servlet/test/beans/Transactional.java
index d2ed8a6..3f12323 100644
--- a/appserver/tests/appserv-tests/devtests/cdi/decorators/simple-decorator/servlet/test/beans/Transactional.java
+++ b/appserver/tests/appserv-tests/devtests/cdi/decorators/simple-decorator/servlet/test/beans/Transactional.java
@@ -23,7 +23,7 @@
 import java.lang.annotation.RetentionPolicy;
 import java.lang.annotation.Target;
 
-import javax.enterprise.util.Nonbinding;
+import jakarta.enterprise.util.Nonbinding;
 import jakarta.interceptor.InterceptorBinding;
 
 @Target({TYPE, METHOD})
diff --git a/appserver/tests/appserv-tests/devtests/cdi/events/conditional-observer/servlet/test/beans/SecondTestEventConditionalObserver.java b/appserver/tests/appserv-tests/devtests/cdi/events/conditional-observer/servlet/test/beans/SecondTestEventConditionalObserver.java
index 0a34e1e..9698f2a 100644
--- a/appserver/tests/appserv-tests/devtests/cdi/events/conditional-observer/servlet/test/beans/SecondTestEventConditionalObserver.java
+++ b/appserver/tests/appserv-tests/devtests/cdi/events/conditional-observer/servlet/test/beans/SecondTestEventConditionalObserver.java
@@ -18,9 +18,9 @@
 
 import java.io.Serializable;
 
-import javax.enterprise.context.ConversationScoped;
-import javax.enterprise.event.Observes;
-import javax.enterprise.event.Reception;
+import jakarta.enterprise.context.ConversationScoped;
+import jakarta.enterprise.event.Observes;
+import jakarta.enterprise.event.Reception;
 
 @ConversationScoped
 public class SecondTestEventConditionalObserver implements Serializable{
diff --git a/appserver/tests/appserv-tests/devtests/cdi/events/conditional-observer/servlet/test/beans/TestEventConditionalObserver.java b/appserver/tests/appserv-tests/devtests/cdi/events/conditional-observer/servlet/test/beans/TestEventConditionalObserver.java
index 1725d36..e690ca0 100644
--- a/appserver/tests/appserv-tests/devtests/cdi/events/conditional-observer/servlet/test/beans/TestEventConditionalObserver.java
+++ b/appserver/tests/appserv-tests/devtests/cdi/events/conditional-observer/servlet/test/beans/TestEventConditionalObserver.java
@@ -16,9 +16,9 @@
 
 package test.beans;
 
-import javax.enterprise.context.RequestScoped;
-import javax.enterprise.event.Observes;
-import javax.enterprise.event.Reception;
+import jakarta.enterprise.context.RequestScoped;
+import jakarta.enterprise.event.Observes;
+import jakarta.enterprise.event.Reception;
 
 @RequestScoped
 public class TestEventConditionalObserver {
diff --git a/appserver/tests/appserv-tests/devtests/cdi/events/conditional-observer/servlet/test/beans/TestEventProducer.java b/appserver/tests/appserv-tests/devtests/cdi/events/conditional-observer/servlet/test/beans/TestEventProducer.java
index f899bc0..bb6c1be 100644
--- a/appserver/tests/appserv-tests/devtests/cdi/events/conditional-observer/servlet/test/beans/TestEventProducer.java
+++ b/appserver/tests/appserv-tests/devtests/cdi/events/conditional-observer/servlet/test/beans/TestEventProducer.java
@@ -16,8 +16,8 @@
 
 package test.beans;
 
-import javax.enterprise.event.Event;
-import javax.enterprise.util.AnnotationLiteral;
+import jakarta.enterprise.event.Event;
+import jakarta.enterprise.util.AnnotationLiteral;
 import jakarta.inject.Inject;
 
 public class TestEventProducer {
diff --git a/appserver/tests/appserv-tests/devtests/cdi/events/event-producers/servlet/test/beans/TestEventObserver.java b/appserver/tests/appserv-tests/devtests/cdi/events/event-producers/servlet/test/beans/TestEventObserver.java
index 9bddd9a..60a0b83 100644
--- a/appserver/tests/appserv-tests/devtests/cdi/events/event-producers/servlet/test/beans/TestEventObserver.java
+++ b/appserver/tests/appserv-tests/devtests/cdi/events/event-producers/servlet/test/beans/TestEventObserver.java
@@ -16,7 +16,7 @@
 
 package test.beans;
 
-import javax.enterprise.event.Observes;
+import jakarta.enterprise.event.Observes;
 
 public class TestEventObserver {
     public static int documentCreatedEvent = 0;
diff --git a/appserver/tests/appserv-tests/devtests/cdi/events/event-producers/servlet/test/beans/TestEventProducer.java b/appserver/tests/appserv-tests/devtests/cdi/events/event-producers/servlet/test/beans/TestEventProducer.java
index f899bc0..bb6c1be 100644
--- a/appserver/tests/appserv-tests/devtests/cdi/events/event-producers/servlet/test/beans/TestEventProducer.java
+++ b/appserver/tests/appserv-tests/devtests/cdi/events/event-producers/servlet/test/beans/TestEventProducer.java
@@ -16,8 +16,8 @@
 
 package test.beans;
 
-import javax.enterprise.event.Event;
-import javax.enterprise.util.AnnotationLiteral;
+import jakarta.enterprise.event.Event;
+import jakarta.enterprise.util.AnnotationLiteral;
 import jakarta.inject.Inject;
 
 public class TestEventProducer {
diff --git a/appserver/tests/appserv-tests/devtests/cdi/events/event-qualifiers-with-members/servlet/test/beans/TestEventConditionalObserver.java b/appserver/tests/appserv-tests/devtests/cdi/events/event-qualifiers-with-members/servlet/test/beans/TestEventConditionalObserver.java
index 8c2f110..d3d5773 100644
--- a/appserver/tests/appserv-tests/devtests/cdi/events/event-qualifiers-with-members/servlet/test/beans/TestEventConditionalObserver.java
+++ b/appserver/tests/appserv-tests/devtests/cdi/events/event-qualifiers-with-members/servlet/test/beans/TestEventConditionalObserver.java
@@ -16,9 +16,9 @@
 
 package test.beans;
 
-import javax.enterprise.context.RequestScoped;
-import javax.enterprise.event.Observes;
-import javax.enterprise.event.Reception;
+import jakarta.enterprise.context.RequestScoped;
+import jakarta.enterprise.event.Observes;
+import jakarta.enterprise.event.Reception;
 
 public class TestEventConditionalObserver {
     public static int documentAdminUpdatedEvent,
diff --git a/appserver/tests/appserv-tests/devtests/cdi/events/event-qualifiers-with-members/servlet/test/beans/TestEventProducer.java b/appserver/tests/appserv-tests/devtests/cdi/events/event-qualifiers-with-members/servlet/test/beans/TestEventProducer.java
index 8503f73..b9ed6d3 100644
--- a/appserver/tests/appserv-tests/devtests/cdi/events/event-qualifiers-with-members/servlet/test/beans/TestEventProducer.java
+++ b/appserver/tests/appserv-tests/devtests/cdi/events/event-qualifiers-with-members/servlet/test/beans/TestEventProducer.java
@@ -16,8 +16,8 @@
 
 package test.beans;
 
-import javax.enterprise.event.Event;
-import javax.enterprise.util.AnnotationLiteral;
+import jakarta.enterprise.event.Event;
+import jakarta.enterprise.util.AnnotationLiteral;
 import jakarta.inject.Inject;
 
 public class TestEventProducer {
diff --git a/appserver/tests/appserv-tests/devtests/cdi/events/multiple-event-qualifiers/servlet/test/beans/TestEventObserver.java b/appserver/tests/appserv-tests/devtests/cdi/events/multiple-event-qualifiers/servlet/test/beans/TestEventObserver.java
index 7885b88..ace53f0 100644
--- a/appserver/tests/appserv-tests/devtests/cdi/events/multiple-event-qualifiers/servlet/test/beans/TestEventObserver.java
+++ b/appserver/tests/appserv-tests/devtests/cdi/events/multiple-event-qualifiers/servlet/test/beans/TestEventObserver.java
@@ -16,7 +16,7 @@
 
 package test.beans;
 
-import javax.enterprise.event.Observes;
+import jakarta.enterprise.event.Observes;
 
 public class TestEventObserver {
     public static int documentAfterBlogUpdate;
diff --git a/appserver/tests/appserv-tests/devtests/cdi/events/multiple-event-qualifiers/servlet/test/beans/TestEventProducer.java b/appserver/tests/appserv-tests/devtests/cdi/events/multiple-event-qualifiers/servlet/test/beans/TestEventProducer.java
index 267fc5e..e17012b 100644
--- a/appserver/tests/appserv-tests/devtests/cdi/events/multiple-event-qualifiers/servlet/test/beans/TestEventProducer.java
+++ b/appserver/tests/appserv-tests/devtests/cdi/events/multiple-event-qualifiers/servlet/test/beans/TestEventProducer.java
@@ -16,8 +16,8 @@
 
 package test.beans;
 
-import javax.enterprise.event.Event;
-import javax.enterprise.util.AnnotationLiteral;
+import jakarta.enterprise.event.Event;
+import jakarta.enterprise.util.AnnotationLiteral;
 import jakarta.inject.Inject;
 
 import com.sun.research.ws.wadl.Doc;
diff --git a/appserver/tests/appserv-tests/devtests/cdi/events/simple-event-observers/servlet/test/beans/TestEventObserver.java b/appserver/tests/appserv-tests/devtests/cdi/events/simple-event-observers/servlet/test/beans/TestEventObserver.java
index 9b642a6..3529a85 100644
--- a/appserver/tests/appserv-tests/devtests/cdi/events/simple-event-observers/servlet/test/beans/TestEventObserver.java
+++ b/appserver/tests/appserv-tests/devtests/cdi/events/simple-event-observers/servlet/test/beans/TestEventObserver.java
@@ -16,7 +16,7 @@
 
 package test.beans;
 
-import javax.enterprise.event.Observes;
+import jakarta.enterprise.event.Observes;
 
 public class TestEventObserver {
     public static int documentCreatedEvent = 0;
diff --git a/appserver/tests/appserv-tests/devtests/cdi/events/simple-event-observers/servlet/test/beans/TestRequestScopedBean.java b/appserver/tests/appserv-tests/devtests/cdi/events/simple-event-observers/servlet/test/beans/TestRequestScopedBean.java
index 9df6434..da85887 100644
--- a/appserver/tests/appserv-tests/devtests/cdi/events/simple-event-observers/servlet/test/beans/TestRequestScopedBean.java
+++ b/appserver/tests/appserv-tests/devtests/cdi/events/simple-event-observers/servlet/test/beans/TestRequestScopedBean.java
@@ -16,7 +16,7 @@
 
 package test.beans;
 
-import javax.enterprise.event.Event;
+import jakarta.enterprise.event.Event;
 import jakarta.inject.Inject;
 
 public class TestRequestScopedBean {
diff --git a/appserver/tests/appserv-tests/devtests/cdi/implicit/deployment-option/ejb/ImplicitTestBean.java b/appserver/tests/appserv-tests/devtests/cdi/implicit/deployment-option/ejb/ImplicitTestBean.java
index c7ca937..f337062 100644
--- a/appserver/tests/appserv-tests/devtests/cdi/implicit/deployment-option/ejb/ImplicitTestBean.java
+++ b/appserver/tests/appserv-tests/devtests/cdi/implicit/deployment-option/ejb/ImplicitTestBean.java
@@ -14,7 +14,7 @@
  * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
  */
 
-import javax.enterprise.context.RequestScoped;
+import jakarta.enterprise.context.RequestScoped;
 
 //Simple TestBean to test CDI.
 @RequestScoped
diff --git a/appserver/tests/appserv-tests/devtests/cdi/implicit/simple-ejb-cdi/ejb/ImplicitTestBean.java b/appserver/tests/appserv-tests/devtests/cdi/implicit/simple-ejb-cdi/ejb/ImplicitTestBean.java
index c7ca937..f337062 100644
--- a/appserver/tests/appserv-tests/devtests/cdi/implicit/simple-ejb-cdi/ejb/ImplicitTestBean.java
+++ b/appserver/tests/appserv-tests/devtests/cdi/implicit/simple-ejb-cdi/ejb/ImplicitTestBean.java
@@ -14,7 +14,7 @@
  * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
  */
 
-import javax.enterprise.context.RequestScoped;
+import jakarta.enterprise.context.RequestScoped;
 
 //Simple TestBean to test CDI.
 @RequestScoped
diff --git a/appserver/tests/appserv-tests/devtests/cdi/injection-point/servlet/InjectionPointServlet.java b/appserver/tests/appserv-tests/devtests/cdi/injection-point/servlet/InjectionPointServlet.java
index ab4c93b..8ff75ad 100644
--- a/appserver/tests/appserv-tests/devtests/cdi/injection-point/servlet/InjectionPointServlet.java
+++ b/appserver/tests/appserv-tests/devtests/cdi/injection-point/servlet/InjectionPointServlet.java
@@ -18,7 +18,7 @@
 import java.io.PrintWriter;
 import java.util.logging.Logger;
 
-import javax.enterprise.inject.Instance;
+import jakarta.enterprise.inject.Instance;
 import jakarta.inject.Inject;
 import javax.servlet.ServletException;
 import javax.servlet.annotation.WebServlet;
diff --git a/appserver/tests/appserv-tests/devtests/cdi/injection-point/servlet/test/artifacts/HttpParam.java b/appserver/tests/appserv-tests/devtests/cdi/injection-point/servlet/test/artifacts/HttpParam.java
index 99d0f8b..04ddb8b 100644
--- a/appserver/tests/appserv-tests/devtests/cdi/injection-point/servlet/test/artifacts/HttpParam.java
+++ b/appserver/tests/appserv-tests/devtests/cdi/injection-point/servlet/test/artifacts/HttpParam.java
@@ -21,7 +21,7 @@
 import java.lang.annotation.Target;
 import static java.lang.annotation.ElementType.*;
 
-import javax.enterprise.util.Nonbinding;
+import jakarta.enterprise.util.Nonbinding;
 import jakarta.inject.Qualifier;
 
 @Qualifier
diff --git a/appserver/tests/appserv-tests/devtests/cdi/injection-point/servlet/test/artifacts/HttpParams.java b/appserver/tests/appserv-tests/devtests/cdi/injection-point/servlet/test/artifacts/HttpParams.java
index d7d2bd4..8b85e55 100644
--- a/appserver/tests/appserv-tests/devtests/cdi/injection-point/servlet/test/artifacts/HttpParams.java
+++ b/appserver/tests/appserv-tests/devtests/cdi/injection-point/servlet/test/artifacts/HttpParams.java
@@ -18,9 +18,9 @@
 
 import java.util.Enumeration;
 
-import javax.enterprise.context.RequestScoped;
-import javax.enterprise.inject.Produces;
-import javax.enterprise.inject.spi.InjectionPoint;
+import jakarta.enterprise.context.RequestScoped;
+import jakarta.enterprise.inject.Produces;
+import jakarta.enterprise.inject.spi.InjectionPoint;
 import javax.servlet.ServletRequest;
 
 @RequestScoped
diff --git a/appserver/tests/appserv-tests/devtests/cdi/injection-point/servlet/test/artifacts/LogFactory.java b/appserver/tests/appserv-tests/devtests/cdi/injection-point/servlet/test/artifacts/LogFactory.java
index a486c8f..1986687 100644
--- a/appserver/tests/appserv-tests/devtests/cdi/injection-point/servlet/test/artifacts/LogFactory.java
+++ b/appserver/tests/appserv-tests/devtests/cdi/injection-point/servlet/test/artifacts/LogFactory.java
@@ -18,8 +18,8 @@
 
 import java.util.logging.Logger;
 
-import javax.enterprise.inject.Produces;
-import javax.enterprise.inject.spi.InjectionPoint;
+import jakarta.enterprise.inject.Produces;
+import jakarta.enterprise.inject.spi.InjectionPoint;
 
 public class LogFactory {
     @Produces Logger createLogger(InjectionPoint ip){
diff --git a/appserver/tests/appserv-tests/devtests/cdi/interceptors/interceptors-bean-validation/servlet/test/beans/BadProducer.java b/appserver/tests/appserv-tests/devtests/cdi/interceptors/interceptors-bean-validation/servlet/test/beans/BadProducer.java
index c5e5f43..563b3cf 100644
--- a/appserver/tests/appserv-tests/devtests/cdi/interceptors/interceptors-bean-validation/servlet/test/beans/BadProducer.java
+++ b/appserver/tests/appserv-tests/devtests/cdi/interceptors/interceptors-bean-validation/servlet/test/beans/BadProducer.java
@@ -16,7 +16,7 @@
 
 package test.beans;
 
-import javax.enterprise.inject.Produces;
+import jakarta.enterprise.inject.Produces;
 
 
 /**
diff --git a/appserver/tests/appserv-tests/devtests/cdi/interceptors/interceptors-bean-validation/servlet/test/beans/TestBean.java b/appserver/tests/appserv-tests/devtests/cdi/interceptors/interceptors-bean-validation/servlet/test/beans/TestBean.java
index 8179020..24af173 100644
--- a/appserver/tests/appserv-tests/devtests/cdi/interceptors/interceptors-bean-validation/servlet/test/beans/TestBean.java
+++ b/appserver/tests/appserv-tests/devtests/cdi/interceptors/interceptors-bean-validation/servlet/test/beans/TestBean.java
@@ -17,7 +17,7 @@
 package test.beans;
 
 import jakarta.annotation.PostConstruct;
-import javax.enterprise.context.RequestScoped;
+import jakarta.enterprise.context.RequestScoped;
 
 import jakarta.validation.constraints.NotNull;
 
diff --git a/appserver/tests/appserv-tests/devtests/cdi/interceptors/interceptors-binding-type-inheritance/servlet/test/beans/TestBean.java b/appserver/tests/appserv-tests/devtests/cdi/interceptors/interceptors-binding-type-inheritance/servlet/test/beans/TestBean.java
index 4792d26..eec4d45 100644
--- a/appserver/tests/appserv-tests/devtests/cdi/interceptors/interceptors-binding-type-inheritance/servlet/test/beans/TestBean.java
+++ b/appserver/tests/appserv-tests/devtests/cdi/interceptors/interceptors-binding-type-inheritance/servlet/test/beans/TestBean.java
@@ -16,7 +16,7 @@
 
 package test.beans;
 
-import javax.enterprise.context.RequestScoped;
+import jakarta.enterprise.context.RequestScoped;
 
 @Transactional
 @RequestScoped
diff --git a/appserver/tests/appserv-tests/devtests/cdi/interceptors/interceptors-binding-type-inheritance/servlet/test/beans/TestRequestScopedBean.java b/appserver/tests/appserv-tests/devtests/cdi/interceptors/interceptors-binding-type-inheritance/servlet/test/beans/TestRequestScopedBean.java
index 4317821..5c394bd 100644
--- a/appserver/tests/appserv-tests/devtests/cdi/interceptors/interceptors-binding-type-inheritance/servlet/test/beans/TestRequestScopedBean.java
+++ b/appserver/tests/appserv-tests/devtests/cdi/interceptors/interceptors-binding-type-inheritance/servlet/test/beans/TestRequestScopedBean.java
@@ -19,7 +19,7 @@
 import java.util.ArrayList;
 import java.util.List;
 
-import javax.enterprise.context.RequestScoped;
+import jakarta.enterprise.context.RequestScoped;
 
 @RequestScoped
 public class TestRequestScopedBean {
diff --git a/appserver/tests/appserv-tests/devtests/cdi/interceptors/interceptors-binding-type-with-members/servlet/test/beans/TestBean.java b/appserver/tests/appserv-tests/devtests/cdi/interceptors/interceptors-binding-type-with-members/servlet/test/beans/TestBean.java
index 4792d26..eec4d45 100644
--- a/appserver/tests/appserv-tests/devtests/cdi/interceptors/interceptors-binding-type-with-members/servlet/test/beans/TestBean.java
+++ b/appserver/tests/appserv-tests/devtests/cdi/interceptors/interceptors-binding-type-with-members/servlet/test/beans/TestBean.java
@@ -16,7 +16,7 @@
 
 package test.beans;
 
-import javax.enterprise.context.RequestScoped;
+import jakarta.enterprise.context.RequestScoped;
 
 @Transactional
 @RequestScoped
diff --git a/appserver/tests/appserv-tests/devtests/cdi/interceptors/interceptors-binding-type-with-members/servlet/test/beans/Transactional.java b/appserver/tests/appserv-tests/devtests/cdi/interceptors/interceptors-binding-type-with-members/servlet/test/beans/Transactional.java
index d2ed8a6..3f12323 100644
--- a/appserver/tests/appserv-tests/devtests/cdi/interceptors/interceptors-binding-type-with-members/servlet/test/beans/Transactional.java
+++ b/appserver/tests/appserv-tests/devtests/cdi/interceptors/interceptors-binding-type-with-members/servlet/test/beans/Transactional.java
@@ -23,7 +23,7 @@
 import java.lang.annotation.RetentionPolicy;
 import java.lang.annotation.Target;
 
-import javax.enterprise.util.Nonbinding;
+import jakarta.enterprise.util.Nonbinding;
 import jakarta.interceptor.InterceptorBinding;
 
 @Target({TYPE, METHOD})
diff --git a/appserver/tests/appserv-tests/devtests/cdi/interceptors/interceptors-business-method-interception/servlet/test/beans/TestBean.java b/appserver/tests/appserv-tests/devtests/cdi/interceptors/interceptors-business-method-interception/servlet/test/beans/TestBean.java
index 4792d26..eec4d45 100644
--- a/appserver/tests/appserv-tests/devtests/cdi/interceptors/interceptors-business-method-interception/servlet/test/beans/TestBean.java
+++ b/appserver/tests/appserv-tests/devtests/cdi/interceptors/interceptors-business-method-interception/servlet/test/beans/TestBean.java
@@ -16,7 +16,7 @@
 
 package test.beans;
 
-import javax.enterprise.context.RequestScoped;
+import jakarta.enterprise.context.RequestScoped;
 
 @Transactional
 @RequestScoped
diff --git a/appserver/tests/appserv-tests/devtests/cdi/interceptors/interceptors-invalid-interceptor-specified-at-beans-xml/servlet/test/beans/TestBean.java b/appserver/tests/appserv-tests/devtests/cdi/interceptors/interceptors-invalid-interceptor-specified-at-beans-xml/servlet/test/beans/TestBean.java
index 4792d26..eec4d45 100644
--- a/appserver/tests/appserv-tests/devtests/cdi/interceptors/interceptors-invalid-interceptor-specified-at-beans-xml/servlet/test/beans/TestBean.java
+++ b/appserver/tests/appserv-tests/devtests/cdi/interceptors/interceptors-invalid-interceptor-specified-at-beans-xml/servlet/test/beans/TestBean.java
@@ -16,7 +16,7 @@
 
 package test.beans;
 
-import javax.enterprise.context.RequestScoped;
+import jakarta.enterprise.context.RequestScoped;
 
 @Transactional
 @RequestScoped
diff --git a/appserver/tests/appserv-tests/devtests/cdi/interceptors/interceptors-multiple-interceptor-binding-annotations/servlet/test/beans/TestBean.java b/appserver/tests/appserv-tests/devtests/cdi/interceptors/interceptors-multiple-interceptor-binding-annotations/servlet/test/beans/TestBean.java
index 4792d26..eec4d45 100644
--- a/appserver/tests/appserv-tests/devtests/cdi/interceptors/interceptors-multiple-interceptor-binding-annotations/servlet/test/beans/TestBean.java
+++ b/appserver/tests/appserv-tests/devtests/cdi/interceptors/interceptors-multiple-interceptor-binding-annotations/servlet/test/beans/TestBean.java
@@ -16,7 +16,7 @@
 
 package test.beans;
 
-import javax.enterprise.context.RequestScoped;
+import jakarta.enterprise.context.RequestScoped;
 
 @Transactional
 @RequestScoped
diff --git a/appserver/tests/appserv-tests/devtests/cdi/interceptors/interceptors-multiple-interceptor-binding-annotations/servlet/test/beans/TestRequestScopedBean.java b/appserver/tests/appserv-tests/devtests/cdi/interceptors/interceptors-multiple-interceptor-binding-annotations/servlet/test/beans/TestRequestScopedBean.java
index 4317821..5c394bd 100644
--- a/appserver/tests/appserv-tests/devtests/cdi/interceptors/interceptors-multiple-interceptor-binding-annotations/servlet/test/beans/TestRequestScopedBean.java
+++ b/appserver/tests/appserv-tests/devtests/cdi/interceptors/interceptors-multiple-interceptor-binding-annotations/servlet/test/beans/TestRequestScopedBean.java
@@ -19,7 +19,7 @@
 import java.util.ArrayList;
 import java.util.List;
 
-import javax.enterprise.context.RequestScoped;
+import jakarta.enterprise.context.RequestScoped;
 
 @RequestScoped
 public class TestRequestScopedBean {
diff --git a/appserver/tests/appserv-tests/devtests/cdi/interceptors/interceptors-multiple-interceptors-for-a-binding-type/servlet/test/beans/TestBean.java b/appserver/tests/appserv-tests/devtests/cdi/interceptors/interceptors-multiple-interceptors-for-a-binding-type/servlet/test/beans/TestBean.java
index 4792d26..eec4d45 100644
--- a/appserver/tests/appserv-tests/devtests/cdi/interceptors/interceptors-multiple-interceptors-for-a-binding-type/servlet/test/beans/TestBean.java
+++ b/appserver/tests/appserv-tests/devtests/cdi/interceptors/interceptors-multiple-interceptors-for-a-binding-type/servlet/test/beans/TestBean.java
@@ -16,7 +16,7 @@
 
 package test.beans;
 
-import javax.enterprise.context.RequestScoped;
+import jakarta.enterprise.context.RequestScoped;
 
 @Transactional
 @RequestScoped
diff --git a/appserver/tests/appserv-tests/devtests/cdi/interceptors/interceptors-multiple-interceptors-for-a-binding-type/servlet/test/beans/TestRequestScopedBean.java b/appserver/tests/appserv-tests/devtests/cdi/interceptors/interceptors-multiple-interceptors-for-a-binding-type/servlet/test/beans/TestRequestScopedBean.java
index 4317821..5c394bd 100644
--- a/appserver/tests/appserv-tests/devtests/cdi/interceptors/interceptors-multiple-interceptors-for-a-binding-type/servlet/test/beans/TestRequestScopedBean.java
+++ b/appserver/tests/appserv-tests/devtests/cdi/interceptors/interceptors-multiple-interceptors-for-a-binding-type/servlet/test/beans/TestRequestScopedBean.java
@@ -19,7 +19,7 @@
 import java.util.ArrayList;
 import java.util.List;
 
-import javax.enterprise.context.RequestScoped;
+import jakarta.enterprise.context.RequestScoped;
 
 @RequestScoped
 public class TestRequestScopedBean {
diff --git a/appserver/tests/appserv-tests/devtests/cdi/interceptors/interceptors-use-of-at-interceptors/servlet/test/beans/TestBean.java b/appserver/tests/appserv-tests/devtests/cdi/interceptors/interceptors-use-of-at-interceptors/servlet/test/beans/TestBean.java
index 4cf442f..5fb867a 100644
--- a/appserver/tests/appserv-tests/devtests/cdi/interceptors/interceptors-use-of-at-interceptors/servlet/test/beans/TestBean.java
+++ b/appserver/tests/appserv-tests/devtests/cdi/interceptors/interceptors-use-of-at-interceptors/servlet/test/beans/TestBean.java
@@ -16,7 +16,7 @@
 
 package test.beans;
 
-import javax.enterprise.context.RequestScoped;
+import jakarta.enterprise.context.RequestScoped;
 import jakarta.interceptor.Interceptors;
 
 
diff --git a/appserver/tests/appserv-tests/devtests/cdi/interceptors/interceptors-use-of-at-interceptors/servlet/test/beans/TestRequestScopedBean.java b/appserver/tests/appserv-tests/devtests/cdi/interceptors/interceptors-use-of-at-interceptors/servlet/test/beans/TestRequestScopedBean.java
index 4317821..5c394bd 100644
--- a/appserver/tests/appserv-tests/devtests/cdi/interceptors/interceptors-use-of-at-interceptors/servlet/test/beans/TestRequestScopedBean.java
+++ b/appserver/tests/appserv-tests/devtests/cdi/interceptors/interceptors-use-of-at-interceptors/servlet/test/beans/TestRequestScopedBean.java
@@ -19,7 +19,7 @@
 import java.util.ArrayList;
 import java.util.List;
 
-import javax.enterprise.context.RequestScoped;
+import jakarta.enterprise.context.RequestScoped;
 
 @RequestScoped
 public class TestRequestScopedBean {
diff --git a/appserver/tests/appserv-tests/devtests/cdi/javaee-component-resources/em-injection-no-interface-ejb/servlet/test/beans/nonmock/TestEJBInjectionViaAtEJB.java b/appserver/tests/appserv-tests/devtests/cdi/javaee-component-resources/em-injection-no-interface-ejb/servlet/test/beans/nonmock/TestEJBInjectionViaAtEJB.java
index d951d2e..1a2ba98 100644
--- a/appserver/tests/appserv-tests/devtests/cdi/javaee-component-resources/em-injection-no-interface-ejb/servlet/test/beans/nonmock/TestEJBInjectionViaAtEJB.java
+++ b/appserver/tests/appserv-tests/devtests/cdi/javaee-component-resources/em-injection-no-interface-ejb/servlet/test/beans/nonmock/TestEJBInjectionViaAtEJB.java
@@ -17,7 +17,7 @@
 package test.beans.nonmock;
 
 import jakarta.ejb.EJB;
-import javax.enterprise.context.RequestScoped;
+import jakarta.enterprise.context.RequestScoped;
 import jakarta.inject.Named;
 
 import test.beans.artifacts.InjectViaAtEJB;
diff --git a/appserver/tests/appserv-tests/devtests/cdi/javaee-component-resources/em-injection-no-interface-ejb/servlet/test/beans/nonmock/TestEJBInjectionViaInject.java b/appserver/tests/appserv-tests/devtests/cdi/javaee-component-resources/em-injection-no-interface-ejb/servlet/test/beans/nonmock/TestEJBInjectionViaInject.java
index d95223d..c915d53 100644
--- a/appserver/tests/appserv-tests/devtests/cdi/javaee-component-resources/em-injection-no-interface-ejb/servlet/test/beans/nonmock/TestEJBInjectionViaInject.java
+++ b/appserver/tests/appserv-tests/devtests/cdi/javaee-component-resources/em-injection-no-interface-ejb/servlet/test/beans/nonmock/TestEJBInjectionViaInject.java
@@ -16,7 +16,7 @@
 
 package test.beans.nonmock;
 
-import javax.enterprise.context.RequestScoped;
+import jakarta.enterprise.context.RequestScoped;
 import jakarta.inject.Inject;
 import jakarta.inject.Named;
 
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 ae693d3..ad47cc7 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
@@ -16,7 +16,7 @@
 
 package test.util;
 
-import javax.enterprise.inject.Produces;
+import jakarta.enterprise.inject.Produces;
 import jakarta.inject.Singleton;
 import jakarta.persistence.EntityManager;
 import jakarta.persistence.PersistenceContext;
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 7f3c737..b047b3d 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
@@ -16,7 +16,7 @@
 
 package test.beans.nonmock;
 
-import javax.enterprise.context.RequestScoped;
+import jakarta.enterprise.context.RequestScoped;
 import jakarta.inject.Inject;
 import jakarta.persistence.EntityManager;
 import jakarta.persistence.EntityManagerFactory;
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 94699e0..e28d8a9 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
@@ -16,7 +16,7 @@
 
 package test.util;
 
-import javax.enterprise.inject.Produces;
+import jakarta.enterprise.inject.Produces;
 import jakarta.inject.Singleton;
 import jakarta.persistence.EntityManager;
 import jakarta.persistence.PersistenceContext;
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 178966a..ea029ac 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
@@ -16,7 +16,7 @@
 
 package com.acme.util;
 
-import javax.enterprise.inject.Produces;
+import jakarta.enterprise.inject.Produces;
 import jakarta.inject.Inject;
 import jakarta.inject.Singleton;
 import jakarta.persistence.EntityManager;
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 7f3c737..b047b3d 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
@@ -16,7 +16,7 @@
 
 package test.beans.nonmock;
 
-import javax.enterprise.context.RequestScoped;
+import jakarta.enterprise.context.RequestScoped;
 import jakarta.inject.Inject;
 import jakarta.persistence.EntityManager;
 import jakarta.persistence.EntityManagerFactory;
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 512e17a..984b47d 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
@@ -16,7 +16,7 @@
 
 package test.util;
 
-import javax.enterprise.inject.Produces;
+import jakarta.enterprise.inject.Produces;
 import jakarta.inject.Singleton;
 import jakarta.persistence.EntityManager;
 import jakarta.persistence.PersistenceContext;
diff --git a/appserver/tests/appserv-tests/devtests/cdi/javaee-component-resources/javaee-component-resource-typesafe-injection/servlet/test/beans/nonmock/TestBean.java b/appserver/tests/appserv-tests/devtests/cdi/javaee-component-resources/javaee-component-resource-typesafe-injection/servlet/test/beans/nonmock/TestBean.java
index 8faa131..338a3bf 100644
--- a/appserver/tests/appserv-tests/devtests/cdi/javaee-component-resources/javaee-component-resource-typesafe-injection/servlet/test/beans/nonmock/TestBean.java
+++ b/appserver/tests/appserv-tests/devtests/cdi/javaee-component-resources/javaee-component-resource-typesafe-injection/servlet/test/beans/nonmock/TestBean.java
@@ -16,7 +16,7 @@
 
 package test.beans.nonmock;
 
-import javax.enterprise.context.RequestScoped;
+import jakarta.enterprise.context.RequestScoped;
 import jakarta.inject.Inject;
 import javax.sql.DataSource;
 
diff --git a/appserver/tests/appserv-tests/devtests/cdi/javaee-component-resources/javaee-component-resource-typesafe-injection/servlet/test/servlet/DatabaseManager.java b/appserver/tests/appserv-tests/devtests/cdi/javaee-component-resources/javaee-component-resource-typesafe-injection/servlet/test/servlet/DatabaseManager.java
index d04b74a..6c595cd 100644
--- a/appserver/tests/appserv-tests/devtests/cdi/javaee-component-resources/javaee-component-resource-typesafe-injection/servlet/test/servlet/DatabaseManager.java
+++ b/appserver/tests/appserv-tests/devtests/cdi/javaee-component-resources/javaee-component-resource-typesafe-injection/servlet/test/servlet/DatabaseManager.java
@@ -17,7 +17,7 @@
 package test.servlet;
 
 import jakarta.annotation.Resource;
-import javax.enterprise.inject.Produces;
+import jakarta.enterprise.inject.Produces;
 import javax.sql.DataSource;
 
 import test.beans.artifacts.TestDatabase;
diff --git a/appserver/tests/appserv-tests/devtests/cdi/javaee-component-resources/jms-resource-producer-field-in-library-jar/producer-library-jar/test/servlet/JMSResourcesProducer.java b/appserver/tests/appserv-tests/devtests/cdi/javaee-component-resources/jms-resource-producer-field-in-library-jar/producer-library-jar/test/servlet/JMSResourcesProducer.java
index 2e16702..2ab7e9b 100644
--- a/appserver/tests/appserv-tests/devtests/cdi/javaee-component-resources/jms-resource-producer-field-in-library-jar/producer-library-jar/test/servlet/JMSResourcesProducer.java
+++ b/appserver/tests/appserv-tests/devtests/cdi/javaee-component-resources/jms-resource-producer-field-in-library-jar/producer-library-jar/test/servlet/JMSResourcesProducer.java
@@ -17,8 +17,8 @@
 package test.servlet;
 
 import jakarta.annotation.Resource;
-import javax.enterprise.context.ApplicationScoped;
-import javax.enterprise.inject.Produces;
+import jakarta.enterprise.context.ApplicationScoped;
+import jakarta.enterprise.inject.Produces;
 import jakarta.jms.ConnectionFactory;
 import jakarta.jms.JMSException;
 import jakarta.jms.Queue;
diff --git a/appserver/tests/appserv-tests/devtests/cdi/javaee-component-resources/jms-resource-producer-field-in-library-jar/servlet/test/beans/nonmock/TestBean.java b/appserver/tests/appserv-tests/devtests/cdi/javaee-component-resources/jms-resource-producer-field-in-library-jar/servlet/test/beans/nonmock/TestBean.java
index f15ee81..5daaf34 100644
--- a/appserver/tests/appserv-tests/devtests/cdi/javaee-component-resources/jms-resource-producer-field-in-library-jar/servlet/test/beans/nonmock/TestBean.java
+++ b/appserver/tests/appserv-tests/devtests/cdi/javaee-component-resources/jms-resource-producer-field-in-library-jar/servlet/test/beans/nonmock/TestBean.java
@@ -16,7 +16,7 @@
 
 package test.beans.nonmock;
 
-import javax.enterprise.context.RequestScoped;
+import jakarta.enterprise.context.RequestScoped;
 import jakarta.inject.Inject;
 import jakarta.jms.Queue;
 
diff --git a/appserver/tests/appserv-tests/devtests/cdi/javaee-component-resources/jms-resource-producer-field/servlet/test/beans/nonmock/TestBean.java b/appserver/tests/appserv-tests/devtests/cdi/javaee-component-resources/jms-resource-producer-field/servlet/test/beans/nonmock/TestBean.java
index f15ee81..5daaf34 100644
--- a/appserver/tests/appserv-tests/devtests/cdi/javaee-component-resources/jms-resource-producer-field/servlet/test/beans/nonmock/TestBean.java
+++ b/appserver/tests/appserv-tests/devtests/cdi/javaee-component-resources/jms-resource-producer-field/servlet/test/beans/nonmock/TestBean.java
@@ -16,7 +16,7 @@
 
 package test.beans.nonmock;
 
-import javax.enterprise.context.RequestScoped;
+import jakarta.enterprise.context.RequestScoped;
 import jakarta.inject.Inject;
 import jakarta.jms.Queue;
 
diff --git a/appserver/tests/appserv-tests/devtests/cdi/javaee-component-resources/jms-resource-producer-field/servlet/test/servlet/JMSResourcesProducer.java b/appserver/tests/appserv-tests/devtests/cdi/javaee-component-resources/jms-resource-producer-field/servlet/test/servlet/JMSResourcesProducer.java
index 2e16702..2ab7e9b 100644
--- a/appserver/tests/appserv-tests/devtests/cdi/javaee-component-resources/jms-resource-producer-field/servlet/test/servlet/JMSResourcesProducer.java
+++ b/appserver/tests/appserv-tests/devtests/cdi/javaee-component-resources/jms-resource-producer-field/servlet/test/servlet/JMSResourcesProducer.java
@@ -17,8 +17,8 @@
 package test.servlet;
 
 import jakarta.annotation.Resource;
-import javax.enterprise.context.ApplicationScoped;
-import javax.enterprise.inject.Produces;
+import jakarta.enterprise.context.ApplicationScoped;
+import jakarta.enterprise.inject.Produces;
 import jakarta.jms.ConnectionFactory;
 import jakarta.jms.JMSException;
 import jakarta.jms.Queue;
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 11ada06..6009be5 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
@@ -18,7 +18,7 @@
 
 import java.io.Serializable;
 
-import javax.enterprise.context.SessionScoped;
+import jakarta.enterprise.context.SessionScoped;
 import jakarta.inject.Inject;
 import jakarta.persistence.EntityManagerFactory;
 import jakarta.persistence.EntityManager;
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 fd70e3c..9917aca 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
@@ -16,7 +16,7 @@
 
 package test.util;
 
-import javax.enterprise.inject.Produces;
+import jakarta.enterprise.inject.Produces;
 import jakarta.inject.Singleton;
 import jakarta.persistence.EntityManager;
 import jakarta.persistence.EntityManagerFactory;
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 9c2b2c8..3a324d6 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
@@ -16,8 +16,8 @@
 
 package test.util;
 
-import javax.enterprise.context.ConversationScoped;
-import javax.enterprise.inject.Produces;
+import jakarta.enterprise.context.ConversationScoped;
+import jakarta.enterprise.inject.Produces;
 import jakarta.inject.Singleton;
 import jakarta.persistence.EntityManager;
 import jakarta.persistence.EntityManagerFactory;
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 364306c..3dcfa94 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
@@ -16,7 +16,7 @@
 
 package test.beans.nonmock;
 
-import javax.enterprise.context.RequestScoped;
+import jakarta.enterprise.context.RequestScoped;
 import jakarta.inject.Inject;
 import jakarta.persistence.EntityManagerFactory;
 
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 424cba9..a35e6aa 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
@@ -16,7 +16,7 @@
 
 package test.ejb;
 
-import javax.enterprise.inject.Produces;
+import jakarta.enterprise.inject.Produces;
 import jakarta.persistence.EntityManagerFactory;
 import jakarta.persistence.PersistenceUnit;
 
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 65fe2d7..cbdf936 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
@@ -16,7 +16,7 @@
 
 package test.ejb;
 
-import javax.enterprise.inject.Produces;
+import jakarta.enterprise.inject.Produces;
 import jakarta.persistence.EntityManagerFactory;
 import jakarta.persistence.PersistenceUnit;
 
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 39654d2..61ca5cf 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
@@ -16,7 +16,7 @@
 
 package test.beans.nonmock;
 
-import javax.enterprise.context.RequestScoped;
+import jakarta.enterprise.context.RequestScoped;
 import jakarta.inject.Inject;
 import jakarta.persistence.EntityManagerFactory;
 
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 4c87899..a7a14ad 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
@@ -16,7 +16,7 @@
 
 package test.util;
 
-import javax.enterprise.inject.Produces;
+import jakarta.enterprise.inject.Produces;
 import jakarta.inject.Singleton;
 import jakarta.persistence.EntityManagerFactory;
 import jakarta.persistence.PersistenceUnit;
diff --git a/appserver/tests/appserv-tests/devtests/cdi/javaee-component-resources/no-interface-ejb/servlet/test/beans/nonmock/local/TestEJBInjectionViaAtEJB.java b/appserver/tests/appserv-tests/devtests/cdi/javaee-component-resources/no-interface-ejb/servlet/test/beans/nonmock/local/TestEJBInjectionViaAtEJB.java
index 6fe8afb..6d0dd45 100644
--- a/appserver/tests/appserv-tests/devtests/cdi/javaee-component-resources/no-interface-ejb/servlet/test/beans/nonmock/local/TestEJBInjectionViaAtEJB.java
+++ b/appserver/tests/appserv-tests/devtests/cdi/javaee-component-resources/no-interface-ejb/servlet/test/beans/nonmock/local/TestEJBInjectionViaAtEJB.java
@@ -17,7 +17,7 @@
 package test.beans.nonmock.local;
 
 import jakarta.ejb.EJB;
-import javax.enterprise.context.RequestScoped;
+import jakarta.enterprise.context.RequestScoped;
 import jakarta.inject.Named;
 
 import test.beans.artifacts.InjectViaAtEJB;
diff --git a/appserver/tests/appserv-tests/devtests/cdi/javaee-component-resources/no-interface-ejb/servlet/test/beans/nonmock/local/TestEJBInjectionViaInject.java b/appserver/tests/appserv-tests/devtests/cdi/javaee-component-resources/no-interface-ejb/servlet/test/beans/nonmock/local/TestEJBInjectionViaInject.java
index d35b71d..af5ebf7 100644
--- a/appserver/tests/appserv-tests/devtests/cdi/javaee-component-resources/no-interface-ejb/servlet/test/beans/nonmock/local/TestEJBInjectionViaInject.java
+++ b/appserver/tests/appserv-tests/devtests/cdi/javaee-component-resources/no-interface-ejb/servlet/test/beans/nonmock/local/TestEJBInjectionViaInject.java
@@ -16,7 +16,7 @@
 
 package test.beans.nonmock.local;
 
-import javax.enterprise.context.RequestScoped;
+import jakarta.enterprise.context.RequestScoped;
 import jakarta.inject.Inject;
 import jakarta.inject.Named;
 
diff --git a/appserver/tests/appserv-tests/devtests/cdi/javaee-component-resources/no-interface-ejb/servlet/test/beans/nonmock/nointerfacebeanview/TestEJBInjectionViaAtEJB.java b/appserver/tests/appserv-tests/devtests/cdi/javaee-component-resources/no-interface-ejb/servlet/test/beans/nonmock/nointerfacebeanview/TestEJBInjectionViaAtEJB.java
index 50bdca4..3dabc45 100644
--- a/appserver/tests/appserv-tests/devtests/cdi/javaee-component-resources/no-interface-ejb/servlet/test/beans/nonmock/nointerfacebeanview/TestEJBInjectionViaAtEJB.java
+++ b/appserver/tests/appserv-tests/devtests/cdi/javaee-component-resources/no-interface-ejb/servlet/test/beans/nonmock/nointerfacebeanview/TestEJBInjectionViaAtEJB.java
@@ -17,7 +17,7 @@
 package test.beans.nonmock.nointerfacebeanview;
 
 import jakarta.ejb.EJB;
-import javax.enterprise.context.RequestScoped;
+import jakarta.enterprise.context.RequestScoped;
 import jakarta.inject.Named;
 
 import test.beans.artifacts.InjectViaAtEJB;
diff --git a/appserver/tests/appserv-tests/devtests/cdi/javaee-component-resources/no-interface-ejb/servlet/test/beans/nonmock/nointerfacebeanview/TestEJBInjectionViaInject.java b/appserver/tests/appserv-tests/devtests/cdi/javaee-component-resources/no-interface-ejb/servlet/test/beans/nonmock/nointerfacebeanview/TestEJBInjectionViaInject.java
index cc0e898..58c528b 100644
--- a/appserver/tests/appserv-tests/devtests/cdi/javaee-component-resources/no-interface-ejb/servlet/test/beans/nonmock/nointerfacebeanview/TestEJBInjectionViaInject.java
+++ b/appserver/tests/appserv-tests/devtests/cdi/javaee-component-resources/no-interface-ejb/servlet/test/beans/nonmock/nointerfacebeanview/TestEJBInjectionViaInject.java
@@ -16,7 +16,7 @@
 
 package test.beans.nonmock.nointerfacebeanview;
 
-import javax.enterprise.context.RequestScoped;
+import jakarta.enterprise.context.RequestScoped;
 import jakarta.inject.Inject;
 import jakarta.inject.Named;
 
diff --git a/appserver/tests/appserv-tests/devtests/cdi/javaee-component-resources/no-interface-ejb/servlet/test/ejb/local/TestSuperClass.java b/appserver/tests/appserv-tests/devtests/cdi/javaee-component-resources/no-interface-ejb/servlet/test/ejb/local/TestSuperClass.java
index 53ad721..4a419c0 100644
--- a/appserver/tests/appserv-tests/devtests/cdi/javaee-component-resources/no-interface-ejb/servlet/test/ejb/local/TestSuperClass.java
+++ b/appserver/tests/appserv-tests/devtests/cdi/javaee-component-resources/no-interface-ejb/servlet/test/ejb/local/TestSuperClass.java
@@ -16,7 +16,7 @@
 
 package test.ejb.local;
 
-import javax.enterprise.inject.Alternative;
+import jakarta.enterprise.inject.Alternative;
 
  
 //marked as Alternative, otherwise there would
diff --git a/appserver/tests/appserv-tests/devtests/cdi/javaee-component-resources/no-interface-ejb/servlet/test/ejb/nointerfacebeanview/TestSuperClass.java b/appserver/tests/appserv-tests/devtests/cdi/javaee-component-resources/no-interface-ejb/servlet/test/ejb/nointerfacebeanview/TestSuperClass.java
index b4fbe8e..d093d1c 100644
--- a/appserver/tests/appserv-tests/devtests/cdi/javaee-component-resources/no-interface-ejb/servlet/test/ejb/nointerfacebeanview/TestSuperClass.java
+++ b/appserver/tests/appserv-tests/devtests/cdi/javaee-component-resources/no-interface-ejb/servlet/test/ejb/nointerfacebeanview/TestSuperClass.java
@@ -16,7 +16,7 @@
 
 package test.ejb.nointerfacebeanview;
 
-import javax.enterprise.inject.Alternative;
+import jakarta.enterprise.inject.Alternative;
 
  
 public class TestSuperClass implements TestInterface{
diff --git a/appserver/tests/appserv-tests/devtests/cdi/javaee-component-resources/slsb-injection-into-sessionscoped/servlet/test/beans/TestSessionScopedBean.java b/appserver/tests/appserv-tests/devtests/cdi/javaee-component-resources/slsb-injection-into-sessionscoped/servlet/test/beans/TestSessionScopedBean.java
index a20c2ae..667a729 100644
--- a/appserver/tests/appserv-tests/devtests/cdi/javaee-component-resources/slsb-injection-into-sessionscoped/servlet/test/beans/TestSessionScopedBean.java
+++ b/appserver/tests/appserv-tests/devtests/cdi/javaee-component-resources/slsb-injection-into-sessionscoped/servlet/test/beans/TestSessionScopedBean.java
@@ -17,7 +17,7 @@
 package test.beans;
 
 import java.io.Serializable;
-import javax.enterprise.context.SessionScoped;
+import jakarta.enterprise.context.SessionScoped;
 import jakarta.inject.Inject;
 import jakarta.inject.Named;
 
diff --git a/appserver/tests/appserv-tests/devtests/cdi/javaee-component-resources/slsb-injection-into-sessionscoped/servlet/test/beans/nonmock/local/TestEJBInjectionViaAtEJB.java b/appserver/tests/appserv-tests/devtests/cdi/javaee-component-resources/slsb-injection-into-sessionscoped/servlet/test/beans/nonmock/local/TestEJBInjectionViaAtEJB.java
index 6fe8afb..6d0dd45 100644
--- a/appserver/tests/appserv-tests/devtests/cdi/javaee-component-resources/slsb-injection-into-sessionscoped/servlet/test/beans/nonmock/local/TestEJBInjectionViaAtEJB.java
+++ b/appserver/tests/appserv-tests/devtests/cdi/javaee-component-resources/slsb-injection-into-sessionscoped/servlet/test/beans/nonmock/local/TestEJBInjectionViaAtEJB.java
@@ -17,7 +17,7 @@
 package test.beans.nonmock.local;
 
 import jakarta.ejb.EJB;
-import javax.enterprise.context.RequestScoped;
+import jakarta.enterprise.context.RequestScoped;
 import jakarta.inject.Named;
 
 import test.beans.artifacts.InjectViaAtEJB;
diff --git a/appserver/tests/appserv-tests/devtests/cdi/javaee-component-resources/slsb-injection-into-sessionscoped/servlet/test/beans/nonmock/local/TestEJBInjectionViaInject.java b/appserver/tests/appserv-tests/devtests/cdi/javaee-component-resources/slsb-injection-into-sessionscoped/servlet/test/beans/nonmock/local/TestEJBInjectionViaInject.java
index d35b71d..af5ebf7 100644
--- a/appserver/tests/appserv-tests/devtests/cdi/javaee-component-resources/slsb-injection-into-sessionscoped/servlet/test/beans/nonmock/local/TestEJBInjectionViaInject.java
+++ b/appserver/tests/appserv-tests/devtests/cdi/javaee-component-resources/slsb-injection-into-sessionscoped/servlet/test/beans/nonmock/local/TestEJBInjectionViaInject.java
@@ -16,7 +16,7 @@
 
 package test.beans.nonmock.local;
 
-import javax.enterprise.context.RequestScoped;
+import jakarta.enterprise.context.RequestScoped;
 import jakarta.inject.Inject;
 import jakarta.inject.Named;
 
diff --git a/appserver/tests/appserv-tests/devtests/cdi/javaee-component-resources/slsb-injection-into-sessionscoped/servlet/test/beans/nonmock/nointerfacebeanview/TestEJBInjectionViaAtEJB.java b/appserver/tests/appserv-tests/devtests/cdi/javaee-component-resources/slsb-injection-into-sessionscoped/servlet/test/beans/nonmock/nointerfacebeanview/TestEJBInjectionViaAtEJB.java
index cb02473..4f9d5e9 100644
--- a/appserver/tests/appserv-tests/devtests/cdi/javaee-component-resources/slsb-injection-into-sessionscoped/servlet/test/beans/nonmock/nointerfacebeanview/TestEJBInjectionViaAtEJB.java
+++ b/appserver/tests/appserv-tests/devtests/cdi/javaee-component-resources/slsb-injection-into-sessionscoped/servlet/test/beans/nonmock/nointerfacebeanview/TestEJBInjectionViaAtEJB.java
@@ -17,7 +17,7 @@
 package test.beans.nonmock.nointerfacebeanview;
 
 import jakarta.ejb.EJB;
-import javax.enterprise.context.RequestScoped;
+import jakarta.enterprise.context.RequestScoped;
 import jakarta.inject.Named;
 
 import test.beans.artifacts.InjectViaAtEJB;
diff --git a/appserver/tests/appserv-tests/devtests/cdi/javaee-component-resources/slsb-injection-into-sessionscoped/servlet/test/beans/nonmock/nointerfacebeanview/TestEJBInjectionViaInject.java b/appserver/tests/appserv-tests/devtests/cdi/javaee-component-resources/slsb-injection-into-sessionscoped/servlet/test/beans/nonmock/nointerfacebeanview/TestEJBInjectionViaInject.java
index cc0e898..58c528b 100644
--- a/appserver/tests/appserv-tests/devtests/cdi/javaee-component-resources/slsb-injection-into-sessionscoped/servlet/test/beans/nonmock/nointerfacebeanview/TestEJBInjectionViaInject.java
+++ b/appserver/tests/appserv-tests/devtests/cdi/javaee-component-resources/slsb-injection-into-sessionscoped/servlet/test/beans/nonmock/nointerfacebeanview/TestEJBInjectionViaInject.java
@@ -16,7 +16,7 @@
 
 package test.beans.nonmock.nointerfacebeanview;
 
-import javax.enterprise.context.RequestScoped;
+import jakarta.enterprise.context.RequestScoped;
 import jakarta.inject.Inject;
 import jakarta.inject.Named;
 
diff --git a/appserver/tests/appserv-tests/devtests/cdi/javaee-component-resources/slsb-injection-into-sessionscoped/servlet/test/ejb/local/TestSuperClass.java b/appserver/tests/appserv-tests/devtests/cdi/javaee-component-resources/slsb-injection-into-sessionscoped/servlet/test/ejb/local/TestSuperClass.java
index 53ad721..4a419c0 100644
--- a/appserver/tests/appserv-tests/devtests/cdi/javaee-component-resources/slsb-injection-into-sessionscoped/servlet/test/ejb/local/TestSuperClass.java
+++ b/appserver/tests/appserv-tests/devtests/cdi/javaee-component-resources/slsb-injection-into-sessionscoped/servlet/test/ejb/local/TestSuperClass.java
@@ -16,7 +16,7 @@
 
 package test.ejb.local;
 
-import javax.enterprise.inject.Alternative;
+import jakarta.enterprise.inject.Alternative;
 
  
 //marked as Alternative, otherwise there would
diff --git a/appserver/tests/appserv-tests/devtests/cdi/javaee-component-resources/slsb-injection-into-sessionscoped/servlet/test/ejb/nointerfacebeanview/TestSuperClass.java b/appserver/tests/appserv-tests/devtests/cdi/javaee-component-resources/slsb-injection-into-sessionscoped/servlet/test/ejb/nointerfacebeanview/TestSuperClass.java
index ef5e220..dba28e6 100644
--- a/appserver/tests/appserv-tests/devtests/cdi/javaee-component-resources/slsb-injection-into-sessionscoped/servlet/test/ejb/nointerfacebeanview/TestSuperClass.java
+++ b/appserver/tests/appserv-tests/devtests/cdi/javaee-component-resources/slsb-injection-into-sessionscoped/servlet/test/ejb/nointerfacebeanview/TestSuperClass.java
@@ -16,7 +16,7 @@
 
 package test.ejb.nointerfacebeanview;
 
-import javax.enterprise.inject.Alternative;
+import jakarta.enterprise.inject.Alternative;
 
  
 //marked as Alternative, otherwise there would
diff --git a/appserver/tests/appserv-tests/devtests/cdi/javaee-component-resources/slsb-injection-into-sessionscoped/servlet/test/ejb/slsb/TestSLSB.java b/appserver/tests/appserv-tests/devtests/cdi/javaee-component-resources/slsb-injection-into-sessionscoped/servlet/test/ejb/slsb/TestSLSB.java
index 8a1ecc4..202d7da 100644
--- a/appserver/tests/appserv-tests/devtests/cdi/javaee-component-resources/slsb-injection-into-sessionscoped/servlet/test/ejb/slsb/TestSLSB.java
+++ b/appserver/tests/appserv-tests/devtests/cdi/javaee-component-resources/slsb-injection-into-sessionscoped/servlet/test/ejb/slsb/TestSLSB.java
@@ -16,7 +16,7 @@
 
 package test.ejb.slsb;
 import jakarta.ejb.Stateless;
-import javax.enterprise.context.Dependent;
+import jakarta.enterprise.context.Dependent;
 import jakarta.inject.Named;
 
 @Named
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 178966a..ea029ac 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
@@ -16,7 +16,7 @@
 
 package com.acme.util;
 
-import javax.enterprise.inject.Produces;
+import jakarta.enterprise.inject.Produces;
 import jakarta.inject.Inject;
 import jakarta.inject.Singleton;
 import jakarta.persistence.EntityManager;
diff --git a/appserver/tests/appserv-tests/devtests/cdi/javaee-integration/bean-in-lib-dir-used-by-ejb-in-ear/lib/com/acme/util/TestSessionScopedBeanInLib.java b/appserver/tests/appserv-tests/devtests/cdi/javaee-integration/bean-in-lib-dir-used-by-ejb-in-ear/lib/com/acme/util/TestSessionScopedBeanInLib.java
index 03f1071..85da7c4 100644
--- a/appserver/tests/appserv-tests/devtests/cdi/javaee-integration/bean-in-lib-dir-used-by-ejb-in-ear/lib/com/acme/util/TestSessionScopedBeanInLib.java
+++ b/appserver/tests/appserv-tests/devtests/cdi/javaee-integration/bean-in-lib-dir-used-by-ejb-in-ear/lib/com/acme/util/TestSessionScopedBeanInLib.java
@@ -18,7 +18,7 @@
 
 import java.io.Serializable;
 
-import javax.enterprise.context.SessionScoped;
+import jakarta.enterprise.context.SessionScoped;
 
 @SessionScoped
 public class TestSessionScopedBeanInLib implements Serializable{
diff --git a/appserver/tests/appserv-tests/devtests/cdi/javaee-integration/builtin-beans/servlet/test/beans/nonmock/TestBean.java b/appserver/tests/appserv-tests/devtests/cdi/javaee-integration/builtin-beans/servlet/test/beans/nonmock/TestBean.java
index 8faa131..338a3bf 100644
--- a/appserver/tests/appserv-tests/devtests/cdi/javaee-integration/builtin-beans/servlet/test/beans/nonmock/TestBean.java
+++ b/appserver/tests/appserv-tests/devtests/cdi/javaee-integration/builtin-beans/servlet/test/beans/nonmock/TestBean.java
@@ -16,7 +16,7 @@
 
 package test.beans.nonmock;
 
-import javax.enterprise.context.RequestScoped;
+import jakarta.enterprise.context.RequestScoped;
 import jakarta.inject.Inject;
 import javax.sql.DataSource;
 
diff --git a/appserver/tests/appserv-tests/devtests/cdi/javaee-integration/builtin-beans/servlet/test/servlet/DatabaseManager.java b/appserver/tests/appserv-tests/devtests/cdi/javaee-integration/builtin-beans/servlet/test/servlet/DatabaseManager.java
index d04b74a..6c595cd 100644
--- a/appserver/tests/appserv-tests/devtests/cdi/javaee-integration/builtin-beans/servlet/test/servlet/DatabaseManager.java
+++ b/appserver/tests/appserv-tests/devtests/cdi/javaee-integration/builtin-beans/servlet/test/servlet/DatabaseManager.java
@@ -17,7 +17,7 @@
 package test.servlet;
 
 import jakarta.annotation.Resource;
-import javax.enterprise.inject.Produces;
+import jakarta.enterprise.inject.Produces;
 import javax.sql.DataSource;
 
 import test.beans.artifacts.TestDatabase;
diff --git a/appserver/tests/appserv-tests/devtests/cdi/javaee-integration/cdi-servlet-3.0-annotation-with-web-inf-lib-extension-alternative/build.xml b/appserver/tests/appserv-tests/devtests/cdi/javaee-integration/cdi-servlet-3.0-annotation-with-web-inf-lib-extension-alternative/build.xml
index e4dca16..c658dc8 100644
--- a/appserver/tests/appserv-tests/devtests/cdi/javaee-integration/cdi-servlet-3.0-annotation-with-web-inf-lib-extension-alternative/build.xml
+++ b/appserver/tests/appserv-tests/devtests/cdi/javaee-integration/cdi-servlet-3.0-annotation-with-web-inf-lib-extension-alternative/build.xml
@@ -49,7 +49,7 @@
         <javac srcdir="util" destdir="${build.classes.dir}" classpath="${s1astest.classpath}" debug="on" source="1.6"/>
         <copy file="descriptor/beans-alternative.xml" tofile="${build.classes.dir}/META-INF/beans.xml"/>
         <mkdir dir="${build.classes.dir}/META-INF/services"/>
-        <copy file="services/javax.enterprise.inject.spi.Extension" tofile="${build.classes.dir}/META-INF/services/javax.enterprise.inject.spi.Extension"/>
+        <copy file="services/jakarta.enterprise.inject.spi.Extension" tofile="${build.classes.dir}/META-INF/services/jakarta.enterprise.inject.spi.Extension"/>
         <delete file="${build.classes.dir}/TestBean.class" /> <!-- This is included in the WAR below -->
 
         <jar destfile="lib/bean-lib.jar">
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 ce9aef7..9a2cecf 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
@@ -16,7 +16,7 @@
 
 package test.beans;
 
-import javax.enterprise.context.RequestScoped;
+import jakarta.enterprise.context.RequestScoped;
 import jakarta.inject.Inject;
 import jakarta.persistence.EntityManager;
 
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/TestLoggerProducer.java b/appserver/tests/appserv-tests/devtests/cdi/javaee-integration/cdi-servlet-3.0-annotation-with-web-inf-lib-extension-alternative/servlet/test/beans/TestLoggerProducer.java
index 5d6b389..a3cee91 100644
--- a/appserver/tests/appserv-tests/devtests/cdi/javaee-integration/cdi-servlet-3.0-annotation-with-web-inf-lib-extension-alternative/servlet/test/beans/TestLoggerProducer.java
+++ b/appserver/tests/appserv-tests/devtests/cdi/javaee-integration/cdi-servlet-3.0-annotation-with-web-inf-lib-extension-alternative/servlet/test/beans/TestLoggerProducer.java
@@ -15,7 +15,7 @@
  */
 
 package test.beans;
-import javax.enterprise.inject.Produces;
+import jakarta.enterprise.inject.Produces;
 
 
 public class TestLoggerProducer {
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 5171fbe..b88e975 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
@@ -21,9 +21,9 @@
 import java.util.Set;
 
 import jakarta.annotation.Resource;
-import javax.enterprise.inject.Any;
-import javax.enterprise.inject.spi.BeanManager;
-import javax.enterprise.util.AnnotationLiteral;
+import jakarta.enterprise.inject.Any;
+import jakarta.enterprise.inject.spi.BeanManager;
+import jakarta.enterprise.util.AnnotationLiteral;
 import jakarta.inject.Inject;
 import javax.naming.InitialContext;
 import jakarta.persistence.EntityManager;
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 6ba0c64..18bba77 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
@@ -16,7 +16,7 @@
 
 package test.util;
 
-import javax.enterprise.inject.Produces;
+import jakarta.enterprise.inject.Produces;
 import jakarta.inject.Singleton;
 import jakarta.persistence.EntityManager;
 import jakarta.persistence.PersistenceContext;
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/TestAlternativeBeanInWebInfLib.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/TestAlternativeBeanInWebInfLib.java
index 45bbdb4..f05634d 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/TestAlternativeBeanInWebInfLib.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/TestAlternativeBeanInWebInfLib.java
@@ -16,7 +16,7 @@
 
 package test.beans.wbinflib;
 
-import javax.enterprise.inject.Alternative;
+import jakarta.enterprise.inject.Alternative;
 
 @Alternative
 public class TestAlternativeBeanInWebInfLib extends TestBeanInWebInfLib {
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 6b1cf6e..387ac45 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
@@ -17,10 +17,10 @@
 package test.beans.wbinflib;
 import java.util.Set;
 
-import javax.enterprise.inject.Any;
-import javax.enterprise.inject.spi.Bean;
-import javax.enterprise.inject.spi.BeanManager;
-import javax.enterprise.util.AnnotationLiteral;
+import jakarta.enterprise.inject.Any;
+import jakarta.enterprise.inject.spi.Bean;
+import jakarta.enterprise.inject.spi.BeanManager;
+import jakarta.enterprise.util.AnnotationLiteral;
 import jakarta.inject.Inject;
 import jakarta.persistence.EntityManager;
 import jakarta.persistence.PersistenceContext;
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/TestExtensionInWebInfLib.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/TestExtensionInWebInfLib.java
index 9f33e08..82207b6 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/TestExtensionInWebInfLib.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/TestExtensionInWebInfLib.java
@@ -16,7 +16,7 @@
 
 package test.beans.wbinflib;
 
-import javax.enterprise.inject.spi.Extension;
+import jakarta.enterprise.inject.spi.Extension;
 
 public class TestExtensionInWebInfLib implements Extension {
 //no-op
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 9c3d6f0..104c6b0 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
@@ -16,7 +16,7 @@
 
 package test.beans;
 
-import javax.enterprise.context.RequestScoped;
+import jakarta.enterprise.context.RequestScoped;
 import jakarta.inject.Inject;
 import jakarta.persistence.EntityManager;
 
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/TestLoggerProducer.java b/appserver/tests/appserv-tests/devtests/cdi/javaee-integration/cdi-servlet-3.0-annotation-with-web-inf-lib-javaee-injection/servlet/test/beans/TestLoggerProducer.java
index 8be9d65..14b9f86 100644
--- a/appserver/tests/appserv-tests/devtests/cdi/javaee-integration/cdi-servlet-3.0-annotation-with-web-inf-lib-javaee-injection/servlet/test/beans/TestLoggerProducer.java
+++ b/appserver/tests/appserv-tests/devtests/cdi/javaee-integration/cdi-servlet-3.0-annotation-with-web-inf-lib-javaee-injection/servlet/test/beans/TestLoggerProducer.java
@@ -16,7 +16,7 @@
 
 package test.beans;
 
-import javax.enterprise.inject.Produces;
+import jakarta.enterprise.inject.Produces;
 
 
 public class TestLoggerProducer {
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 e354e7b..e771242 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
@@ -21,9 +21,9 @@
 import java.util.Set;
 
 import jakarta.annotation.Resource;
-import javax.enterprise.inject.Any;
-import javax.enterprise.inject.spi.BeanManager;
-import javax.enterprise.util.AnnotationLiteral;
+import jakarta.enterprise.inject.Any;
+import jakarta.enterprise.inject.spi.BeanManager;
+import jakarta.enterprise.util.AnnotationLiteral;
 import jakarta.inject.Inject;
 import javax.naming.InitialContext;
 import jakarta.persistence.EntityManager;
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 6ba0c64..18bba77 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
@@ -16,7 +16,7 @@
 
 package test.util;
 
-import javax.enterprise.inject.Produces;
+import jakarta.enterprise.inject.Produces;
 import jakarta.inject.Singleton;
 import jakarta.persistence.EntityManager;
 import jakarta.persistence.PersistenceContext;
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 2cee02f..7635ce1 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
@@ -18,10 +18,10 @@
 
 import java.util.Set;
 
-import javax.enterprise.inject.Any;
-import javax.enterprise.inject.spi.Bean;
-import javax.enterprise.inject.spi.BeanManager;
-import javax.enterprise.util.AnnotationLiteral;
+import jakarta.enterprise.inject.Any;
+import jakarta.enterprise.inject.spi.Bean;
+import jakarta.enterprise.inject.spi.BeanManager;
+import jakarta.enterprise.util.AnnotationLiteral;
 import jakarta.inject.Inject;
 import jakarta.persistence.EntityManager;
 import jakarta.persistence.PersistenceContext;
diff --git a/appserver/tests/appserv-tests/devtests/cdi/javaee-integration/cdi-servlet-3.0-annotation-with-web-inf-lib-ordering-reversed/servlet/TestLoggerProducer.java b/appserver/tests/appserv-tests/devtests/cdi/javaee-integration/cdi-servlet-3.0-annotation-with-web-inf-lib-ordering-reversed/servlet/TestLoggerProducer.java
index f8e08a7..1559570 100644
--- a/appserver/tests/appserv-tests/devtests/cdi/javaee-integration/cdi-servlet-3.0-annotation-with-web-inf-lib-ordering-reversed/servlet/TestLoggerProducer.java
+++ b/appserver/tests/appserv-tests/devtests/cdi/javaee-integration/cdi-servlet-3.0-annotation-with-web-inf-lib-ordering-reversed/servlet/TestLoggerProducer.java
@@ -14,7 +14,7 @@
  * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
  */
 
-import javax.enterprise.inject.Produces;
+import jakarta.enterprise.inject.Produces;
 
 
 public class TestLoggerProducer {
diff --git a/appserver/tests/appserv-tests/devtests/cdi/javaee-integration/cdi-servlet-3.0-annotation-with-web-inf-lib-ordering-reversed/servlet/TestServlet.java b/appserver/tests/appserv-tests/devtests/cdi/javaee-integration/cdi-servlet-3.0-annotation-with-web-inf-lib-ordering-reversed/servlet/TestServlet.java
index 14e9b3c..5cace30 100644
--- a/appserver/tests/appserv-tests/devtests/cdi/javaee-integration/cdi-servlet-3.0-annotation-with-web-inf-lib-ordering-reversed/servlet/TestServlet.java
+++ b/appserver/tests/appserv-tests/devtests/cdi/javaee-integration/cdi-servlet-3.0-annotation-with-web-inf-lib-ordering-reversed/servlet/TestServlet.java
@@ -26,10 +26,10 @@
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 import jakarta.inject.Inject;
-import javax.enterprise.inject.Any;
-import javax.enterprise.inject.Default;
-import javax.enterprise.inject.spi.BeanManager;
-import javax.enterprise.util.AnnotationLiteral;
+import jakarta.enterprise.inject.Any;
+import jakarta.enterprise.inject.Default;
+import jakarta.enterprise.inject.spi.BeanManager;
+import jakarta.enterprise.util.AnnotationLiteral;
 import javax.naming.InitialContext;
 
 @WebServlet(name="mytest",
diff --git a/appserver/tests/appserv-tests/devtests/cdi/javaee-integration/cdi-servlet-3.0-annotation-with-web-inf-lib-ordering-reversed/util1/Foo.java b/appserver/tests/appserv-tests/devtests/cdi/javaee-integration/cdi-servlet-3.0-annotation-with-web-inf-lib-ordering-reversed/util1/Foo.java
index 9ee6ebb..a331b2f 100644
--- a/appserver/tests/appserv-tests/devtests/cdi/javaee-integration/cdi-servlet-3.0-annotation-with-web-inf-lib-ordering-reversed/util1/Foo.java
+++ b/appserver/tests/appserv-tests/devtests/cdi/javaee-integration/cdi-servlet-3.0-annotation-with-web-inf-lib-ordering-reversed/util1/Foo.java
@@ -14,6 +14,6 @@
  * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
  */
 
-@javax.enterprise.context.RequestScoped
+@jakarta.enterprise.context.RequestScoped
 public class Foo {
 }
diff --git a/appserver/tests/appserv-tests/devtests/cdi/javaee-integration/cdi-servlet-3.0-annotation-with-web-inf-lib-ordering-reversed/util2/Bar.java b/appserver/tests/appserv-tests/devtests/cdi/javaee-integration/cdi-servlet-3.0-annotation-with-web-inf-lib-ordering-reversed/util2/Bar.java
index ead2389..f629bc3 100644
--- a/appserver/tests/appserv-tests/devtests/cdi/javaee-integration/cdi-servlet-3.0-annotation-with-web-inf-lib-ordering-reversed/util2/Bar.java
+++ b/appserver/tests/appserv-tests/devtests/cdi/javaee-integration/cdi-servlet-3.0-annotation-with-web-inf-lib-ordering-reversed/util2/Bar.java
@@ -14,7 +14,7 @@
  * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
  */
 
-@javax.enterprise.context.RequestScoped
+@jakarta.enterprise.context.RequestScoped
 public class Bar{
 @jakarta.inject.Inject
 Foo f;
diff --git a/appserver/tests/appserv-tests/devtests/cdi/javaee-integration/cdi-servlet-3.0-annotation-with-web-inf-lib-ordering/servlet/TestLoggerProducer.java b/appserver/tests/appserv-tests/devtests/cdi/javaee-integration/cdi-servlet-3.0-annotation-with-web-inf-lib-ordering/servlet/TestLoggerProducer.java
index f8e08a7..1559570 100644
--- a/appserver/tests/appserv-tests/devtests/cdi/javaee-integration/cdi-servlet-3.0-annotation-with-web-inf-lib-ordering/servlet/TestLoggerProducer.java
+++ b/appserver/tests/appserv-tests/devtests/cdi/javaee-integration/cdi-servlet-3.0-annotation-with-web-inf-lib-ordering/servlet/TestLoggerProducer.java
@@ -14,7 +14,7 @@
  * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
  */
 
-import javax.enterprise.inject.Produces;
+import jakarta.enterprise.inject.Produces;
 
 
 public class TestLoggerProducer {
diff --git a/appserver/tests/appserv-tests/devtests/cdi/javaee-integration/cdi-servlet-3.0-annotation-with-web-inf-lib-ordering/servlet/TestServlet.java b/appserver/tests/appserv-tests/devtests/cdi/javaee-integration/cdi-servlet-3.0-annotation-with-web-inf-lib-ordering/servlet/TestServlet.java
index 14e9b3c..5cace30 100644
--- a/appserver/tests/appserv-tests/devtests/cdi/javaee-integration/cdi-servlet-3.0-annotation-with-web-inf-lib-ordering/servlet/TestServlet.java
+++ b/appserver/tests/appserv-tests/devtests/cdi/javaee-integration/cdi-servlet-3.0-annotation-with-web-inf-lib-ordering/servlet/TestServlet.java
@@ -26,10 +26,10 @@
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 import jakarta.inject.Inject;
-import javax.enterprise.inject.Any;
-import javax.enterprise.inject.Default;
-import javax.enterprise.inject.spi.BeanManager;
-import javax.enterprise.util.AnnotationLiteral;
+import jakarta.enterprise.inject.Any;
+import jakarta.enterprise.inject.Default;
+import jakarta.enterprise.inject.spi.BeanManager;
+import jakarta.enterprise.util.AnnotationLiteral;
 import javax.naming.InitialContext;
 
 @WebServlet(name="mytest",
diff --git a/appserver/tests/appserv-tests/devtests/cdi/javaee-integration/cdi-servlet-3.0-annotation-with-web-inf-lib-ordering/util1/Foo.java b/appserver/tests/appserv-tests/devtests/cdi/javaee-integration/cdi-servlet-3.0-annotation-with-web-inf-lib-ordering/util1/Foo.java
index 9ee6ebb..a331b2f 100644
--- a/appserver/tests/appserv-tests/devtests/cdi/javaee-integration/cdi-servlet-3.0-annotation-with-web-inf-lib-ordering/util1/Foo.java
+++ b/appserver/tests/appserv-tests/devtests/cdi/javaee-integration/cdi-servlet-3.0-annotation-with-web-inf-lib-ordering/util1/Foo.java
@@ -14,6 +14,6 @@
  * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
  */
 
-@javax.enterprise.context.RequestScoped
+@jakarta.enterprise.context.RequestScoped
 public class Foo {
 }
diff --git a/appserver/tests/appserv-tests/devtests/cdi/javaee-integration/cdi-servlet-3.0-annotation-with-web-inf-lib-ordering/util2/Bar.java b/appserver/tests/appserv-tests/devtests/cdi/javaee-integration/cdi-servlet-3.0-annotation-with-web-inf-lib-ordering/util2/Bar.java
index ead2389..f629bc3 100644
--- a/appserver/tests/appserv-tests/devtests/cdi/javaee-integration/cdi-servlet-3.0-annotation-with-web-inf-lib-ordering/util2/Bar.java
+++ b/appserver/tests/appserv-tests/devtests/cdi/javaee-integration/cdi-servlet-3.0-annotation-with-web-inf-lib-ordering/util2/Bar.java
@@ -14,7 +14,7 @@
  * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
  */
 
-@javax.enterprise.context.RequestScoped
+@jakarta.enterprise.context.RequestScoped
 public class Bar{
 @jakarta.inject.Inject
 Foo f;
diff --git a/appserver/tests/appserv-tests/devtests/cdi/javaee-integration/cdi-servlet-3.0-annotation-with-web-inf-lib/servlet/TestLoggerProducer.java b/appserver/tests/appserv-tests/devtests/cdi/javaee-integration/cdi-servlet-3.0-annotation-with-web-inf-lib/servlet/TestLoggerProducer.java
index f8e08a7..1559570 100644
--- a/appserver/tests/appserv-tests/devtests/cdi/javaee-integration/cdi-servlet-3.0-annotation-with-web-inf-lib/servlet/TestLoggerProducer.java
+++ b/appserver/tests/appserv-tests/devtests/cdi/javaee-integration/cdi-servlet-3.0-annotation-with-web-inf-lib/servlet/TestLoggerProducer.java
@@ -14,7 +14,7 @@
  * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
  */
 
-import javax.enterprise.inject.Produces;
+import jakarta.enterprise.inject.Produces;
 
 
 public class TestLoggerProducer {
diff --git a/appserver/tests/appserv-tests/devtests/cdi/javaee-integration/cdi-servlet-3.0-annotation-with-web-inf-lib/servlet/TestServlet.java b/appserver/tests/appserv-tests/devtests/cdi/javaee-integration/cdi-servlet-3.0-annotation-with-web-inf-lib/servlet/TestServlet.java
index 214abf8..80efc2e 100644
--- a/appserver/tests/appserv-tests/devtests/cdi/javaee-integration/cdi-servlet-3.0-annotation-with-web-inf-lib/servlet/TestServlet.java
+++ b/appserver/tests/appserv-tests/devtests/cdi/javaee-integration/cdi-servlet-3.0-annotation-with-web-inf-lib/servlet/TestServlet.java
@@ -26,10 +26,10 @@
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 import jakarta.inject.Inject;
-import javax.enterprise.inject.Any;
-import javax.enterprise.inject.Default;
-import javax.enterprise.inject.spi.BeanManager;
-import javax.enterprise.util.AnnotationLiteral;
+import jakarta.enterprise.inject.Any;
+import jakarta.enterprise.inject.Default;
+import jakarta.enterprise.inject.spi.BeanManager;
+import jakarta.enterprise.util.AnnotationLiteral;
 import javax.naming.InitialContext;
 
 @WebServlet(name="mytest",
diff --git a/appserver/tests/appserv-tests/devtests/cdi/javaee-integration/cdi-servlet-3.0-annotation-with-web-inf-lib/util/TestBeanInWebInfLib.java b/appserver/tests/appserv-tests/devtests/cdi/javaee-integration/cdi-servlet-3.0-annotation-with-web-inf-lib/util/TestBeanInWebInfLib.java
index b9713a9..2d24305 100644
--- a/appserver/tests/appserv-tests/devtests/cdi/javaee-integration/cdi-servlet-3.0-annotation-with-web-inf-lib/util/TestBeanInWebInfLib.java
+++ b/appserver/tests/appserv-tests/devtests/cdi/javaee-integration/cdi-servlet-3.0-annotation-with-web-inf-lib/util/TestBeanInWebInfLib.java
@@ -16,11 +16,11 @@
 
 import java.util.Set;
 
-import javax.enterprise.inject.Any;
-import javax.enterprise.inject.spi.BeanManager;
-import javax.enterprise.util.AnnotationLiteral;
+import jakarta.enterprise.inject.Any;
+import jakarta.enterprise.inject.spi.BeanManager;
+import jakarta.enterprise.util.AnnotationLiteral;
 import jakarta.inject.Inject;
-import javax.enterprise.inject.spi.Bean;
+import jakarta.enterprise.inject.spi.Bean;
 
 public class TestBeanInWebInfLib {
     @Inject
diff --git a/appserver/tests/appserv-tests/devtests/cdi/javaee-integration/no-interface-local-view-proxy-serializable/servlet/test/beans/nonmock/TestBean.java b/appserver/tests/appserv-tests/devtests/cdi/javaee-integration/no-interface-local-view-proxy-serializable/servlet/test/beans/nonmock/TestBean.java
index 9c66252..709bf1a 100644
--- a/appserver/tests/appserv-tests/devtests/cdi/javaee-integration/no-interface-local-view-proxy-serializable/servlet/test/beans/nonmock/TestBean.java
+++ b/appserver/tests/appserv-tests/devtests/cdi/javaee-integration/no-interface-local-view-proxy-serializable/servlet/test/beans/nonmock/TestBean.java
@@ -18,7 +18,7 @@
 
 import java.io.Serializable;
 
-import javax.enterprise.context.SessionScoped;
+import jakarta.enterprise.context.SessionScoped;
 import jakarta.inject.Inject;
 
 import test.beans.TestBeanInterface;
diff --git a/appserver/tests/appserv-tests/devtests/cdi/javaee-integration/normal-bean-injection-ear/war/com/acme/NormalLookupInEARServlet.java b/appserver/tests/appserv-tests/devtests/cdi/javaee-integration/normal-bean-injection-ear/war/com/acme/NormalLookupInEARServlet.java
index 426f592..8936285 100644
--- a/appserver/tests/appserv-tests/devtests/cdi/javaee-integration/normal-bean-injection-ear/war/com/acme/NormalLookupInEARServlet.java
+++ b/appserver/tests/appserv-tests/devtests/cdi/javaee-integration/normal-bean-injection-ear/war/com/acme/NormalLookupInEARServlet.java
@@ -21,7 +21,7 @@
 
 import jakarta.annotation.Resource;
 import jakarta.ejb.EJB;
-import javax.enterprise.inject.Instance;
+import jakarta.enterprise.inject.Instance;
 import jakarta.inject.Inject;
 import javax.naming.InitialContext;
 import javax.servlet.ServletConfig;
diff --git a/appserver/tests/appserv-tests/devtests/cdi/javaee-integration/normal-bean-injection-ear/war/com/acme/TestBeanWARImpl.java b/appserver/tests/appserv-tests/devtests/cdi/javaee-integration/normal-bean-injection-ear/war/com/acme/TestBeanWARImpl.java
index 8b45c02..e079b68 100644
--- a/appserver/tests/appserv-tests/devtests/cdi/javaee-integration/normal-bean-injection-ear/war/com/acme/TestBeanWARImpl.java
+++ b/appserver/tests/appserv-tests/devtests/cdi/javaee-integration/normal-bean-injection-ear/war/com/acme/TestBeanWARImpl.java
@@ -16,7 +16,7 @@
 
 package com.acme;
 
-import javax.enterprise.context.SessionScoped;
+import jakarta.enterprise.context.SessionScoped;
 
 
 @SessionScoped
diff --git a/appserver/tests/appserv-tests/devtests/cdi/javaee-integration/programmatic-lookup-ear/war/com/acme/ProgrammaticLookupInEARServlet.java b/appserver/tests/appserv-tests/devtests/cdi/javaee-integration/programmatic-lookup-ear/war/com/acme/ProgrammaticLookupInEARServlet.java
index 6352661..5b189b7 100644
--- a/appserver/tests/appserv-tests/devtests/cdi/javaee-integration/programmatic-lookup-ear/war/com/acme/ProgrammaticLookupInEARServlet.java
+++ b/appserver/tests/appserv-tests/devtests/cdi/javaee-integration/programmatic-lookup-ear/war/com/acme/ProgrammaticLookupInEARServlet.java
@@ -21,7 +21,7 @@
 
 import jakarta.annotation.Resource;
 import jakarta.ejb.EJB;
-import javax.enterprise.inject.Instance;
+import jakarta.enterprise.inject.Instance;
 import jakarta.inject.Inject;
 import javax.naming.InitialContext;
 import javax.servlet.ServletConfig;
diff --git a/appserver/tests/appserv-tests/devtests/cdi/javaee-integration/programmatic-lookup-ear/war/com/acme/TestBeanWARImpl.java b/appserver/tests/appserv-tests/devtests/cdi/javaee-integration/programmatic-lookup-ear/war/com/acme/TestBeanWARImpl.java
index 05f6914..9a73adb 100644
--- a/appserver/tests/appserv-tests/devtests/cdi/javaee-integration/programmatic-lookup-ear/war/com/acme/TestBeanWARImpl.java
+++ b/appserver/tests/appserv-tests/devtests/cdi/javaee-integration/programmatic-lookup-ear/war/com/acme/TestBeanWARImpl.java
@@ -18,7 +18,7 @@
 
 import java.io.Serializable;
 
-import javax.enterprise.context.SessionScoped;
+import jakarta.enterprise.context.SessionScoped;
 
 
 @SessionScoped
diff --git a/appserver/tests/appserv-tests/devtests/cdi/javaee-integration/servlet-context-injection-cdi/servlet/tests/cdi/context/ServletContextBridge.java b/appserver/tests/appserv-tests/devtests/cdi/javaee-integration/servlet-context-injection-cdi/servlet/tests/cdi/context/ServletContextBridge.java
index d99d01b..749cbaf 100644
--- a/appserver/tests/appserv-tests/devtests/cdi/javaee-integration/servlet-context-injection-cdi/servlet/tests/cdi/context/ServletContextBridge.java
+++ b/appserver/tests/appserv-tests/devtests/cdi/javaee-integration/servlet-context-injection-cdi/servlet/tests/cdi/context/ServletContextBridge.java
@@ -18,8 +18,8 @@
 
 import java.lang.annotation.Annotation;
 
-import javax.enterprise.inject.spi.BeanManager;
-import javax.enterprise.util.AnnotationLiteral;
+import jakarta.enterprise.inject.spi.BeanManager;
+import jakarta.enterprise.util.AnnotationLiteral;
 import jakarta.inject.Inject;
 import javax.servlet.ServletContextEvent;
 import javax.servlet.ServletContextListener;
diff --git a/appserver/tests/appserv-tests/devtests/cdi/javaee-integration/servlet-context-injection-cdi/servlet/tests/cdi/context/ServletContextProducer.java b/appserver/tests/appserv-tests/devtests/cdi/javaee-integration/servlet-context-injection-cdi/servlet/tests/cdi/context/ServletContextProducer.java
index 478b7e1..297d8b2 100644
--- a/appserver/tests/appserv-tests/devtests/cdi/javaee-integration/servlet-context-injection-cdi/servlet/tests/cdi/context/ServletContextProducer.java
+++ b/appserver/tests/appserv-tests/devtests/cdi/javaee-integration/servlet-context-injection-cdi/servlet/tests/cdi/context/ServletContextProducer.java
@@ -17,10 +17,10 @@
 package tests.cdi.context;
 
 //JJS: With cdi 1.1 the ServletContext is produced by Weld (2.0) and so producing one creates an ambiguous dependency.
-//import javax.enterprise.context.ApplicationScoped;
-//import javax.enterprise.event.Observes;
-//import javax.enterprise.inject.Produces;
-//import javax.enterprise.inject.spi.BeanManager;
+//import jakarta.enterprise.context.ApplicationScoped;
+//import jakarta.enterprise.event.Observes;
+//import jakarta.enterprise.inject.Produces;
+//import jakarta.enterprise.inject.spi.BeanManager;
 //import jakarta.inject.Inject;
 //import javax.servlet.ServletContext;
 //import javax.servlet.ServletContextEvent;
diff --git a/appserver/tests/appserv-tests/devtests/cdi/javaee-integration/servlet-context-injection-cdi/servlet/tests/cdi/servlet/TestServlet.java b/appserver/tests/appserv-tests/devtests/cdi/javaee-integration/servlet-context-injection-cdi/servlet/tests/cdi/servlet/TestServlet.java
index d704e57..79cd22c 100644
--- a/appserver/tests/appserv-tests/devtests/cdi/javaee-integration/servlet-context-injection-cdi/servlet/tests/cdi/servlet/TestServlet.java
+++ b/appserver/tests/appserv-tests/devtests/cdi/javaee-integration/servlet-context-injection-cdi/servlet/tests/cdi/servlet/TestServlet.java
@@ -19,7 +19,7 @@
 import java.io.IOException;
 import java.io.PrintWriter;
 
-import javax.enterprise.inject.spi.BeanManager;
+import jakarta.enterprise.inject.spi.BeanManager;
 import jakarta.inject.Inject;
 import javax.naming.InitialContext;
 import javax.servlet.ServletContext;
diff --git a/appserver/tests/appserv-tests/devtests/cdi/managed-beans/managed-bean-lifecycle-polymorphism/servlet/com/tests/TestManagedBeanExtension.java b/appserver/tests/appserv-tests/devtests/cdi/managed-beans/managed-bean-lifecycle-polymorphism/servlet/com/tests/TestManagedBeanExtension.java
index 27535e2..9d71d57 100644
--- a/appserver/tests/appserv-tests/devtests/cdi/managed-beans/managed-bean-lifecycle-polymorphism/servlet/com/tests/TestManagedBeanExtension.java
+++ b/appserver/tests/appserv-tests/devtests/cdi/managed-beans/managed-bean-lifecycle-polymorphism/servlet/com/tests/TestManagedBeanExtension.java
@@ -16,7 +16,7 @@
 
 package com.tests;
 
-@javax.enterprise.inject.Alternative
+@jakarta.enterprise.inject.Alternative
 @jakarta.annotation.ManagedBean
 public class TestManagedBeanExtension extends TestManagedBean {
 
diff --git a/appserver/tests/appserv-tests/devtests/cdi/osgi-cdi/common.xml b/appserver/tests/appserv-tests/devtests/cdi/osgi-cdi/common.xml
index f396e66..f342d87 100644
--- a/appserver/tests/appserv-tests/devtests/cdi/osgi-cdi/common.xml
+++ b/appserver/tests/appserv-tests/devtests/cdi/osgi-cdi/common.xml
@@ -183,7 +183,7 @@
   <copy file="${context.xml}"
       tofile="${build.classes.dir}/tmp/META-INF/context.xml" failonerror="false"/>
   <copy file="${cdi-extension.service}"
-      tofile="${build.classes.dir}/tmp/WEB-INF/classes/META-INF/services/javax.enterprise.inject.spi.Extension" failonerror="false"/>
+      tofile="${build.classes.dir}/tmp/WEB-INF/classes/META-INF/services/jakarta.enterprise.inject.spi.Extension" failonerror="false"/>
       
   <copy todir="${build.classes.dir}/tmp/WEB-INF/classes">
       <fileset dir="${war.classes}">
@@ -226,7 +226,7 @@
       <include name="WEB-INF/wsdl/${wsdlfile.name}"/>
       <include name="${mappingfile.name}"/>
       <include name="META-INF/context.xml"/>
-      <include name="WEB-INF/classes/META-INF/services/javax.enterprise.inject.spi.Extension"/>
+      <include name="WEB-INF/classes/META-INF/services/jakarta.enterprise.inject.spi.Extension"/>
       <include name="WEB-INF/classes/META-INF/persistence.xml"/>
     </fileset>
   </jar>       
@@ -286,7 +286,7 @@
   <copy file="${context.xml}"
       tofile="${build.classes.dir}/tmp/META-INF/context.xml" failonerror="false"/>
   <copy file="${cdi-extension.service}"
-      tofile="${build.classes.dir}/tmp/WEB-INF/classes/META-INF/services/javax.enterprise.inject.spi.Extension" failonerror="false"/>
+      tofile="${build.classes.dir}/tmp/WEB-INF/classes/META-INF/services/jakarta.enterprise.inject.spi.Extension" failonerror="false"/>
       
   <copy todir="${build.classes.dir}/tmp/WEB-INF/classes">
       <fileset dir="${war.classes}">
@@ -329,7 +329,7 @@
       <include name="WEB-INF/wsdl/${wsdlfile.name}"/>
       <include name="${mappingfile.name}"/>
       <include name="META-INF/context.xml"/>
-      <include name="WEB-INF/classes/META-INF/services/javax.enterprise.inject.spi.Extension"/>
+      <include name="WEB-INF/classes/META-INF/services/jakarta.enterprise.inject.spi.Extension"/>
       <include name="WEB-INF/classes/META-INF/persistence.xml"/>
     </fileset>
   </jar>       
diff --git a/appserver/tests/appserv-tests/devtests/cdi/osgi-cdi/simple-wab-with-cdi/descriptor/MANIFEST.MF b/appserver/tests/appserv-tests/devtests/cdi/osgi-cdi/simple-wab-with-cdi/descriptor/MANIFEST.MF
index 5b53761..ee90990 100644
--- a/appserver/tests/appserv-tests/devtests/cdi/osgi-cdi/simple-wab-with-cdi/descriptor/MANIFEST.MF
+++ b/appserver/tests/appserv-tests/devtests/cdi/osgi-cdi/simple-wab-with-cdi/descriptor/MANIFEST.MF
@@ -16,6 +16,6 @@
 Bundle-ManifestVersion: 2
 Bundle-SymbolicName: tests.cdi.simple-cdi-osgi-test
 Web-ContextPath: /test
-Import-Package: javax.enterprise.context,javax.enterprise.inject,javax
- .inject,javax.enterprise.inject.spi,javax.servlet,javax.servlet.annotation,javax.servlet.http,javax.naming
+Import-Package: jakarta.enterprise.context,jakarta.enterprise.inject,javax
+ .inject,jakarta.enterprise.inject.spi,javax.servlet,javax.servlet.annotation,javax.servlet.http,javax.naming
 
diff --git a/appserver/tests/appserv-tests/devtests/cdi/osgi-cdi/simple-wab-with-cdi/servlet/tests/cdi/TestServlet.java b/appserver/tests/appserv-tests/devtests/cdi/osgi-cdi/simple-wab-with-cdi/servlet/tests/cdi/TestServlet.java
index a3be8e7..67f230a 100644
--- a/appserver/tests/appserv-tests/devtests/cdi/osgi-cdi/simple-wab-with-cdi/servlet/tests/cdi/TestServlet.java
+++ b/appserver/tests/appserv-tests/devtests/cdi/osgi-cdi/simple-wab-with-cdi/servlet/tests/cdi/TestServlet.java
@@ -27,7 +27,7 @@
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 import jakarta.inject.Inject;
-import javax.enterprise.inject.spi.BeanManager;
+import jakarta.enterprise.inject.spi.BeanManager;
 import javax.naming.InitialContext;
 
 @WebServlet(urlPatterns={"/*"})
diff --git a/appserver/tests/appserv-tests/devtests/cdi/portable-extensions/bean-interface/servlet/test/beans/DuplicateTestBean.java b/appserver/tests/appserv-tests/devtests/cdi/portable-extensions/bean-interface/servlet/test/beans/DuplicateTestBean.java
index 0d2eb25..635e1cd 100644
--- a/appserver/tests/appserv-tests/devtests/cdi/portable-extensions/bean-interface/servlet/test/beans/DuplicateTestBean.java
+++ b/appserver/tests/appserv-tests/devtests/cdi/portable-extensions/bean-interface/servlet/test/beans/DuplicateTestBean.java
@@ -16,7 +16,7 @@
 
 package test.beans;
 
-import javax.enterprise.context.RequestScoped;
+import jakarta.enterprise.context.RequestScoped;
 import jakarta.inject.Named;
 
 @Transactional
diff --git a/appserver/tests/appserv-tests/devtests/cdi/portable-extensions/bean-interface/servlet/test/beans/TestBean.java b/appserver/tests/appserv-tests/devtests/cdi/portable-extensions/bean-interface/servlet/test/beans/TestBean.java
index 4792d26..eec4d45 100644
--- a/appserver/tests/appserv-tests/devtests/cdi/portable-extensions/bean-interface/servlet/test/beans/TestBean.java
+++ b/appserver/tests/appserv-tests/devtests/cdi/portable-extensions/bean-interface/servlet/test/beans/TestBean.java
@@ -16,7 +16,7 @@
 
 package test.beans;
 
-import javax.enterprise.context.RequestScoped;
+import jakarta.enterprise.context.RequestScoped;
 
 @Transactional
 @RequestScoped
diff --git a/appserver/tests/appserv-tests/devtests/cdi/portable-extensions/bean-interface/servlet/test/beans/TestNamedBean.java b/appserver/tests/appserv-tests/devtests/cdi/portable-extensions/bean-interface/servlet/test/beans/TestNamedBean.java
index 46dc161..ae72d8f 100644
--- a/appserver/tests/appserv-tests/devtests/cdi/portable-extensions/bean-interface/servlet/test/beans/TestNamedBean.java
+++ b/appserver/tests/appserv-tests/devtests/cdi/portable-extensions/bean-interface/servlet/test/beans/TestNamedBean.java
@@ -16,7 +16,7 @@
 
 package test.beans;
 
-import javax.enterprise.context.RequestScoped;
+import jakarta.enterprise.context.RequestScoped;
 import jakarta.inject.Named;
 
 @Named("test_named_bean")
diff --git a/appserver/tests/appserv-tests/devtests/cdi/portable-extensions/bean-interface/servlet/test/extension/MyExtension.java b/appserver/tests/appserv-tests/devtests/cdi/portable-extensions/bean-interface/servlet/test/extension/MyExtension.java
index be36563..67737a9 100644
--- a/appserver/tests/appserv-tests/devtests/cdi/portable-extensions/bean-interface/servlet/test/extension/MyExtension.java
+++ b/appserver/tests/appserv-tests/devtests/cdi/portable-extensions/bean-interface/servlet/test/extension/MyExtension.java
@@ -16,12 +16,12 @@
 
 package test.extension;
 
-import javax.enterprise.event.Observes;
-import javax.enterprise.inject.spi.AfterBeanDiscovery;
-import javax.enterprise.inject.spi.BeanManager;
-import javax.enterprise.inject.spi.BeforeBeanDiscovery;
-import javax.enterprise.inject.spi.Extension;
-import javax.enterprise.inject.spi.ProcessAnnotatedType;
+import jakarta.enterprise.event.Observes;
+import jakarta.enterprise.inject.spi.AfterBeanDiscovery;
+import jakarta.enterprise.inject.spi.BeanManager;
+import jakarta.enterprise.inject.spi.BeforeBeanDiscovery;
+import jakarta.enterprise.inject.spi.Extension;
+import jakarta.enterprise.inject.spi.ProcessAnnotatedType;
 
 import test.beans.DuplicateTestBean;
 
diff --git a/appserver/tests/appserv-tests/devtests/cdi/portable-extensions/bean-interface/servlet/test/servlet/PortableExtensionBeanInterfaceTestServlet.java b/appserver/tests/appserv-tests/devtests/cdi/portable-extensions/bean-interface/servlet/test/servlet/PortableExtensionBeanInterfaceTestServlet.java
index f1c4fb3..50a7793 100644
--- a/appserver/tests/appserv-tests/devtests/cdi/portable-extensions/bean-interface/servlet/test/servlet/PortableExtensionBeanInterfaceTestServlet.java
+++ b/appserver/tests/appserv-tests/devtests/cdi/portable-extensions/bean-interface/servlet/test/servlet/PortableExtensionBeanInterfaceTestServlet.java
@@ -23,13 +23,13 @@
 import java.util.NoSuchElementException;
 import java.util.Set;
 
-import javax.enterprise.context.ConversationScoped;
-import javax.enterprise.context.RequestScoped;
-import javax.enterprise.context.SessionScoped;
-import javax.enterprise.inject.Any;
-import javax.enterprise.inject.spi.Bean;
-import javax.enterprise.inject.spi.BeanManager;
-import javax.enterprise.util.AnnotationLiteral;
+import jakarta.enterprise.context.ConversationScoped;
+import jakarta.enterprise.context.RequestScoped;
+import jakarta.enterprise.context.SessionScoped;
+import jakarta.enterprise.inject.Any;
+import jakarta.enterprise.inject.spi.Bean;
+import jakarta.enterprise.inject.spi.BeanManager;
+import jakarta.enterprise.util.AnnotationLiteral;
 import jakarta.inject.Inject;
 import javax.naming.InitialContext;
 import javax.naming.NamingException;
diff --git a/appserver/tests/appserv-tests/devtests/cdi/portable-extensions/bean-manager/servlet/test/beans/DuplicateTestBean.java b/appserver/tests/appserv-tests/devtests/cdi/portable-extensions/bean-manager/servlet/test/beans/DuplicateTestBean.java
index 0d2eb25..635e1cd 100644
--- a/appserver/tests/appserv-tests/devtests/cdi/portable-extensions/bean-manager/servlet/test/beans/DuplicateTestBean.java
+++ b/appserver/tests/appserv-tests/devtests/cdi/portable-extensions/bean-manager/servlet/test/beans/DuplicateTestBean.java
@@ -16,7 +16,7 @@
 
 package test.beans;
 
-import javax.enterprise.context.RequestScoped;
+import jakarta.enterprise.context.RequestScoped;
 import jakarta.inject.Named;
 
 @Transactional
diff --git a/appserver/tests/appserv-tests/devtests/cdi/portable-extensions/bean-manager/servlet/test/beans/TestBean.java b/appserver/tests/appserv-tests/devtests/cdi/portable-extensions/bean-manager/servlet/test/beans/TestBean.java
index 4792d26..eec4d45 100644
--- a/appserver/tests/appserv-tests/devtests/cdi/portable-extensions/bean-manager/servlet/test/beans/TestBean.java
+++ b/appserver/tests/appserv-tests/devtests/cdi/portable-extensions/bean-manager/servlet/test/beans/TestBean.java
@@ -16,7 +16,7 @@
 
 package test.beans;
 
-import javax.enterprise.context.RequestScoped;
+import jakarta.enterprise.context.RequestScoped;
 
 @Transactional
 @RequestScoped
diff --git a/appserver/tests/appserv-tests/devtests/cdi/portable-extensions/bean-manager/servlet/test/beans/TestNamedBean.java b/appserver/tests/appserv-tests/devtests/cdi/portable-extensions/bean-manager/servlet/test/beans/TestNamedBean.java
index 46dc161..ae72d8f 100644
--- a/appserver/tests/appserv-tests/devtests/cdi/portable-extensions/bean-manager/servlet/test/beans/TestNamedBean.java
+++ b/appserver/tests/appserv-tests/devtests/cdi/portable-extensions/bean-manager/servlet/test/beans/TestNamedBean.java
@@ -16,7 +16,7 @@
 
 package test.beans;
 
-import javax.enterprise.context.RequestScoped;
+import jakarta.enterprise.context.RequestScoped;
 import jakarta.inject.Named;
 
 @Named("test_named_bean")
diff --git a/appserver/tests/appserv-tests/devtests/cdi/portable-extensions/bean-manager/servlet/test/extension/MyExtension.java b/appserver/tests/appserv-tests/devtests/cdi/portable-extensions/bean-manager/servlet/test/extension/MyExtension.java
index be36563..67737a9 100644
--- a/appserver/tests/appserv-tests/devtests/cdi/portable-extensions/bean-manager/servlet/test/extension/MyExtension.java
+++ b/appserver/tests/appserv-tests/devtests/cdi/portable-extensions/bean-manager/servlet/test/extension/MyExtension.java
@@ -16,12 +16,12 @@
 
 package test.extension;
 
-import javax.enterprise.event.Observes;
-import javax.enterprise.inject.spi.AfterBeanDiscovery;
-import javax.enterprise.inject.spi.BeanManager;
-import javax.enterprise.inject.spi.BeforeBeanDiscovery;
-import javax.enterprise.inject.spi.Extension;
-import javax.enterprise.inject.spi.ProcessAnnotatedType;
+import jakarta.enterprise.event.Observes;
+import jakarta.enterprise.inject.spi.AfterBeanDiscovery;
+import jakarta.enterprise.inject.spi.BeanManager;
+import jakarta.enterprise.inject.spi.BeforeBeanDiscovery;
+import jakarta.enterprise.inject.spi.Extension;
+import jakarta.enterprise.inject.spi.ProcessAnnotatedType;
 
 import test.beans.DuplicateTestBean;
 
diff --git a/appserver/tests/appserv-tests/devtests/cdi/portable-extensions/bean-manager/servlet/test/servlet/PortableExtensionBeanManagerTestServlet.java b/appserver/tests/appserv-tests/devtests/cdi/portable-extensions/bean-manager/servlet/test/servlet/PortableExtensionBeanManagerTestServlet.java
index c5f1b15..af563bd 100644
--- a/appserver/tests/appserv-tests/devtests/cdi/portable-extensions/bean-manager/servlet/test/servlet/PortableExtensionBeanManagerTestServlet.java
+++ b/appserver/tests/appserv-tests/devtests/cdi/portable-extensions/bean-manager/servlet/test/servlet/PortableExtensionBeanManagerTestServlet.java
@@ -19,11 +19,11 @@
 import java.io.IOException;
 import java.io.PrintWriter;
 
-import javax.enterprise.context.ConversationScoped;
-import javax.enterprise.context.RequestScoped;
-import javax.enterprise.context.SessionScoped;
-import javax.enterprise.inject.Default;
-import javax.enterprise.inject.spi.BeanManager;
+import jakarta.enterprise.context.ConversationScoped;
+import jakarta.enterprise.context.RequestScoped;
+import jakarta.enterprise.context.SessionScoped;
+import jakarta.enterprise.inject.Default;
+import jakarta.enterprise.inject.spi.BeanManager;
 import jakarta.inject.Inject;
 import javax.naming.InitialContext;
 import javax.naming.NamingException;
diff --git a/appserver/tests/appserv-tests/devtests/cdi/portable-extensions/injection-target/servlet/test/beans/DuplicateTestBean.java b/appserver/tests/appserv-tests/devtests/cdi/portable-extensions/injection-target/servlet/test/beans/DuplicateTestBean.java
index 0d2eb25..635e1cd 100644
--- a/appserver/tests/appserv-tests/devtests/cdi/portable-extensions/injection-target/servlet/test/beans/DuplicateTestBean.java
+++ b/appserver/tests/appserv-tests/devtests/cdi/portable-extensions/injection-target/servlet/test/beans/DuplicateTestBean.java
@@ -16,7 +16,7 @@
 
 package test.beans;
 
-import javax.enterprise.context.RequestScoped;
+import jakarta.enterprise.context.RequestScoped;
 import jakarta.inject.Named;
 
 @Transactional
diff --git a/appserver/tests/appserv-tests/devtests/cdi/portable-extensions/injection-target/servlet/test/beans/TestBean.java b/appserver/tests/appserv-tests/devtests/cdi/portable-extensions/injection-target/servlet/test/beans/TestBean.java
index 4792d26..eec4d45 100644
--- a/appserver/tests/appserv-tests/devtests/cdi/portable-extensions/injection-target/servlet/test/beans/TestBean.java
+++ b/appserver/tests/appserv-tests/devtests/cdi/portable-extensions/injection-target/servlet/test/beans/TestBean.java
@@ -16,7 +16,7 @@
 
 package test.beans;
 
-import javax.enterprise.context.RequestScoped;
+import jakarta.enterprise.context.RequestScoped;
 
 @Transactional
 @RequestScoped
diff --git a/appserver/tests/appserv-tests/devtests/cdi/portable-extensions/injection-target/servlet/test/beans/TestNamedBean.java b/appserver/tests/appserv-tests/devtests/cdi/portable-extensions/injection-target/servlet/test/beans/TestNamedBean.java
index 46dc161..ae72d8f 100644
--- a/appserver/tests/appserv-tests/devtests/cdi/portable-extensions/injection-target/servlet/test/beans/TestNamedBean.java
+++ b/appserver/tests/appserv-tests/devtests/cdi/portable-extensions/injection-target/servlet/test/beans/TestNamedBean.java
@@ -16,7 +16,7 @@
 
 package test.beans;
 
-import javax.enterprise.context.RequestScoped;
+import jakarta.enterprise.context.RequestScoped;
 import jakarta.inject.Named;
 
 @Named("test_named_bean")
diff --git a/appserver/tests/appserv-tests/devtests/cdi/portable-extensions/injection-target/servlet/test/extension/MyExtension.java b/appserver/tests/appserv-tests/devtests/cdi/portable-extensions/injection-target/servlet/test/extension/MyExtension.java
index be36563..67737a9 100644
--- a/appserver/tests/appserv-tests/devtests/cdi/portable-extensions/injection-target/servlet/test/extension/MyExtension.java
+++ b/appserver/tests/appserv-tests/devtests/cdi/portable-extensions/injection-target/servlet/test/extension/MyExtension.java
@@ -16,12 +16,12 @@
 
 package test.extension;
 
-import javax.enterprise.event.Observes;
-import javax.enterprise.inject.spi.AfterBeanDiscovery;
-import javax.enterprise.inject.spi.BeanManager;
-import javax.enterprise.inject.spi.BeforeBeanDiscovery;
-import javax.enterprise.inject.spi.Extension;
-import javax.enterprise.inject.spi.ProcessAnnotatedType;
+import jakarta.enterprise.event.Observes;
+import jakarta.enterprise.inject.spi.AfterBeanDiscovery;
+import jakarta.enterprise.inject.spi.BeanManager;
+import jakarta.enterprise.inject.spi.BeforeBeanDiscovery;
+import jakarta.enterprise.inject.spi.Extension;
+import jakarta.enterprise.inject.spi.ProcessAnnotatedType;
 
 import test.beans.DuplicateTestBean;
 
diff --git a/appserver/tests/appserv-tests/devtests/cdi/portable-extensions/injection-target/servlet/test/servlet/PortableExtensionInjectionTargetTestServlet.java b/appserver/tests/appserv-tests/devtests/cdi/portable-extensions/injection-target/servlet/test/servlet/PortableExtensionInjectionTargetTestServlet.java
index b25045e..66ddeef 100644
--- a/appserver/tests/appserv-tests/devtests/cdi/portable-extensions/injection-target/servlet/test/servlet/PortableExtensionInjectionTargetTestServlet.java
+++ b/appserver/tests/appserv-tests/devtests/cdi/portable-extensions/injection-target/servlet/test/servlet/PortableExtensionInjectionTargetTestServlet.java
@@ -19,13 +19,13 @@
 import java.io.IOException;
 import java.io.PrintWriter;
 
-import javax.enterprise.context.ConversationScoped;
-import javax.enterprise.context.RequestScoped;
-import javax.enterprise.context.SessionScoped;
-import javax.enterprise.context.spi.CreationalContext;
-import javax.enterprise.inject.spi.AnnotatedType;
-import javax.enterprise.inject.spi.BeanManager;
-import javax.enterprise.inject.spi.InjectionTarget;
+import jakarta.enterprise.context.ConversationScoped;
+import jakarta.enterprise.context.RequestScoped;
+import jakarta.enterprise.context.SessionScoped;
+import jakarta.enterprise.context.spi.CreationalContext;
+import jakarta.enterprise.inject.spi.AnnotatedType;
+import jakarta.enterprise.inject.spi.BeanManager;
+import jakarta.enterprise.inject.spi.InjectionTarget;
 import jakarta.inject.Inject;
 import javax.naming.InitialContext;
 import javax.naming.NamingException;
diff --git a/appserver/tests/appserv-tests/devtests/cdi/portable-extensions/new-bean-registration-extension-in-lib/build.xml b/appserver/tests/appserv-tests/devtests/cdi/portable-extensions/new-bean-registration-extension-in-lib/build.xml
index 747aac5..eba1687 100644
--- a/appserver/tests/appserv-tests/devtests/cdi/portable-extensions/new-bean-registration-extension-in-lib/build.xml
+++ b/appserver/tests/appserv-tests/devtests/cdi/portable-extensions/new-bean-registration-extension-in-lib/build.xml
@@ -52,14 +52,14 @@
         <mkdir dir="${build.classes.dir}/META-INF"/>
         <mkdir dir="${build.classes.dir}/META-INF/services"/>
         <copy file="${cdi.extension}"
-              tofile="${build.classes.dir}/META-INF/services/javax.enterprise.inject.spi.Extension"
+              tofile="${build.classes.dir}/META-INF/services/jakarta.enterprise.inject.spi.Extension"
               failonerror="false"/>
         <copy file="${beans.xml}"
 	          tofile="${build.classes.dir}/META-INF/beans.xml"
               failonerror="false"/>
         <jar jarfile="lib/${extension.jar}" basedir="${build.classes.dir}" update="true" includes ="${build.classes.dir}">
             <metainf dir="${build.classes.dir}/META-INF">
-                <include name="services/javax.enterprise.inject.spi.Extension"/>
+                <include name="services/jakarta.enterprise.inject.spi.Extension"/>
             </metainf>
             <fileset dir="${build.classes.dir}/" casesensitive="yes">
                 <include name="**/*class*"/>
diff --git a/appserver/tests/appserv-tests/devtests/cdi/portable-extensions/new-bean-registration-extension-in-lib/extension/test/extension/ServiceFrameworkExtension.java b/appserver/tests/appserv-tests/devtests/cdi/portable-extensions/new-bean-registration-extension-in-lib/extension/test/extension/ServiceFrameworkExtension.java
index c9361f9..e006da3 100644
--- a/appserver/tests/appserv-tests/devtests/cdi/portable-extensions/new-bean-registration-extension-in-lib/extension/test/extension/ServiceFrameworkExtension.java
+++ b/appserver/tests/appserv-tests/devtests/cdi/portable-extensions/new-bean-registration-extension-in-lib/extension/test/extension/ServiceFrameworkExtension.java
@@ -25,20 +25,20 @@
 import java.util.Map;
 import java.util.Set;
 
-import javax.enterprise.context.Dependent;
-import javax.enterprise.context.spi.CreationalContext;
-import javax.enterprise.event.Observes;
-import javax.enterprise.inject.Any;
-import javax.enterprise.inject.Default;
-import javax.enterprise.inject.spi.AfterBeanDiscovery;
-import javax.enterprise.inject.spi.Bean;
-import javax.enterprise.inject.spi.BeforeBeanDiscovery;
-import javax.enterprise.inject.spi.Extension;
-import javax.enterprise.inject.spi.InjectionPoint;
-import javax.enterprise.inject.spi.ProcessAnnotatedType;
-import javax.enterprise.inject.spi.ProcessBean;
-import javax.enterprise.inject.spi.ProcessInjectionTarget;
-import javax.enterprise.util.AnnotationLiteral;
+import jakarta.enterprise.context.Dependent;
+import jakarta.enterprise.context.spi.CreationalContext;
+import jakarta.enterprise.event.Observes;
+import jakarta.enterprise.inject.Any;
+import jakarta.enterprise.inject.Default;
+import jakarta.enterprise.inject.spi.AfterBeanDiscovery;
+import jakarta.enterprise.inject.spi.Bean;
+import jakarta.enterprise.inject.spi.BeforeBeanDiscovery;
+import jakarta.enterprise.inject.spi.Extension;
+import jakarta.enterprise.inject.spi.InjectionPoint;
+import jakarta.enterprise.inject.spi.ProcessAnnotatedType;
+import jakarta.enterprise.inject.spi.ProcessBean;
+import jakarta.enterprise.inject.spi.ProcessInjectionTarget;
+import jakarta.enterprise.util.AnnotationLiteral;
 
 import test.fwk.FrameworkService;
 import test.fwk.SomeFwkServiceImpl;
diff --git a/appserver/tests/appserv-tests/devtests/cdi/portable-extensions/new-bean-registration-extension-in-lib/servlet/test/beans/TestBean.java b/appserver/tests/appserv-tests/devtests/cdi/portable-extensions/new-bean-registration-extension-in-lib/servlet/test/beans/TestBean.java
index 4792d26..eec4d45 100644
--- a/appserver/tests/appserv-tests/devtests/cdi/portable-extensions/new-bean-registration-extension-in-lib/servlet/test/beans/TestBean.java
+++ b/appserver/tests/appserv-tests/devtests/cdi/portable-extensions/new-bean-registration-extension-in-lib/servlet/test/beans/TestBean.java
@@ -16,7 +16,7 @@
 
 package test.beans;
 
-import javax.enterprise.context.RequestScoped;
+import jakarta.enterprise.context.RequestScoped;
 
 @Transactional
 @RequestScoped
diff --git a/appserver/tests/appserv-tests/devtests/cdi/portable-extensions/new-bean-registration-extension-in-lib/servlet/test/servlet/PortableExtensionBeanRegistrationTestServlet.java b/appserver/tests/appserv-tests/devtests/cdi/portable-extensions/new-bean-registration-extension-in-lib/servlet/test/servlet/PortableExtensionBeanRegistrationTestServlet.java
index 47b1e28..001440b 100644
--- a/appserver/tests/appserv-tests/devtests/cdi/portable-extensions/new-bean-registration-extension-in-lib/servlet/test/servlet/PortableExtensionBeanRegistrationTestServlet.java
+++ b/appserver/tests/appserv-tests/devtests/cdi/portable-extensions/new-bean-registration-extension-in-lib/servlet/test/servlet/PortableExtensionBeanRegistrationTestServlet.java
@@ -22,12 +22,12 @@
 import java.util.Iterator;
 import java.util.Set;
 
-import javax.enterprise.context.Dependent;
-import javax.enterprise.inject.Any;
-import javax.enterprise.inject.Default;
-import javax.enterprise.inject.spi.Bean;
-import javax.enterprise.inject.spi.BeanManager;
-import javax.enterprise.util.AnnotationLiteral;
+import jakarta.enterprise.context.Dependent;
+import jakarta.enterprise.inject.Any;
+import jakarta.enterprise.inject.Default;
+import jakarta.enterprise.inject.spi.Bean;
+import jakarta.enterprise.inject.spi.BeanManager;
+import jakarta.enterprise.util.AnnotationLiteral;
 import jakarta.inject.Inject;
 import javax.servlet.ServletException;
 import javax.servlet.annotation.WebServlet;
diff --git a/appserver/tests/appserv-tests/devtests/cdi/portable-extensions/new-bean-registration/servlet/test/beans/TestBean.java b/appserver/tests/appserv-tests/devtests/cdi/portable-extensions/new-bean-registration/servlet/test/beans/TestBean.java
index 4792d26..eec4d45 100644
--- a/appserver/tests/appserv-tests/devtests/cdi/portable-extensions/new-bean-registration/servlet/test/beans/TestBean.java
+++ b/appserver/tests/appserv-tests/devtests/cdi/portable-extensions/new-bean-registration/servlet/test/beans/TestBean.java
@@ -16,7 +16,7 @@
 
 package test.beans;
 
-import javax.enterprise.context.RequestScoped;
+import jakarta.enterprise.context.RequestScoped;
 
 @Transactional
 @RequestScoped
diff --git a/appserver/tests/appserv-tests/devtests/cdi/portable-extensions/new-bean-registration/servlet/test/extension/ServiceFrameworkExtension.java b/appserver/tests/appserv-tests/devtests/cdi/portable-extensions/new-bean-registration/servlet/test/extension/ServiceFrameworkExtension.java
index 8a9f5b8..e4b732b 100644
--- a/appserver/tests/appserv-tests/devtests/cdi/portable-extensions/new-bean-registration/servlet/test/extension/ServiceFrameworkExtension.java
+++ b/appserver/tests/appserv-tests/devtests/cdi/portable-extensions/new-bean-registration/servlet/test/extension/ServiceFrameworkExtension.java
@@ -25,20 +25,20 @@
 import java.util.Map;
 import java.util.Set;
 
-import javax.enterprise.context.Dependent;
-import javax.enterprise.context.spi.CreationalContext;
-import javax.enterprise.event.Observes;
-import javax.enterprise.inject.Any;
-import javax.enterprise.inject.Default;
-import javax.enterprise.inject.spi.AfterBeanDiscovery;
-import javax.enterprise.inject.spi.Bean;
-import javax.enterprise.inject.spi.BeforeBeanDiscovery;
-import javax.enterprise.inject.spi.Extension;
-import javax.enterprise.inject.spi.InjectionPoint;
-import javax.enterprise.inject.spi.ProcessAnnotatedType;
-import javax.enterprise.inject.spi.ProcessBean;
-import javax.enterprise.inject.spi.ProcessInjectionTarget;
-import javax.enterprise.util.AnnotationLiteral;
+import jakarta.enterprise.context.Dependent;
+import jakarta.enterprise.context.spi.CreationalContext;
+import jakarta.enterprise.event.Observes;
+import jakarta.enterprise.inject.Any;
+import jakarta.enterprise.inject.Default;
+import jakarta.enterprise.inject.spi.AfterBeanDiscovery;
+import jakarta.enterprise.inject.spi.Bean;
+import jakarta.enterprise.inject.spi.BeforeBeanDiscovery;
+import jakarta.enterprise.inject.spi.Extension;
+import jakarta.enterprise.inject.spi.InjectionPoint;
+import jakarta.enterprise.inject.spi.ProcessAnnotatedType;
+import jakarta.enterprise.inject.spi.ProcessBean;
+import jakarta.enterprise.inject.spi.ProcessInjectionTarget;
+import jakarta.enterprise.util.AnnotationLiteral;
 
 import test.fwk.FrameworkService;
 import test.fwk.SomeFwkServiceImpl;
diff --git a/appserver/tests/appserv-tests/devtests/cdi/portable-extensions/new-bean-registration/servlet/test/servlet/PortableExtensionBeanRegistrationTestServlet.java b/appserver/tests/appserv-tests/devtests/cdi/portable-extensions/new-bean-registration/servlet/test/servlet/PortableExtensionBeanRegistrationTestServlet.java
index e923ab8..886b2ec 100644
--- a/appserver/tests/appserv-tests/devtests/cdi/portable-extensions/new-bean-registration/servlet/test/servlet/PortableExtensionBeanRegistrationTestServlet.java
+++ b/appserver/tests/appserv-tests/devtests/cdi/portable-extensions/new-bean-registration/servlet/test/servlet/PortableExtensionBeanRegistrationTestServlet.java
@@ -22,12 +22,12 @@
 import java.util.Iterator;
 import java.util.Set;
 
-import javax.enterprise.context.Dependent;
-import javax.enterprise.inject.Any;
-import javax.enterprise.inject.Default;
-import javax.enterprise.inject.spi.Bean;
-import javax.enterprise.inject.spi.BeanManager;
-import javax.enterprise.util.AnnotationLiteral;
+import jakarta.enterprise.context.Dependent;
+import jakarta.enterprise.inject.Any;
+import jakarta.enterprise.inject.Default;
+import jakarta.enterprise.inject.spi.Bean;
+import jakarta.enterprise.inject.spi.BeanManager;
+import jakarta.enterprise.util.AnnotationLiteral;
 import jakarta.inject.Inject;
 import javax.servlet.ServletException;
 import javax.servlet.annotation.WebServlet;
diff --git a/appserver/tests/appserv-tests/devtests/cdi/portable-extensions/package-private-extension-constructor/servlet/test/beans/DuplicateTestBean.java b/appserver/tests/appserv-tests/devtests/cdi/portable-extensions/package-private-extension-constructor/servlet/test/beans/DuplicateTestBean.java
index e44cd09..7bac82a 100644
--- a/appserver/tests/appserv-tests/devtests/cdi/portable-extensions/package-private-extension-constructor/servlet/test/beans/DuplicateTestBean.java
+++ b/appserver/tests/appserv-tests/devtests/cdi/portable-extensions/package-private-extension-constructor/servlet/test/beans/DuplicateTestBean.java
@@ -16,7 +16,7 @@
 
 package test.beans;
 
-import javax.enterprise.context.RequestScoped;
+import jakarta.enterprise.context.RequestScoped;
 
 @Transactional
 @RequestScoped
diff --git a/appserver/tests/appserv-tests/devtests/cdi/portable-extensions/package-private-extension-constructor/servlet/test/beans/TestBean.java b/appserver/tests/appserv-tests/devtests/cdi/portable-extensions/package-private-extension-constructor/servlet/test/beans/TestBean.java
index 4792d26..eec4d45 100644
--- a/appserver/tests/appserv-tests/devtests/cdi/portable-extensions/package-private-extension-constructor/servlet/test/beans/TestBean.java
+++ b/appserver/tests/appserv-tests/devtests/cdi/portable-extensions/package-private-extension-constructor/servlet/test/beans/TestBean.java
@@ -16,7 +16,7 @@
 
 package test.beans;
 
-import javax.enterprise.context.RequestScoped;
+import jakarta.enterprise.context.RequestScoped;
 
 @Transactional
 @RequestScoped
diff --git a/appserver/tests/appserv-tests/devtests/cdi/portable-extensions/package-private-extension-constructor/servlet/test/extension/PackagePrivateConstructorExtension.java b/appserver/tests/appserv-tests/devtests/cdi/portable-extensions/package-private-extension-constructor/servlet/test/extension/PackagePrivateConstructorExtension.java
index 87c672b..005fa32 100644
--- a/appserver/tests/appserv-tests/devtests/cdi/portable-extensions/package-private-extension-constructor/servlet/test/extension/PackagePrivateConstructorExtension.java
+++ b/appserver/tests/appserv-tests/devtests/cdi/portable-extensions/package-private-extension-constructor/servlet/test/extension/PackagePrivateConstructorExtension.java
@@ -20,14 +20,14 @@
 import java.util.Collections;
 import java.util.HashSet;
 
-import javax.enterprise.event.Observes;
-import javax.enterprise.inject.spi.AfterBeanDiscovery;
-import javax.enterprise.inject.spi.BeanManager;
-import javax.enterprise.inject.spi.BeforeBeanDiscovery;
-import javax.enterprise.inject.spi.Extension;
-import javax.enterprise.inject.spi.Interceptor;
-import javax.enterprise.inject.spi.ProcessAnnotatedType;
-import javax.enterprise.inject.spi.ProcessBean;
+import jakarta.enterprise.event.Observes;
+import jakarta.enterprise.inject.spi.AfterBeanDiscovery;
+import jakarta.enterprise.inject.spi.BeanManager;
+import jakarta.enterprise.inject.spi.BeforeBeanDiscovery;
+import jakarta.enterprise.inject.spi.Extension;
+import jakarta.enterprise.inject.spi.Interceptor;
+import jakarta.enterprise.inject.spi.ProcessAnnotatedType;
+import jakarta.enterprise.inject.spi.ProcessBean;
 
 import test.beans.DuplicateTestBean;
 
diff --git a/appserver/tests/appserv-tests/devtests/cdi/portable-extensions/package-private-extension-constructor/servlet/test/servlet/PackagePrivateConstructorInPortableExtensionTestServlet.java b/appserver/tests/appserv-tests/devtests/cdi/portable-extensions/package-private-extension-constructor/servlet/test/servlet/PackagePrivateConstructorInPortableExtensionTestServlet.java
index 2f63c73..4b5c220 100644
--- a/appserver/tests/appserv-tests/devtests/cdi/portable-extensions/package-private-extension-constructor/servlet/test/servlet/PackagePrivateConstructorInPortableExtensionTestServlet.java
+++ b/appserver/tests/appserv-tests/devtests/cdi/portable-extensions/package-private-extension-constructor/servlet/test/servlet/PackagePrivateConstructorInPortableExtensionTestServlet.java
@@ -19,9 +19,9 @@
 import java.io.IOException;
 import java.io.PrintWriter;
 
-import javax.enterprise.inject.Any;
-import javax.enterprise.inject.spi.BeanManager;
-import javax.enterprise.util.AnnotationLiteral;
+import jakarta.enterprise.inject.Any;
+import jakarta.enterprise.inject.spi.BeanManager;
+import jakarta.enterprise.util.AnnotationLiteral;
 import jakarta.inject.Inject;
 import javax.servlet.ServletException;
 import javax.servlet.annotation.WebServlet;
diff --git a/appserver/tests/appserv-tests/devtests/cdi/portable-extensions/process-injection-target/servlet/test/extension/MyExtension.java b/appserver/tests/appserv-tests/devtests/cdi/portable-extensions/process-injection-target/servlet/test/extension/MyExtension.java
index 6472681..93abd53 100644
--- a/appserver/tests/appserv-tests/devtests/cdi/portable-extensions/process-injection-target/servlet/test/extension/MyExtension.java
+++ b/appserver/tests/appserv-tests/devtests/cdi/portable-extensions/process-injection-target/servlet/test/extension/MyExtension.java
@@ -16,9 +16,9 @@
 
 package test.extension;
 
-import javax.enterprise.event.Observes;
-import javax.enterprise.inject.spi.*;
-import javax.enterprise.context.spi.*;
+import jakarta.enterprise.event.Observes;
+import jakarta.enterprise.inject.spi.*;
+import jakarta.enterprise.context.spi.*;
 
 import test.servlet.PortableExtensionInjectionTargetTestServlet;
 
diff --git a/appserver/tests/appserv-tests/devtests/cdi/portable-extensions/process-injection-target/servlet/test/servlet/PortableExtensionInjectionTargetTestServlet.java b/appserver/tests/appserv-tests/devtests/cdi/portable-extensions/process-injection-target/servlet/test/servlet/PortableExtensionInjectionTargetTestServlet.java
index 0a58d0c..6cefa08 100644
--- a/appserver/tests/appserv-tests/devtests/cdi/portable-extensions/process-injection-target/servlet/test/servlet/PortableExtensionInjectionTargetTestServlet.java
+++ b/appserver/tests/appserv-tests/devtests/cdi/portable-extensions/process-injection-target/servlet/test/servlet/PortableExtensionInjectionTargetTestServlet.java
@@ -19,13 +19,13 @@
 import java.io.IOException;
 import java.io.PrintWriter;
 
-import javax.enterprise.context.ConversationScoped;
-import javax.enterprise.context.RequestScoped;
-import javax.enterprise.context.SessionScoped;
-import javax.enterprise.context.spi.CreationalContext;
-import javax.enterprise.inject.spi.AnnotatedType;
-import javax.enterprise.inject.spi.BeanManager;
-import javax.enterprise.inject.spi.InjectionTarget;
+import jakarta.enterprise.context.ConversationScoped;
+import jakarta.enterprise.context.RequestScoped;
+import jakarta.enterprise.context.SessionScoped;
+import jakarta.enterprise.context.spi.CreationalContext;
+import jakarta.enterprise.inject.spi.AnnotatedType;
+import jakarta.enterprise.inject.spi.BeanManager;
+import jakarta.enterprise.inject.spi.InjectionTarget;
 import jakarta.inject.Inject;
 import javax.naming.InitialContext;
 import javax.naming.NamingException;
diff --git a/appserver/tests/appserv-tests/devtests/cdi/portable-extensions/simple-portable-extension/servlet/test/beans/DuplicateTestBean.java b/appserver/tests/appserv-tests/devtests/cdi/portable-extensions/simple-portable-extension/servlet/test/beans/DuplicateTestBean.java
index e44cd09..7bac82a 100644
--- a/appserver/tests/appserv-tests/devtests/cdi/portable-extensions/simple-portable-extension/servlet/test/beans/DuplicateTestBean.java
+++ b/appserver/tests/appserv-tests/devtests/cdi/portable-extensions/simple-portable-extension/servlet/test/beans/DuplicateTestBean.java
@@ -16,7 +16,7 @@
 
 package test.beans;
 
-import javax.enterprise.context.RequestScoped;
+import jakarta.enterprise.context.RequestScoped;
 
 @Transactional
 @RequestScoped
diff --git a/appserver/tests/appserv-tests/devtests/cdi/portable-extensions/simple-portable-extension/servlet/test/beans/TestBean.java b/appserver/tests/appserv-tests/devtests/cdi/portable-extensions/simple-portable-extension/servlet/test/beans/TestBean.java
index 4792d26..eec4d45 100644
--- a/appserver/tests/appserv-tests/devtests/cdi/portable-extensions/simple-portable-extension/servlet/test/beans/TestBean.java
+++ b/appserver/tests/appserv-tests/devtests/cdi/portable-extensions/simple-portable-extension/servlet/test/beans/TestBean.java
@@ -16,7 +16,7 @@
 
 package test.beans;
 
-import javax.enterprise.context.RequestScoped;
+import jakarta.enterprise.context.RequestScoped;
 
 @Transactional
 @RequestScoped
diff --git a/appserver/tests/appserv-tests/devtests/cdi/portable-extensions/simple-portable-extension/servlet/test/extension/MyExtension.java b/appserver/tests/appserv-tests/devtests/cdi/portable-extensions/simple-portable-extension/servlet/test/extension/MyExtension.java
index 22c7415..0e9f1a7 100644
--- a/appserver/tests/appserv-tests/devtests/cdi/portable-extensions/simple-portable-extension/servlet/test/extension/MyExtension.java
+++ b/appserver/tests/appserv-tests/devtests/cdi/portable-extensions/simple-portable-extension/servlet/test/extension/MyExtension.java
@@ -16,12 +16,12 @@
 
 package test.extension;
 
-import javax.enterprise.event.Observes;
-import javax.enterprise.inject.spi.AfterBeanDiscovery;
-import javax.enterprise.inject.spi.BeanManager;
-import javax.enterprise.inject.spi.BeforeBeanDiscovery;
-import javax.enterprise.inject.spi.Extension;
-import javax.enterprise.inject.spi.ProcessAnnotatedType;
+import jakarta.enterprise.event.Observes;
+import jakarta.enterprise.inject.spi.AfterBeanDiscovery;
+import jakarta.enterprise.inject.spi.BeanManager;
+import jakarta.enterprise.inject.spi.BeforeBeanDiscovery;
+import jakarta.enterprise.inject.spi.Extension;
+import jakarta.enterprise.inject.spi.ProcessAnnotatedType;
 
 import test.beans.DuplicateTestBean;
 
diff --git a/appserver/tests/appserv-tests/devtests/cdi/portable-extensions/simple-portable-extension/servlet/test/servlet/SimplePortableExtensionTestServlet.java b/appserver/tests/appserv-tests/devtests/cdi/portable-extensions/simple-portable-extension/servlet/test/servlet/SimplePortableExtensionTestServlet.java
index 1f638f1..90a936d 100644
--- a/appserver/tests/appserv-tests/devtests/cdi/portable-extensions/simple-portable-extension/servlet/test/servlet/SimplePortableExtensionTestServlet.java
+++ b/appserver/tests/appserv-tests/devtests/cdi/portable-extensions/simple-portable-extension/servlet/test/servlet/SimplePortableExtensionTestServlet.java
@@ -19,9 +19,9 @@
 import java.io.IOException;
 import java.io.PrintWriter;
 
-import javax.enterprise.inject.Any;
-import javax.enterprise.inject.spi.BeanManager;
-import javax.enterprise.util.AnnotationLiteral;
+import jakarta.enterprise.inject.Any;
+import jakarta.enterprise.inject.spi.BeanManager;
+import jakarta.enterprise.util.AnnotationLiteral;
 import jakarta.inject.Inject;
 import javax.servlet.ServletException;
 import javax.servlet.annotation.WebServlet;
diff --git a/appserver/tests/appserv-tests/devtests/cdi/producer-methods/producer-method-disposes/servlet/test/beans/BeanSetup.java b/appserver/tests/appserv-tests/devtests/cdi/producer-methods/producer-method-disposes/servlet/test/beans/BeanSetup.java
index 1736754..8417538 100644
--- a/appserver/tests/appserv-tests/devtests/cdi/producer-methods/producer-method-disposes/servlet/test/beans/BeanSetup.java
+++ b/appserver/tests/appserv-tests/devtests/cdi/producer-methods/producer-method-disposes/servlet/test/beans/BeanSetup.java
@@ -16,9 +16,9 @@
 
 package test.beans;
 
-import javax.enterprise.context.RequestScoped;
-import javax.enterprise.inject.Disposes;
-import javax.enterprise.inject.Produces;
+import jakarta.enterprise.context.RequestScoped;
+import jakarta.enterprise.inject.Disposes;
+import jakarta.enterprise.inject.Produces;
 
 public class BeanSetup {
     public static boolean disposeCalledForPreferred = false;
diff --git a/appserver/tests/appserv-tests/devtests/cdi/producer-methods/producer-method-qualifiers/servlet/BeanToTestQualiferInProducerMethods.java b/appserver/tests/appserv-tests/devtests/cdi/producer-methods/producer-method-qualifiers/servlet/BeanToTestQualiferInProducerMethods.java
index f589f6d..7c86a04 100644
--- a/appserver/tests/appserv-tests/devtests/cdi/producer-methods/producer-method-qualifiers/servlet/BeanToTestQualiferInProducerMethods.java
+++ b/appserver/tests/appserv-tests/devtests/cdi/producer-methods/producer-method-qualifiers/servlet/BeanToTestQualiferInProducerMethods.java
@@ -14,7 +14,7 @@
  * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
  */
 
-import javax.enterprise.inject.Produces;
+import jakarta.enterprise.inject.Produces;
 import jakarta.inject.Named;
 
 @Named
diff --git a/appserver/tests/appserv-tests/devtests/cdi/producer-methods/producer-method-qualifiers/servlet/RandomNumberGenerator.java b/appserver/tests/appserv-tests/devtests/cdi/producer-methods/producer-method-qualifiers/servlet/RandomNumberGenerator.java
index 7339ed3..8ad654f 100644
--- a/appserver/tests/appserv-tests/devtests/cdi/producer-methods/producer-method-qualifiers/servlet/RandomNumberGenerator.java
+++ b/appserver/tests/appserv-tests/devtests/cdi/producer-methods/producer-method-qualifiers/servlet/RandomNumberGenerator.java
@@ -14,8 +14,8 @@
  * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
  */
 
-import javax.enterprise.context.ApplicationScoped;
-import javax.enterprise.inject.Produces;
+import jakarta.enterprise.context.ApplicationScoped;
+import jakarta.enterprise.inject.Produces;
 import jakarta.inject.Named;
 
 
diff --git a/appserver/tests/appserv-tests/devtests/cdi/producer-methods/producer-method-runtimepolymorphism/servlet/test/beans/CreditCardPaymentStrategy.java b/appserver/tests/appserv-tests/devtests/cdi/producer-methods/producer-method-runtimepolymorphism/servlet/test/beans/CreditCardPaymentStrategy.java
index 0e3e7c9..b8f3518 100644
--- a/appserver/tests/appserv-tests/devtests/cdi/producer-methods/producer-method-runtimepolymorphism/servlet/test/beans/CreditCardPaymentStrategy.java
+++ b/appserver/tests/appserv-tests/devtests/cdi/producer-methods/producer-method-runtimepolymorphism/servlet/test/beans/CreditCardPaymentStrategy.java
@@ -18,7 +18,7 @@
 
 import java.io.Serializable;
 
-import javax.enterprise.context.RequestScoped;
+import jakarta.enterprise.context.RequestScoped;
 
 @RequestScoped 
 //Note: This is request scoped bean
diff --git a/appserver/tests/appserv-tests/devtests/cdi/producer-methods/producer-method-runtimepolymorphism/servlet/test/beans/Preferences.java b/appserver/tests/appserv-tests/devtests/cdi/producer-methods/producer-method-runtimepolymorphism/servlet/test/beans/Preferences.java
index 46091cb..14b07bf 100644
--- a/appserver/tests/appserv-tests/devtests/cdi/producer-methods/producer-method-runtimepolymorphism/servlet/test/beans/Preferences.java
+++ b/appserver/tests/appserv-tests/devtests/cdi/producer-methods/producer-method-runtimepolymorphism/servlet/test/beans/Preferences.java
@@ -18,9 +18,9 @@
 
 import java.io.Serializable;
 
-import javax.enterprise.context.SessionScoped;
-import javax.enterprise.inject.New;
-import javax.enterprise.inject.Produces;
+import jakarta.enterprise.context.SessionScoped;
+import jakarta.enterprise.inject.New;
+import jakarta.enterprise.inject.Produces;
 
 public class Preferences implements Serializable {
 
diff --git a/appserver/tests/appserv-tests/devtests/cdi/producer-methods/producer-method-runtimepolymorphism/servlet/test/servlet/ProducerMethodRuntimePolymorhpismTestServlet.java b/appserver/tests/appserv-tests/devtests/cdi/producer-methods/producer-method-runtimepolymorphism/servlet/test/servlet/ProducerMethodRuntimePolymorhpismTestServlet.java
index 6636f28..46fb806 100644
--- a/appserver/tests/appserv-tests/devtests/cdi/producer-methods/producer-method-runtimepolymorphism/servlet/test/servlet/ProducerMethodRuntimePolymorhpismTestServlet.java
+++ b/appserver/tests/appserv-tests/devtests/cdi/producer-methods/producer-method-runtimepolymorphism/servlet/test/servlet/ProducerMethodRuntimePolymorhpismTestServlet.java
@@ -19,7 +19,7 @@
 import java.io.IOException;
 import java.io.PrintWriter;
 
-import javax.enterprise.context.SessionScoped;
+import jakarta.enterprise.context.SessionScoped;
 import jakarta.inject.Inject;
 import javax.servlet.ServletException;
 import javax.servlet.annotation.WebServlet;
diff --git a/appserver/tests/appserv-tests/devtests/cdi/programmatic-lookup/servlet/test/artifacts/MockPaymentProcessor.java b/appserver/tests/appserv-tests/devtests/cdi/programmatic-lookup/servlet/test/artifacts/MockPaymentProcessor.java
index 8d736e2..4186886 100644
--- a/appserver/tests/appserv-tests/devtests/cdi/programmatic-lookup/servlet/test/artifacts/MockPaymentProcessor.java
+++ b/appserver/tests/appserv-tests/devtests/cdi/programmatic-lookup/servlet/test/artifacts/MockPaymentProcessor.java
@@ -16,7 +16,7 @@
 
 package test.artifacts;
 
-import javax.enterprise.inject.Alternative;
+import jakarta.enterprise.inject.Alternative;
 
 @Alternative @Asynchronous @Synchronous
 public class MockPaymentProcessor implements PaymentProcessor{
diff --git a/appserver/tests/appserv-tests/devtests/cdi/programmatic-lookup/servlet/test/artifacts/PayBy.java b/appserver/tests/appserv-tests/devtests/cdi/programmatic-lookup/servlet/test/artifacts/PayBy.java
index e8d9f1f..8d24977 100644
--- a/appserver/tests/appserv-tests/devtests/cdi/programmatic-lookup/servlet/test/artifacts/PayBy.java
+++ b/appserver/tests/appserv-tests/devtests/cdi/programmatic-lookup/servlet/test/artifacts/PayBy.java
@@ -21,7 +21,7 @@
 import java.lang.annotation.RetentionPolicy;
 import java.lang.annotation.Target;
 
-import javax.enterprise.util.Nonbinding;
+import jakarta.enterprise.util.Nonbinding;
 import jakarta.inject.Qualifier;
 
 @Qualifier
diff --git a/appserver/tests/appserv-tests/devtests/cdi/programmatic-lookup/servlet/test/artifacts/TestApplicationScopedBean.java b/appserver/tests/appserv-tests/devtests/cdi/programmatic-lookup/servlet/test/artifacts/TestApplicationScopedBean.java
index 28cffb1..d24a76e 100644
--- a/appserver/tests/appserv-tests/devtests/cdi/programmatic-lookup/servlet/test/artifacts/TestApplicationScopedBean.java
+++ b/appserver/tests/appserv-tests/devtests/cdi/programmatic-lookup/servlet/test/artifacts/TestApplicationScopedBean.java
@@ -16,7 +16,7 @@
 
 package test.artifacts;
 
-import javax.enterprise.context.ApplicationScoped;
+import jakarta.enterprise.context.ApplicationScoped;
 import jakarta.inject.Inject;
 
 @ApplicationScoped
diff --git a/appserver/tests/appserv-tests/devtests/cdi/programmatic-lookup/servlet/test/artifacts/TestSessionScopedBean.java b/appserver/tests/appserv-tests/devtests/cdi/programmatic-lookup/servlet/test/artifacts/TestSessionScopedBean.java
index 272d946..1101ece 100644
--- a/appserver/tests/appserv-tests/devtests/cdi/programmatic-lookup/servlet/test/artifacts/TestSessionScopedBean.java
+++ b/appserver/tests/appserv-tests/devtests/cdi/programmatic-lookup/servlet/test/artifacts/TestSessionScopedBean.java
@@ -18,7 +18,7 @@
 
 import java.io.Serializable;
 
-import javax.enterprise.context.SessionScoped;
+import jakarta.enterprise.context.SessionScoped;
 
 @SessionScoped
 public class TestSessionScopedBean implements Serializable{
diff --git a/appserver/tests/appserv-tests/devtests/cdi/programmatic-lookup/servlet/test/artifacts/UnproxyableFinalClass.java b/appserver/tests/appserv-tests/devtests/cdi/programmatic-lookup/servlet/test/artifacts/UnproxyableFinalClass.java
index cd00eed..395b033 100644
--- a/appserver/tests/appserv-tests/devtests/cdi/programmatic-lookup/servlet/test/artifacts/UnproxyableFinalClass.java
+++ b/appserver/tests/appserv-tests/devtests/cdi/programmatic-lookup/servlet/test/artifacts/UnproxyableFinalClass.java
@@ -18,7 +18,7 @@
 
 import java.io.Serializable;
 
-import javax.enterprise.context.Dependent;
+import jakarta.enterprise.context.Dependent;
 
 @Dependent
 public final class UnproxyableFinalClass implements UnproxyableType,  Serializable{
diff --git a/appserver/tests/appserv-tests/devtests/cdi/programmatic-lookup/servlet/test/artifacts/UnproxyableTypeWithNoPublicNullConstructor.java b/appserver/tests/appserv-tests/devtests/cdi/programmatic-lookup/servlet/test/artifacts/UnproxyableTypeWithNoPublicNullConstructor.java
index a92bd4d..3183cfb 100644
--- a/appserver/tests/appserv-tests/devtests/cdi/programmatic-lookup/servlet/test/artifacts/UnproxyableTypeWithNoPublicNullConstructor.java
+++ b/appserver/tests/appserv-tests/devtests/cdi/programmatic-lookup/servlet/test/artifacts/UnproxyableTypeWithNoPublicNullConstructor.java
@@ -18,7 +18,7 @@
 
 import java.io.Serializable;
 
-import javax.enterprise.context.Dependent;
+import jakarta.enterprise.context.Dependent;
 
 @Dependent
 public class UnproxyableTypeWithNoPublicNullConstructor implements UnproxyableType, Serializable{
diff --git a/appserver/tests/appserv-tests/devtests/cdi/programmatic-lookup/servlet/test/beans/BeanToTestProgrammaticLookup.java b/appserver/tests/appserv-tests/devtests/cdi/programmatic-lookup/servlet/test/beans/BeanToTestProgrammaticLookup.java
index 2f39c26..710df27 100644
--- a/appserver/tests/appserv-tests/devtests/cdi/programmatic-lookup/servlet/test/beans/BeanToTestProgrammaticLookup.java
+++ b/appserver/tests/appserv-tests/devtests/cdi/programmatic-lookup/servlet/test/beans/BeanToTestProgrammaticLookup.java
@@ -16,8 +16,8 @@
 
 package test.beans;
 
-import javax.enterprise.inject.Any;
-import javax.enterprise.inject.Instance;
+import jakarta.enterprise.inject.Any;
+import jakarta.enterprise.inject.Instance;
 import jakarta.inject.Inject;
 
 import test.artifacts.Asynchronous;
diff --git a/appserver/tests/appserv-tests/devtests/cdi/programmatic-lookup/servlet/test/servlets/ProgrammaticLookupServlet.java b/appserver/tests/appserv-tests/devtests/cdi/programmatic-lookup/servlet/test/servlets/ProgrammaticLookupServlet.java
index 0691522..a23bac6 100644
--- a/appserver/tests/appserv-tests/devtests/cdi/programmatic-lookup/servlet/test/servlets/ProgrammaticLookupServlet.java
+++ b/appserver/tests/appserv-tests/devtests/cdi/programmatic-lookup/servlet/test/servlets/ProgrammaticLookupServlet.java
@@ -20,9 +20,9 @@
 import java.io.PrintWriter;
 import java.util.Iterator;
 
-import javax.enterprise.inject.Any;
-import javax.enterprise.inject.Instance;
-import javax.enterprise.util.AnnotationLiteral;
+import jakarta.enterprise.inject.Any;
+import jakarta.enterprise.inject.Instance;
+import jakarta.enterprise.util.AnnotationLiteral;
 import jakarta.inject.Inject;
 import javax.servlet.ServletException;
 import javax.servlet.annotation.WebInitParam;
diff --git a/appserver/tests/appserv-tests/devtests/cdi/qualifiers/servlet/test/artifacts/PayBy.java b/appserver/tests/appserv-tests/devtests/cdi/qualifiers/servlet/test/artifacts/PayBy.java
index e8d9f1f..8d24977 100644
--- a/appserver/tests/appserv-tests/devtests/cdi/qualifiers/servlet/test/artifacts/PayBy.java
+++ b/appserver/tests/appserv-tests/devtests/cdi/qualifiers/servlet/test/artifacts/PayBy.java
@@ -21,7 +21,7 @@
 import java.lang.annotation.RetentionPolicy;
 import java.lang.annotation.Target;
 
-import javax.enterprise.util.Nonbinding;
+import jakarta.enterprise.util.Nonbinding;
 import jakarta.inject.Qualifier;
 
 @Qualifier
diff --git a/appserver/tests/appserv-tests/devtests/cdi/qualifiers/servlet/test/beans/BeanToTestAny.java b/appserver/tests/appserv-tests/devtests/cdi/qualifiers/servlet/test/beans/BeanToTestAny.java
index 261633c..d5dec92 100644
--- a/appserver/tests/appserv-tests/devtests/cdi/qualifiers/servlet/test/beans/BeanToTestAny.java
+++ b/appserver/tests/appserv-tests/devtests/cdi/qualifiers/servlet/test/beans/BeanToTestAny.java
@@ -16,8 +16,8 @@
 
 package test.beans;
 
-import javax.enterprise.inject.Any;
-import javax.enterprise.inject.Instance;
+import jakarta.enterprise.inject.Any;
+import jakarta.enterprise.inject.Instance;
 import jakarta.inject.Inject;
 
 import test.artifacts.PaymentProcessor;
diff --git a/appserver/tests/appserv-tests/devtests/cdi/scopes/dependent-scope/servlet/test/beans/TestRequestScopedBean.java b/appserver/tests/appserv-tests/devtests/cdi/scopes/dependent-scope/servlet/test/beans/TestRequestScopedBean.java
index f674cd8..191af9c 100644
--- a/appserver/tests/appserv-tests/devtests/cdi/scopes/dependent-scope/servlet/test/beans/TestRequestScopedBean.java
+++ b/appserver/tests/appserv-tests/devtests/cdi/scopes/dependent-scope/servlet/test/beans/TestRequestScopedBean.java
@@ -16,7 +16,7 @@
 
 package test.beans;
 
-import javax.enterprise.context.RequestScoped;
+import jakarta.enterprise.context.RequestScoped;
 import jakarta.inject.Inject;
 
 @RequestScoped
diff --git a/appserver/tests/appserv-tests/devtests/cdi/scopes/dependent-scope/servlet/test/servlets/DependentScopeTestServlet.java b/appserver/tests/appserv-tests/devtests/cdi/scopes/dependent-scope/servlet/test/servlets/DependentScopeTestServlet.java
index 6569408..b9a75f7 100644
--- a/appserver/tests/appserv-tests/devtests/cdi/scopes/dependent-scope/servlet/test/servlets/DependentScopeTestServlet.java
+++ b/appserver/tests/appserv-tests/devtests/cdi/scopes/dependent-scope/servlet/test/servlets/DependentScopeTestServlet.java
@@ -19,7 +19,7 @@
 import java.io.IOException;
 import java.io.PrintWriter;
 
-import javax.enterprise.inject.spi.BeanManager;
+import jakarta.enterprise.inject.spi.BeanManager;
 import jakarta.inject.Inject;
 import javax.naming.InitialContext;
 import javax.servlet.ServletException;
diff --git a/appserver/tests/appserv-tests/devtests/cdi/scopes/new-qualifier/servlet/test/beans/TestRequestScopedBean.java b/appserver/tests/appserv-tests/devtests/cdi/scopes/new-qualifier/servlet/test/beans/TestRequestScopedBean.java
index e854645..972ead4 100644
--- a/appserver/tests/appserv-tests/devtests/cdi/scopes/new-qualifier/servlet/test/beans/TestRequestScopedBean.java
+++ b/appserver/tests/appserv-tests/devtests/cdi/scopes/new-qualifier/servlet/test/beans/TestRequestScopedBean.java
@@ -16,7 +16,7 @@
 
 package test.beans;
 
-import javax.enterprise.context.RequestScoped;
+import jakarta.enterprise.context.RequestScoped;
 
 @RequestScoped
 public class TestRequestScopedBean {
diff --git a/appserver/tests/appserv-tests/devtests/cdi/scopes/new-qualifier/servlet/test/servlets/NewQualifierTestServlet.java b/appserver/tests/appserv-tests/devtests/cdi/scopes/new-qualifier/servlet/test/servlets/NewQualifierTestServlet.java
index 9d37bb7..04af4d2 100644
--- a/appserver/tests/appserv-tests/devtests/cdi/scopes/new-qualifier/servlet/test/servlets/NewQualifierTestServlet.java
+++ b/appserver/tests/appserv-tests/devtests/cdi/scopes/new-qualifier/servlet/test/servlets/NewQualifierTestServlet.java
@@ -19,8 +19,8 @@
 import java.io.IOException;
 import java.io.PrintWriter;
 
-import javax.enterprise.inject.New;
-import javax.enterprise.inject.Instance;
+import jakarta.enterprise.inject.New;
+import jakarta.enterprise.inject.Instance;
 import jakarta.inject.Inject;
 import javax.servlet.ServletException;
 import javax.servlet.annotation.WebServlet;
diff --git a/appserver/tests/appserv-tests/devtests/cdi/scopes/request-and-application-scope-ejb-mdb/src/test/beans/TestApplicationScopedBean.java b/appserver/tests/appserv-tests/devtests/cdi/scopes/request-and-application-scope-ejb-mdb/src/test/beans/TestApplicationScopedBean.java
index aa487ef..f4fdd29 100644
--- a/appserver/tests/appserv-tests/devtests/cdi/scopes/request-and-application-scope-ejb-mdb/src/test/beans/TestApplicationScopedBean.java
+++ b/appserver/tests/appserv-tests/devtests/cdi/scopes/request-and-application-scope-ejb-mdb/src/test/beans/TestApplicationScopedBean.java
@@ -16,7 +16,7 @@
 
 package test.beans;
 
-import javax.enterprise.context.ApplicationScoped;
+import jakarta.enterprise.context.ApplicationScoped;
 
 //Simple TestBean to test CDI. 
 @ApplicationScoped
diff --git a/appserver/tests/appserv-tests/devtests/cdi/scopes/request-and-application-scope-ejb-mdb/src/test/beans/TestRequestScopedBean.java b/appserver/tests/appserv-tests/devtests/cdi/scopes/request-and-application-scope-ejb-mdb/src/test/beans/TestRequestScopedBean.java
index 15a8ea0..118503b 100644
--- a/appserver/tests/appserv-tests/devtests/cdi/scopes/request-and-application-scope-ejb-mdb/src/test/beans/TestRequestScopedBean.java
+++ b/appserver/tests/appserv-tests/devtests/cdi/scopes/request-and-application-scope-ejb-mdb/src/test/beans/TestRequestScopedBean.java
@@ -16,7 +16,7 @@
 
 package test.beans;
 
-import javax.enterprise.context.RequestScoped;
+import jakarta.enterprise.context.RequestScoped;
 
 //Simple TestBean to test CDI. 
 @RequestScoped
diff --git a/appserver/tests/appserv-tests/devtests/cdi/scopes/request-and-application-scope-ejb-mdb/src/test/ejb/mdb/MessageBean.java b/appserver/tests/appserv-tests/devtests/cdi/scopes/request-and-application-scope-ejb-mdb/src/test/ejb/mdb/MessageBean.java
index 1496ca1..c7d0dca 100644
--- a/appserver/tests/appserv-tests/devtests/cdi/scopes/request-and-application-scope-ejb-mdb/src/test/ejb/mdb/MessageBean.java
+++ b/appserver/tests/appserv-tests/devtests/cdi/scopes/request-and-application-scope-ejb-mdb/src/test/ejb/mdb/MessageBean.java
@@ -22,7 +22,7 @@
 import jakarta.ejb.NoSuchEJBException;
 import jakarta.ejb.TransactionManagement;
 import jakarta.ejb.TransactionManagementType;
-import javax.enterprise.inject.spi.BeanManager;
+import jakarta.enterprise.inject.spi.BeanManager;
 import jakarta.inject.Inject;
 import jakarta.jms.Message;
 import jakarta.jms.MessageListener;
diff --git a/appserver/tests/appserv-tests/devtests/cdi/scopes/request-and-application-scope-ejb-mdb/src/test/ejb/session/HelloStatelessRemoteBean.java b/appserver/tests/appserv-tests/devtests/cdi/scopes/request-and-application-scope-ejb-mdb/src/test/ejb/session/HelloStatelessRemoteBean.java
index 6fb1311..3aebd35 100644
--- a/appserver/tests/appserv-tests/devtests/cdi/scopes/request-and-application-scope-ejb-mdb/src/test/ejb/session/HelloStatelessRemoteBean.java
+++ b/appserver/tests/appserv-tests/devtests/cdi/scopes/request-and-application-scope-ejb-mdb/src/test/ejb/session/HelloStatelessRemoteBean.java
@@ -19,7 +19,7 @@
 import jakarta.annotation.PostConstruct;
 import jakarta.ejb.Remote;
 import jakarta.ejb.Stateless;
-import javax.enterprise.inject.spi.BeanManager;
+import jakarta.enterprise.inject.spi.BeanManager;
 import jakarta.inject.Inject;
 
 import test.beans.BeanToTestTimerUse;
diff --git a/appserver/tests/appserv-tests/devtests/cdi/scopes/singleton-scope/servlet/test/beans/TestSessionScopedBean.java b/appserver/tests/appserv-tests/devtests/cdi/scopes/singleton-scope/servlet/test/beans/TestSessionScopedBean.java
index 9d5a914..13dca77 100644
--- a/appserver/tests/appserv-tests/devtests/cdi/scopes/singleton-scope/servlet/test/beans/TestSessionScopedBean.java
+++ b/appserver/tests/appserv-tests/devtests/cdi/scopes/singleton-scope/servlet/test/beans/TestSessionScopedBean.java
@@ -18,8 +18,8 @@
 
 import java.io.Serializable;
 
-import javax.enterprise.context.SessionScoped;
-import javax.enterprise.inject.Instance;
+import jakarta.enterprise.context.SessionScoped;
+import jakarta.enterprise.inject.Instance;
 import jakarta.inject.Inject;
 
 @SessionScoped
diff --git a/appserver/tests/appserv-tests/devtests/cdi/scopes/singleton-scope/servlet/test/servlets/SingletonScopedServlet.java b/appserver/tests/appserv-tests/devtests/cdi/scopes/singleton-scope/servlet/test/servlets/SingletonScopedServlet.java
index 37e0a09..95c925b 100644
--- a/appserver/tests/appserv-tests/devtests/cdi/scopes/singleton-scope/servlet/test/servlets/SingletonScopedServlet.java
+++ b/appserver/tests/appserv-tests/devtests/cdi/scopes/singleton-scope/servlet/test/servlets/SingletonScopedServlet.java
@@ -19,7 +19,7 @@
 import java.io.IOException;
 import java.io.PrintWriter;
 
-import javax.enterprise.inject.spi.BeanManager;
+import jakarta.enterprise.inject.spi.BeanManager;
 import jakarta.inject.Inject;
 import javax.naming.InitialContext;
 import javax.servlet.ServletException;
diff --git a/appserver/tests/appserv-tests/devtests/cdi/smoke-tests/cdi-servlet-3.0-annotation/servlet/TestLoggerProducer.java b/appserver/tests/appserv-tests/devtests/cdi/smoke-tests/cdi-servlet-3.0-annotation/servlet/TestLoggerProducer.java
index 04785e9..c8f0709 100644
--- a/appserver/tests/appserv-tests/devtests/cdi/smoke-tests/cdi-servlet-3.0-annotation/servlet/TestLoggerProducer.java
+++ b/appserver/tests/appserv-tests/devtests/cdi/smoke-tests/cdi-servlet-3.0-annotation/servlet/TestLoggerProducer.java
@@ -14,7 +14,7 @@
  * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
  */
 
-import javax.enterprise.inject.Produces;
+import jakarta.enterprise.inject.Produces;
 import org.jboss.logging.Logger;
 
 
diff --git a/appserver/tests/appserv-tests/devtests/cdi/smoke-tests/cdi-servlet-3.0-annotation/servlet/TestServlet.java b/appserver/tests/appserv-tests/devtests/cdi/smoke-tests/cdi-servlet-3.0-annotation/servlet/TestServlet.java
index 2f6c966..f4ebb67 100644
--- a/appserver/tests/appserv-tests/devtests/cdi/smoke-tests/cdi-servlet-3.0-annotation/servlet/TestServlet.java
+++ b/appserver/tests/appserv-tests/devtests/cdi/smoke-tests/cdi-servlet-3.0-annotation/servlet/TestServlet.java
@@ -25,7 +25,7 @@
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 import jakarta.inject.Inject;
-import javax.enterprise.inject.spi.BeanManager;
+import jakarta.enterprise.inject.spi.BeanManager;
 import javax.naming.InitialContext;
 
 @WebServlet(name="mytest",
diff --git a/appserver/tests/appserv-tests/devtests/cdi/smoke-tests/cdi-servlet-filter-3.0-annotation/servlet/TestFilter.java b/appserver/tests/appserv-tests/devtests/cdi/smoke-tests/cdi-servlet-filter-3.0-annotation/servlet/TestFilter.java
index e646a80..a398802 100644
--- a/appserver/tests/appserv-tests/devtests/cdi/smoke-tests/cdi-servlet-filter-3.0-annotation/servlet/TestFilter.java
+++ b/appserver/tests/appserv-tests/devtests/cdi/smoke-tests/cdi-servlet-filter-3.0-annotation/servlet/TestFilter.java
@@ -16,7 +16,7 @@
 
 import java.io.IOException;
 
-import javax.enterprise.inject.spi.BeanManager;
+import jakarta.enterprise.inject.spi.BeanManager;
 import jakarta.inject.Inject;
 import javax.servlet.Filter;
 import javax.servlet.FilterChain;
diff --git a/appserver/tests/appserv-tests/devtests/cdi/smoke-tests/cdi-servlet-filter-3.0-annotation/servlet/TestServlet.java b/appserver/tests/appserv-tests/devtests/cdi/smoke-tests/cdi-servlet-filter-3.0-annotation/servlet/TestServlet.java
index a5c324c..2cab270 100644
--- a/appserver/tests/appserv-tests/devtests/cdi/smoke-tests/cdi-servlet-filter-3.0-annotation/servlet/TestServlet.java
+++ b/appserver/tests/appserv-tests/devtests/cdi/smoke-tests/cdi-servlet-filter-3.0-annotation/servlet/TestServlet.java
@@ -17,7 +17,7 @@
 import java.io.IOException;
 import java.io.PrintWriter;
 
-import javax.enterprise.inject.spi.BeanManager;
+import jakarta.enterprise.inject.spi.BeanManager;
 import jakarta.inject.Inject;
 import javax.naming.InitialContext;
 import javax.servlet.ServletException;
diff --git a/appserver/tests/appserv-tests/devtests/cdi/smoke-tests/optional-unbundled-beans/servlet/TestLoggerProducer.java b/appserver/tests/appserv-tests/devtests/cdi/smoke-tests/optional-unbundled-beans/servlet/TestLoggerProducer.java
index 9c2e72e..f65ecdb 100644
--- a/appserver/tests/appserv-tests/devtests/cdi/smoke-tests/optional-unbundled-beans/servlet/TestLoggerProducer.java
+++ b/appserver/tests/appserv-tests/devtests/cdi/smoke-tests/optional-unbundled-beans/servlet/TestLoggerProducer.java
@@ -14,7 +14,7 @@
  * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
  */
 
-import javax.enterprise.inject.Produces;
+import jakarta.enterprise.inject.Produces;
 
 
 public class TestLoggerProducer {
diff --git a/appserver/tests/appserv-tests/devtests/cdi/smoke-tests/optional-unbundled-beans/servlet/TestServlet.java b/appserver/tests/appserv-tests/devtests/cdi/smoke-tests/optional-unbundled-beans/servlet/TestServlet.java
index 42e4d3b..67edfe7 100644
--- a/appserver/tests/appserv-tests/devtests/cdi/smoke-tests/optional-unbundled-beans/servlet/TestServlet.java
+++ b/appserver/tests/appserv-tests/devtests/cdi/smoke-tests/optional-unbundled-beans/servlet/TestServlet.java
@@ -27,10 +27,10 @@
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 import jakarta.inject.Inject;
-import javax.enterprise.inject.Any;
-import javax.enterprise.inject.spi.Bean;
-import javax.enterprise.inject.spi.BeanManager;
-import javax.enterprise.util.AnnotationLiteral;
+import jakarta.enterprise.inject.Any;
+import jakarta.enterprise.inject.spi.Bean;
+import jakarta.enterprise.inject.spi.BeanManager;
+import jakarta.enterprise.util.AnnotationLiteral;
 import javax.naming.InitialContext;
 
 @WebServlet(name="mytest",
diff --git a/appserver/tests/appserv-tests/devtests/cdi/smoke-tests/simple-wab-with-cdi/common.xml b/appserver/tests/appserv-tests/devtests/cdi/smoke-tests/simple-wab-with-cdi/common.xml
index f396e66..f342d87 100644
--- a/appserver/tests/appserv-tests/devtests/cdi/smoke-tests/simple-wab-with-cdi/common.xml
+++ b/appserver/tests/appserv-tests/devtests/cdi/smoke-tests/simple-wab-with-cdi/common.xml
@@ -183,7 +183,7 @@
   <copy file="${context.xml}"
       tofile="${build.classes.dir}/tmp/META-INF/context.xml" failonerror="false"/>
   <copy file="${cdi-extension.service}"
-      tofile="${build.classes.dir}/tmp/WEB-INF/classes/META-INF/services/javax.enterprise.inject.spi.Extension" failonerror="false"/>
+      tofile="${build.classes.dir}/tmp/WEB-INF/classes/META-INF/services/jakarta.enterprise.inject.spi.Extension" failonerror="false"/>
       
   <copy todir="${build.classes.dir}/tmp/WEB-INF/classes">
       <fileset dir="${war.classes}">
@@ -226,7 +226,7 @@
       <include name="WEB-INF/wsdl/${wsdlfile.name}"/>
       <include name="${mappingfile.name}"/>
       <include name="META-INF/context.xml"/>
-      <include name="WEB-INF/classes/META-INF/services/javax.enterprise.inject.spi.Extension"/>
+      <include name="WEB-INF/classes/META-INF/services/jakarta.enterprise.inject.spi.Extension"/>
       <include name="WEB-INF/classes/META-INF/persistence.xml"/>
     </fileset>
   </jar>       
@@ -286,7 +286,7 @@
   <copy file="${context.xml}"
       tofile="${build.classes.dir}/tmp/META-INF/context.xml" failonerror="false"/>
   <copy file="${cdi-extension.service}"
-      tofile="${build.classes.dir}/tmp/WEB-INF/classes/META-INF/services/javax.enterprise.inject.spi.Extension" failonerror="false"/>
+      tofile="${build.classes.dir}/tmp/WEB-INF/classes/META-INF/services/jakarta.enterprise.inject.spi.Extension" failonerror="false"/>
       
   <copy todir="${build.classes.dir}/tmp/WEB-INF/classes">
       <fileset dir="${war.classes}">
@@ -329,7 +329,7 @@
       <include name="WEB-INF/wsdl/${wsdlfile.name}"/>
       <include name="${mappingfile.name}"/>
       <include name="META-INF/context.xml"/>
-      <include name="WEB-INF/classes/META-INF/services/javax.enterprise.inject.spi.Extension"/>
+      <include name="WEB-INF/classes/META-INF/services/jakarta.enterprise.inject.spi.Extension"/>
       <include name="WEB-INF/classes/META-INF/persistence.xml"/>
     </fileset>
   </jar>       
diff --git a/appserver/tests/appserv-tests/devtests/cdi/smoke-tests/simple-wab-with-cdi/descriptor/MANIFEST.MF b/appserver/tests/appserv-tests/devtests/cdi/smoke-tests/simple-wab-with-cdi/descriptor/MANIFEST.MF
index 5b53761..ee90990 100644
--- a/appserver/tests/appserv-tests/devtests/cdi/smoke-tests/simple-wab-with-cdi/descriptor/MANIFEST.MF
+++ b/appserver/tests/appserv-tests/devtests/cdi/smoke-tests/simple-wab-with-cdi/descriptor/MANIFEST.MF
@@ -16,6 +16,6 @@
 Bundle-ManifestVersion: 2
 Bundle-SymbolicName: tests.cdi.simple-cdi-osgi-test
 Web-ContextPath: /test
-Import-Package: javax.enterprise.context,javax.enterprise.inject,javax
- .inject,javax.enterprise.inject.spi,javax.servlet,javax.servlet.annotation,javax.servlet.http,javax.naming
+Import-Package: jakarta.enterprise.context,jakarta.enterprise.inject,javax
+ .inject,jakarta.enterprise.inject.spi,javax.servlet,javax.servlet.annotation,javax.servlet.http,javax.naming
 
diff --git a/appserver/tests/appserv-tests/devtests/cdi/smoke-tests/simple-wab-with-cdi/servlet/tests/cdi/TestServlet.java b/appserver/tests/appserv-tests/devtests/cdi/smoke-tests/simple-wab-with-cdi/servlet/tests/cdi/TestServlet.java
index a3be8e7..67f230a 100644
--- a/appserver/tests/appserv-tests/devtests/cdi/smoke-tests/simple-wab-with-cdi/servlet/tests/cdi/TestServlet.java
+++ b/appserver/tests/appserv-tests/devtests/cdi/smoke-tests/simple-wab-with-cdi/servlet/tests/cdi/TestServlet.java
@@ -27,7 +27,7 @@
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 import jakarta.inject.Inject;
-import javax.enterprise.inject.spi.BeanManager;
+import jakarta.enterprise.inject.spi.BeanManager;
 import javax.naming.InitialContext;
 
 @WebServlet(urlPatterns={"/*"})
diff --git a/appserver/tests/appserv-tests/devtests/cdi/smoke-tests/slf4j-visibility/servlet/TestServlet.java b/appserver/tests/appserv-tests/devtests/cdi/smoke-tests/slf4j-visibility/servlet/TestServlet.java
index 27bcc35..27b0683 100644
--- a/appserver/tests/appserv-tests/devtests/cdi/smoke-tests/slf4j-visibility/servlet/TestServlet.java
+++ b/appserver/tests/appserv-tests/devtests/cdi/smoke-tests/slf4j-visibility/servlet/TestServlet.java
@@ -17,7 +17,7 @@
 import java.io.IOException;
 import java.io.PrintWriter;
 
-import javax.enterprise.inject.spi.BeanManager;
+import jakarta.enterprise.inject.spi.BeanManager;
 import jakarta.inject.Inject;
 import javax.naming.InitialContext;
 import javax.servlet.ServletException;
diff --git a/appserver/tests/appserv-tests/devtests/cdi/specialization/alternative-leaks/servlet/test/beans/artifacts/MockStereotype.java b/appserver/tests/appserv-tests/devtests/cdi/specialization/alternative-leaks/servlet/test/beans/artifacts/MockStereotype.java
index 35fa89e..dbeb9ff 100644
--- a/appserver/tests/appserv-tests/devtests/cdi/specialization/alternative-leaks/servlet/test/beans/artifacts/MockStereotype.java
+++ b/appserver/tests/appserv-tests/devtests/cdi/specialization/alternative-leaks/servlet/test/beans/artifacts/MockStereotype.java
@@ -22,12 +22,12 @@
 import java.lang.annotation.RetentionPolicy;
 import java.lang.annotation.Target;
 
-import javax.enterprise.inject.Alternative;
+import jakarta.enterprise.inject.Alternative;
 
 
 
 @Alternative
-@javax.enterprise.inject.Stereotype
+@jakarta.enterprise.inject.Stereotype
 @Retention(RetentionPolicy.RUNTIME)
 @Target({ TYPE })
 public @interface MockStereotype {
diff --git a/appserver/tests/appserv-tests/devtests/cdi/specialization/alternative-leaks/servlet/test/beans/artifacts/Transactional.java b/appserver/tests/appserv-tests/devtests/cdi/specialization/alternative-leaks/servlet/test/beans/artifacts/Transactional.java
index 8889920..2e93b96 100644
--- a/appserver/tests/appserv-tests/devtests/cdi/specialization/alternative-leaks/servlet/test/beans/artifacts/Transactional.java
+++ b/appserver/tests/appserv-tests/devtests/cdi/specialization/alternative-leaks/servlet/test/beans/artifacts/Transactional.java
@@ -23,7 +23,7 @@
 import java.lang.annotation.RetentionPolicy;
 import java.lang.annotation.Target;
 
-import javax.enterprise.util.Nonbinding;
+import jakarta.enterprise.util.Nonbinding;
 import jakarta.interceptor.InterceptorBinding;
 
 @Target({TYPE, METHOD})
diff --git a/appserver/tests/appserv-tests/devtests/cdi/specialization/alternative-leaks/servlet/test/beans/mock/MockBean.java b/appserver/tests/appserv-tests/devtests/cdi/specialization/alternative-leaks/servlet/test/beans/mock/MockBean.java
index d309650..55b3116 100644
--- a/appserver/tests/appserv-tests/devtests/cdi/specialization/alternative-leaks/servlet/test/beans/mock/MockBean.java
+++ b/appserver/tests/appserv-tests/devtests/cdi/specialization/alternative-leaks/servlet/test/beans/mock/MockBean.java
@@ -16,7 +16,7 @@
 
 package test.beans.mock;
 
-import javax.enterprise.context.RequestScoped;
+import jakarta.enterprise.context.RequestScoped;
 
 import test.beans.TestBeanInterface;
 import test.beans.artifacts.MockStereotype;
diff --git a/appserver/tests/appserv-tests/devtests/cdi/specialization/alternative-leaks/servlet/test/beans/nonmock/AnotherTestBeanWithLeakQualifier.java b/appserver/tests/appserv-tests/devtests/cdi/specialization/alternative-leaks/servlet/test/beans/nonmock/AnotherTestBeanWithLeakQualifier.java
index a5431cd..b2675fc 100644
--- a/appserver/tests/appserv-tests/devtests/cdi/specialization/alternative-leaks/servlet/test/beans/nonmock/AnotherTestBeanWithLeakQualifier.java
+++ b/appserver/tests/appserv-tests/devtests/cdi/specialization/alternative-leaks/servlet/test/beans/nonmock/AnotherTestBeanWithLeakQualifier.java
@@ -16,7 +16,7 @@
 
 package test.beans.nonmock;
 
-import javax.enterprise.context.RequestScoped;
+import jakarta.enterprise.context.RequestScoped;
 
 import test.beans.TestBeanInterface;
 import test.beans.artifacts.LeakQualifier;
diff --git a/appserver/tests/appserv-tests/devtests/cdi/specialization/alternative-leaks/servlet/test/beans/nonmock/TestBean.java b/appserver/tests/appserv-tests/devtests/cdi/specialization/alternative-leaks/servlet/test/beans/nonmock/TestBean.java
index d1bed8f..bcdac0b 100644
--- a/appserver/tests/appserv-tests/devtests/cdi/specialization/alternative-leaks/servlet/test/beans/nonmock/TestBean.java
+++ b/appserver/tests/appserv-tests/devtests/cdi/specialization/alternative-leaks/servlet/test/beans/nonmock/TestBean.java
@@ -16,7 +16,7 @@
 
 package test.beans.nonmock;
 
-import javax.enterprise.context.RequestScoped;
+import jakarta.enterprise.context.RequestScoped;
 
 import test.beans.TestBeanInterface;
 import test.beans.artifacts.Preferred;
diff --git a/appserver/tests/appserv-tests/devtests/cdi/specialization/specialization-simple/servlet/test/beans/artifacts/MockStereotype.java b/appserver/tests/appserv-tests/devtests/cdi/specialization/specialization-simple/servlet/test/beans/artifacts/MockStereotype.java
index 35fa89e..dbeb9ff 100644
--- a/appserver/tests/appserv-tests/devtests/cdi/specialization/specialization-simple/servlet/test/beans/artifacts/MockStereotype.java
+++ b/appserver/tests/appserv-tests/devtests/cdi/specialization/specialization-simple/servlet/test/beans/artifacts/MockStereotype.java
@@ -22,12 +22,12 @@
 import java.lang.annotation.RetentionPolicy;
 import java.lang.annotation.Target;
 
-import javax.enterprise.inject.Alternative;
+import jakarta.enterprise.inject.Alternative;
 
 
 
 @Alternative
-@javax.enterprise.inject.Stereotype
+@jakarta.enterprise.inject.Stereotype
 @Retention(RetentionPolicy.RUNTIME)
 @Target({ TYPE })
 public @interface MockStereotype {
diff --git a/appserver/tests/appserv-tests/devtests/cdi/specialization/specialization-simple/servlet/test/beans/artifacts/Transactional.java b/appserver/tests/appserv-tests/devtests/cdi/specialization/specialization-simple/servlet/test/beans/artifacts/Transactional.java
index 8889920..2e93b96 100644
--- a/appserver/tests/appserv-tests/devtests/cdi/specialization/specialization-simple/servlet/test/beans/artifacts/Transactional.java
+++ b/appserver/tests/appserv-tests/devtests/cdi/specialization/specialization-simple/servlet/test/beans/artifacts/Transactional.java
@@ -23,7 +23,7 @@
 import java.lang.annotation.RetentionPolicy;
 import java.lang.annotation.Target;
 
-import javax.enterprise.util.Nonbinding;
+import jakarta.enterprise.util.Nonbinding;
 import jakarta.interceptor.InterceptorBinding;
 
 @Target({TYPE, METHOD})
diff --git a/appserver/tests/appserv-tests/devtests/cdi/specialization/specialization-simple/servlet/test/beans/mock/MockAnotherQualifierProducer.java b/appserver/tests/appserv-tests/devtests/cdi/specialization/specialization-simple/servlet/test/beans/mock/MockAnotherQualifierProducer.java
index dd4d273..ea5d9dc 100644
--- a/appserver/tests/appserv-tests/devtests/cdi/specialization/specialization-simple/servlet/test/beans/mock/MockAnotherQualifierProducer.java
+++ b/appserver/tests/appserv-tests/devtests/cdi/specialization/specialization-simple/servlet/test/beans/mock/MockAnotherQualifierProducer.java
@@ -17,8 +17,8 @@
 package test.beans.mock;
 
 
-import javax.enterprise.inject.Produces;
-import javax.enterprise.inject.Specializes;
+import jakarta.enterprise.inject.Produces;
+import jakarta.enterprise.inject.Specializes;
 
 import test.beans.TestBeanInterface;
 import test.beans.nonmock.AnotherQualifierProducer;
diff --git a/appserver/tests/appserv-tests/devtests/cdi/specialization/specialization-simple/servlet/test/beans/mock/MockBean.java b/appserver/tests/appserv-tests/devtests/cdi/specialization/specialization-simple/servlet/test/beans/mock/MockBean.java
index d309650..55b3116 100644
--- a/appserver/tests/appserv-tests/devtests/cdi/specialization/specialization-simple/servlet/test/beans/mock/MockBean.java
+++ b/appserver/tests/appserv-tests/devtests/cdi/specialization/specialization-simple/servlet/test/beans/mock/MockBean.java
@@ -16,7 +16,7 @@
 
 package test.beans.mock;
 
-import javax.enterprise.context.RequestScoped;
+import jakarta.enterprise.context.RequestScoped;
 
 import test.beans.TestBeanInterface;
 import test.beans.artifacts.MockStereotype;
diff --git a/appserver/tests/appserv-tests/devtests/cdi/specialization/specialization-simple/servlet/test/beans/mock/MockShoppingCart.java b/appserver/tests/appserv-tests/devtests/cdi/specialization/specialization-simple/servlet/test/beans/mock/MockShoppingCart.java
index 0e2c7c2..d90b874 100644
--- a/appserver/tests/appserv-tests/devtests/cdi/specialization/specialization-simple/servlet/test/beans/mock/MockShoppingCart.java
+++ b/appserver/tests/appserv-tests/devtests/cdi/specialization/specialization-simple/servlet/test/beans/mock/MockShoppingCart.java
@@ -16,7 +16,7 @@
 
 package test.beans.mock;
 
-import javax.enterprise.inject.Specializes;
+import jakarta.enterprise.inject.Specializes;
 
 import test.beans.artifacts.MockStereotype;
 import test.beans.artifacts.Transactional;
diff --git a/appserver/tests/appserv-tests/devtests/cdi/specialization/specialization-simple/servlet/test/beans/nonmock/AnotherQualifierProducer.java b/appserver/tests/appserv-tests/devtests/cdi/specialization/specialization-simple/servlet/test/beans/nonmock/AnotherQualifierProducer.java
index cd8d502..fc70cb1 100644
--- a/appserver/tests/appserv-tests/devtests/cdi/specialization/specialization-simple/servlet/test/beans/nonmock/AnotherQualifierProducer.java
+++ b/appserver/tests/appserv-tests/devtests/cdi/specialization/specialization-simple/servlet/test/beans/nonmock/AnotherQualifierProducer.java
@@ -16,7 +16,7 @@
 
 package test.beans.nonmock;
 
-import javax.enterprise.inject.Produces;
+import jakarta.enterprise.inject.Produces;
 
 import test.beans.TestBeanInterface;
 import test.beans.artifacts.AnotherQualifier;
diff --git a/appserver/tests/appserv-tests/devtests/cdi/specialization/specialization-simple/servlet/test/beans/nonmock/TestBean.java b/appserver/tests/appserv-tests/devtests/cdi/specialization/specialization-simple/servlet/test/beans/nonmock/TestBean.java
index d1bed8f..bcdac0b 100644
--- a/appserver/tests/appserv-tests/devtests/cdi/specialization/specialization-simple/servlet/test/beans/nonmock/TestBean.java
+++ b/appserver/tests/appserv-tests/devtests/cdi/specialization/specialization-simple/servlet/test/beans/nonmock/TestBean.java
@@ -16,7 +16,7 @@
 
 package test.beans.nonmock;
 
-import javax.enterprise.context.RequestScoped;
+import jakarta.enterprise.context.RequestScoped;
 
 import test.beans.TestBeanInterface;
 import test.beans.artifacts.Preferred;
diff --git a/appserver/tests/appserv-tests/devtests/cdi/stereotypes/alternative-stereotypes/servlet/test/beans/artifacts/MockStereotype.java b/appserver/tests/appserv-tests/devtests/cdi/stereotypes/alternative-stereotypes/servlet/test/beans/artifacts/MockStereotype.java
index 35fa89e..dbeb9ff 100644
--- a/appserver/tests/appserv-tests/devtests/cdi/stereotypes/alternative-stereotypes/servlet/test/beans/artifacts/MockStereotype.java
+++ b/appserver/tests/appserv-tests/devtests/cdi/stereotypes/alternative-stereotypes/servlet/test/beans/artifacts/MockStereotype.java
@@ -22,12 +22,12 @@
 import java.lang.annotation.RetentionPolicy;
 import java.lang.annotation.Target;
 
-import javax.enterprise.inject.Alternative;
+import jakarta.enterprise.inject.Alternative;
 
 
 
 @Alternative
-@javax.enterprise.inject.Stereotype
+@jakarta.enterprise.inject.Stereotype
 @Retention(RetentionPolicy.RUNTIME)
 @Target({ TYPE })
 public @interface MockStereotype {
diff --git a/appserver/tests/appserv-tests/devtests/cdi/stereotypes/alternative-stereotypes/servlet/test/beans/artifacts/Transactional.java b/appserver/tests/appserv-tests/devtests/cdi/stereotypes/alternative-stereotypes/servlet/test/beans/artifacts/Transactional.java
index 8889920..2e93b96 100644
--- a/appserver/tests/appserv-tests/devtests/cdi/stereotypes/alternative-stereotypes/servlet/test/beans/artifacts/Transactional.java
+++ b/appserver/tests/appserv-tests/devtests/cdi/stereotypes/alternative-stereotypes/servlet/test/beans/artifacts/Transactional.java
@@ -23,7 +23,7 @@
 import java.lang.annotation.RetentionPolicy;
 import java.lang.annotation.Target;
 
-import javax.enterprise.util.Nonbinding;
+import jakarta.enterprise.util.Nonbinding;
 import jakarta.interceptor.InterceptorBinding;
 
 @Target({TYPE, METHOD})
diff --git a/appserver/tests/appserv-tests/devtests/cdi/stereotypes/alternative-stereotypes/servlet/test/beans/mock/MockBean.java b/appserver/tests/appserv-tests/devtests/cdi/stereotypes/alternative-stereotypes/servlet/test/beans/mock/MockBean.java
index d309650..55b3116 100644
--- a/appserver/tests/appserv-tests/devtests/cdi/stereotypes/alternative-stereotypes/servlet/test/beans/mock/MockBean.java
+++ b/appserver/tests/appserv-tests/devtests/cdi/stereotypes/alternative-stereotypes/servlet/test/beans/mock/MockBean.java
@@ -16,7 +16,7 @@
 
 package test.beans.mock;
 
-import javax.enterprise.context.RequestScoped;
+import jakarta.enterprise.context.RequestScoped;
 
 import test.beans.TestBeanInterface;
 import test.beans.artifacts.MockStereotype;
diff --git a/appserver/tests/appserv-tests/devtests/cdi/stereotypes/alternative-stereotypes/servlet/test/beans/nonmock/TestBean.java b/appserver/tests/appserv-tests/devtests/cdi/stereotypes/alternative-stereotypes/servlet/test/beans/nonmock/TestBean.java
index d1bed8f..bcdac0b 100644
--- a/appserver/tests/appserv-tests/devtests/cdi/stereotypes/alternative-stereotypes/servlet/test/beans/nonmock/TestBean.java
+++ b/appserver/tests/appserv-tests/devtests/cdi/stereotypes/alternative-stereotypes/servlet/test/beans/nonmock/TestBean.java
@@ -16,7 +16,7 @@
 
 package test.beans.nonmock;
 
-import javax.enterprise.context.RequestScoped;
+import jakarta.enterprise.context.RequestScoped;
 
 import test.beans.TestBeanInterface;
 import test.beans.artifacts.Preferred;
diff --git a/appserver/tests/appserv-tests/devtests/cdi/stereotypes/interceptor-bindings-for-stereotypes/servlet/test/beans/ActionStereotype.java b/appserver/tests/appserv-tests/devtests/cdi/stereotypes/interceptor-bindings-for-stereotypes/servlet/test/beans/ActionStereotype.java
index 1e49019..332b664 100644
--- a/appserver/tests/appserv-tests/devtests/cdi/stereotypes/interceptor-bindings-for-stereotypes/servlet/test/beans/ActionStereotype.java
+++ b/appserver/tests/appserv-tests/devtests/cdi/stereotypes/interceptor-bindings-for-stereotypes/servlet/test/beans/ActionStereotype.java
@@ -22,11 +22,11 @@
 import java.lang.annotation.RetentionPolicy;
 import java.lang.annotation.Target;
 
-import javax.enterprise.context.RequestScoped;
+import jakarta.enterprise.context.RequestScoped;
 
 
 
-@javax.enterprise.inject.Stereotype
+@jakarta.enterprise.inject.Stereotype
 @RequestScoped
 @Transactional(requiresNew=true)
 @Retention(RetentionPolicy.RUNTIME)
diff --git a/appserver/tests/appserv-tests/devtests/cdi/stereotypes/interceptor-bindings-for-stereotypes/servlet/test/beans/TestBean.java b/appserver/tests/appserv-tests/devtests/cdi/stereotypes/interceptor-bindings-for-stereotypes/servlet/test/beans/TestBean.java
index 4792d26..eec4d45 100644
--- a/appserver/tests/appserv-tests/devtests/cdi/stereotypes/interceptor-bindings-for-stereotypes/servlet/test/beans/TestBean.java
+++ b/appserver/tests/appserv-tests/devtests/cdi/stereotypes/interceptor-bindings-for-stereotypes/servlet/test/beans/TestBean.java
@@ -16,7 +16,7 @@
 
 package test.beans;
 
-import javax.enterprise.context.RequestScoped;
+import jakarta.enterprise.context.RequestScoped;
 
 @Transactional
 @RequestScoped
diff --git a/appserver/tests/appserv-tests/devtests/cdi/stereotypes/interceptor-bindings-for-stereotypes/servlet/test/beans/Transactional.java b/appserver/tests/appserv-tests/devtests/cdi/stereotypes/interceptor-bindings-for-stereotypes/servlet/test/beans/Transactional.java
index d2ed8a6..3f12323 100644
--- a/appserver/tests/appserv-tests/devtests/cdi/stereotypes/interceptor-bindings-for-stereotypes/servlet/test/beans/Transactional.java
+++ b/appserver/tests/appserv-tests/devtests/cdi/stereotypes/interceptor-bindings-for-stereotypes/servlet/test/beans/Transactional.java
@@ -23,7 +23,7 @@
 import java.lang.annotation.RetentionPolicy;
 import java.lang.annotation.Target;
 
-import javax.enterprise.util.Nonbinding;
+import jakarta.enterprise.util.Nonbinding;
 import jakarta.interceptor.InterceptorBinding;
 
 @Target({TYPE, METHOD})
diff --git a/appserver/tests/appserv-tests/devtests/cdi/stereotypes/stereotype-stacking/servlet/test/beans/TestSecureBean.java b/appserver/tests/appserv-tests/devtests/cdi/stereotypes/stereotype-stacking/servlet/test/beans/TestSecureBean.java
index a127308..99321b8 100644
--- a/appserver/tests/appserv-tests/devtests/cdi/stereotypes/stereotype-stacking/servlet/test/beans/TestSecureBean.java
+++ b/appserver/tests/appserv-tests/devtests/cdi/stereotypes/stereotype-stacking/servlet/test/beans/TestSecureBean.java
@@ -16,7 +16,7 @@
 
 package test.beans;
 
-import javax.enterprise.context.RequestScoped;
+import jakarta.enterprise.context.RequestScoped;
 
 import test.beans.qualifiers.Preferred;
 import test.beans.stereotypes.SecStereotype;
diff --git a/appserver/tests/appserv-tests/devtests/cdi/stereotypes/stereotype-stacking/servlet/test/beans/TestTxBean.java b/appserver/tests/appserv-tests/devtests/cdi/stereotypes/stereotype-stacking/servlet/test/beans/TestTxBean.java
index 9af2f53..cc61630 100644
--- a/appserver/tests/appserv-tests/devtests/cdi/stereotypes/stereotype-stacking/servlet/test/beans/TestTxBean.java
+++ b/appserver/tests/appserv-tests/devtests/cdi/stereotypes/stereotype-stacking/servlet/test/beans/TestTxBean.java
@@ -16,7 +16,7 @@
 
 package test.beans;
 
-import javax.enterprise.context.RequestScoped;
+import jakarta.enterprise.context.RequestScoped;
 
 import test.beans.qualifiers.Preferred;
 import test.beans.stereotypes.TxStereotype;
diff --git a/appserver/tests/appserv-tests/devtests/cdi/stereotypes/stereotype-stacking/servlet/test/beans/TestTxSecBean.java b/appserver/tests/appserv-tests/devtests/cdi/stereotypes/stereotype-stacking/servlet/test/beans/TestTxSecBean.java
index cb70ad3..fe9cce1 100644
--- a/appserver/tests/appserv-tests/devtests/cdi/stereotypes/stereotype-stacking/servlet/test/beans/TestTxSecBean.java
+++ b/appserver/tests/appserv-tests/devtests/cdi/stereotypes/stereotype-stacking/servlet/test/beans/TestTxSecBean.java
@@ -16,7 +16,7 @@
 
 package test.beans;
 
-import javax.enterprise.context.RequestScoped;
+import jakarta.enterprise.context.RequestScoped;
 
 import test.beans.qualifiers.Preferred;
 import test.beans.stereotypes.TxSecureStereotype;
diff --git a/appserver/tests/appserv-tests/devtests/cdi/stereotypes/stereotype-stacking/servlet/test/beans/stereotypes/SecStereotype.java b/appserver/tests/appserv-tests/devtests/cdi/stereotypes/stereotype-stacking/servlet/test/beans/stereotypes/SecStereotype.java
index 9738f58..4392564 100644
--- a/appserver/tests/appserv-tests/devtests/cdi/stereotypes/stereotype-stacking/servlet/test/beans/stereotypes/SecStereotype.java
+++ b/appserver/tests/appserv-tests/devtests/cdi/stereotypes/stereotype-stacking/servlet/test/beans/stereotypes/SecStereotype.java
@@ -24,7 +24,7 @@
 
 import test.beans.interceptors.Secure;
 
-@javax.enterprise.inject.Stereotype
+@jakarta.enterprise.inject.Stereotype
 @Retention(RetentionPolicy.RUNTIME)
 @Target({ TYPE })
 @Secure
diff --git a/appserver/tests/appserv-tests/devtests/cdi/stereotypes/stereotype-stacking/servlet/test/beans/stereotypes/TxSecureStereotype.java b/appserver/tests/appserv-tests/devtests/cdi/stereotypes/stereotype-stacking/servlet/test/beans/stereotypes/TxSecureStereotype.java
index 89f0ccd..a76ed42 100644
--- a/appserver/tests/appserv-tests/devtests/cdi/stereotypes/stereotype-stacking/servlet/test/beans/stereotypes/TxSecureStereotype.java
+++ b/appserver/tests/appserv-tests/devtests/cdi/stereotypes/stereotype-stacking/servlet/test/beans/stereotypes/TxSecureStereotype.java
@@ -24,7 +24,7 @@
 
 @TxStereotype
 @SecStereotype
-@javax.enterprise.inject.Stereotype
+@jakarta.enterprise.inject.Stereotype
 @Retention(RetentionPolicy.RUNTIME)
 @Target({ TYPE })
 public @interface TxSecureStereotype {
diff --git a/appserver/tests/appserv-tests/devtests/cdi/stereotypes/stereotype-stacking/servlet/test/beans/stereotypes/TxStereotype.java b/appserver/tests/appserv-tests/devtests/cdi/stereotypes/stereotype-stacking/servlet/test/beans/stereotypes/TxStereotype.java
index 0f6fb1e..1776d2a 100644
--- a/appserver/tests/appserv-tests/devtests/cdi/stereotypes/stereotype-stacking/servlet/test/beans/stereotypes/TxStereotype.java
+++ b/appserver/tests/appserv-tests/devtests/cdi/stereotypes/stereotype-stacking/servlet/test/beans/stereotypes/TxStereotype.java
@@ -25,7 +25,7 @@
 import test.beans.interceptors.Transactional;
 
 
-@javax.enterprise.inject.Stereotype
+@jakarta.enterprise.inject.Stereotype
 @Retention(RetentionPolicy.RUNTIME)
 @Target({ TYPE })
 @Transactional
diff --git a/appserver/tests/appserv-tests/devtests/cdi/transactions/transaction-scoped/servlet/test/beans/Bean2.java b/appserver/tests/appserv-tests/devtests/cdi/transactions/transaction-scoped/servlet/test/beans/Bean2.java
index d256fe9..ed45fd4 100644
--- a/appserver/tests/appserv-tests/devtests/cdi/transactions/transaction-scoped/servlet/test/beans/Bean2.java
+++ b/appserver/tests/appserv-tests/devtests/cdi/transactions/transaction-scoped/servlet/test/beans/Bean2.java
@@ -19,7 +19,7 @@
 import test.servlet.TransactionScopedTestServlet;
 
 import jakarta.annotation.PreDestroy;
-import javax.enterprise.inject.spi.PassivationCapable;
+import jakarta.enterprise.inject.spi.PassivationCapable;
 import jakarta.transaction.TransactionScoped;
 import java.io.Serializable;
 
diff --git a/appserver/tests/appserv-tests/devtests/cdi/transactions/transaction-scoped/servlet/test/servlet/TransactionScopedTestServlet.java b/appserver/tests/appserv-tests/devtests/cdi/transactions/transaction-scoped/servlet/test/servlet/TransactionScopedTestServlet.java
index 26b547b..1140143 100644
--- a/appserver/tests/appserv-tests/devtests/cdi/transactions/transaction-scoped/servlet/test/servlet/TransactionScopedTestServlet.java
+++ b/appserver/tests/appserv-tests/devtests/cdi/transactions/transaction-scoped/servlet/test/servlet/TransactionScopedTestServlet.java
@@ -19,7 +19,7 @@
 import test.beans.Bean1;
 import test.beans.Bean2;
 
-import javax.enterprise.context.ContextNotActiveException;
+import jakarta.enterprise.context.ContextNotActiveException;
 import jakarta.inject.Inject;
 import javax.servlet.ServletException;
 import javax.servlet.ServletOutputStream;
diff --git a/appserver/tests/appserv-tests/devtests/cdi/unproxyable-deps/servlet/test/artifacts/AppScopedBean.java b/appserver/tests/appserv-tests/devtests/cdi/unproxyable-deps/servlet/test/artifacts/AppScopedBean.java
index 08bb9e1..19b0aaf 100644
--- a/appserver/tests/appserv-tests/devtests/cdi/unproxyable-deps/servlet/test/artifacts/AppScopedBean.java
+++ b/appserver/tests/appserv-tests/devtests/cdi/unproxyable-deps/servlet/test/artifacts/AppScopedBean.java
@@ -16,7 +16,7 @@
 
 package test.artifacts;
 
-import javax.enterprise.context.ApplicationScoped;
+import jakarta.enterprise.context.ApplicationScoped;
 import jakarta.inject.Inject;
 
 @ApplicationScoped
diff --git a/appserver/tests/appserv-tests/devtests/cdi/unproxyable-deps/servlet/test/artifacts/BeanScopedBean.java b/appserver/tests/appserv-tests/devtests/cdi/unproxyable-deps/servlet/test/artifacts/BeanScopedBean.java
index 76307f3..b901a0f 100644
--- a/appserver/tests/appserv-tests/devtests/cdi/unproxyable-deps/servlet/test/artifacts/BeanScopedBean.java
+++ b/appserver/tests/appserv-tests/devtests/cdi/unproxyable-deps/servlet/test/artifacts/BeanScopedBean.java
@@ -16,7 +16,7 @@
 
 package test.artifacts;
 
-import javax.enterprise.context.RequestScoped;
+import jakarta.enterprise.context.RequestScoped;
 
 @RequestScoped
 //A request-scoped final class(therefore un-proxyable)
diff --git a/appserver/tests/appserv-tests/devtests/cdi/unsatisfied-deps/servlet/test/artifacts/MockPaymentProcessor.java b/appserver/tests/appserv-tests/devtests/cdi/unsatisfied-deps/servlet/test/artifacts/MockPaymentProcessor.java
index 13686d2..75cc52b 100644
--- a/appserver/tests/appserv-tests/devtests/cdi/unsatisfied-deps/servlet/test/artifacts/MockPaymentProcessor.java
+++ b/appserver/tests/appserv-tests/devtests/cdi/unsatisfied-deps/servlet/test/artifacts/MockPaymentProcessor.java
@@ -16,7 +16,7 @@
 
 package test.artifacts;
 
-import javax.enterprise.inject.Alternative;
+import jakarta.enterprise.inject.Alternative;
 
 @Alternative 
 public class MockPaymentProcessor implements PaymentProcessor{
diff --git a/appserver/tests/appserv-tests/devtests/cdi/unsatisfied-deps/servlet/test/beans/BeanToTestUnsatisfiedDependencies.java b/appserver/tests/appserv-tests/devtests/cdi/unsatisfied-deps/servlet/test/beans/BeanToTestUnsatisfiedDependencies.java
index e3a279e..1373c6b 100644
--- a/appserver/tests/appserv-tests/devtests/cdi/unsatisfied-deps/servlet/test/beans/BeanToTestUnsatisfiedDependencies.java
+++ b/appserver/tests/appserv-tests/devtests/cdi/unsatisfied-deps/servlet/test/beans/BeanToTestUnsatisfiedDependencies.java
@@ -16,8 +16,8 @@
 
 package test.beans;
 
-import javax.enterprise.inject.Any;
-import javax.enterprise.inject.Instance;
+import jakarta.enterprise.inject.Any;
+import jakarta.enterprise.inject.Instance;
 import jakarta.inject.Inject;
 
 import test.artifacts.MockPaymentProcessor;
diff --git a/appserver/tests/appserv-tests/devtests/deployment/ejb31/jndivalidation/ResourceRef/DefaultResources/src/gf/TestServlet.java b/appserver/tests/appserv-tests/devtests/deployment/ejb31/jndivalidation/ResourceRef/DefaultResources/src/gf/TestServlet.java
index b417f1e..8824cb6 100644
--- a/appserver/tests/appserv-tests/devtests/deployment/ejb31/jndivalidation/ResourceRef/DefaultResources/src/gf/TestServlet.java
+++ b/appserver/tests/appserv-tests/devtests/deployment/ejb31/jndivalidation/ResourceRef/DefaultResources/src/gf/TestServlet.java
@@ -25,7 +25,7 @@
 import javax.enterprise.concurrent.ManagedExecutorService;
 import javax.enterprise.concurrent.ManagedScheduledExecutorService;
 import javax.enterprise.concurrent.ManagedThreadFactory;
-import javax.enterprise.inject.spi.BeanManager;
+import jakarta.enterprise.inject.spi.BeanManager;
 import jakarta.jms.ConnectionFactory;
 import javax.sql.DataSource;
 import jakarta.transaction.UserTransaction;
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb31/embedded/embedasync/ejb/SingletonBean.java b/appserver/tests/appserv-tests/devtests/ejb/ejb31/embedded/embedasync/ejb/SingletonBean.java
index ed400ec..1ad414f 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb31/embedded/embedasync/ejb/SingletonBean.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb31/embedded/embedasync/ejb/SingletonBean.java
@@ -21,7 +21,7 @@
 
 import javax.naming.*;
 
-import javax.enterprise.inject.spi.BeanManager;
+import jakarta.enterprise.inject.spi.BeanManager;
 
 @Singleton
 @Startup
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/jcdifull/ejb/Foo.java b/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/jcdifull/ejb/Foo.java
index d3520ba..e02a306 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/jcdifull/ejb/Foo.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/jcdifull/ejb/Foo.java
@@ -16,7 +16,7 @@
 
 package com.acme;
 
-import javax.enterprise.context.*;
+import jakarta.enterprise.context.*;
 
 @RequestScoped
 public class Foo {
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/jcdifull/ejb/SingletonBean.java b/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/jcdifull/ejb/SingletonBean.java
index 2c68ab0..8d853a2 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/jcdifull/ejb/SingletonBean.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/jcdifull/ejb/SingletonBean.java
@@ -24,9 +24,9 @@
 
 import javax.naming.InitialContext;
 
-import javax.enterprise.inject.spi.BeanManager;
+import jakarta.enterprise.inject.spi.BeanManager;
 
-import javax.enterprise.event.Event;
+import jakarta.enterprise.event.Event;
 
 import java.lang.reflect.Method;
 
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/jcdifull/ejb/SingletonBean2.java b/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/jcdifull/ejb/SingletonBean2.java
index bc99ed3..53899e3 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/jcdifull/ejb/SingletonBean2.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/jcdifull/ejb/SingletonBean2.java
@@ -24,9 +24,9 @@
 
 import javax.naming.InitialContext;
 
-import javax.enterprise.inject.spi.BeanManager;
+import jakarta.enterprise.inject.spi.BeanManager;
 
-import javax.enterprise.event.Event;
+import jakarta.enterprise.event.Event;
 
 import java.lang.reflect.Method;
 
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/jcdifull/ejb/StatelessBean.java b/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/jcdifull/ejb/StatelessBean.java
index 9ac9ed4..2d52c2a 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/jcdifull/ejb/StatelessBean.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/jcdifull/ejb/StatelessBean.java
@@ -27,7 +27,7 @@
 
 import jakarta.inject.Inject;
 import jakarta.inject.Named;
-import javax.enterprise.event.Observes;
+import jakarta.enterprise.event.Observes;
 
 @Stateless
 @test.beans.interceptors.Another
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/jcdifull/ejb/StatelessBean2.java b/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/jcdifull/ejb/StatelessBean2.java
index 06508f8..91f205d 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/jcdifull/ejb/StatelessBean2.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/jcdifull/ejb/StatelessBean2.java
@@ -21,7 +21,7 @@
 
 import jakarta.inject.Inject;
 import jakarta.inject.Named;
-import javax.enterprise.event.Observes;
+import jakarta.enterprise.event.Observes;
 
 @Stateless
 public class StatelessBean2 implements StatelessLocal2 {
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/jcdifull/ejb/TranslatorControllerBean.java b/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/jcdifull/ejb/TranslatorControllerBean.java
index f94e915..97750ee 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/jcdifull/ejb/TranslatorControllerBean.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/jcdifull/ejb/TranslatorControllerBean.java
@@ -18,7 +18,7 @@
 
 import jakarta.ejb.Remove;
 import jakarta.ejb.Stateful;
-import javax.enterprise.context.RequestScoped;
+import jakarta.enterprise.context.RequestScoped;
 import jakarta.inject.Inject;
 import jakarta.inject.Named;
 
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb32/ejblite/async/war/SingletonBean.java b/appserver/tests/appserv-tests/devtests/ejb/ejb32/ejblite/async/war/SingletonBean.java
index 4ce2f5d..4d6a53c 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb32/ejblite/async/war/SingletonBean.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb32/ejblite/async/war/SingletonBean.java
@@ -21,7 +21,7 @@
 
 import javax.naming.*;
 
-import javax.enterprise.inject.spi.BeanManager;
+import jakarta.enterprise.inject.spi.BeanManager;
 
 @Singleton
 @Startup
diff --git a/appserver/tests/appserv-tests/devtests/security/soteria/app-bundled-ham-basic-login-config-form/src/main/java/org/glassfish/soteria/test/TestAuthenticationMechanism.java b/appserver/tests/appserv-tests/devtests/security/soteria/app-bundled-ham-basic-login-config-form/src/main/java/org/glassfish/soteria/test/TestAuthenticationMechanism.java
index 0dbb2f6..4279838 100644
--- a/appserver/tests/appserv-tests/devtests/security/soteria/app-bundled-ham-basic-login-config-form/src/main/java/org/glassfish/soteria/test/TestAuthenticationMechanism.java
+++ b/appserver/tests/appserv-tests/devtests/security/soteria/app-bundled-ham-basic-login-config-form/src/main/java/org/glassfish/soteria/test/TestAuthenticationMechanism.java
@@ -16,7 +16,7 @@
 
 package org.glassfish.soteria.test;
 
-import javax.enterprise.context.RequestScoped;
+import jakarta.enterprise.context.RequestScoped;
 import jakarta.inject.Inject;
 import javax.security.enterprise.AuthenticationException;
 import javax.security.enterprise.AuthenticationStatus;
diff --git a/appserver/tests/appserv-tests/devtests/security/soteria/app-bundled-ham-basic-login-config-form/src/main/java/org/glassfish/soteria/test/TestIdentityStore.java b/appserver/tests/appserv-tests/devtests/security/soteria/app-bundled-ham-basic-login-config-form/src/main/java/org/glassfish/soteria/test/TestIdentityStore.java
index 874747e..35b1b7d 100644
--- a/appserver/tests/appserv-tests/devtests/security/soteria/app-bundled-ham-basic-login-config-form/src/main/java/org/glassfish/soteria/test/TestIdentityStore.java
+++ b/appserver/tests/appserv-tests/devtests/security/soteria/app-bundled-ham-basic-login-config-form/src/main/java/org/glassfish/soteria/test/TestIdentityStore.java
@@ -21,7 +21,7 @@
 
 import java.util.HashSet;
 
-import javax.enterprise.context.RequestScoped;
+import jakarta.enterprise.context.RequestScoped;
 import javax.security.enterprise.credential.UsernamePasswordCredential;
 import javax.security.enterprise.identitystore.CredentialValidationResult;
 import javax.security.enterprise.identitystore.IdentityStore;
diff --git a/appserver/tests/appserv-tests/devtests/security/soteria/app-caller-principal/src/main/java/org/glassfish/soteria/test/TestAuthenticationMechanism.java b/appserver/tests/appserv-tests/devtests/security/soteria/app-caller-principal/src/main/java/org/glassfish/soteria/test/TestAuthenticationMechanism.java
index 9374f2b..fff77ca 100644
--- a/appserver/tests/appserv-tests/devtests/security/soteria/app-caller-principal/src/main/java/org/glassfish/soteria/test/TestAuthenticationMechanism.java
+++ b/appserver/tests/appserv-tests/devtests/security/soteria/app-caller-principal/src/main/java/org/glassfish/soteria/test/TestAuthenticationMechanism.java
@@ -18,7 +18,7 @@
 
 import static javax.security.enterprise.identitystore.CredentialValidationResult.Status.VALID;
 
-import javax.enterprise.context.RequestScoped;
+import jakarta.enterprise.context.RequestScoped;
 import jakarta.inject.Inject;
 import javax.security.enterprise.AuthenticationStatus;
 import javax.security.enterprise.AuthenticationException;
diff --git a/appserver/tests/appserv-tests/devtests/security/soteria/app-caller-principal/src/main/java/org/glassfish/soteria/test/TestIdentityStore.java b/appserver/tests/appserv-tests/devtests/security/soteria/app-caller-principal/src/main/java/org/glassfish/soteria/test/TestIdentityStore.java
index 0200b04..c4556df 100644
--- a/appserver/tests/appserv-tests/devtests/security/soteria/app-caller-principal/src/main/java/org/glassfish/soteria/test/TestIdentityStore.java
+++ b/appserver/tests/appserv-tests/devtests/security/soteria/app-caller-principal/src/main/java/org/glassfish/soteria/test/TestIdentityStore.java
@@ -21,7 +21,7 @@
 
 import java.util.HashSet;
 
-import javax.enterprise.context.RequestScoped;
+import jakarta.enterprise.context.RequestScoped;
 import javax.security.enterprise.identitystore.CredentialValidationResult;
 import javax.security.enterprise.identitystore.IdentityStore;
 import javax.security.enterprise.credential.UsernamePasswordCredential;
diff --git a/appserver/tests/appserv-tests/devtests/security/soteria/app-custom-identity-store-handler/src/main/java/org/glassfish/soteria/test/BlackListedIdentityStore.java b/appserver/tests/appserv-tests/devtests/security/soteria/app-custom-identity-store-handler/src/main/java/org/glassfish/soteria/test/BlackListedIdentityStore.java
index 750480e..6eb467f 100644
--- a/appserver/tests/appserv-tests/devtests/security/soteria/app-custom-identity-store-handler/src/main/java/org/glassfish/soteria/test/BlackListedIdentityStore.java
+++ b/appserver/tests/appserv-tests/devtests/security/soteria/app-custom-identity-store-handler/src/main/java/org/glassfish/soteria/test/BlackListedIdentityStore.java
@@ -23,7 +23,7 @@
 
 import java.util.Set;
 
-import javax.enterprise.context.ApplicationScoped;
+import jakarta.enterprise.context.ApplicationScoped;
 import javax.security.enterprise.credential.Credential;
 import javax.security.enterprise.credential.UsernamePasswordCredential;
 import javax.security.enterprise.identitystore.CredentialValidationResult;
diff --git a/appserver/tests/appserv-tests/devtests/security/soteria/app-custom-identity-store-handler/src/main/java/org/glassfish/soteria/test/ConfigBean.java b/appserver/tests/appserv-tests/devtests/security/soteria/app-custom-identity-store-handler/src/main/java/org/glassfish/soteria/test/ConfigBean.java
index 267bd20..c8cda52 100644
--- a/appserver/tests/appserv-tests/devtests/security/soteria/app-custom-identity-store-handler/src/main/java/org/glassfish/soteria/test/ConfigBean.java
+++ b/appserver/tests/appserv-tests/devtests/security/soteria/app-custom-identity-store-handler/src/main/java/org/glassfish/soteria/test/ConfigBean.java
@@ -24,7 +24,7 @@
 import static javax.security.enterprise.identitystore.LdapIdentityStoreDefinition.LdapSearchScope.ONE_LEVEL;
 import static javax.security.enterprise.identitystore.LdapIdentityStoreDefinition.LdapSearchScope.SUBTREE;
 
-import javax.enterprise.context.RequestScoped;
+import jakarta.enterprise.context.RequestScoped;
 import jakarta.inject.Named;
 
 @RequestScoped
diff --git a/appserver/tests/appserv-tests/devtests/security/soteria/app-custom-identity-store-handler/src/main/java/org/glassfish/soteria/test/CustomIdentityStoreHandler.java b/appserver/tests/appserv-tests/devtests/security/soteria/app-custom-identity-store-handler/src/main/java/org/glassfish/soteria/test/CustomIdentityStoreHandler.java
index d3ec02e..58b5972 100644
--- a/appserver/tests/appserv-tests/devtests/security/soteria/app-custom-identity-store-handler/src/main/java/org/glassfish/soteria/test/CustomIdentityStoreHandler.java
+++ b/appserver/tests/appserv-tests/devtests/security/soteria/app-custom-identity-store-handler/src/main/java/org/glassfish/soteria/test/CustomIdentityStoreHandler.java
@@ -18,8 +18,8 @@
 
 import jakarta.annotation.PostConstruct;
 import jakarta.annotation.Priority;
-import javax.enterprise.context.ApplicationScoped;
-import javax.enterprise.inject.Alternative;
+import jakarta.enterprise.context.ApplicationScoped;
+import jakarta.enterprise.inject.Alternative;
 import javax.security.enterprise.CallerPrincipal;
 import javax.security.enterprise.credential.Credential;
 import javax.security.enterprise.identitystore.CredentialValidationResult;
diff --git a/appserver/tests/appserv-tests/devtests/security/soteria/app-custom-identity-store-handler/src/main/java/org/glassfish/soteria/test/GroupProviderIdentityStore.java b/appserver/tests/appserv-tests/devtests/security/soteria/app-custom-identity-store-handler/src/main/java/org/glassfish/soteria/test/GroupProviderIdentityStore.java
index 7f31b40..3670fff 100644
--- a/appserver/tests/appserv-tests/devtests/security/soteria/app-custom-identity-store-handler/src/main/java/org/glassfish/soteria/test/GroupProviderIdentityStore.java
+++ b/appserver/tests/appserv-tests/devtests/security/soteria/app-custom-identity-store-handler/src/main/java/org/glassfish/soteria/test/GroupProviderIdentityStore.java
@@ -27,7 +27,7 @@
 import java.util.Set;
 
 import jakarta.annotation.PostConstruct;
-import javax.enterprise.context.ApplicationScoped;
+import jakarta.enterprise.context.ApplicationScoped;
 import javax.security.enterprise.identitystore.CredentialValidationResult;
 import javax.security.enterprise.identitystore.IdentityStore;
 import javax.security.enterprise.identitystore.LdapIdentityStoreDefinition;
diff --git a/appserver/tests/appserv-tests/devtests/security/soteria/app-custom-identity-store-handler/src/main/java/org/glassfish/soteria/test/TestAuthenticationMechanism.java b/appserver/tests/appserv-tests/devtests/security/soteria/app-custom-identity-store-handler/src/main/java/org/glassfish/soteria/test/TestAuthenticationMechanism.java
index 10cde68..4b7b45d 100644
--- a/appserver/tests/appserv-tests/devtests/security/soteria/app-custom-identity-store-handler/src/main/java/org/glassfish/soteria/test/TestAuthenticationMechanism.java
+++ b/appserver/tests/appserv-tests/devtests/security/soteria/app-custom-identity-store-handler/src/main/java/org/glassfish/soteria/test/TestAuthenticationMechanism.java
@@ -16,7 +16,7 @@
 
 package org.glassfish.soteria.test;
 
-import javax.enterprise.context.ApplicationScoped;
+import jakarta.enterprise.context.ApplicationScoped;
 import jakarta.inject.Inject;
 import javax.security.enterprise.AuthenticationException;
 import javax.security.enterprise.AuthenticationStatus;
diff --git a/appserver/tests/appserv-tests/devtests/security/soteria/app-custom-rememberme/src/main/java/org/glassfish/soteria/test/RememberMeConfigBean.java b/appserver/tests/appserv-tests/devtests/security/soteria/app-custom-rememberme/src/main/java/org/glassfish/soteria/test/RememberMeConfigBean.java
index 86fcbd9..d7c027b 100644
--- a/appserver/tests/appserv-tests/devtests/security/soteria/app-custom-rememberme/src/main/java/org/glassfish/soteria/test/RememberMeConfigBean.java
+++ b/appserver/tests/appserv-tests/devtests/security/soteria/app-custom-rememberme/src/main/java/org/glassfish/soteria/test/RememberMeConfigBean.java
@@ -17,7 +17,7 @@
 package org.glassfish.soteria.test;
 
 
-import javax.enterprise.context.RequestScoped;
+import jakarta.enterprise.context.RequestScoped;
 import jakarta.inject.Named;
 
 @RequestScoped
diff --git a/appserver/tests/appserv-tests/devtests/security/soteria/app-custom-rememberme/src/main/java/org/glassfish/soteria/test/TestAuthenticationMechanism.java b/appserver/tests/appserv-tests/devtests/security/soteria/app-custom-rememberme/src/main/java/org/glassfish/soteria/test/TestAuthenticationMechanism.java
index 77094f2..ac866d0 100644
--- a/appserver/tests/appserv-tests/devtests/security/soteria/app-custom-rememberme/src/main/java/org/glassfish/soteria/test/TestAuthenticationMechanism.java
+++ b/appserver/tests/appserv-tests/devtests/security/soteria/app-custom-rememberme/src/main/java/org/glassfish/soteria/test/TestAuthenticationMechanism.java
@@ -17,7 +17,7 @@
 package org.glassfish.soteria.test;
 
 
-import javax.enterprise.context.RequestScoped;
+import jakarta.enterprise.context.RequestScoped;
 import jakarta.inject.Inject;
 import javax.security.enterprise.AuthenticationException;
 import javax.security.enterprise.AuthenticationStatus;
diff --git a/appserver/tests/appserv-tests/devtests/security/soteria/app-custom-rememberme/src/main/java/org/glassfish/soteria/test/TestIdentityStore.java b/appserver/tests/appserv-tests/devtests/security/soteria/app-custom-rememberme/src/main/java/org/glassfish/soteria/test/TestIdentityStore.java
index 6453d36..1a3733a 100644
--- a/appserver/tests/appserv-tests/devtests/security/soteria/app-custom-rememberme/src/main/java/org/glassfish/soteria/test/TestIdentityStore.java
+++ b/appserver/tests/appserv-tests/devtests/security/soteria/app-custom-rememberme/src/main/java/org/glassfish/soteria/test/TestIdentityStore.java
@@ -22,7 +22,7 @@
 
 import java.util.HashSet;
 
-import javax.enterprise.context.RequestScoped;
+import jakarta.enterprise.context.RequestScoped;
 import javax.security.enterprise.credential.Credential;
 import javax.security.enterprise.credential.UsernamePasswordCredential;
 import javax.security.enterprise.identitystore.CredentialValidationResult;
diff --git a/appserver/tests/appserv-tests/devtests/security/soteria/app-custom-rememberme/src/main/java/org/glassfish/soteria/test/TestRememberMeIdentityStore.java b/appserver/tests/appserv-tests/devtests/security/soteria/app-custom-rememberme/src/main/java/org/glassfish/soteria/test/TestRememberMeIdentityStore.java
index c210891..7a6f650 100644
--- a/appserver/tests/appserv-tests/devtests/security/soteria/app-custom-rememberme/src/main/java/org/glassfish/soteria/test/TestRememberMeIdentityStore.java
+++ b/appserver/tests/appserv-tests/devtests/security/soteria/app-custom-rememberme/src/main/java/org/glassfish/soteria/test/TestRememberMeIdentityStore.java
@@ -22,7 +22,7 @@
 import java.util.UUID;
 import java.util.concurrent.ConcurrentHashMap;
 
-import javax.enterprise.context.ApplicationScoped;
+import jakarta.enterprise.context.ApplicationScoped;
 import javax.security.enterprise.CallerPrincipal;
 import javax.security.enterprise.credential.RememberMeCredential;
 import javax.security.enterprise.identitystore.CredentialValidationResult;
diff --git a/appserver/tests/appserv-tests/devtests/security/soteria/app-custom-session/src/main/java/org/glassfish/soteria/test/TestAuthenticationMechanism.java b/appserver/tests/appserv-tests/devtests/security/soteria/app-custom-session/src/main/java/org/glassfish/soteria/test/TestAuthenticationMechanism.java
index bbe1789..54f45f6 100644
--- a/appserver/tests/appserv-tests/devtests/security/soteria/app-custom-session/src/main/java/org/glassfish/soteria/test/TestAuthenticationMechanism.java
+++ b/appserver/tests/appserv-tests/devtests/security/soteria/app-custom-session/src/main/java/org/glassfish/soteria/test/TestAuthenticationMechanism.java
@@ -17,7 +17,7 @@
 package org.glassfish.soteria.test;
 
 
-import javax.enterprise.context.RequestScoped;
+import jakarta.enterprise.context.RequestScoped;
 import jakarta.inject.Inject;
 import javax.security.enterprise.AuthenticationException;
 import javax.security.enterprise.AuthenticationStatus;
diff --git a/appserver/tests/appserv-tests/devtests/security/soteria/app-custom-session/src/main/java/org/glassfish/soteria/test/TestIdentityStore.java b/appserver/tests/appserv-tests/devtests/security/soteria/app-custom-session/src/main/java/org/glassfish/soteria/test/TestIdentityStore.java
index af07d7a..403af16 100644
--- a/appserver/tests/appserv-tests/devtests/security/soteria/app-custom-session/src/main/java/org/glassfish/soteria/test/TestIdentityStore.java
+++ b/appserver/tests/appserv-tests/devtests/security/soteria/app-custom-session/src/main/java/org/glassfish/soteria/test/TestIdentityStore.java
@@ -22,7 +22,7 @@
 
 import java.util.HashSet;
 
-import javax.enterprise.context.RequestScoped;
+import jakarta.enterprise.context.RequestScoped;
 import javax.security.enterprise.credential.Credential;
 import javax.security.enterprise.credential.UsernamePasswordCredential;
 import javax.security.enterprise.identitystore.CredentialValidationResult;
diff --git a/appserver/tests/appserv-tests/devtests/security/soteria/app-custom/src/main/java/org/glassfish/soteria/test/TestAuthenticationMechanism.java b/appserver/tests/appserv-tests/devtests/security/soteria/app-custom/src/main/java/org/glassfish/soteria/test/TestAuthenticationMechanism.java
index e689b17..790c234 100644
--- a/appserver/tests/appserv-tests/devtests/security/soteria/app-custom/src/main/java/org/glassfish/soteria/test/TestAuthenticationMechanism.java
+++ b/appserver/tests/appserv-tests/devtests/security/soteria/app-custom/src/main/java/org/glassfish/soteria/test/TestAuthenticationMechanism.java
@@ -18,7 +18,7 @@
 
 import static javax.security.enterprise.identitystore.CredentialValidationResult.Status.VALID;
 
-import javax.enterprise.context.RequestScoped;
+import jakarta.enterprise.context.RequestScoped;
 import jakarta.inject.Inject;
 import javax.security.enterprise.AuthenticationStatus;
 import javax.security.enterprise.AuthenticationException;
diff --git a/appserver/tests/appserv-tests/devtests/security/soteria/app-custom/src/main/java/org/glassfish/soteria/test/TestIdentityStore.java b/appserver/tests/appserv-tests/devtests/security/soteria/app-custom/src/main/java/org/glassfish/soteria/test/TestIdentityStore.java
index 0200b04..c4556df 100644
--- a/appserver/tests/appserv-tests/devtests/security/soteria/app-custom/src/main/java/org/glassfish/soteria/test/TestIdentityStore.java
+++ b/appserver/tests/appserv-tests/devtests/security/soteria/app-custom/src/main/java/org/glassfish/soteria/test/TestIdentityStore.java
@@ -21,7 +21,7 @@
 
 import java.util.HashSet;
 
-import javax.enterprise.context.RequestScoped;
+import jakarta.enterprise.context.RequestScoped;
 import javax.security.enterprise.identitystore.CredentialValidationResult;
 import javax.security.enterprise.identitystore.IdentityStore;
 import javax.security.enterprise.credential.UsernamePasswordCredential;
diff --git a/appserver/tests/appserv-tests/devtests/security/soteria/app-db/src/main/java/org/glassfish/soteria/test/ApplicationConfig.java b/appserver/tests/appserv-tests/devtests/security/soteria/app-db/src/main/java/org/glassfish/soteria/test/ApplicationConfig.java
index 40162fb..fd49e29 100644
--- a/appserver/tests/appserv-tests/devtests/security/soteria/app-db/src/main/java/org/glassfish/soteria/test/ApplicationConfig.java
+++ b/appserver/tests/appserv-tests/devtests/security/soteria/app-db/src/main/java/org/glassfish/soteria/test/ApplicationConfig.java
@@ -16,7 +16,7 @@
 
 package org.glassfish.soteria.test;
 
-import javax.enterprise.context.ApplicationScoped;
+import jakarta.enterprise.context.ApplicationScoped;
 import jakarta.inject.Named;
 import javax.security.enterprise.identitystore.DatabaseIdentityStoreDefinition;
 
diff --git a/appserver/tests/appserv-tests/devtests/security/soteria/app-db/src/main/java/org/glassfish/soteria/test/PlaintextPasswordHash.java b/appserver/tests/appserv-tests/devtests/security/soteria/app-db/src/main/java/org/glassfish/soteria/test/PlaintextPasswordHash.java
index 58c9b00..aa26df2 100644
--- a/appserver/tests/appserv-tests/devtests/security/soteria/app-db/src/main/java/org/glassfish/soteria/test/PlaintextPasswordHash.java
+++ b/appserver/tests/appserv-tests/devtests/security/soteria/app-db/src/main/java/org/glassfish/soteria/test/PlaintextPasswordHash.java
@@ -17,7 +17,7 @@
 package org.glassfish.soteria.test;
 import java.util.Map;
 
-import javax.enterprise.context.Dependent;
+import jakarta.enterprise.context.Dependent;
 import javax.security.enterprise.identitystore.PasswordHash;
 
 @Dependent
diff --git a/appserver/tests/appserv-tests/devtests/security/soteria/app-db/src/main/java/org/glassfish/soteria/test/TestAuthenticationMechanism.java b/appserver/tests/appserv-tests/devtests/security/soteria/app-db/src/main/java/org/glassfish/soteria/test/TestAuthenticationMechanism.java
index a5b5509..1f380dd 100644
--- a/appserver/tests/appserv-tests/devtests/security/soteria/app-db/src/main/java/org/glassfish/soteria/test/TestAuthenticationMechanism.java
+++ b/appserver/tests/appserv-tests/devtests/security/soteria/app-db/src/main/java/org/glassfish/soteria/test/TestAuthenticationMechanism.java
@@ -17,7 +17,7 @@
 package org.glassfish.soteria.test;
 
 
-import javax.enterprise.context.RequestScoped;
+import jakarta.enterprise.context.RequestScoped;
 import jakarta.inject.Inject;
 import javax.security.enterprise.AuthenticationException;
 import javax.security.enterprise.AuthenticationStatus;
diff --git a/appserver/tests/appserv-tests/devtests/security/soteria/app-double-ham/src/main/java/org/glassfish/soteria/test/TestAuthenticationMechanism.java b/appserver/tests/appserv-tests/devtests/security/soteria/app-double-ham/src/main/java/org/glassfish/soteria/test/TestAuthenticationMechanism.java
index 8d3de60..ccd5766 100644
--- a/appserver/tests/appserv-tests/devtests/security/soteria/app-double-ham/src/main/java/org/glassfish/soteria/test/TestAuthenticationMechanism.java
+++ b/appserver/tests/appserv-tests/devtests/security/soteria/app-double-ham/src/main/java/org/glassfish/soteria/test/TestAuthenticationMechanism.java
@@ -18,7 +18,7 @@
 
 import static javax.security.enterprise.identitystore.CredentialValidationResult.Status.VALID;
 
-import javax.enterprise.context.RequestScoped;
+import jakarta.enterprise.context.RequestScoped;
 import jakarta.inject.Inject;
 import javax.security.enterprise.AuthenticationStatus;
 import javax.security.enterprise.AuthenticationException;
diff --git a/appserver/tests/appserv-tests/devtests/security/soteria/app-double-ham/src/main/java/org/glassfish/soteria/test/TestIdentityStore.java b/appserver/tests/appserv-tests/devtests/security/soteria/app-double-ham/src/main/java/org/glassfish/soteria/test/TestIdentityStore.java
index 0200b04..c4556df 100644
--- a/appserver/tests/appserv-tests/devtests/security/soteria/app-double-ham/src/main/java/org/glassfish/soteria/test/TestIdentityStore.java
+++ b/appserver/tests/appserv-tests/devtests/security/soteria/app-double-ham/src/main/java/org/glassfish/soteria/test/TestIdentityStore.java
@@ -21,7 +21,7 @@
 
 import java.util.HashSet;
 
-import javax.enterprise.context.RequestScoped;
+import jakarta.enterprise.context.RequestScoped;
 import javax.security.enterprise.identitystore.CredentialValidationResult;
 import javax.security.enterprise.identitystore.IdentityStore;
 import javax.security.enterprise.credential.UsernamePasswordCredential;
diff --git a/appserver/tests/appserv-tests/devtests/security/soteria/app-ham-ordering/src/main/java/org/glassfish/soteria/test/TestAuthenticationMechanism.java b/appserver/tests/appserv-tests/devtests/security/soteria/app-ham-ordering/src/main/java/org/glassfish/soteria/test/TestAuthenticationMechanism.java
index d2bf53d..afc38a9 100644
--- a/appserver/tests/appserv-tests/devtests/security/soteria/app-ham-ordering/src/main/java/org/glassfish/soteria/test/TestAuthenticationMechanism.java
+++ b/appserver/tests/appserv-tests/devtests/security/soteria/app-ham-ordering/src/main/java/org/glassfish/soteria/test/TestAuthenticationMechanism.java
@@ -18,7 +18,7 @@
 
 import static javax.security.enterprise.identitystore.CredentialValidationResult.Status.VALID;
 import java.io.IOException;
-import javax.enterprise.context.RequestScoped;
+import jakarta.enterprise.context.RequestScoped;
 import jakarta.inject.Inject;
 import javax.security.enterprise.AuthenticationStatus;
 import javax.security.enterprise.AuthenticationException;
diff --git a/appserver/tests/appserv-tests/devtests/security/soteria/app-ham-ordering/src/main/java/org/glassfish/soteria/test/TestIdentityStore.java b/appserver/tests/appserv-tests/devtests/security/soteria/app-ham-ordering/src/main/java/org/glassfish/soteria/test/TestIdentityStore.java
index 0200b04..c4556df 100644
--- a/appserver/tests/appserv-tests/devtests/security/soteria/app-ham-ordering/src/main/java/org/glassfish/soteria/test/TestIdentityStore.java
+++ b/appserver/tests/appserv-tests/devtests/security/soteria/app-ham-ordering/src/main/java/org/glassfish/soteria/test/TestIdentityStore.java
@@ -21,7 +21,7 @@
 
 import java.util.HashSet;
 
-import javax.enterprise.context.RequestScoped;
+import jakarta.enterprise.context.RequestScoped;
 import javax.security.enterprise.identitystore.CredentialValidationResult;
 import javax.security.enterprise.identitystore.IdentityStore;
 import javax.security.enterprise.credential.UsernamePasswordCredential;
diff --git a/appserver/tests/appserv-tests/devtests/security/soteria/app-mem-form/src/main/java/org/glassfish/soteria/test/ApplicationConfig.java b/appserver/tests/appserv-tests/devtests/security/soteria/app-mem-form/src/main/java/org/glassfish/soteria/test/ApplicationConfig.java
index 89efdd3..aa66ff8 100644
--- a/appserver/tests/appserv-tests/devtests/security/soteria/app-mem-form/src/main/java/org/glassfish/soteria/test/ApplicationConfig.java
+++ b/appserver/tests/appserv-tests/devtests/security/soteria/app-mem-form/src/main/java/org/glassfish/soteria/test/ApplicationConfig.java
@@ -16,7 +16,7 @@
 
 package org.glassfish.soteria.test;
 
-import javax.enterprise.context.ApplicationScoped;
+import jakarta.enterprise.context.ApplicationScoped;
 import jakarta.inject.Named;
 
 
diff --git a/appserver/tests/appserv-tests/devtests/security/soteria/app-mem-form/src/main/java/org/glassfish/soteria/test/TestIdentityStore.java b/appserver/tests/appserv-tests/devtests/security/soteria/app-mem-form/src/main/java/org/glassfish/soteria/test/TestIdentityStore.java
index 96b943c..1ac02f9 100644
--- a/appserver/tests/appserv-tests/devtests/security/soteria/app-mem-form/src/main/java/org/glassfish/soteria/test/TestIdentityStore.java
+++ b/appserver/tests/appserv-tests/devtests/security/soteria/app-mem-form/src/main/java/org/glassfish/soteria/test/TestIdentityStore.java
@@ -21,7 +21,7 @@
 
 import java.util.HashSet;
 
-import javax.enterprise.context.ApplicationScoped;
+import jakarta.enterprise.context.ApplicationScoped;
 import javax.security.enterprise.credential.UsernamePasswordCredential;
 import javax.security.enterprise.identitystore.CredentialValidationResult;
 import javax.security.enterprise.identitystore.IdentityStore;
diff --git a/appserver/tests/appserv-tests/devtests/security/soteria/app-multiple-store-backup/src/main/java/org/glassfish/soteria/test/TestAuthenticationMechanism.java b/appserver/tests/appserv-tests/devtests/security/soteria/app-multiple-store-backup/src/main/java/org/glassfish/soteria/test/TestAuthenticationMechanism.java
index 9b663e7..8f55870 100644
--- a/appserver/tests/appserv-tests/devtests/security/soteria/app-multiple-store-backup/src/main/java/org/glassfish/soteria/test/TestAuthenticationMechanism.java
+++ b/appserver/tests/appserv-tests/devtests/security/soteria/app-multiple-store-backup/src/main/java/org/glassfish/soteria/test/TestAuthenticationMechanism.java
@@ -19,7 +19,7 @@
 import static javax.security.enterprise.identitystore.CredentialValidationResult.Status.VALID;
 import static org.glassfish.soteria.Utils.notNull;
 
-import javax.enterprise.context.RequestScoped;
+import jakarta.enterprise.context.RequestScoped;
 import jakarta.inject.Inject;
 import javax.security.enterprise.AuthenticationException;
 import javax.security.enterprise.AuthenticationStatus;
diff --git a/appserver/tests/appserv-tests/devtests/security/soteria/app-multiple-store-backup/src/main/java/org/glassfish/soteria/test/TestBackupIdentityStore.java b/appserver/tests/appserv-tests/devtests/security/soteria/app-multiple-store-backup/src/main/java/org/glassfish/soteria/test/TestBackupIdentityStore.java
index bd37a01..a468058 100644
--- a/appserver/tests/appserv-tests/devtests/security/soteria/app-multiple-store-backup/src/main/java/org/glassfish/soteria/test/TestBackupIdentityStore.java
+++ b/appserver/tests/appserv-tests/devtests/security/soteria/app-multiple-store-backup/src/main/java/org/glassfish/soteria/test/TestBackupIdentityStore.java
@@ -22,7 +22,7 @@
 
 import java.util.HashSet;
 
-import javax.enterprise.context.RequestScoped;
+import jakarta.enterprise.context.RequestScoped;
 import javax.security.enterprise.credential.Credential;
 import javax.security.enterprise.credential.UsernamePasswordCredential;
 import javax.security.enterprise.identitystore.CredentialValidationResult;
diff --git a/appserver/tests/appserv-tests/devtests/security/soteria/app-multiple-store-backup/src/main/java/org/glassfish/soteria/test/TestIdentityStore.java b/appserver/tests/appserv-tests/devtests/security/soteria/app-multiple-store-backup/src/main/java/org/glassfish/soteria/test/TestIdentityStore.java
index c442d7c..2cbf9b2 100644
--- a/appserver/tests/appserv-tests/devtests/security/soteria/app-multiple-store-backup/src/main/java/org/glassfish/soteria/test/TestIdentityStore.java
+++ b/appserver/tests/appserv-tests/devtests/security/soteria/app-multiple-store-backup/src/main/java/org/glassfish/soteria/test/TestIdentityStore.java
@@ -22,7 +22,7 @@
 
 import java.util.HashSet;
 
-import javax.enterprise.context.RequestScoped;
+import jakarta.enterprise.context.RequestScoped;
 import javax.security.enterprise.credential.Credential;
 import javax.security.enterprise.credential.UsernamePasswordCredential;
 import javax.security.enterprise.identitystore.CredentialValidationResult;
diff --git a/appserver/tests/appserv-tests/devtests/security/soteria/app-multiple-store/src/main/java/org/glassfish/soteria/test/AuthenticationIdentityStore.java b/appserver/tests/appserv-tests/devtests/security/soteria/app-multiple-store/src/main/java/org/glassfish/soteria/test/AuthenticationIdentityStore.java
index 688dc9f..4f71226 100644
--- a/appserver/tests/appserv-tests/devtests/security/soteria/app-multiple-store/src/main/java/org/glassfish/soteria/test/AuthenticationIdentityStore.java
+++ b/appserver/tests/appserv-tests/devtests/security/soteria/app-multiple-store/src/main/java/org/glassfish/soteria/test/AuthenticationIdentityStore.java
@@ -27,7 +27,7 @@
 import java.util.Set;
 
 import jakarta.annotation.PostConstruct;
-import javax.enterprise.context.RequestScoped;
+import jakarta.enterprise.context.RequestScoped;
 import javax.security.enterprise.credential.Credential;
 import javax.security.enterprise.credential.UsernamePasswordCredential;
 import javax.security.enterprise.identitystore.CredentialValidationResult;
diff --git a/appserver/tests/appserv-tests/devtests/security/soteria/app-multiple-store/src/main/java/org/glassfish/soteria/test/AuthorizationIdentityStore.java b/appserver/tests/appserv-tests/devtests/security/soteria/app-multiple-store/src/main/java/org/glassfish/soteria/test/AuthorizationIdentityStore.java
index 77849a9..3a518df 100644
--- a/appserver/tests/appserv-tests/devtests/security/soteria/app-multiple-store/src/main/java/org/glassfish/soteria/test/AuthorizationIdentityStore.java
+++ b/appserver/tests/appserv-tests/devtests/security/soteria/app-multiple-store/src/main/java/org/glassfish/soteria/test/AuthorizationIdentityStore.java
@@ -25,7 +25,7 @@
 import java.util.Set;
 
 import jakarta.annotation.PostConstruct;
-import javax.enterprise.context.RequestScoped;
+import jakarta.enterprise.context.RequestScoped;
 import javax.security.enterprise.identitystore.CredentialValidationResult;
 import javax.security.enterprise.identitystore.IdentityStore;
 
diff --git a/appserver/tests/appserv-tests/devtests/security/soteria/app-multiple-store/src/main/java/org/glassfish/soteria/test/TestAuthenticationMechanism.java b/appserver/tests/appserv-tests/devtests/security/soteria/app-multiple-store/src/main/java/org/glassfish/soteria/test/TestAuthenticationMechanism.java
index 532d0d3..410aa67 100644
--- a/appserver/tests/appserv-tests/devtests/security/soteria/app-multiple-store/src/main/java/org/glassfish/soteria/test/TestAuthenticationMechanism.java
+++ b/appserver/tests/appserv-tests/devtests/security/soteria/app-multiple-store/src/main/java/org/glassfish/soteria/test/TestAuthenticationMechanism.java
@@ -19,7 +19,7 @@
 import static javax.security.enterprise.identitystore.CredentialValidationResult.Status.VALID;
 import static org.glassfish.soteria.Utils.notNull;
 
-import javax.enterprise.context.RequestScoped;
+import jakarta.enterprise.context.RequestScoped;
 import jakarta.inject.Inject;
 import javax.security.enterprise.AuthenticationException;
 import javax.security.enterprise.AuthenticationStatus;
diff --git a/appserver/tests/appserv-tests/devtests/security/soteria/app-no-application-caller-principal/src/main/java/org/glassfish/soteria/test/TestAuthenticationMechanism.java b/appserver/tests/appserv-tests/devtests/security/soteria/app-no-application-caller-principal/src/main/java/org/glassfish/soteria/test/TestAuthenticationMechanism.java
index 63d8de7..a08390c 100644
--- a/appserver/tests/appserv-tests/devtests/security/soteria/app-no-application-caller-principal/src/main/java/org/glassfish/soteria/test/TestAuthenticationMechanism.java
+++ b/appserver/tests/appserv-tests/devtests/security/soteria/app-no-application-caller-principal/src/main/java/org/glassfish/soteria/test/TestAuthenticationMechanism.java
@@ -18,7 +18,7 @@
 
 import static javax.security.enterprise.identitystore.CredentialValidationResult.Status.VALID;
 
-import javax.enterprise.context.RequestScoped;
+import jakarta.enterprise.context.RequestScoped;
 import jakarta.inject.Inject;
 import javax.security.enterprise.AuthenticationStatus;
 import javax.security.enterprise.AuthenticationException;
diff --git a/appserver/tests/appserv-tests/devtests/security/soteria/app-no-application-caller-principal/src/main/java/org/glassfish/soteria/test/TestIdentityStore.java b/appserver/tests/appserv-tests/devtests/security/soteria/app-no-application-caller-principal/src/main/java/org/glassfish/soteria/test/TestIdentityStore.java
index 0200b04..c4556df 100644
--- a/appserver/tests/appserv-tests/devtests/security/soteria/app-no-application-caller-principal/src/main/java/org/glassfish/soteria/test/TestIdentityStore.java
+++ b/appserver/tests/appserv-tests/devtests/security/soteria/app-no-application-caller-principal/src/main/java/org/glassfish/soteria/test/TestIdentityStore.java
@@ -21,7 +21,7 @@
 
 import java.util.HashSet;
 
-import javax.enterprise.context.RequestScoped;
+import jakarta.enterprise.context.RequestScoped;
 import javax.security.enterprise.identitystore.CredentialValidationResult;
 import javax.security.enterprise.identitystore.IdentityStore;
 import javax.security.enterprise.credential.UsernamePasswordCredential;
diff --git a/appserver/tests/appserv-tests/devtests/security/soteria/app-securitycontext-auth-ejb/src/main/java/org/glassfish/soteria/test/TestAuthenticationMechanism.java b/appserver/tests/appserv-tests/devtests/security/soteria/app-securitycontext-auth-ejb/src/main/java/org/glassfish/soteria/test/TestAuthenticationMechanism.java
index fbea70c..cf515ec 100644
--- a/appserver/tests/appserv-tests/devtests/security/soteria/app-securitycontext-auth-ejb/src/main/java/org/glassfish/soteria/test/TestAuthenticationMechanism.java
+++ b/appserver/tests/appserv-tests/devtests/security/soteria/app-securitycontext-auth-ejb/src/main/java/org/glassfish/soteria/test/TestAuthenticationMechanism.java
@@ -21,7 +21,7 @@
 
 import java.util.HashSet;
 
-import javax.enterprise.context.RequestScoped;
+import jakarta.enterprise.context.RequestScoped;
 import javax.security.enterprise.AuthenticationStatus;
 import javax.security.enterprise.AuthenticationException;
 import javax.security.enterprise.authentication.mechanism.http.HttpAuthenticationMechanism;
diff --git a/appserver/tests/appserv-tests/devtests/security/soteria/app-securitycontext-auth/src/main/java/org/glassfish/soteria/test/TestAuthenticationMechanism.java b/appserver/tests/appserv-tests/devtests/security/soteria/app-securitycontext-auth/src/main/java/org/glassfish/soteria/test/TestAuthenticationMechanism.java
index fbea70c..cf515ec 100644
--- a/appserver/tests/appserv-tests/devtests/security/soteria/app-securitycontext-auth/src/main/java/org/glassfish/soteria/test/TestAuthenticationMechanism.java
+++ b/appserver/tests/appserv-tests/devtests/security/soteria/app-securitycontext-auth/src/main/java/org/glassfish/soteria/test/TestAuthenticationMechanism.java
@@ -21,7 +21,7 @@
 
 import java.util.HashSet;
 
-import javax.enterprise.context.RequestScoped;
+import jakarta.enterprise.context.RequestScoped;
 import javax.security.enterprise.AuthenticationStatus;
 import javax.security.enterprise.AuthenticationException;
 import javax.security.enterprise.authentication.mechanism.http.HttpAuthenticationMechanism;
diff --git a/appserver/tests/appserv-tests/devtests/web/servlet-3.1/upgradeWithCDI/servlet/test/ISBNValidator.java b/appserver/tests/appserv-tests/devtests/web/servlet-3.1/upgradeWithCDI/servlet/test/ISBNValidator.java
index ba886fb..dd876e9 100644
--- a/appserver/tests/appserv-tests/devtests/web/servlet-3.1/upgradeWithCDI/servlet/test/ISBNValidator.java
+++ b/appserver/tests/appserv-tests/devtests/web/servlet-3.1/upgradeWithCDI/servlet/test/ISBNValidator.java
@@ -16,7 +16,7 @@
 
 package test;
 
-import javax.enterprise.context.ApplicationScoped;
+import jakarta.enterprise.context.ApplicationScoped;
 
 /**
  * Validate the ISBN number as described in
diff --git a/appserver/tests/appserv-tests/devtests/web/weldJsfFormLoginHttpSessionListener/src/test/MyBean.java b/appserver/tests/appserv-tests/devtests/web/weldJsfFormLoginHttpSessionListener/src/test/MyBean.java
index aadcccd..2b2d126 100644
--- a/appserver/tests/appserv-tests/devtests/web/weldJsfFormLoginHttpSessionListener/src/test/MyBean.java
+++ b/appserver/tests/appserv-tests/devtests/web/weldJsfFormLoginHttpSessionListener/src/test/MyBean.java
@@ -16,7 +16,7 @@
 
 package test;
 
-import javax.enterprise.context.RequestScoped;
+import jakarta.enterprise.context.RequestScoped;
 
 @RequestScoped
 public class MyBean {
diff --git a/appserver/tests/appserv-tests/devtests/web/weldJsfFormLoginHttpSessionListener/src/test/TestMessage.java b/appserver/tests/appserv-tests/devtests/web/weldJsfFormLoginHttpSessionListener/src/test/TestMessage.java
index 8ada045..719d44b 100644
--- a/appserver/tests/appserv-tests/devtests/web/weldJsfFormLoginHttpSessionListener/src/test/TestMessage.java
+++ b/appserver/tests/appserv-tests/devtests/web/weldJsfFormLoginHttpSessionListener/src/test/TestMessage.java
@@ -18,7 +18,7 @@
 
 import java.io.Serializable;
 
-import javax.enterprise.context.SessionScoped;
+import jakarta.enterprise.context.SessionScoped;
 //import jakarta.faces.bean.ManagedBean;
 import jakarta.inject.Named;
 
diff --git a/appserver/tests/appserv-tests/devtests/web/weldJsfServerAuthModuleRedirect/src/test/TestMessage.java b/appserver/tests/appserv-tests/devtests/web/weldJsfServerAuthModuleRedirect/src/test/TestMessage.java
index 8ada045..719d44b 100644
--- a/appserver/tests/appserv-tests/devtests/web/weldJsfServerAuthModuleRedirect/src/test/TestMessage.java
+++ b/appserver/tests/appserv-tests/devtests/web/weldJsfServerAuthModuleRedirect/src/test/TestMessage.java
@@ -18,7 +18,7 @@
 
 import java.io.Serializable;
 
-import javax.enterprise.context.SessionScoped;
+import jakarta.enterprise.context.SessionScoped;
 //import jakarta.faces.bean.ManagedBean;
 import jakarta.inject.Named;
 
diff --git a/appserver/tests/cdi/cases/multiBeansXml/ejb1/src/main/java/com/oracle/cdi/cases/devtests/multiejb1/InterceptedEjb1.java b/appserver/tests/cdi/cases/multiBeansXml/ejb1/src/main/java/com/oracle/cdi/cases/devtests/multiejb1/InterceptedEjb1.java
index de0a98c..d059098 100644
--- a/appserver/tests/cdi/cases/multiBeansXml/ejb1/src/main/java/com/oracle/cdi/cases/devtests/multiejb1/InterceptedEjb1.java
+++ b/appserver/tests/cdi/cases/multiBeansXml/ejb1/src/main/java/com/oracle/cdi/cases/devtests/multiejb1/InterceptedEjb1.java
@@ -20,7 +20,7 @@
 
 import jakarta.ejb.Remote;
 import jakarta.ejb.Stateless;
-import javax.enterprise.inject.spi.BeanManager;
+import jakarta.enterprise.inject.spi.BeanManager;
 import jakarta.inject.Inject;
 
 /**
diff --git a/appserver/tests/cdi/cases/multiBeansXml/ejb2/src/main/java/com/oracle/cdi/cases/devtests/multiejb2/InterceptedEjb2.java b/appserver/tests/cdi/cases/multiBeansXml/ejb2/src/main/java/com/oracle/cdi/cases/devtests/multiejb2/InterceptedEjb2.java
index acffd79..dc0cc0a 100644
--- a/appserver/tests/cdi/cases/multiBeansXml/ejb2/src/main/java/com/oracle/cdi/cases/devtests/multiejb2/InterceptedEjb2.java
+++ b/appserver/tests/cdi/cases/multiBeansXml/ejb2/src/main/java/com/oracle/cdi/cases/devtests/multiejb2/InterceptedEjb2.java
@@ -20,7 +20,7 @@
 
 import jakarta.ejb.Remote;
 import jakarta.ejb.Stateless;
-import javax.enterprise.inject.spi.BeanManager;
+import jakarta.enterprise.inject.spi.BeanManager;
 import jakarta.inject.Inject;
 
 /**
diff --git a/appserver/tests/cdi/cases/preDestroyScoping/lib/src/main/java/com/oracle/cdi/cases/devtests/predestroy/lib/EventLog.java b/appserver/tests/cdi/cases/preDestroyScoping/lib/src/main/java/com/oracle/cdi/cases/devtests/predestroy/lib/EventLog.java
index 15c2347..6bc28d6 100644
--- a/appserver/tests/cdi/cases/preDestroyScoping/lib/src/main/java/com/oracle/cdi/cases/devtests/predestroy/lib/EventLog.java
+++ b/appserver/tests/cdi/cases/preDestroyScoping/lib/src/main/java/com/oracle/cdi/cases/devtests/predestroy/lib/EventLog.java
@@ -17,7 +17,7 @@
 package com.oracle.cdi.cases.devtests.predestroy.lib;
 
 
-import javax.enterprise.context.ApplicationScoped;
+import jakarta.enterprise.context.ApplicationScoped;
 import java.util.Collections;
 import java.util.List;
 import java.util.concurrent.CopyOnWriteArrayList;
diff --git a/appserver/tests/cdi/cases/preDestroyScoping/lib/src/main/java/com/oracle/cdi/cases/devtests/predestroy/lib/RequestBean.java b/appserver/tests/cdi/cases/preDestroyScoping/lib/src/main/java/com/oracle/cdi/cases/devtests/predestroy/lib/RequestBean.java
index d07a1f4..a6a00c0 100644
--- a/appserver/tests/cdi/cases/preDestroyScoping/lib/src/main/java/com/oracle/cdi/cases/devtests/predestroy/lib/RequestBean.java
+++ b/appserver/tests/cdi/cases/preDestroyScoping/lib/src/main/java/com/oracle/cdi/cases/devtests/predestroy/lib/RequestBean.java
@@ -16,7 +16,7 @@
 
 package com.oracle.cdi.cases.devtests.predestroy.lib;
 
-import javax.enterprise.context.RequestScoped;
+import jakarta.enterprise.context.RequestScoped;
 import jakarta.inject.Inject;
 
 @RequestScoped
diff --git a/appserver/tests/cdi/cases/preDestroyScoping/web/src/main/java/com/oracle/cdi/cases/devtests/predestroy/war/SessionBeanProducer.java b/appserver/tests/cdi/cases/preDestroyScoping/web/src/main/java/com/oracle/cdi/cases/devtests/predestroy/war/SessionBeanProducer.java
index efb8b90..4ba59c4 100644
--- a/appserver/tests/cdi/cases/preDestroyScoping/web/src/main/java/com/oracle/cdi/cases/devtests/predestroy/war/SessionBeanProducer.java
+++ b/appserver/tests/cdi/cases/preDestroyScoping/web/src/main/java/com/oracle/cdi/cases/devtests/predestroy/war/SessionBeanProducer.java
@@ -19,9 +19,9 @@
 
 import jakarta.annotation.PostConstruct;
 import jakarta.annotation.PreDestroy;
-import javax.enterprise.context.ContextNotActiveException;
-import javax.enterprise.context.SessionScoped;
-import javax.enterprise.inject.Produces;
+import jakarta.enterprise.context.ContextNotActiveException;
+import jakarta.enterprise.context.SessionScoped;
+import jakarta.enterprise.inject.Produces;
 import jakarta.inject.Inject;
 
 import com.oracle.cdi.cases.devtests.predestroy.lib.EventLog;
diff --git a/appserver/tests/cdi/negative/normalScopeWithFinal/src/main/java/com/oracle/cdi/devtest/negative/normalScoped/IExtendAClassWithFinalMethods.java b/appserver/tests/cdi/negative/normalScopeWithFinal/src/main/java/com/oracle/cdi/devtest/negative/normalScoped/IExtendAClassWithFinalMethods.java
index e5f6d51..a0a877f 100644
--- a/appserver/tests/cdi/negative/normalScopeWithFinal/src/main/java/com/oracle/cdi/devtest/negative/normalScoped/IExtendAClassWithFinalMethods.java
+++ b/appserver/tests/cdi/negative/normalScopeWithFinal/src/main/java/com/oracle/cdi/devtest/negative/normalScoped/IExtendAClassWithFinalMethods.java
@@ -16,7 +16,7 @@
 
 package com.oracle.cdi.devtest.negative.normalScoped;
 
-import javax.enterprise.context.ApplicationScoped;
+import jakarta.enterprise.context.ApplicationScoped;
 
 /**
  * This class extends a class with final methods, but does not have any final
diff --git a/appserver/tests/embedded/cdi_basic/src/main/java/org/glassfish/tests/embedded/cdi_basic/TestRequestScopedBean.java b/appserver/tests/embedded/cdi_basic/src/main/java/org/glassfish/tests/embedded/cdi_basic/TestRequestScopedBean.java
index 0138242..211f07e 100644
--- a/appserver/tests/embedded/cdi_basic/src/main/java/org/glassfish/tests/embedded/cdi_basic/TestRequestScopedBean.java
+++ b/appserver/tests/embedded/cdi_basic/src/main/java/org/glassfish/tests/embedded/cdi_basic/TestRequestScopedBean.java
@@ -18,6 +18,6 @@
 
 //Simple RequestScoped TestBean to test CDI. 
 //This bean implements Serializable as it needs to be placed into a Stateful Bean
-@javax.enterprise.context.RequestScoped
+@jakarta.enterprise.context.RequestScoped
 public class TestRequestScopedBean
 {}
diff --git a/appserver/tests/embedded/cdi_ejb_jpa/src/main/java/org/glassfish/tests/embedded/cdi_ejb_jpa/TestRequestScopedBean.java b/appserver/tests/embedded/cdi_ejb_jpa/src/main/java/org/glassfish/tests/embedded/cdi_ejb_jpa/TestRequestScopedBean.java
index 5dd4628..05e4a47 100644
--- a/appserver/tests/embedded/cdi_ejb_jpa/src/main/java/org/glassfish/tests/embedded/cdi_ejb_jpa/TestRequestScopedBean.java
+++ b/appserver/tests/embedded/cdi_ejb_jpa/src/main/java/org/glassfish/tests/embedded/cdi_ejb_jpa/TestRequestScopedBean.java
@@ -18,6 +18,6 @@
 
 //Simple RequestScoped TestBean to test CDI. 
 //This bean implements Serializable as it needs to be placed into a Stateful Bean
-@javax.enterprise.context.RequestScoped
+@jakarta.enterprise.context.RequestScoped
 public class TestRequestScopedBean
 {}
diff --git a/appserver/tests/embedded/glassfish_resources_xml/src/main/java/org/glassfish/tests/embedded/cdi_ejb_jpa/TestRequestScopedBean.java b/appserver/tests/embedded/glassfish_resources_xml/src/main/java/org/glassfish/tests/embedded/cdi_ejb_jpa/TestRequestScopedBean.java
index 5dd4628..05e4a47 100644
--- a/appserver/tests/embedded/glassfish_resources_xml/src/main/java/org/glassfish/tests/embedded/cdi_ejb_jpa/TestRequestScopedBean.java
+++ b/appserver/tests/embedded/glassfish_resources_xml/src/main/java/org/glassfish/tests/embedded/cdi_ejb_jpa/TestRequestScopedBean.java
@@ -18,6 +18,6 @@
 
 //Simple RequestScoped TestBean to test CDI. 
 //This bean implements Serializable as it needs to be placed into a Stateful Bean
-@javax.enterprise.context.RequestScoped
+@jakarta.enterprise.context.RequestScoped
 public class TestRequestScopedBean
 {}
diff --git a/appserver/tests/hk2/cdi/basic/ejb1/src/main/java/com/oracle/hk2/devtest/cdi/ejb1/EjbInjectedWithServiceLocator.java b/appserver/tests/hk2/cdi/basic/ejb1/src/main/java/com/oracle/hk2/devtest/cdi/ejb1/EjbInjectedWithServiceLocator.java
index 96cf155..21d0773 100644
--- a/appserver/tests/hk2/cdi/basic/ejb1/src/main/java/com/oracle/hk2/devtest/cdi/ejb1/EjbInjectedWithServiceLocator.java
+++ b/appserver/tests/hk2/cdi/basic/ejb1/src/main/java/com/oracle/hk2/devtest/cdi/ejb1/EjbInjectedWithServiceLocator.java
@@ -21,7 +21,7 @@
 
 import jakarta.ejb.Remote;
 import jakarta.ejb.Stateless;
-import javax.enterprise.inject.spi.BeanManager;
+import jakarta.enterprise.inject.spi.BeanManager;
 import jakarta.inject.Inject;
 
 import org.glassfish.hk2.api.ActiveDescriptor;
diff --git a/appserver/tests/hk2/cdi/basic/ejb1/src/main/java/com/oracle/hk2/devtest/cdi/ejb1/scoped/CountingApplicationScopedCDIService.java b/appserver/tests/hk2/cdi/basic/ejb1/src/main/java/com/oracle/hk2/devtest/cdi/ejb1/scoped/CountingApplicationScopedCDIService.java
index 5c42f1e..b96e9fe 100644
--- a/appserver/tests/hk2/cdi/basic/ejb1/src/main/java/com/oracle/hk2/devtest/cdi/ejb1/scoped/CountingApplicationScopedCDIService.java
+++ b/appserver/tests/hk2/cdi/basic/ejb1/src/main/java/com/oracle/hk2/devtest/cdi/ejb1/scoped/CountingApplicationScopedCDIService.java
@@ -17,7 +17,7 @@
 package com.oracle.hk2.devtest.cdi.ejb1.scoped;
 
 import jakarta.annotation.ManagedBean;
-import javax.enterprise.context.ApplicationScoped;
+import jakarta.enterprise.context.ApplicationScoped;
 
 /**
  * This is a CDI ApplicationScoped (a NormalScope) class that will be injected
diff --git a/appserver/tests/hk2/cdi/basic/ejb1/src/main/java/com/oracle/hk2/devtest/cdi/ejb1/scoped/CustomScopedEjb.java b/appserver/tests/hk2/cdi/basic/ejb1/src/main/java/com/oracle/hk2/devtest/cdi/ejb1/scoped/CustomScopedEjb.java
index e94a6a3..e63accd 100644
--- a/appserver/tests/hk2/cdi/basic/ejb1/src/main/java/com/oracle/hk2/devtest/cdi/ejb1/scoped/CustomScopedEjb.java
+++ b/appserver/tests/hk2/cdi/basic/ejb1/src/main/java/com/oracle/hk2/devtest/cdi/ejb1/scoped/CustomScopedEjb.java
@@ -16,7 +16,7 @@
 
 package com.oracle.hk2.devtest.cdi.ejb1.scoped;
 
-import javax.enterprise.context.RequestScoped;
+import jakarta.enterprise.context.RequestScoped;
 import jakarta.inject.Inject;
 import jakarta.inject.Named;
 
diff --git a/appserver/tests/hk2/cdi/basic/ejb1/src/main/java/com/oracle/hk2/devtest/cdi/extension/CDIExtension.java b/appserver/tests/hk2/cdi/basic/ejb1/src/main/java/com/oracle/hk2/devtest/cdi/extension/CDIExtension.java
index b2394ac..de4046f 100644
--- a/appserver/tests/hk2/cdi/basic/ejb1/src/main/java/com/oracle/hk2/devtest/cdi/extension/CDIExtension.java
+++ b/appserver/tests/hk2/cdi/basic/ejb1/src/main/java/com/oracle/hk2/devtest/cdi/extension/CDIExtension.java
@@ -19,20 +19,20 @@
 import java.io.File;
 import java.io.IOException;
 
-import javax.enterprise.event.Observes;
-import javax.enterprise.inject.spi.AfterBeanDiscovery;
-import javax.enterprise.inject.spi.AfterDeploymentValidation;
-import javax.enterprise.inject.spi.BeforeBeanDiscovery;
-import javax.enterprise.inject.spi.BeforeShutdown;
-import javax.enterprise.inject.spi.Extension;
-import javax.enterprise.inject.spi.ProcessAnnotatedType;
-import javax.enterprise.inject.spi.ProcessInjectionTarget;
-import javax.enterprise.inject.spi.ProcessManagedBean;
-import javax.enterprise.inject.spi.ProcessObserverMethod;
-import javax.enterprise.inject.spi.ProcessProducer;
-import javax.enterprise.inject.spi.ProcessProducerField;
-import javax.enterprise.inject.spi.ProcessProducerMethod;
-import javax.enterprise.inject.spi.ProcessSessionBean;
+import jakarta.enterprise.event.Observes;
+import jakarta.enterprise.inject.spi.AfterBeanDiscovery;
+import jakarta.enterprise.inject.spi.AfterDeploymentValidation;
+import jakarta.enterprise.inject.spi.BeforeBeanDiscovery;
+import jakarta.enterprise.inject.spi.BeforeShutdown;
+import jakarta.enterprise.inject.spi.Extension;
+import jakarta.enterprise.inject.spi.ProcessAnnotatedType;
+import jakarta.enterprise.inject.spi.ProcessInjectionTarget;
+import jakarta.enterprise.inject.spi.ProcessManagedBean;
+import jakarta.enterprise.inject.spi.ProcessObserverMethod;
+import jakarta.enterprise.inject.spi.ProcessProducer;
+import jakarta.enterprise.inject.spi.ProcessProducerField;
+import jakarta.enterprise.inject.spi.ProcessProducerMethod;
+import jakarta.enterprise.inject.spi.ProcessSessionBean;
 import jakarta.inject.Singleton;
 import javax.naming.Context;
 import javax.naming.InitialContext;
diff --git a/appserver/tests/hk2/cdi/basic/ejb1/src/main/java/com/oracle/hk2/devtest/cdi/extension/EventObserver.java b/appserver/tests/hk2/cdi/basic/ejb1/src/main/java/com/oracle/hk2/devtest/cdi/extension/EventObserver.java
index 8b40f1c..e0cbb87 100644
--- a/appserver/tests/hk2/cdi/basic/ejb1/src/main/java/com/oracle/hk2/devtest/cdi/extension/EventObserver.java
+++ b/appserver/tests/hk2/cdi/basic/ejb1/src/main/java/com/oracle/hk2/devtest/cdi/extension/EventObserver.java
@@ -16,7 +16,7 @@
 
 package com.oracle.hk2.devtest.cdi.extension;
 
-import javax.enterprise.event.Observes;
+import jakarta.enterprise.event.Observes;
 
 /**
  * This is a CDI bean which observes an event
diff --git a/appserver/tests/hk2/cdi/basic/ejb1/src/main/java/com/oracle/hk2/devtest/cdi/extension/FieldProducer.java b/appserver/tests/hk2/cdi/basic/ejb1/src/main/java/com/oracle/hk2/devtest/cdi/extension/FieldProducer.java
index d6ae3ef..bc8972f 100644
--- a/appserver/tests/hk2/cdi/basic/ejb1/src/main/java/com/oracle/hk2/devtest/cdi/extension/FieldProducer.java
+++ b/appserver/tests/hk2/cdi/basic/ejb1/src/main/java/com/oracle/hk2/devtest/cdi/extension/FieldProducer.java
@@ -16,7 +16,7 @@
 
 package com.oracle.hk2.devtest.cdi.extension;
 
-import javax.enterprise.inject.Produces;
+import jakarta.enterprise.inject.Produces;
 
 /**
  * This produces a service with a field
diff --git a/appserver/tests/hk2/cdi/basic/ejb1/src/main/java/com/oracle/hk2/devtest/cdi/extension/MethodProducer.java b/appserver/tests/hk2/cdi/basic/ejb1/src/main/java/com/oracle/hk2/devtest/cdi/extension/MethodProducer.java
index 8a90d1f..0e8ef9e 100644
--- a/appserver/tests/hk2/cdi/basic/ejb1/src/main/java/com/oracle/hk2/devtest/cdi/extension/MethodProducer.java
+++ b/appserver/tests/hk2/cdi/basic/ejb1/src/main/java/com/oracle/hk2/devtest/cdi/extension/MethodProducer.java
@@ -16,7 +16,7 @@
 
 package com.oracle.hk2.devtest.cdi.extension;
 
-import javax.enterprise.inject.Produces;
+import jakarta.enterprise.inject.Produces;
 
 /**
  * This produces a service with a producer method
diff --git a/appserver/tests/hk2/cdi/basic/ejb1/src/main/java/com/oracle/hk2/devtest/cdi/locator/BasicService.java b/appserver/tests/hk2/cdi/basic/ejb1/src/main/java/com/oracle/hk2/devtest/cdi/locator/BasicService.java
index 1168650..0f1b2b2 100644
--- a/appserver/tests/hk2/cdi/basic/ejb1/src/main/java/com/oracle/hk2/devtest/cdi/locator/BasicService.java
+++ b/appserver/tests/hk2/cdi/basic/ejb1/src/main/java/com/oracle/hk2/devtest/cdi/locator/BasicService.java
@@ -16,7 +16,7 @@
 
 package com.oracle.hk2.devtest.cdi.locator;
 
-import javax.enterprise.inject.spi.BeanManager;
+import jakarta.enterprise.inject.spi.BeanManager;
 import jakarta.inject.Inject;
 import jakarta.inject.Singleton;
 
diff --git a/appserver/tests/hk2/cdi/jersey/war/src/main/java/org/glassfish/jersey/examples/jersey_cdi/resources/EchoParamConstructorResource.java b/appserver/tests/hk2/cdi/jersey/war/src/main/java/org/glassfish/jersey/examples/jersey_cdi/resources/EchoParamConstructorResource.java
index d000962..ef9830a 100644
--- a/appserver/tests/hk2/cdi/jersey/war/src/main/java/org/glassfish/jersey/examples/jersey_cdi/resources/EchoParamConstructorResource.java
+++ b/appserver/tests/hk2/cdi/jersey/war/src/main/java/org/glassfish/jersey/examples/jersey_cdi/resources/EchoParamConstructorResource.java
@@ -17,7 +17,7 @@
 package org.glassfish.jersey.examples.jersey_cdi.resources;
 
 import jakarta.annotation.ManagedBean;
-import javax.enterprise.context.RequestScoped;
+import jakarta.enterprise.context.RequestScoped;
 import jakarta.inject.Inject;
 import jakarta.ws.rs.GET;
 import jakarta.ws.rs.Produces;
diff --git a/appserver/tests/hk2/cdi/jersey/war/src/main/java/org/glassfish/jersey/examples/jersey_cdi/resources/FormBean.java b/appserver/tests/hk2/cdi/jersey/war/src/main/java/org/glassfish/jersey/examples/jersey_cdi/resources/FormBean.java
index 1df2d5a..2980920 100644
--- a/appserver/tests/hk2/cdi/jersey/war/src/main/java/org/glassfish/jersey/examples/jersey_cdi/resources/FormBean.java
+++ b/appserver/tests/hk2/cdi/jersey/war/src/main/java/org/glassfish/jersey/examples/jersey_cdi/resources/FormBean.java
@@ -17,7 +17,7 @@
 package org.glassfish.jersey.examples.jersey_cdi.resources;
 
 import java.math.BigDecimal;
-import javax.enterprise.context.RequestScoped;
+import jakarta.enterprise.context.RequestScoped;
 import jakarta.ws.rs.DefaultValue;
 import jakarta.ws.rs.FormParam;
 
diff --git a/appserver/tests/hk2/cdi/jersey/war/src/main/java/org/glassfish/jersey/examples/jersey_cdi/resources/FormResource.java b/appserver/tests/hk2/cdi/jersey/war/src/main/java/org/glassfish/jersey/examples/jersey_cdi/resources/FormResource.java
index 82115fb..f29267e 100644
--- a/appserver/tests/hk2/cdi/jersey/war/src/main/java/org/glassfish/jersey/examples/jersey_cdi/resources/FormResource.java
+++ b/appserver/tests/hk2/cdi/jersey/war/src/main/java/org/glassfish/jersey/examples/jersey_cdi/resources/FormResource.java
@@ -16,7 +16,7 @@
 
 package org.glassfish.jersey.examples.jersey_cdi.resources;
 
-import javax.enterprise.context.RequestScoped;
+import jakarta.enterprise.context.RequestScoped;
 import jakarta.inject.Inject;
 import jakarta.inject.Provider;
 import jakarta.ws.rs.POST;
diff --git a/appserver/tests/hk2/cdi/jersey/war/src/main/java/org/glassfish/jersey/examples/jersey_cdi/resources/JCDIBeanDependentSingletonResource.java b/appserver/tests/hk2/cdi/jersey/war/src/main/java/org/glassfish/jersey/examples/jersey_cdi/resources/JCDIBeanDependentSingletonResource.java
index 8432478..f21556a 100644
--- a/appserver/tests/hk2/cdi/jersey/war/src/main/java/org/glassfish/jersey/examples/jersey_cdi/resources/JCDIBeanDependentSingletonResource.java
+++ b/appserver/tests/hk2/cdi/jersey/war/src/main/java/org/glassfish/jersey/examples/jersey_cdi/resources/JCDIBeanDependentSingletonResource.java
@@ -23,7 +23,7 @@
 import jakarta.annotation.Resource;
 import jakarta.annotation.PostConstruct;
 import jakarta.annotation.PreDestroy;
-import javax.enterprise.context.ApplicationScoped;
+import jakarta.enterprise.context.ApplicationScoped;
 
 import jakarta.ws.rs.GET;
 import jakarta.ws.rs.Produces;
diff --git a/appserver/tests/hk2/cdi/jersey/war/src/main/java/org/glassfish/jersey/examples/jersey_cdi/resources/JCDIBeanExceptionMapper.java b/appserver/tests/hk2/cdi/jersey/war/src/main/java/org/glassfish/jersey/examples/jersey_cdi/resources/JCDIBeanExceptionMapper.java
index c89e39a..6ce94a2 100644
--- a/appserver/tests/hk2/cdi/jersey/war/src/main/java/org/glassfish/jersey/examples/jersey_cdi/resources/JCDIBeanExceptionMapper.java
+++ b/appserver/tests/hk2/cdi/jersey/war/src/main/java/org/glassfish/jersey/examples/jersey_cdi/resources/JCDIBeanExceptionMapper.java
@@ -20,7 +20,7 @@
 import java.util.logging.Logger;
 
 import jakarta.annotation.PostConstruct;
-import javax.enterprise.context.ApplicationScoped;
+import jakarta.enterprise.context.ApplicationScoped;
 
 import jakarta.ws.rs.container.ResourceContext;
 import jakarta.ws.rs.core.Context;
diff --git a/appserver/tests/hk2/cdi/jersey/war/src/main/java/org/glassfish/jersey/examples/jersey_cdi/resources/JCDIBeanPerRequestResource.java b/appserver/tests/hk2/cdi/jersey/war/src/main/java/org/glassfish/jersey/examples/jersey_cdi/resources/JCDIBeanPerRequestResource.java
index d17333b..8633877 100644
--- a/appserver/tests/hk2/cdi/jersey/war/src/main/java/org/glassfish/jersey/examples/jersey_cdi/resources/JCDIBeanPerRequestResource.java
+++ b/appserver/tests/hk2/cdi/jersey/war/src/main/java/org/glassfish/jersey/examples/jersey_cdi/resources/JCDIBeanPerRequestResource.java
@@ -22,7 +22,7 @@
 import jakarta.annotation.Resource;
 import jakarta.annotation.PostConstruct;
 import jakarta.annotation.PreDestroy;
-import javax.enterprise.context.RequestScoped;
+import jakarta.enterprise.context.RequestScoped;
 
 import jakarta.ws.rs.GET;
 import jakarta.ws.rs.Produces;
diff --git a/appserver/tests/hk2/cdi/jersey/war/src/main/java/org/glassfish/jersey/examples/jersey_cdi/resources/JCDIBeanSingletonResource.java b/appserver/tests/hk2/cdi/jersey/war/src/main/java/org/glassfish/jersey/examples/jersey_cdi/resources/JCDIBeanSingletonResource.java
index 233d6d1..1d901e5 100644
--- a/appserver/tests/hk2/cdi/jersey/war/src/main/java/org/glassfish/jersey/examples/jersey_cdi/resources/JCDIBeanSingletonResource.java
+++ b/appserver/tests/hk2/cdi/jersey/war/src/main/java/org/glassfish/jersey/examples/jersey_cdi/resources/JCDIBeanSingletonResource.java
@@ -22,7 +22,7 @@
 import jakarta.annotation.Resource;
 import jakarta.annotation.PostConstruct;
 import jakarta.annotation.PreDestroy;
-import javax.enterprise.context.ApplicationScoped;
+import jakarta.enterprise.context.ApplicationScoped;
 
 import jakarta.ws.rs.GET;
 import jakarta.ws.rs.Produces;
diff --git a/appserver/tests/hk2/cdi/jersey/war/src/main/java/org/glassfish/jersey/examples/jersey_cdi/resources/inherited/BaseResource.java b/appserver/tests/hk2/cdi/jersey/war/src/main/java/org/glassfish/jersey/examples/jersey_cdi/resources/inherited/BaseResource.java
index 4a653b0..c63b00e 100644
--- a/appserver/tests/hk2/cdi/jersey/war/src/main/java/org/glassfish/jersey/examples/jersey_cdi/resources/inherited/BaseResource.java
+++ b/appserver/tests/hk2/cdi/jersey/war/src/main/java/org/glassfish/jersey/examples/jersey_cdi/resources/inherited/BaseResource.java
@@ -16,8 +16,8 @@
 
 package org.glassfish.jersey.examples.jersey_cdi.resources.inherited;
 
-import javax.enterprise.context.RequestScoped;
-import javax.enterprise.inject.spi.BeanManager;
+import jakarta.enterprise.context.RequestScoped;
+import jakarta.enterprise.inject.spi.BeanManager;
 import jakarta.inject.Inject;
 
 import jakarta.ws.rs.GET;
diff --git a/appserver/tests/hk2/cdi/jersey/war/src/main/java/org/glassfish/jersey/examples/jersey_cdi/resources/inherited/ResourceA.java b/appserver/tests/hk2/cdi/jersey/war/src/main/java/org/glassfish/jersey/examples/jersey_cdi/resources/inherited/ResourceA.java
index 15a4e2d..58b64a4 100644
--- a/appserver/tests/hk2/cdi/jersey/war/src/main/java/org/glassfish/jersey/examples/jersey_cdi/resources/inherited/ResourceA.java
+++ b/appserver/tests/hk2/cdi/jersey/war/src/main/java/org/glassfish/jersey/examples/jersey_cdi/resources/inherited/ResourceA.java
@@ -16,7 +16,7 @@
 
 package org.glassfish.jersey.examples.jersey_cdi.resources.inherited;
 
-import javax.enterprise.context.RequestScoped;
+import jakarta.enterprise.context.RequestScoped;
 import jakarta.ws.rs.Path;
 
 /**
diff --git a/appserver/tests/hk2/cdi/jersey/war/src/main/java/org/glassfish/jersey/examples/jersey_cdi/resources/inherited/ResourceB.java b/appserver/tests/hk2/cdi/jersey/war/src/main/java/org/glassfish/jersey/examples/jersey_cdi/resources/inherited/ResourceB.java
index dbe773e..c3e82cf 100644
--- a/appserver/tests/hk2/cdi/jersey/war/src/main/java/org/glassfish/jersey/examples/jersey_cdi/resources/inherited/ResourceB.java
+++ b/appserver/tests/hk2/cdi/jersey/war/src/main/java/org/glassfish/jersey/examples/jersey_cdi/resources/inherited/ResourceB.java
@@ -16,7 +16,7 @@
 
 package org.glassfish.jersey.examples.jersey_cdi.resources.inherited;
 
-import javax.enterprise.context.RequestScoped;
+import jakarta.enterprise.context.RequestScoped;
 import jakarta.ws.rs.Path;
 
 /**
diff --git a/appserver/tests/hk2/cdi/jersey/war/src/main/java/org/glassfish/jersey/examples/jersey_cdi/resources/inherited/ResourceC.java b/appserver/tests/hk2/cdi/jersey/war/src/main/java/org/glassfish/jersey/examples/jersey_cdi/resources/inherited/ResourceC.java
index 1316aae..0a80562 100644
--- a/appserver/tests/hk2/cdi/jersey/war/src/main/java/org/glassfish/jersey/examples/jersey_cdi/resources/inherited/ResourceC.java
+++ b/appserver/tests/hk2/cdi/jersey/war/src/main/java/org/glassfish/jersey/examples/jersey_cdi/resources/inherited/ResourceC.java
@@ -16,7 +16,7 @@
 
 package org.glassfish.jersey.examples.jersey_cdi.resources.inherited;
 
-import javax.enterprise.context.RequestScoped;
+import jakarta.enterprise.context.RequestScoped;
 import jakarta.ws.rs.Path;
 
 /**
diff --git a/appserver/tests/quicklook/weld/extensions/src/java/extensions/ExtensionBean.java b/appserver/tests/quicklook/weld/extensions/src/java/extensions/ExtensionBean.java
index 6268b42..b8656a0 100644
--- a/appserver/tests/quicklook/weld/extensions/src/java/extensions/ExtensionBean.java
+++ b/appserver/tests/quicklook/weld/extensions/src/java/extensions/ExtensionBean.java
@@ -18,17 +18,17 @@
 
 import java.util.ArrayList;
 import java.util.List;
-import javax.enterprise.event.Observes;
-import javax.enterprise.inject.spi.AfterBeanDiscovery;
-import javax.enterprise.inject.spi.AfterDeploymentValidation;
-import javax.enterprise.inject.spi.BeanManager;
-import javax.enterprise.inject.spi.BeforeBeanDiscovery;
-import javax.enterprise.inject.spi.Extension;
-import javax.enterprise.inject.spi.InjectionPoint;
-import javax.enterprise.inject.spi.InjectionTarget;
-import javax.enterprise.inject.spi.ProcessAnnotatedType;
-import javax.enterprise.inject.spi.ProcessInjectionTarget;
-import javax.enterprise.inject.spi.ProcessManagedBean;
+import jakarta.enterprise.event.Observes;
+import jakarta.enterprise.inject.spi.AfterBeanDiscovery;
+import jakarta.enterprise.inject.spi.AfterDeploymentValidation;
+import jakarta.enterprise.inject.spi.BeanManager;
+import jakarta.enterprise.inject.spi.BeforeBeanDiscovery;
+import jakarta.enterprise.inject.spi.Extension;
+import jakarta.enterprise.inject.spi.InjectionPoint;
+import jakarta.enterprise.inject.spi.InjectionTarget;
+import jakarta.enterprise.inject.spi.ProcessAnnotatedType;
+import jakarta.enterprise.inject.spi.ProcessInjectionTarget;
+import jakarta.enterprise.inject.spi.ProcessManagedBean;
 
 public class ExtensionBean implements Extension {
 
diff --git a/appserver/tests/quicklook/weld/extensions/src/java/extensions/ExtensionBeanServlet.java b/appserver/tests/quicklook/weld/extensions/src/java/extensions/ExtensionBeanServlet.java
index 98a8327..fba7756 100644
--- a/appserver/tests/quicklook/weld/extensions/src/java/extensions/ExtensionBeanServlet.java
+++ b/appserver/tests/quicklook/weld/extensions/src/java/extensions/ExtensionBeanServlet.java
@@ -22,11 +22,11 @@
 import java.util.logging.Level;
 import java.util.logging.Logger;
 import jakarta.annotation.PostConstruct;
-import javax.enterprise.context.spi.CreationalContext;
-import javax.enterprise.inject.spi.Bean;
-import javax.enterprise.inject.spi.BeanManager;
-import javax.enterprise.inject.spi.InjectionTarget;
-import javax.enterprise.inject.spi.ProcessInjectionTarget;
+import jakarta.enterprise.context.spi.CreationalContext;
+import jakarta.enterprise.inject.spi.Bean;
+import jakarta.enterprise.inject.spi.BeanManager;
+import jakarta.enterprise.inject.spi.InjectionTarget;
+import jakarta.enterprise.inject.spi.ProcessInjectionTarget;
 import javax.naming.InitialContext;
 import javax.naming.NamingException;
 import javax.servlet.ServletException;
diff --git a/appserver/tests/quicklook/weld/extensions/src/java/extensions/JarExtensionBeanServlet.java b/appserver/tests/quicklook/weld/extensions/src/java/extensions/JarExtensionBeanServlet.java
index a94d024..1750a35 100644
--- a/appserver/tests/quicklook/weld/extensions/src/java/extensions/JarExtensionBeanServlet.java
+++ b/appserver/tests/quicklook/weld/extensions/src/java/extensions/JarExtensionBeanServlet.java
@@ -21,9 +21,9 @@
 import java.util.Set;
 import jakarta.annotation.PostConstruct;
 import jakarta.annotation.Resource;
-import javax.enterprise.context.spi.CreationalContext;
-import javax.enterprise.inject.spi.InjectionTarget;
-import javax.enterprise.inject.spi.ProcessInjectionTarget;
+import jakarta.enterprise.context.spi.CreationalContext;
+import jakarta.enterprise.inject.spi.InjectionTarget;
+import jakarta.enterprise.inject.spi.ProcessInjectionTarget;
 import javax.servlet.ServletException;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
diff --git a/appserver/tests/quicklook/weld/extensions/src/java/extensions/WebBean.java b/appserver/tests/quicklook/weld/extensions/src/java/extensions/WebBean.java
index a5d0cca..caeec8e 100644
--- a/appserver/tests/quicklook/weld/extensions/src/java/extensions/WebBean.java
+++ b/appserver/tests/quicklook/weld/extensions/src/java/extensions/WebBean.java
@@ -22,7 +22,7 @@
 package extensions;
 
 import jakarta.annotation.Resource;
-import javax.enterprise.context.RequestScoped;
+import jakarta.enterprise.context.RequestScoped;
 
 /**
  *
diff --git a/appserver/tests/quicklook/weld/extensions/src/java/extensions/WebBeanServlet.java b/appserver/tests/quicklook/weld/extensions/src/java/extensions/WebBeanServlet.java
index ac85bcb..66c8c6e 100644
--- a/appserver/tests/quicklook/weld/extensions/src/java/extensions/WebBeanServlet.java
+++ b/appserver/tests/quicklook/weld/extensions/src/java/extensions/WebBeanServlet.java
@@ -23,11 +23,11 @@
 import java.util.logging.Logger;
 import jakarta.annotation.PostConstruct;
 import jakarta.annotation.Resource;
-import javax.enterprise.context.spi.CreationalContext;
-import javax.enterprise.inject.spi.Bean;
-import javax.enterprise.inject.spi.BeanManager;
-import javax.enterprise.inject.spi.InjectionTarget;
-import javax.enterprise.inject.spi.ProcessInjectionTarget;
+import jakarta.enterprise.context.spi.CreationalContext;
+import jakarta.enterprise.inject.spi.Bean;
+import jakarta.enterprise.inject.spi.BeanManager;
+import jakarta.enterprise.inject.spi.InjectionTarget;
+import jakarta.enterprise.inject.spi.ProcessInjectionTarget;
 import javax.naming.InitialContext;
 import javax.naming.NamingException;
 import javax.servlet.ServletException;
diff --git a/appserver/tests/quicklook/weld/extensions/src/java/jar/ExtensionBean.java b/appserver/tests/quicklook/weld/extensions/src/java/jar/ExtensionBean.java
index 337b352..68855da 100644
--- a/appserver/tests/quicklook/weld/extensions/src/java/jar/ExtensionBean.java
+++ b/appserver/tests/quicklook/weld/extensions/src/java/jar/ExtensionBean.java
@@ -18,17 +18,17 @@
 
 import java.util.ArrayList;
 import java.util.List;
-import javax.enterprise.event.Observes;
-import javax.enterprise.inject.spi.AfterBeanDiscovery;
-import javax.enterprise.inject.spi.AfterDeploymentValidation;
-import javax.enterprise.inject.spi.BeanManager;
-import javax.enterprise.inject.spi.BeforeBeanDiscovery;
-import javax.enterprise.inject.spi.Extension;
-import javax.enterprise.inject.spi.InjectionPoint;
-import javax.enterprise.inject.spi.InjectionTarget;
-import javax.enterprise.inject.spi.ProcessAnnotatedType;
-import javax.enterprise.inject.spi.ProcessInjectionTarget;
-import javax.enterprise.inject.spi.ProcessManagedBean;
+import jakarta.enterprise.event.Observes;
+import jakarta.enterprise.inject.spi.AfterBeanDiscovery;
+import jakarta.enterprise.inject.spi.AfterDeploymentValidation;
+import jakarta.enterprise.inject.spi.BeanManager;
+import jakarta.enterprise.inject.spi.BeforeBeanDiscovery;
+import jakarta.enterprise.inject.spi.Extension;
+import jakarta.enterprise.inject.spi.InjectionPoint;
+import jakarta.enterprise.inject.spi.InjectionTarget;
+import jakarta.enterprise.inject.spi.ProcessAnnotatedType;
+import jakarta.enterprise.inject.spi.ProcessInjectionTarget;
+import jakarta.enterprise.inject.spi.ProcessManagedBean;
 
 public class ExtensionBean implements Extension {
 
diff --git a/appserver/tests/quicklook/weld/numberguess/src/java/numberguess/Game.java b/appserver/tests/quicklook/weld/numberguess/src/java/numberguess/Game.java
index 38e6c0f..fc2cfd3 100644
--- a/appserver/tests/quicklook/weld/numberguess/src/java/numberguess/Game.java
+++ b/appserver/tests/quicklook/weld/numberguess/src/java/numberguess/Game.java
@@ -20,15 +20,15 @@
 import java.io.Serializable;
 
 import jakarta.annotation.PostConstruct;
-import javax.enterprise.context.SessionScoped;
-import javax.enterprise.inject.Instance;
+import jakarta.enterprise.context.SessionScoped;
+import jakarta.enterprise.inject.Instance;
 import jakarta.inject.Inject;
 import jakarta.inject.Named;
 import jakarta.faces.application.FacesMessage;
 import jakarta.faces.component.UIComponent;
 import jakarta.faces.component.UIInput;
 import jakarta.faces.context.FacesContext;
-import javax.enterprise.context.ApplicationScoped;
+import jakarta.enterprise.context.ApplicationScoped;
 
 @Named
 @SessionScoped
diff --git a/appserver/tests/quicklook/weld/numberguess/src/java/numberguess/Generator.java b/appserver/tests/quicklook/weld/numberguess/src/java/numberguess/Generator.java
index 1ce936e..d9e4f65 100644
--- a/appserver/tests/quicklook/weld/numberguess/src/java/numberguess/Generator.java
+++ b/appserver/tests/quicklook/weld/numberguess/src/java/numberguess/Generator.java
@@ -19,8 +19,8 @@
 
 import java.io.Serializable;
 
-import javax.enterprise.context.ApplicationScoped;
-import javax.enterprise.inject.Produces;
+import jakarta.enterprise.context.ApplicationScoped;
+import jakarta.enterprise.inject.Produces;
 
 @ApplicationScoped
 public class Generator implements Serializable 
diff --git a/appserver/tests/quicklook/weld/numberguess/src/java/numberguess/SingletonBean.java b/appserver/tests/quicklook/weld/numberguess/src/java/numberguess/SingletonBean.java
index 042c612..76c7c12 100644
--- a/appserver/tests/quicklook/weld/numberguess/src/java/numberguess/SingletonBean.java
+++ b/appserver/tests/quicklook/weld/numberguess/src/java/numberguess/SingletonBean.java
@@ -23,7 +23,7 @@
 import jakarta.ejb.SessionContext;
 import jakarta.ejb.Singleton;
 import jakarta.ejb.Startup;
-import javax.enterprise.context.ApplicationScoped;
+import jakarta.enterprise.context.ApplicationScoped;
 import jakarta.inject.Inject;
 
 
diff --git a/appserver/tests/quicklook/weld/osgiweld/metadata/weld-osgi.properties b/appserver/tests/quicklook/weld/osgiweld/metadata/weld-osgi.properties
index e453be4..525de44 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,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,jakarta.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,jakarta.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,jakarta.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,jakarta.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,jakarta.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,jakarta.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:="jakarta.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,jakarta.inject,com.google.common.cache,org.jboss.weld.transaction.spi,jakarta.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,jakarta.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,jakarta.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,jakarta.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,jakarta.inject,javax.enterprise.event,jakarta.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:="jakarta.enterprise.context.spi";version="2.2.9.Final",org.jboss.weld.construction.api;uses:="jakarta.enterprise.inject.spi,jakarta.enterprise.context.spi";version="2.2.9.Final",org.jboss.weld.ejb.api;version="2.2.9.Final",org.jboss.weld.bootstrap.api;uses:="jakarta.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,jakarta.enterprise.inject.spi,org.jboss.weld.serialization.spi,jakarta.enterprise.inject,org.jboss.weld.construction.api,org.jboss.weld.ejb.spi,jakarta.enterprise.context.spi";version="2.2.9.Final",org.jboss.weld.ejb.spi;uses:="org.jboss.weld.bootstrap.api,org.jboss.weld.ejb.api,jakarta.enterprise.inject.spi";version="2.2.9.Final",org.jboss.weld.serialization.spi.helpers;uses:="jakarta.enterprise.context.spi,org.jboss.weld.context.api";version="2.2.9.Final",org.jboss.weld.injection.spi.helpers;uses:="jakarta.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,jakarta.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,jakarta.enterprise.inject.spi";version="2.2.9.Final",org.jboss.weld.interceptor.spi.model;uses:="org.jboss.weld.interceptor.spi.metadata,jakarta.enterprise.inject.spi";version="2.2.9.Final",org.jboss.weld.injection.spi;uses:="org.jboss.weld.bootstrap.api,jakarta.enterprise.inject.spi,jakarta.persistence";version="2.2.9.Final",org.jboss.weld.transaction.spi;uses:="org.jboss.weld.bootstrap.api,jakarta.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,jakarta.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:="jakarta.enterprise.inject.spi,jakarta.enterprise.util,jakarta.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:="jakarta.enterprise.inject.spi,org.jboss.weld.manager,jakarta.enterprise.inject,org.jboss.weld.bootstrap,org.jboss.weld.serialization.spi,org.jboss.weld.bootstrap.api,jakarta.enterprise.context,jakarta.inject,org.jboss.weld.interceptor.spi.model,org.jboss.weld.util,com.google.common.base,jakarta.enterprise.context.spi,org.jboss.weld.injection,org.jboss.weld.ejb.spi,jakarta.enterprise.event,jakarta.interceptor,org.jboss.weld.interceptor.spi.metadata,org.jboss.weld.context,org.jboss.weld.ejb,org.jboss.weld.ejb.api,jakarta.decorator,org.jboss.weld.bean.proxy";version="2.2.9.Final",org.jboss.weld.bean.builtin;uses:="jakarta.enterprise.inject,jakarta.enterprise.context,com.google.common.collect,org.jboss.weld.bootstrap,org.jboss.weld.serialization.spi,org.jboss.weld.bean,jakarta.enterprise.inject.spi,org.jboss.weld.manager,org.jboss.weld.bootstrap.api,org.jboss.weld.context,jakarta.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,jakarta.enterprise.util,org.jboss.weld.event,jakarta.enterprise.event,org.jboss.weld.ejb,com.google.common.base";version="2.2.9.Final",org.jboss.weld.bean.proxy;uses:="jakarta.enterprise.inject.spi,org.jboss.weld.util,jakarta.enterprise.context,com.google.common.collect,jakarta.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,jakarta.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,jakarta.enterprise.inject.spi,org.jboss.weld.manager,jakarta.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,jakarta.interceptor,org.jboss.weld.interceptor.spi.model,jakarta.decorator,org.jboss.weld.ejb.spi,com.google.common.cache,org.jboss.weld,com.google.common.collect,jakarta.enterprise.event,com.google.common.base,org.jboss.weld.security.spi,jakarta.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,jakarta.enterprise.context,jakarta.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,jakarta.enterprise.context.spi,org.jboss.weld.serialization.spi,org.jboss.weld.bootstrap.api,jakarta.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,jakarta.enterprise.inject.spi";version="2.2.9.Final",org.jboss.weld.ejb;uses:="jakarta.interceptor,org.jboss.weld.manager,jakarta.enterprise.inject,org.jboss.weld.event,org.jboss.weld.context,org.jboss.weld.bootstrap.api,org.jboss.weld.bean,org.jboss.weld.util,jakarta.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:="jakarta.enterprise.inject.spi,org.jboss.weld.manager,jakarta.enterprise.context,org.jboss.weld.context,jakarta.enterprise.context.spi,javax.el";version="2.2.9.Final",org.jboss.weld.event;uses:="org.jboss.weld.injection,jakarta.enterprise.inject.spi,org.jboss.weld.manager,jakarta.enterprise.inject,org.jboss.weld.context,org.jboss.weld,org.jboss.weld.bean.builtin,jakarta.enterprise.util,jakarta.enterprise.context.spi,org.jboss.weld.util,jakarta.enterprise.event,com.google.common.collect,org.jboss.weld.bean,org.jboss.weld.bootstrap.api,com.google.common.base,jakarta.enterprise.context,jakarta.inject,com.google.common.cache,org.jboss.weld.transaction.spi,jakarta.transaction";version="2.2.9.Final",org.jboss.weld.injection;uses:="jakarta.enterprise.inject.spi,org.jboss.weld.manager,jakarta.enterprise.inject,org.jboss.weld.util,org.jboss.weld.injection.spi,org.jboss.weld.context,jakarta.enterprise.context.spi,org.jboss.weld.construction.api,org.jboss.weld.bootstrap.api,org.jboss.weld,org.jboss.weld.bean.proxy,jakarta.enterprise.event,jakarta.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,jakarta.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,jakarta.enterprise.inject.spi,com.google.common.base,com.google.common.collect,jakarta.enterprise.util,org.jboss.weld.ejb,jakarta.enterprise.inject,org.jboss.weld.interceptor.spi.model,jakarta.enterprise.context.spi,org.jboss.weld.injection,org.jboss.weld.util,jakarta.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,jakarta.interceptor,org.jboss.weld.injection.spi,jakarta.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,jakarta.enterprise.inject,org.jboss.weld.context,javax.servlet,org.jboss.weld.servlet.spi,jakarta.inject,org.jboss.weld.jsf,jakarta.enterprise.context,jakarta.faces.context,org.jboss.weld.bootstrap.api.helpers,jakarta.enterprise.context.spi,org.jboss.weld,org.jboss.weld.bootstrap.api,org.jboss.weld.resources.spi,jakarta.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:="jakarta.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,jakarta.enterprise.inject,org.jboss.weld.injection,jakarta.inject,jakarta.enterprise.event,jakarta.interceptor,org.jboss.weld.ejb,jakarta.enterprise.context.spi,jakarta.decorator,jakarta.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/config/common.xml b/appserver/tests/v2-tests/appserv-tests/config/common.xml
index 09c846c..5ca0c0d 100644
--- a/appserver/tests/v2-tests/appserv-tests/config/common.xml
+++ b/appserver/tests/v2-tests/appserv-tests/config/common.xml
@@ -195,7 +195,7 @@
   <copy file="${context.xml}"
       tofile="${build.classes.dir}/tmp/META-INF/context.xml" failonerror="false"/>
   <copy file="${cdi-extension.service}"
-      tofile="${build.classes.dir}/tmp/WEB-INF/classes/META-INF/services/javax.enterprise.inject.spi.Extension" failonerror="false"/>
+      tofile="${build.classes.dir}/tmp/WEB-INF/classes/META-INF/services/jakarta.enterprise.inject.spi.Extension" failonerror="false"/>
       
   <copy todir="${build.classes.dir}/tmp/WEB-INF/classes">
       <fileset dir="${war.classes}">
@@ -241,7 +241,7 @@
       <include name="WEB-INF/wsdl/${wsdlfile.name}"/>
       <include name="${mappingfile.name}"/>
       <include name="META-INF/context.xml"/>
-      <include name="WEB-INF/classes/META-INF/services/javax.enterprise.inject.spi.Extension"/>
+      <include name="WEB-INF/classes/META-INF/services/jakarta.enterprise.inject.spi.Extension"/>
       <include name="WEB-INF/classes/META-INF/persistence.xml"/>
     </fileset>
   </jar>       
diff --git a/appserver/tests/v2-tests/appserv-tests/devtests/embedded/config/common-web.xml b/appserver/tests/v2-tests/appserv-tests/devtests/embedded/config/common-web.xml
index 8d3cd3a..c47d999 100644
--- a/appserver/tests/v2-tests/appserv-tests/devtests/embedded/config/common-web.xml
+++ b/appserver/tests/v2-tests/appserv-tests/devtests/embedded/config/common-web.xml
@@ -179,7 +179,7 @@
   <copy file="${context.xml}"
       tofile="${build.classes.dir}/tmp/META-INF/context.xml" failonerror="false"/>
   <copy file="${cdi-extension.service}"
-      tofile="${build.classes.dir}/tmp/WEB-INF/classes/META-INF/services/javax.enterprise.inject.spi.Extension" failonerror="false"/>
+      tofile="${build.classes.dir}/tmp/WEB-INF/classes/META-INF/services/jakarta.enterprise.inject.spi.Extension" failonerror="false"/>
       
   <copy todir="${build.classes.dir}/tmp/WEB-INF/classes">
       <fileset dir="${war.classes}">
@@ -224,7 +224,7 @@
       <include name="WEB-INF/wsdl/${wsdlfile.name}"/>
       <include name="${mappingfile.name}"/>
       <include name="META-INF/context.xml"/>
-      <include name="WEB-INF/classes/META-INF/services/javax.enterprise.inject.spi.Extension"/>
+      <include name="WEB-INF/classes/META-INF/services/jakarta.enterprise.inject.spi.Extension"/>
       <include name="WEB-INF/classes/META-INF/persistence.xml"/>
     </fileset>
   </jar>       
diff --git a/appserver/tests/v2-tests/appserv-tests/devtests/embedded/config/common.xml b/appserver/tests/v2-tests/appserv-tests/devtests/embedded/config/common.xml
index 6f63ad3..cc17a92 100644
--- a/appserver/tests/v2-tests/appserv-tests/devtests/embedded/config/common.xml
+++ b/appserver/tests/v2-tests/appserv-tests/devtests/embedded/config/common.xml
@@ -179,7 +179,7 @@
   <copy file="${context.xml}"
       tofile="${build.classes.dir}/tmp/META-INF/context.xml" failonerror="false"/>
   <copy file="${cdi-extension.service}"
-      tofile="${build.classes.dir}/tmp/WEB-INF/classes/META-INF/services/javax.enterprise.inject.spi.Extension" failonerror="false"/>
+      tofile="${build.classes.dir}/tmp/WEB-INF/classes/META-INF/services/jakarta.enterprise.inject.spi.Extension" failonerror="false"/>
       
   <copy todir="${build.classes.dir}/tmp/WEB-INF/classes">
       <fileset dir="${war.classes}">
@@ -224,7 +224,7 @@
       <include name="WEB-INF/wsdl/${wsdlfile.name}"/>
       <include name="${mappingfile.name}"/>
       <include name="META-INF/context.xml"/>
-      <include name="WEB-INF/classes/META-INF/services/javax.enterprise.inject.spi.Extension"/>
+      <include name="WEB-INF/classes/META-INF/services/jakarta.enterprise.inject.spi.Extension"/>
       <include name="WEB-INF/classes/META-INF/persistence.xml"/>
     </fileset>
   </jar>       
diff --git a/appserver/web/gf-weld-connector/src/main/java/org/glassfish/weld/connector/WeldUtils.java b/appserver/web/gf-weld-connector/src/main/java/org/glassfish/weld/connector/WeldUtils.java
index fee31f9..04f34e4 100644
--- a/appserver/web/gf-weld-connector/src/main/java/org/glassfish/weld/connector/WeldUtils.java
+++ b/appserver/web/gf-weld-connector/src/main/java/org/glassfish/weld/connector/WeldUtils.java
@@ -76,7 +76,7 @@
 
     // We don't want this connector module to depend on CDI API, as connector can be present in a distribution
     // which does not have CDI implementation. So, we use the class name as a string.
-    private static final String SERVICES_CLASSNAME = "javax.enterprise.inject.spi.Extension";
+    private static final String SERVICES_CLASSNAME = "jakarta.enterprise.inject.spi.Extension";
     public static final String META_INF_SERVICES_EXTENSION =
         "META-INF" + SEPARATOR_CHAR + SERVICES_DIR + SEPARATOR_CHAR + SERVICES_CLASSNAME;
 
diff --git a/appserver/web/war-util/src/main/resources/com/sun/logging/enterprise/system/container/web/LogStrings.properties b/appserver/web/war-util/src/main/resources/com/sun/logging/enterprise/system/container/web/LogStrings.properties
index 22843b7..987b933 100644
--- a/appserver/web/war-util/src/main/resources/com/sun/logging/enterprise/system/container/web/LogStrings.properties
+++ b/appserver/web/war-util/src/main/resources/com/sun/logging/enterprise/system/container/web/LogStrings.properties
@@ -187,8 +187,8 @@
 WEB0358.diag.cause.1=The specified attribute value cannot be parsed as an Integer
 WEB0358.diag.check.1=Make sure to specify an Integer as the attribute value
 webcontainer.invalidAnnotationScope=WEB0359: The class [{0}] is annotated with an invalid scope
-WEB0359.diag.cause.1=The offending class is annotated with javax.enterprise.context.ApplicationScoped, javax.enterprise.context.ConversationScoped, javax.enterprise.context.RequestScoped, or javax.enterprise.context.SessionScoped, which is a violation of the Servlet specification
-WEB0359.diag.check.1=Make sure that the offending class does not have any scope annotation or is annotated with the javax.enterprise.context.Dependent scope, which is the only valid scope for Servlets, Filters, and Listeners 
+WEB0359.diag.cause.1=The offending class is annotated with jakarta.enterprise.context.ApplicationScoped, jakarta.enterprise.context.ConversationScoped, jakarta.enterprise.context.RequestScoped, or jakarta.enterprise.context.SessionScoped, which is a violation of the Servlet specification
+WEB0359.diag.check.1=Make sure that the offending class does not have any scope annotation or is annotated with the jakarta.enterprise.context.Dependent scope, which is the only valid scope for Servlets, Filters, and Listeners 
 webcontainer.unableToCreate=WEB0360: Unable to create {0}
 webcontainer.unableToDelete=WEB0361: Unable to delete {0}
 
diff --git a/appserver/web/weld-integration/exclude.xml b/appserver/web/weld-integration/exclude.xml
index 9c5f4be..02d54bb 100644
--- a/appserver/web/weld-integration/exclude.xml
+++ b/appserver/web/weld-integration/exclude.xml
@@ -24,9 +24,9 @@
     <Match>
         <Class name="org.glassfish.cdi.hk2.HK2IntegrationExtension"/>
         <Or>
-            <Method returns="void" name="injectionTargetObserver" params="javax.enterprise.inject.spi.ProcessInjectionTarget" />
-            <Method returns="void" name="afterDiscoveryObserver" params="javax.enterprise.inject.spi.AfterBeanDiscovery" />
-            <Method returns="void" name="afterDeploymentValidation" params="javax.enterprise.inject.spi.AfterDeploymentValidation" />
+            <Method returns="void" name="injectionTargetObserver" params="jakarta.enterprise.inject.spi.ProcessInjectionTarget" />
+            <Method returns="void" name="afterDiscoveryObserver" params="jakarta.enterprise.inject.spi.AfterBeanDiscovery" />
+            <Method returns="void" name="afterDeploymentValidation" params="jakarta.enterprise.inject.spi.AfterDeploymentValidation" />
         </Or>
         <Bug pattern="UPM_UNCALLED_PRIVATE_METHOD"/>
     </Match>
diff --git a/appserver/web/weld-integration/pom.xml b/appserver/web/weld-integration/pom.xml
index 3b9f84e..be402cd 100644
--- a/appserver/web/weld-integration/pom.xml
+++ b/appserver/web/weld-integration/pom.xml
@@ -60,7 +60,7 @@
                 <includes>
                     <include>**/faces-config.xml</include>
                     <include>**/com.sun.faces.spi.FacesConfigResourceProvider</include>
-                    <include>**/javax.enterprise.inject.spi.Extension</include>
+                    <include>**/jakarta.enterprise.inject.spi.Extension</include>
                 </includes>
             </resource>
         </resources>
diff --git a/appserver/web/weld-integration/src/main/java/org/glassfish/cdi/CDILoggerInfo.java b/appserver/web/weld-integration/src/main/java/org/glassfish/cdi/CDILoggerInfo.java
index 3071b0d..fbc37d7 100644
--- a/appserver/web/weld-integration/src/main/java/org/glassfish/cdi/CDILoggerInfo.java
+++ b/appserver/web/weld-integration/src/main/java/org/glassfish/cdi/CDILoggerInfo.java
@@ -31,7 +31,7 @@
     public static final String CDI_WELD_LOGMESSAGE_RESOURCE = "org.glassfish.cdi.LogMessages";
 
     @LoggerInfo(subsystem = "AS-CDI", description = "CDI", publish = true)
-    public static final String CDI_LOGGER_SUBSYSTEM_NAME = "javax.enterprise.inject.spi";
+    public static final String CDI_LOGGER_SUBSYSTEM_NAME = "jakarta.enterprise.inject.spi";
     private static final Logger CDI_LOGGER = Logger.getLogger(CDI_LOGGER_SUBSYSTEM_NAME, CDI_WELD_LOGMESSAGE_RESOURCE);
 
     public static Logger getLogger() {
diff --git a/appserver/web/weld-integration/src/main/java/org/glassfish/cdi/hk2/HK2IntegrationExtension.java b/appserver/web/weld-integration/src/main/java/org/glassfish/cdi/hk2/HK2IntegrationExtension.java
index 25b6e09..4e98fe5 100644
--- a/appserver/web/weld-integration/src/main/java/org/glassfish/cdi/hk2/HK2IntegrationExtension.java
+++ b/appserver/web/weld-integration/src/main/java/org/glassfish/cdi/hk2/HK2IntegrationExtension.java
@@ -41,7 +41,7 @@
 /**
  * A portable CDI extension, which is the touch-point for hk2 integration with CDI
  *
- * This extension is registered via META-INF/services/javax.enterprise.inject.spi.Extension
+ * This extension is registered via META-INF/services/jakarta.enterprise.inject.spi.Extension
  *
  * @author jwells
  *
diff --git a/appserver/web/weld-integration/src/main/java/org/glassfish/cdi/transaction/TransactionScopedContextImpl.java b/appserver/web/weld-integration/src/main/java/org/glassfish/cdi/transaction/TransactionScopedContextImpl.java
index fe4e540..cdb92b8 100644
--- a/appserver/web/weld-integration/src/main/java/org/glassfish/cdi/transaction/TransactionScopedContextImpl.java
+++ b/appserver/web/weld-integration/src/main/java/org/glassfish/cdi/transaction/TransactionScopedContextImpl.java
@@ -38,7 +38,7 @@
  * The contextual instances are destroyed when the transaction completes.
  * <p/>
  * Any attempt to call a method on a {@link TransactionScoped} bean when a transaction is not active will result in a
- * {@Link javax.enterprise.context.ContextNotActiveException}.
+ * {@Link jakarta.enterprise.context.ContextNotActiveException}.
  *
  * A CDI Event: @Initialized(TransactionScoped.class) is fired with {@link TransactionScopedCDIEventPayload}, when the context is initialized for
  * the first time and @Destroyed(TransactionScoped.class) is fired with {@link TransactionScopedCDIEventPayload}, when the context is destroyed at
diff --git a/nucleus/core/context-propagation/src/main/java/org/glassfish/contextpropagation/internal/DependencyProviderImpl.java b/nucleus/core/context-propagation/src/main/java/org/glassfish/contextpropagation/internal/DependencyProviderImpl.java
index 5318f1b..4b625c5 100644
--- a/nucleus/core/context-propagation/src/main/java/org/glassfish/contextpropagation/internal/DependencyProviderImpl.java
+++ b/nucleus/core/context-propagation/src/main/java/org/glassfish/contextpropagation/internal/DependencyProviderImpl.java
@@ -30,7 +30,7 @@
 
 //@Singleton
 //@Named("myService")
-//@Default from javax.enterprise.inject may be appropriate
+//@Default from jakarta.enterprise.inject may be appropriate
 /**
  * Provides the context-propagation dependencies in Glassfish. Other products
  * should consider replacing this implementation with their own.