diff --git a/appserver/common/container-common/src/main/java/com/sun/enterprise/container/common/spi/JavaEEInterceptorBuilder.java b/appserver/common/container-common/src/main/java/com/sun/enterprise/container/common/spi/JavaEEInterceptorBuilder.java
index 8e182e1..6fd9c45 100644
--- a/appserver/common/container-common/src/main/java/com/sun/enterprise/container/common/spi/JavaEEInterceptorBuilder.java
+++ b/appserver/common/container-common/src/main/java/com/sun/enterprise/container/common/spi/JavaEEInterceptorBuilder.java
@@ -18,7 +18,7 @@
 
 
 /**
- * Provides an abstraction for invoking javax.interceptor
+ * Provides an abstraction for invoking jakarta.interceptor
  * callbacks and around invoke methods on a target instance.
  */
 
diff --git a/appserver/core/api-exporter-fragment/pom.xml b/appserver/core/api-exporter-fragment/pom.xml
index a88aba6..6bb8b3c 100755
--- a/appserver/core/api-exporter-fragment/pom.xml
+++ b/appserver/core/api-exporter-fragment/pom.xml
@@ -141,7 +141,7 @@
 javax.imageio.plugins.jpeg; \
 javax.imageio.spi; \
 javax.imageio.stream; \
-javax.interceptor; \
+jakarta.interceptor; \
 jakarta.json; \
 jakarta.jms; \
 javax.json.bind; \
diff --git a/appserver/deployment/dol/src/main/java/com/sun/enterprise/deployment/annotation/handlers/ManagedBeanHandler.java b/appserver/deployment/dol/src/main/java/com/sun/enterprise/deployment/annotation/handlers/ManagedBeanHandler.java
index 0e99f62..9a8683e 100644
--- a/appserver/deployment/dol/src/main/java/com/sun/enterprise/deployment/annotation/handlers/ManagedBeanHandler.java
+++ b/appserver/deployment/dol/src/main/java/com/sun/enterprise/deployment/annotation/handlers/ManagedBeanHandler.java
@@ -77,17 +77,17 @@
         Map<String, InterceptorDescriptor> interceptorDescs = new HashMap<String, InterceptorDescriptor>();
 
 
-        // For now, just process the javax.interceptor related annotations directly instead
-        // of relying on the annotation framework.   All the existing javax.interceptor
+        // For now, just process the jakarta.interceptor related annotations directly instead
+        // of relying on the annotation framework.   All the existing jakarta.interceptor
         // handlers are very tightly coupled to ejb so it would be more work to abstract those
-        // than to just process the annotations directly.  Also, do javax.interceptor
-        // annotation processing reflectively to avoid dependency on javax.interceptor from
+        // than to just process the annotations directly.  Also, do jakarta.interceptor
+        // annotation processing reflectively to avoid dependency on jakarta.interceptor from
         // DOL module.
 
-        // TODO refactor javax.interceptor annotation handlers to support both ejb and non-ejb
+        // TODO refactor jakarta.interceptor annotation handlers to support both ejb and non-ejb
         // related interceptors
 
-        Annotation interceptorsAnn = getClassAnnotation(managedBeanClass, "javax.interceptor.Interceptors");
+        Annotation interceptorsAnn = getClassAnnotation(managedBeanClass, "jakarta.interceptor.Interceptors");
         if( interceptorsAnn != null ) {
             try {
                 Method m = interceptorsAnn.annotationType().getDeclaredMethod("value");
@@ -102,7 +102,7 @@
         Class nextIntClass = managedBeanClass;
         while(nextIntClass != Object.class) {
             Method managedBeanAroundInvoke =
-                getMethodForMethodAnnotation(nextIntClass, "javax.interceptor.AroundInvoke");
+                getMethodForMethodAnnotation(nextIntClass, "jakarta.interceptor.AroundInvoke");
 
             if( (managedBeanAroundInvoke != null) && !(methodOverridden(managedBeanAroundInvoke,
                     nextIntClass, managedBeanClass)) ) {
@@ -164,7 +164,7 @@
                 Class[] interceptors = next.getValue();
 
                 boolean excludeClassInterceptors =
-                        ( getMethodAnnotation(o, "javax.interceptor.ExcludeClassInterceptors")
+                        ( getMethodAnnotation(o, "jakarta.interceptor.ExcludeClassInterceptors")
                             != null );
 
                 List<InterceptorDescriptor> methodInterceptorChain = excludeClassInterceptors ?
@@ -198,7 +198,7 @@
                  ManagedBeanDescriptor managedBeanDesc, Class managedBeanClass) 
                  throws AnnotationProcessorException {
 
-        Annotation ann = getMethodAnnotation(o, "javax.interceptor.Interceptors");
+        Annotation ann = getMethodAnnotation(o, "jakarta.interceptor.Interceptors");
         if(ann != null) {
             try {
                 Method valueM = ann.annotationType().getDeclaredMethod("value");
@@ -212,7 +212,7 @@
             // If the method or constructor excludes
             // class-level interceptors, explicitly set method-level to an empty list.
             boolean excludeClassInterceptors =
-                    ( getMethodAnnotation(o, "javax.interceptor.ExcludeClassInterceptors") != null );
+                    ( getMethodAnnotation(o, "jakarta.interceptor.ExcludeClassInterceptors") != null );
             if( excludeClassInterceptors ) {
                 MethodDescriptor mDesc = getMethodDescriptor(o, managedBeanClass);
                 if (mDesc != null) {
@@ -259,7 +259,7 @@
         Class nextIntClass = interceptorClass;
         while(nextIntClass != Object.class) {
             Method interceptorAroundInvoke =
-                getMethodForMethodAnnotation(nextIntClass, "javax.interceptor.AroundInvoke");
+                getMethodForMethodAnnotation(nextIntClass, "jakarta.interceptor.AroundInvoke");
             if( (interceptorAroundInvoke != null) && !(methodOverridden(interceptorAroundInvoke,
                     nextIntClass, interceptorClass)) ) {
 
@@ -270,7 +270,7 @@
             }
 
             Method interceptorAroundConstruct =
-                getMethodForMethodAnnotation(nextIntClass, "javax.interceptor.AroundConstruct");
+                getMethodForMethodAnnotation(nextIntClass, "jakarta.interceptor.AroundConstruct");
             if( (interceptorAroundConstruct != null) && !(methodOverridden(interceptorAroundConstruct,
                     nextIntClass, interceptorClass)) ) {
 
diff --git a/appserver/ejb/ejb-container/src/main/java/com/sun/ejb/EjbInvocation.java b/appserver/ejb/ejb-container/src/main/java/com/sun/ejb/EjbInvocation.java
index 5cff04c..1d200e0 100644
--- a/appserver/ejb/ejb-container/src/main/java/com/sun/ejb/EjbInvocation.java
+++ b/appserver/ejb/ejb-container/src/main/java/com/sun/ejb/EjbInvocation.java
@@ -560,7 +560,7 @@
     }
 
     /* (non-Javadoc)
-     * @see javax.interceptor.InvocationContext#proceed()
+     * @see jakarta.interceptor.InvocationContext#proceed()
      */
     public Object proceed()
         throws Exception
diff --git a/appserver/pom.xml b/appserver/pom.xml
index 20edee6..793348b 100644
--- a/appserver/pom.xml
+++ b/appserver/pom.xml
@@ -370,7 +370,7 @@
                             <jarType>api</jarType>
                             <specVersion>${jakarta.interceptor-api.version}</specVersion>
 			    <specImplVersion>${jakarta.interceptor-api.version}</specImplVersion>
-                            <apiPackage>javax.interceptor</apiPackage>
+                            <apiPackage>jakarta.interceptor</apiPackage>
                         </spec>
                         <spec>
                             <artifact>
diff --git a/appserver/tests/appserv-tests/devtests/cdi/decorators/simple-decorator/servlet/test/beans/RequiresNewTransactionInterceptor.java b/appserver/tests/appserv-tests/devtests/cdi/decorators/simple-decorator/servlet/test/beans/RequiresNewTransactionInterceptor.java
index 73f5964..566c4b0 100644
--- a/appserver/tests/appserv-tests/devtests/cdi/decorators/simple-decorator/servlet/test/beans/RequiresNewTransactionInterceptor.java
+++ b/appserver/tests/appserv-tests/devtests/cdi/decorators/simple-decorator/servlet/test/beans/RequiresNewTransactionInterceptor.java
@@ -17,9 +17,9 @@
 package test.beans;
 
 import javax.inject.Inject;
-import javax.interceptor.AroundInvoke;
-import javax.interceptor.Interceptor;
-import javax.interceptor.InvocationContext;
+import jakarta.interceptor.AroundInvoke;
+import jakarta.interceptor.Interceptor;
+import jakarta.interceptor.InvocationContext;
 
 @Interceptor
 @Transactional(requiresNew=true, rolesAllowed={"admin", "manager"})
diff --git a/appserver/tests/appserv-tests/devtests/cdi/decorators/simple-decorator/servlet/test/beans/TransactionInterceptor.java b/appserver/tests/appserv-tests/devtests/cdi/decorators/simple-decorator/servlet/test/beans/TransactionInterceptor.java
index f762992..641c3d0 100644
--- a/appserver/tests/appserv-tests/devtests/cdi/decorators/simple-decorator/servlet/test/beans/TransactionInterceptor.java
+++ b/appserver/tests/appserv-tests/devtests/cdi/decorators/simple-decorator/servlet/test/beans/TransactionInterceptor.java
@@ -17,9 +17,9 @@
 package test.beans;
 
 import javax.inject.Inject;
-import javax.interceptor.AroundInvoke;
-import javax.interceptor.Interceptor;
-import javax.interceptor.InvocationContext;
+import jakarta.interceptor.AroundInvoke;
+import jakarta.interceptor.Interceptor;
+import jakarta.interceptor.InvocationContext;
 
 @Interceptor
 @Transactional
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 b8937b9..d2ed8a6 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
@@ -24,7 +24,7 @@
 import java.lang.annotation.Target;
 
 import javax.enterprise.util.Nonbinding;
-import javax.interceptor.InterceptorBinding;
+import jakarta.interceptor.InterceptorBinding;
 
 @Target({TYPE, METHOD})
 @Retention(RetentionPolicy.RUNTIME)
diff --git a/appserver/tests/appserv-tests/devtests/cdi/interceptors/interceptors-bean-validation/servlet/test/beans/CDITest.java b/appserver/tests/appserv-tests/devtests/cdi/interceptors/interceptors-bean-validation/servlet/test/beans/CDITest.java
index a21f4fb..ea52f6c 100644
--- a/appserver/tests/appserv-tests/devtests/cdi/interceptors/interceptors-bean-validation/servlet/test/beans/CDITest.java
+++ b/appserver/tests/appserv-tests/devtests/cdi/interceptors/interceptors-bean-validation/servlet/test/beans/CDITest.java
@@ -23,7 +23,7 @@
 import java.lang.annotation.RetentionPolicy;
 import java.lang.annotation.Target;
 
-import javax.interceptor.InterceptorBinding;
+import jakarta.interceptor.InterceptorBinding;
 
 
 @Target({TYPE, METHOD})
diff --git a/appserver/tests/appserv-tests/devtests/cdi/interceptors/interceptors-bean-validation/servlet/test/beans/TestInterceptor.java b/appserver/tests/appserv-tests/devtests/cdi/interceptors/interceptors-bean-validation/servlet/test/beans/TestInterceptor.java
index de03948..a431518 100644
--- a/appserver/tests/appserv-tests/devtests/cdi/interceptors/interceptors-bean-validation/servlet/test/beans/TestInterceptor.java
+++ b/appserver/tests/appserv-tests/devtests/cdi/interceptors/interceptors-bean-validation/servlet/test/beans/TestInterceptor.java
@@ -17,10 +17,10 @@
 package test.beans;
 
 import javax.inject.Inject;
-import javax.interceptor.AroundConstruct;
-import javax.interceptor.AroundInvoke;
-import javax.interceptor.Interceptor;
-import javax.interceptor.InvocationContext;
+import jakarta.interceptor.AroundConstruct;
+import jakarta.interceptor.AroundInvoke;
+import jakarta.interceptor.Interceptor;
+import jakarta.interceptor.InvocationContext;
 
 @CDITest
 @Interceptor
diff --git a/appserver/tests/appserv-tests/devtests/cdi/interceptors/interceptors-binding-type-inheritance/servlet/test/beans/Action.java b/appserver/tests/appserv-tests/devtests/cdi/interceptors/interceptors-binding-type-inheritance/servlet/test/beans/Action.java
index 684bd63..f133fb0 100644
--- a/appserver/tests/appserv-tests/devtests/cdi/interceptors/interceptors-binding-type-inheritance/servlet/test/beans/Action.java
+++ b/appserver/tests/appserv-tests/devtests/cdi/interceptors/interceptors-binding-type-inheritance/servlet/test/beans/Action.java
@@ -24,7 +24,7 @@
 import java.lang.annotation.Target;
 
 import javax.inject.Qualifier;
-import javax.interceptor.InterceptorBinding;
+import jakarta.interceptor.InterceptorBinding;
 
 @Target({ TYPE, METHOD })
 @Retention(RetentionPolicy.RUNTIME)
diff --git a/appserver/tests/appserv-tests/devtests/cdi/interceptors/interceptors-binding-type-inheritance/servlet/test/beans/Secure.java b/appserver/tests/appserv-tests/devtests/cdi/interceptors/interceptors-binding-type-inheritance/servlet/test/beans/Secure.java
index 90251e3..0f8c934 100644
--- a/appserver/tests/appserv-tests/devtests/cdi/interceptors/interceptors-binding-type-inheritance/servlet/test/beans/Secure.java
+++ b/appserver/tests/appserv-tests/devtests/cdi/interceptors/interceptors-binding-type-inheritance/servlet/test/beans/Secure.java
@@ -24,7 +24,7 @@
 import java.lang.annotation.Target;
 
 import javax.inject.Qualifier;
-import javax.interceptor.InterceptorBinding;
+import jakarta.interceptor.InterceptorBinding;
 
 @Target({ TYPE, METHOD })
 @Retention(RetentionPolicy.RUNTIME)
diff --git a/appserver/tests/appserv-tests/devtests/cdi/interceptors/interceptors-binding-type-inheritance/servlet/test/beans/SecureInterceptor.java b/appserver/tests/appserv-tests/devtests/cdi/interceptors/interceptors-binding-type-inheritance/servlet/test/beans/SecureInterceptor.java
index 7085281..71f6d0d 100644
--- a/appserver/tests/appserv-tests/devtests/cdi/interceptors/interceptors-binding-type-inheritance/servlet/test/beans/SecureInterceptor.java
+++ b/appserver/tests/appserv-tests/devtests/cdi/interceptors/interceptors-binding-type-inheritance/servlet/test/beans/SecureInterceptor.java
@@ -17,9 +17,9 @@
 package test.beans;
 
 import javax.inject.Inject;
-import javax.interceptor.AroundInvoke;
-import javax.interceptor.Interceptor;
-import javax.interceptor.InvocationContext;
+import jakarta.interceptor.AroundInvoke;
+import jakarta.interceptor.Interceptor;
+import jakarta.interceptor.InvocationContext;
 
 @Secure @Interceptor
 public class SecureInterceptor {
diff --git a/appserver/tests/appserv-tests/devtests/cdi/interceptors/interceptors-binding-type-inheritance/servlet/test/beans/TransactionInterceptor.java b/appserver/tests/appserv-tests/devtests/cdi/interceptors/interceptors-binding-type-inheritance/servlet/test/beans/TransactionInterceptor.java
index 5e47864..046f7c6 100644
--- a/appserver/tests/appserv-tests/devtests/cdi/interceptors/interceptors-binding-type-inheritance/servlet/test/beans/TransactionInterceptor.java
+++ b/appserver/tests/appserv-tests/devtests/cdi/interceptors/interceptors-binding-type-inheritance/servlet/test/beans/TransactionInterceptor.java
@@ -17,9 +17,9 @@
 package test.beans;
 
 import javax.inject.Inject;
-import javax.interceptor.AroundInvoke;
-import javax.interceptor.Interceptor;
-import javax.interceptor.InvocationContext;
+import jakarta.interceptor.AroundInvoke;
+import jakarta.interceptor.Interceptor;
+import jakarta.interceptor.InvocationContext;
 
 @Transactional @Interceptor
 public class TransactionInterceptor {
diff --git a/appserver/tests/appserv-tests/devtests/cdi/interceptors/interceptors-binding-type-inheritance/servlet/test/beans/Transactional.java b/appserver/tests/appserv-tests/devtests/cdi/interceptors/interceptors-binding-type-inheritance/servlet/test/beans/Transactional.java
index 42f2c58..dcb5931 100644
--- a/appserver/tests/appserv-tests/devtests/cdi/interceptors/interceptors-binding-type-inheritance/servlet/test/beans/Transactional.java
+++ b/appserver/tests/appserv-tests/devtests/cdi/interceptors/interceptors-binding-type-inheritance/servlet/test/beans/Transactional.java
@@ -23,7 +23,7 @@
 import java.lang.annotation.RetentionPolicy;
 import java.lang.annotation.Target;
 
-import javax.interceptor.InterceptorBinding;
+import jakarta.interceptor.InterceptorBinding;
 
 @Target({TYPE, METHOD})
 @Retention(RetentionPolicy.RUNTIME)
diff --git a/appserver/tests/appserv-tests/devtests/cdi/interceptors/interceptors-binding-type-inheritance/servlet/test/beans/TransactionalSecureInterceptor.java b/appserver/tests/appserv-tests/devtests/cdi/interceptors/interceptors-binding-type-inheritance/servlet/test/beans/TransactionalSecureInterceptor.java
index ddcdff6..6389b46 100644
--- a/appserver/tests/appserv-tests/devtests/cdi/interceptors/interceptors-binding-type-inheritance/servlet/test/beans/TransactionalSecureInterceptor.java
+++ b/appserver/tests/appserv-tests/devtests/cdi/interceptors/interceptors-binding-type-inheritance/servlet/test/beans/TransactionalSecureInterceptor.java
@@ -17,9 +17,9 @@
 package test.beans;
 
 import javax.inject.Inject;
-import javax.interceptor.AroundInvoke;
-import javax.interceptor.Interceptor;
-import javax.interceptor.InvocationContext;
+import jakarta.interceptor.AroundInvoke;
+import jakarta.interceptor.Interceptor;
+import jakarta.interceptor.InvocationContext;
 
 @Transactional @Secure @Interceptor
 public class TransactionalSecureInterceptor {
diff --git a/appserver/tests/appserv-tests/devtests/cdi/interceptors/interceptors-binding-type-with-members/servlet/test/beans/RequiresNewTransactionInterceptor.java b/appserver/tests/appserv-tests/devtests/cdi/interceptors/interceptors-binding-type-with-members/servlet/test/beans/RequiresNewTransactionInterceptor.java
index 73f5964..566c4b0 100644
--- a/appserver/tests/appserv-tests/devtests/cdi/interceptors/interceptors-binding-type-with-members/servlet/test/beans/RequiresNewTransactionInterceptor.java
+++ b/appserver/tests/appserv-tests/devtests/cdi/interceptors/interceptors-binding-type-with-members/servlet/test/beans/RequiresNewTransactionInterceptor.java
@@ -17,9 +17,9 @@
 package test.beans;
 
 import javax.inject.Inject;
-import javax.interceptor.AroundInvoke;
-import javax.interceptor.Interceptor;
-import javax.interceptor.InvocationContext;
+import jakarta.interceptor.AroundInvoke;
+import jakarta.interceptor.Interceptor;
+import jakarta.interceptor.InvocationContext;
 
 @Interceptor
 @Transactional(requiresNew=true, rolesAllowed={"admin", "manager"})
diff --git a/appserver/tests/appserv-tests/devtests/cdi/interceptors/interceptors-binding-type-with-members/servlet/test/beans/TransactionInterceptor.java b/appserver/tests/appserv-tests/devtests/cdi/interceptors/interceptors-binding-type-with-members/servlet/test/beans/TransactionInterceptor.java
index f762992..641c3d0 100644
--- a/appserver/tests/appserv-tests/devtests/cdi/interceptors/interceptors-binding-type-with-members/servlet/test/beans/TransactionInterceptor.java
+++ b/appserver/tests/appserv-tests/devtests/cdi/interceptors/interceptors-binding-type-with-members/servlet/test/beans/TransactionInterceptor.java
@@ -17,9 +17,9 @@
 package test.beans;
 
 import javax.inject.Inject;
-import javax.interceptor.AroundInvoke;
-import javax.interceptor.Interceptor;
-import javax.interceptor.InvocationContext;
+import jakarta.interceptor.AroundInvoke;
+import jakarta.interceptor.Interceptor;
+import jakarta.interceptor.InvocationContext;
 
 @Interceptor
 @Transactional
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 b8937b9..d2ed8a6 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
@@ -24,7 +24,7 @@
 import java.lang.annotation.Target;
 
 import javax.enterprise.util.Nonbinding;
-import javax.interceptor.InterceptorBinding;
+import jakarta.interceptor.InterceptorBinding;
 
 @Target({TYPE, METHOD})
 @Retention(RetentionPolicy.RUNTIME)
diff --git a/appserver/tests/appserv-tests/devtests/cdi/interceptors/interceptors-business-method-interception/servlet/test/beans/TransactionInterceptor.java b/appserver/tests/appserv-tests/devtests/cdi/interceptors/interceptors-business-method-interception/servlet/test/beans/TransactionInterceptor.java
index f762992..641c3d0 100644
--- a/appserver/tests/appserv-tests/devtests/cdi/interceptors/interceptors-business-method-interception/servlet/test/beans/TransactionInterceptor.java
+++ b/appserver/tests/appserv-tests/devtests/cdi/interceptors/interceptors-business-method-interception/servlet/test/beans/TransactionInterceptor.java
@@ -17,9 +17,9 @@
 package test.beans;
 
 import javax.inject.Inject;
-import javax.interceptor.AroundInvoke;
-import javax.interceptor.Interceptor;
-import javax.interceptor.InvocationContext;
+import jakarta.interceptor.AroundInvoke;
+import jakarta.interceptor.Interceptor;
+import jakarta.interceptor.InvocationContext;
 
 @Interceptor
 @Transactional
diff --git a/appserver/tests/appserv-tests/devtests/cdi/interceptors/interceptors-business-method-interception/servlet/test/beans/Transactional.java b/appserver/tests/appserv-tests/devtests/cdi/interceptors/interceptors-business-method-interception/servlet/test/beans/Transactional.java
index eef70c9..98f85d4 100644
--- a/appserver/tests/appserv-tests/devtests/cdi/interceptors/interceptors-business-method-interception/servlet/test/beans/Transactional.java
+++ b/appserver/tests/appserv-tests/devtests/cdi/interceptors/interceptors-business-method-interception/servlet/test/beans/Transactional.java
@@ -23,7 +23,7 @@
 import java.lang.annotation.RetentionPolicy;
 import java.lang.annotation.Target;
 
-import javax.interceptor.InterceptorBinding;
+import jakarta.interceptor.InterceptorBinding;
 
 
 @Target({TYPE, METHOD})
diff --git a/appserver/tests/appserv-tests/devtests/cdi/interceptors/interceptors-invalid-interceptor-specified-at-beans-xml/servlet/test/beans/TransactionInterceptor.java b/appserver/tests/appserv-tests/devtests/cdi/interceptors/interceptors-invalid-interceptor-specified-at-beans-xml/servlet/test/beans/TransactionInterceptor.java
index f762992..641c3d0 100644
--- a/appserver/tests/appserv-tests/devtests/cdi/interceptors/interceptors-invalid-interceptor-specified-at-beans-xml/servlet/test/beans/TransactionInterceptor.java
+++ b/appserver/tests/appserv-tests/devtests/cdi/interceptors/interceptors-invalid-interceptor-specified-at-beans-xml/servlet/test/beans/TransactionInterceptor.java
@@ -17,9 +17,9 @@
 package test.beans;
 
 import javax.inject.Inject;
-import javax.interceptor.AroundInvoke;
-import javax.interceptor.Interceptor;
-import javax.interceptor.InvocationContext;
+import jakarta.interceptor.AroundInvoke;
+import jakarta.interceptor.Interceptor;
+import jakarta.interceptor.InvocationContext;
 
 @Interceptor
 @Transactional
diff --git a/appserver/tests/appserv-tests/devtests/cdi/interceptors/interceptors-invalid-interceptor-specified-at-beans-xml/servlet/test/beans/Transactional.java b/appserver/tests/appserv-tests/devtests/cdi/interceptors/interceptors-invalid-interceptor-specified-at-beans-xml/servlet/test/beans/Transactional.java
index 42f2c58..dcb5931 100644
--- a/appserver/tests/appserv-tests/devtests/cdi/interceptors/interceptors-invalid-interceptor-specified-at-beans-xml/servlet/test/beans/Transactional.java
+++ b/appserver/tests/appserv-tests/devtests/cdi/interceptors/interceptors-invalid-interceptor-specified-at-beans-xml/servlet/test/beans/Transactional.java
@@ -23,7 +23,7 @@
 import java.lang.annotation.RetentionPolicy;
 import java.lang.annotation.Target;
 
-import javax.interceptor.InterceptorBinding;
+import jakarta.interceptor.InterceptorBinding;
 
 @Target({TYPE, METHOD})
 @Retention(RetentionPolicy.RUNTIME)
diff --git a/appserver/tests/appserv-tests/devtests/cdi/interceptors/interceptors-multiple-interceptor-binding-annotations/servlet/test/beans/Secure.java b/appserver/tests/appserv-tests/devtests/cdi/interceptors/interceptors-multiple-interceptor-binding-annotations/servlet/test/beans/Secure.java
index 377cb2f..fc997fc 100644
--- a/appserver/tests/appserv-tests/devtests/cdi/interceptors/interceptors-multiple-interceptor-binding-annotations/servlet/test/beans/Secure.java
+++ b/appserver/tests/appserv-tests/devtests/cdi/interceptors/interceptors-multiple-interceptor-binding-annotations/servlet/test/beans/Secure.java
@@ -24,7 +24,7 @@
 import java.lang.annotation.Target;
 
 import javax.inject.Qualifier;
-import javax.interceptor.InterceptorBinding;
+import jakarta.interceptor.InterceptorBinding;
 
 @Qualifier
 @Target({ TYPE, METHOD })
diff --git a/appserver/tests/appserv-tests/devtests/cdi/interceptors/interceptors-multiple-interceptor-binding-annotations/servlet/test/beans/Transactional.java b/appserver/tests/appserv-tests/devtests/cdi/interceptors/interceptors-multiple-interceptor-binding-annotations/servlet/test/beans/Transactional.java
index 42f2c58..dcb5931 100644
--- a/appserver/tests/appserv-tests/devtests/cdi/interceptors/interceptors-multiple-interceptor-binding-annotations/servlet/test/beans/Transactional.java
+++ b/appserver/tests/appserv-tests/devtests/cdi/interceptors/interceptors-multiple-interceptor-binding-annotations/servlet/test/beans/Transactional.java
@@ -23,7 +23,7 @@
 import java.lang.annotation.RetentionPolicy;
 import java.lang.annotation.Target;
 
-import javax.interceptor.InterceptorBinding;
+import jakarta.interceptor.InterceptorBinding;
 
 @Target({TYPE, METHOD})
 @Retention(RetentionPolicy.RUNTIME)
diff --git a/appserver/tests/appserv-tests/devtests/cdi/interceptors/interceptors-multiple-interceptor-binding-annotations/servlet/test/beans/TransactionalSecureInterceptor.java b/appserver/tests/appserv-tests/devtests/cdi/interceptors/interceptors-multiple-interceptor-binding-annotations/servlet/test/beans/TransactionalSecureInterceptor.java
index d47052d..bf189aa 100644
--- a/appserver/tests/appserv-tests/devtests/cdi/interceptors/interceptors-multiple-interceptor-binding-annotations/servlet/test/beans/TransactionalSecureInterceptor.java
+++ b/appserver/tests/appserv-tests/devtests/cdi/interceptors/interceptors-multiple-interceptor-binding-annotations/servlet/test/beans/TransactionalSecureInterceptor.java
@@ -17,9 +17,9 @@
 package test.beans;
 
 import javax.inject.Inject;
-import javax.interceptor.AroundInvoke;
-import javax.interceptor.Interceptor;
-import javax.interceptor.InvocationContext;
+import jakarta.interceptor.AroundInvoke;
+import jakarta.interceptor.Interceptor;
+import jakarta.interceptor.InvocationContext;
 
 @Transactional @Secure @Interceptor
 public class TransactionalSecureInterceptor {
diff --git a/appserver/tests/appserv-tests/devtests/cdi/interceptors/interceptors-multiple-interceptors-for-a-binding-type/servlet/test/beans/SecondTransactionInterceptor.java b/appserver/tests/appserv-tests/devtests/cdi/interceptors/interceptors-multiple-interceptors-for-a-binding-type/servlet/test/beans/SecondTransactionInterceptor.java
index d73fcae..d8db4ef 100644
--- a/appserver/tests/appserv-tests/devtests/cdi/interceptors/interceptors-multiple-interceptors-for-a-binding-type/servlet/test/beans/SecondTransactionInterceptor.java
+++ b/appserver/tests/appserv-tests/devtests/cdi/interceptors/interceptors-multiple-interceptors-for-a-binding-type/servlet/test/beans/SecondTransactionInterceptor.java
@@ -17,9 +17,9 @@
 package test.beans;
 
 import javax.inject.Inject;
-import javax.interceptor.AroundInvoke;
-import javax.interceptor.Interceptor;
-import javax.interceptor.InvocationContext;
+import jakarta.interceptor.AroundInvoke;
+import jakarta.interceptor.Interceptor;
+import jakarta.interceptor.InvocationContext;
 
 @Transactional
 @Interceptor
diff --git a/appserver/tests/appserv-tests/devtests/cdi/interceptors/interceptors-multiple-interceptors-for-a-binding-type/servlet/test/beans/ThirdTransactionInterceptor.java b/appserver/tests/appserv-tests/devtests/cdi/interceptors/interceptors-multiple-interceptors-for-a-binding-type/servlet/test/beans/ThirdTransactionInterceptor.java
index 8450653..a818138 100644
--- a/appserver/tests/appserv-tests/devtests/cdi/interceptors/interceptors-multiple-interceptors-for-a-binding-type/servlet/test/beans/ThirdTransactionInterceptor.java
+++ b/appserver/tests/appserv-tests/devtests/cdi/interceptors/interceptors-multiple-interceptors-for-a-binding-type/servlet/test/beans/ThirdTransactionInterceptor.java
@@ -17,9 +17,9 @@
 package test.beans;
 
 import javax.inject.Inject;
-import javax.interceptor.AroundInvoke;
-import javax.interceptor.Interceptor;
-import javax.interceptor.InvocationContext;
+import jakarta.interceptor.AroundInvoke;
+import jakarta.interceptor.Interceptor;
+import jakarta.interceptor.InvocationContext;
 
 @Transactional
 @Interceptor
diff --git a/appserver/tests/appserv-tests/devtests/cdi/interceptors/interceptors-multiple-interceptors-for-a-binding-type/servlet/test/beans/TransactionInterceptor.java b/appserver/tests/appserv-tests/devtests/cdi/interceptors/interceptors-multiple-interceptors-for-a-binding-type/servlet/test/beans/TransactionInterceptor.java
index a4fe338..3a975a6 100644
--- a/appserver/tests/appserv-tests/devtests/cdi/interceptors/interceptors-multiple-interceptors-for-a-binding-type/servlet/test/beans/TransactionInterceptor.java
+++ b/appserver/tests/appserv-tests/devtests/cdi/interceptors/interceptors-multiple-interceptors-for-a-binding-type/servlet/test/beans/TransactionInterceptor.java
@@ -17,9 +17,9 @@
 package test.beans;
 
 import javax.inject.Inject;
-import javax.interceptor.AroundInvoke;
-import javax.interceptor.Interceptor;
-import javax.interceptor.InvocationContext;
+import jakarta.interceptor.AroundInvoke;
+import jakarta.interceptor.Interceptor;
+import jakarta.interceptor.InvocationContext;
 
 @Interceptor
 @Transactional
diff --git a/appserver/tests/appserv-tests/devtests/cdi/interceptors/interceptors-multiple-interceptors-for-a-binding-type/servlet/test/beans/Transactional.java b/appserver/tests/appserv-tests/devtests/cdi/interceptors/interceptors-multiple-interceptors-for-a-binding-type/servlet/test/beans/Transactional.java
index 42f2c58..dcb5931 100644
--- a/appserver/tests/appserv-tests/devtests/cdi/interceptors/interceptors-multiple-interceptors-for-a-binding-type/servlet/test/beans/Transactional.java
+++ b/appserver/tests/appserv-tests/devtests/cdi/interceptors/interceptors-multiple-interceptors-for-a-binding-type/servlet/test/beans/Transactional.java
@@ -23,7 +23,7 @@
 import java.lang.annotation.RetentionPolicy;
 import java.lang.annotation.Target;
 
-import javax.interceptor.InterceptorBinding;
+import jakarta.interceptor.InterceptorBinding;
 
 @Target({TYPE, METHOD})
 @Retention(RetentionPolicy.RUNTIME)
diff --git a/appserver/tests/appserv-tests/devtests/cdi/interceptors/interceptors-use-of-at-interceptors/servlet/test/beans/Secure.java b/appserver/tests/appserv-tests/devtests/cdi/interceptors/interceptors-use-of-at-interceptors/servlet/test/beans/Secure.java
index 377cb2f..fc997fc 100644
--- a/appserver/tests/appserv-tests/devtests/cdi/interceptors/interceptors-use-of-at-interceptors/servlet/test/beans/Secure.java
+++ b/appserver/tests/appserv-tests/devtests/cdi/interceptors/interceptors-use-of-at-interceptors/servlet/test/beans/Secure.java
@@ -24,7 +24,7 @@
 import java.lang.annotation.Target;
 
 import javax.inject.Qualifier;
-import javax.interceptor.InterceptorBinding;
+import jakarta.interceptor.InterceptorBinding;
 
 @Qualifier
 @Target({ TYPE, METHOD })
diff --git a/appserver/tests/appserv-tests/devtests/cdi/interceptors/interceptors-use-of-at-interceptors/servlet/test/beans/SecureInterceptor.java b/appserver/tests/appserv-tests/devtests/cdi/interceptors/interceptors-use-of-at-interceptors/servlet/test/beans/SecureInterceptor.java
index 7085281..71f6d0d 100644
--- a/appserver/tests/appserv-tests/devtests/cdi/interceptors/interceptors-use-of-at-interceptors/servlet/test/beans/SecureInterceptor.java
+++ b/appserver/tests/appserv-tests/devtests/cdi/interceptors/interceptors-use-of-at-interceptors/servlet/test/beans/SecureInterceptor.java
@@ -17,9 +17,9 @@
 package test.beans;
 
 import javax.inject.Inject;
-import javax.interceptor.AroundInvoke;
-import javax.interceptor.Interceptor;
-import javax.interceptor.InvocationContext;
+import jakarta.interceptor.AroundInvoke;
+import jakarta.interceptor.Interceptor;
+import jakarta.interceptor.InvocationContext;
 
 @Secure @Interceptor
 public class SecureInterceptor {
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 a8d9b77..4cf442f 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
@@ -17,7 +17,7 @@
 package test.beans;
 
 import javax.enterprise.context.RequestScoped;
-import javax.interceptor.Interceptors;
+import jakarta.interceptor.Interceptors;
 
 
 @RequestScoped
diff --git a/appserver/tests/appserv-tests/devtests/cdi/interceptors/interceptors-use-of-at-interceptors/servlet/test/beans/TransactionInterceptor.java b/appserver/tests/appserv-tests/devtests/cdi/interceptors/interceptors-use-of-at-interceptors/servlet/test/beans/TransactionInterceptor.java
index 5e47864..046f7c6 100644
--- a/appserver/tests/appserv-tests/devtests/cdi/interceptors/interceptors-use-of-at-interceptors/servlet/test/beans/TransactionInterceptor.java
+++ b/appserver/tests/appserv-tests/devtests/cdi/interceptors/interceptors-use-of-at-interceptors/servlet/test/beans/TransactionInterceptor.java
@@ -17,9 +17,9 @@
 package test.beans;
 
 import javax.inject.Inject;
-import javax.interceptor.AroundInvoke;
-import javax.interceptor.Interceptor;
-import javax.interceptor.InvocationContext;
+import jakarta.interceptor.AroundInvoke;
+import jakarta.interceptor.Interceptor;
+import jakarta.interceptor.InvocationContext;
 
 @Transactional @Interceptor
 public class TransactionInterceptor {
diff --git a/appserver/tests/appserv-tests/devtests/cdi/interceptors/interceptors-use-of-at-interceptors/servlet/test/beans/Transactional.java b/appserver/tests/appserv-tests/devtests/cdi/interceptors/interceptors-use-of-at-interceptors/servlet/test/beans/Transactional.java
index 42f2c58..dcb5931 100644
--- a/appserver/tests/appserv-tests/devtests/cdi/interceptors/interceptors-use-of-at-interceptors/servlet/test/beans/Transactional.java
+++ b/appserver/tests/appserv-tests/devtests/cdi/interceptors/interceptors-use-of-at-interceptors/servlet/test/beans/Transactional.java
@@ -23,7 +23,7 @@
 import java.lang.annotation.RetentionPolicy;
 import java.lang.annotation.Target;
 
-import javax.interceptor.InterceptorBinding;
+import jakarta.interceptor.InterceptorBinding;
 
 @Target({TYPE, METHOD})
 @Retention(RetentionPolicy.RUNTIME)
diff --git a/appserver/tests/appserv-tests/devtests/cdi/interceptors/interceptors-use-of-interceptors-in-ejbs-through-at-interceptors/servlet/org/glassfish/cditest/security/api/Secure.java b/appserver/tests/appserv-tests/devtests/cdi/interceptors/interceptors-use-of-interceptors-in-ejbs-through-at-interceptors/servlet/org/glassfish/cditest/security/api/Secure.java
index a237123..dbf53e2 100644
--- a/appserver/tests/appserv-tests/devtests/cdi/interceptors/interceptors-use-of-interceptors-in-ejbs-through-at-interceptors/servlet/org/glassfish/cditest/security/api/Secure.java
+++ b/appserver/tests/appserv-tests/devtests/cdi/interceptors/interceptors-use-of-interceptors-in-ejbs-through-at-interceptors/servlet/org/glassfish/cditest/security/api/Secure.java
@@ -24,7 +24,7 @@
 import java.lang.annotation.Retention;
 import java.lang.annotation.Target;
 
-import javax.interceptor.InterceptorBinding;
+import jakarta.interceptor.InterceptorBinding;
 
 /**
  * EJBs annotated with Secure are intercepted by SecurityInterceptor, ensuring
diff --git a/appserver/tests/appserv-tests/devtests/cdi/interceptors/interceptors-use-of-interceptors-in-ejbs-through-at-interceptors/servlet/org/glassfish/cditest/security/interceptor/SecurityInterceptor.java b/appserver/tests/appserv-tests/devtests/cdi/interceptors/interceptors-use-of-interceptors-in-ejbs-through-at-interceptors/servlet/org/glassfish/cditest/security/interceptor/SecurityInterceptor.java
index 890e9cd..57f58c4 100644
--- a/appserver/tests/appserv-tests/devtests/cdi/interceptors/interceptors-use-of-interceptors-in-ejbs-through-at-interceptors/servlet/org/glassfish/cditest/security/interceptor/SecurityInterceptor.java
+++ b/appserver/tests/appserv-tests/devtests/cdi/interceptors/interceptors-use-of-interceptors-in-ejbs-through-at-interceptors/servlet/org/glassfish/cditest/security/interceptor/SecurityInterceptor.java
@@ -23,9 +23,9 @@
 
 import jakarta.annotation.Resource;
 import jakarta.ejb.EJBContext;
-import javax.interceptor.AroundInvoke;
-import javax.interceptor.Interceptor;
-import javax.interceptor.InvocationContext;
+import jakarta.interceptor.AroundInvoke;
+import jakarta.interceptor.Interceptor;
+import jakarta.interceptor.InvocationContext;
 
 import java.io.Serializable;
 import org.glassfish.cditest.security.api.Secure;
diff --git a/appserver/tests/appserv-tests/devtests/cdi/interceptors/interceptors-use-of-interceptors-in-ejbs-through-at-interceptors/servlet/org/glassfish/cditest/user/impl/UserServiceImpl.java b/appserver/tests/appserv-tests/devtests/cdi/interceptors/interceptors-use-of-interceptors-in-ejbs-through-at-interceptors/servlet/org/glassfish/cditest/user/impl/UserServiceImpl.java
index bdf5928..e86995f 100644
--- a/appserver/tests/appserv-tests/devtests/cdi/interceptors/interceptors-use-of-interceptors-in-ejbs-through-at-interceptors/servlet/org/glassfish/cditest/user/impl/UserServiceImpl.java
+++ b/appserver/tests/appserv-tests/devtests/cdi/interceptors/interceptors-use-of-interceptors-in-ejbs-through-at-interceptors/servlet/org/glassfish/cditest/user/impl/UserServiceImpl.java
@@ -37,7 +37,7 @@
  */
 @Stateless
 @Local
-@javax.interceptor.Interceptors(org.glassfish.cditest.security.interceptor.SecurityInterceptor.class)
+@jakarta.interceptor.Interceptors(org.glassfish.cditest.security.interceptor.SecurityInterceptor.class)
 public class UserServiceImpl implements UserService {
     private static final Logger LOG = Logger.getLogger(UserService.class.getName());
 
diff --git a/appserver/tests/appserv-tests/devtests/cdi/interceptors/interceptors-use-of-interceptors-in-ejbs-through-interceptor-bindings/servlet/org/glassfish/cditest/security/api/Secure.java b/appserver/tests/appserv-tests/devtests/cdi/interceptors/interceptors-use-of-interceptors-in-ejbs-through-interceptor-bindings/servlet/org/glassfish/cditest/security/api/Secure.java
index a237123..dbf53e2 100644
--- a/appserver/tests/appserv-tests/devtests/cdi/interceptors/interceptors-use-of-interceptors-in-ejbs-through-interceptor-bindings/servlet/org/glassfish/cditest/security/api/Secure.java
+++ b/appserver/tests/appserv-tests/devtests/cdi/interceptors/interceptors-use-of-interceptors-in-ejbs-through-interceptor-bindings/servlet/org/glassfish/cditest/security/api/Secure.java
@@ -24,7 +24,7 @@
 import java.lang.annotation.Retention;
 import java.lang.annotation.Target;
 
-import javax.interceptor.InterceptorBinding;
+import jakarta.interceptor.InterceptorBinding;
 
 /**
  * EJBs annotated with Secure are intercepted by SecurityInterceptor, ensuring
diff --git a/appserver/tests/appserv-tests/devtests/cdi/interceptors/interceptors-use-of-interceptors-in-ejbs-through-interceptor-bindings/servlet/org/glassfish/cditest/security/interceptor/SecurityInterceptor.java b/appserver/tests/appserv-tests/devtests/cdi/interceptors/interceptors-use-of-interceptors-in-ejbs-through-interceptor-bindings/servlet/org/glassfish/cditest/security/interceptor/SecurityInterceptor.java
index 890e9cd..57f58c4 100644
--- a/appserver/tests/appserv-tests/devtests/cdi/interceptors/interceptors-use-of-interceptors-in-ejbs-through-interceptor-bindings/servlet/org/glassfish/cditest/security/interceptor/SecurityInterceptor.java
+++ b/appserver/tests/appserv-tests/devtests/cdi/interceptors/interceptors-use-of-interceptors-in-ejbs-through-interceptor-bindings/servlet/org/glassfish/cditest/security/interceptor/SecurityInterceptor.java
@@ -23,9 +23,9 @@
 
 import jakarta.annotation.Resource;
 import jakarta.ejb.EJBContext;
-import javax.interceptor.AroundInvoke;
-import javax.interceptor.Interceptor;
-import javax.interceptor.InvocationContext;
+import jakarta.interceptor.AroundInvoke;
+import jakarta.interceptor.Interceptor;
+import jakarta.interceptor.InvocationContext;
 
 import java.io.Serializable;
 import org.glassfish.cditest.security.api.Secure;
diff --git a/appserver/tests/appserv-tests/devtests/cdi/javaee-integration/simple-managed-bean-interceptor-noargconstructor-missing/servlet/test/beans/Tester.java b/appserver/tests/appserv-tests/devtests/cdi/javaee-integration/simple-managed-bean-interceptor-noargconstructor-missing/servlet/test/beans/Tester.java
index 779d213..84525e5 100644
--- a/appserver/tests/appserv-tests/devtests/cdi/javaee-integration/simple-managed-bean-interceptor-noargconstructor-missing/servlet/test/beans/Tester.java
+++ b/appserver/tests/appserv-tests/devtests/cdi/javaee-integration/simple-managed-bean-interceptor-noargconstructor-missing/servlet/test/beans/Tester.java
@@ -16,7 +16,7 @@
 
 package test.beans;
 
-import javax.interceptor.*;
+import jakarta.interceptor.*;
 import java.lang.annotation.*;
 import static java.lang.annotation.ElementType.*;
 import static java.lang.annotation.RetentionPolicy.*;
diff --git a/appserver/tests/appserv-tests/devtests/cdi/javaee-integration/simple-managed-bean-interceptor-noargconstructor-missing/servlet/test/interceptors/TestAroundInvokeInterceptor.java b/appserver/tests/appserv-tests/devtests/cdi/javaee-integration/simple-managed-bean-interceptor-noargconstructor-missing/servlet/test/interceptors/TestAroundInvokeInterceptor.java
index 700bf69..4caaaa7 100644
--- a/appserver/tests/appserv-tests/devtests/cdi/javaee-integration/simple-managed-bean-interceptor-noargconstructor-missing/servlet/test/interceptors/TestAroundInvokeInterceptor.java
+++ b/appserver/tests/appserv-tests/devtests/cdi/javaee-integration/simple-managed-bean-interceptor-noargconstructor-missing/servlet/test/interceptors/TestAroundInvokeInterceptor.java
@@ -16,7 +16,7 @@
 
 package test.interceptors;
 
-import javax.interceptor.*;
+import jakarta.interceptor.*;
 
 import test.beans.Tester;
 
diff --git a/appserver/tests/appserv-tests/devtests/cdi/javaee-integration/simple-managed-bean-interceptor-nonnull-package/servlet/test/beans/Tester.java b/appserver/tests/appserv-tests/devtests/cdi/javaee-integration/simple-managed-bean-interceptor-nonnull-package/servlet/test/beans/Tester.java
index 779d213..84525e5 100644
--- a/appserver/tests/appserv-tests/devtests/cdi/javaee-integration/simple-managed-bean-interceptor-nonnull-package/servlet/test/beans/Tester.java
+++ b/appserver/tests/appserv-tests/devtests/cdi/javaee-integration/simple-managed-bean-interceptor-nonnull-package/servlet/test/beans/Tester.java
@@ -16,7 +16,7 @@
 
 package test.beans;
 
-import javax.interceptor.*;
+import jakarta.interceptor.*;
 import java.lang.annotation.*;
 import static java.lang.annotation.ElementType.*;
 import static java.lang.annotation.RetentionPolicy.*;
diff --git a/appserver/tests/appserv-tests/devtests/cdi/javaee-integration/simple-managed-bean-interceptor-nonnull-package/servlet/test/interceptors/TestAroundInvokeInterceptor.java b/appserver/tests/appserv-tests/devtests/cdi/javaee-integration/simple-managed-bean-interceptor-nonnull-package/servlet/test/interceptors/TestAroundInvokeInterceptor.java
index 700bf69..4caaaa7 100644
--- a/appserver/tests/appserv-tests/devtests/cdi/javaee-integration/simple-managed-bean-interceptor-nonnull-package/servlet/test/interceptors/TestAroundInvokeInterceptor.java
+++ b/appserver/tests/appserv-tests/devtests/cdi/javaee-integration/simple-managed-bean-interceptor-nonnull-package/servlet/test/interceptors/TestAroundInvokeInterceptor.java
@@ -16,7 +16,7 @@
 
 package test.interceptors;
 
-import javax.interceptor.*;
+import jakarta.interceptor.*;
 
 import test.beans.Tester;
 
diff --git a/appserver/tests/appserv-tests/devtests/cdi/managed-beans/managed-bean-lifecycle-polymorphism/servlet/com/tests/TestAroundInvokeInterceptor.java b/appserver/tests/appserv-tests/devtests/cdi/managed-beans/managed-bean-lifecycle-polymorphism/servlet/com/tests/TestAroundInvokeInterceptor.java
index 099911d..a3f72bc 100644
--- a/appserver/tests/appserv-tests/devtests/cdi/managed-beans/managed-bean-lifecycle-polymorphism/servlet/com/tests/TestAroundInvokeInterceptor.java
+++ b/appserver/tests/appserv-tests/devtests/cdi/managed-beans/managed-bean-lifecycle-polymorphism/servlet/com/tests/TestAroundInvokeInterceptor.java
@@ -16,7 +16,7 @@
 
 package com.tests;
 
-import javax.interceptor.*;
+import jakarta.interceptor.*;
 
 @Tester @Interceptor
 public class TestAroundInvokeInterceptor {
diff --git a/appserver/tests/appserv-tests/devtests/cdi/managed-beans/managed-bean-lifecycle-polymorphism/servlet/com/tests/Tester.java b/appserver/tests/appserv-tests/devtests/cdi/managed-beans/managed-bean-lifecycle-polymorphism/servlet/com/tests/Tester.java
index a966727..de28fc4 100644
--- a/appserver/tests/appserv-tests/devtests/cdi/managed-beans/managed-bean-lifecycle-polymorphism/servlet/com/tests/Tester.java
+++ b/appserver/tests/appserv-tests/devtests/cdi/managed-beans/managed-bean-lifecycle-polymorphism/servlet/com/tests/Tester.java
@@ -16,7 +16,7 @@
 
 package com.tests;
 
-import javax.interceptor.*;
+import jakarta.interceptor.*;
 import java.lang.annotation.*;
 import static java.lang.annotation.ElementType.*;
 import static java.lang.annotation.RetentionPolicy.*;
diff --git a/appserver/tests/appserv-tests/devtests/cdi/managed-beans/managed-bean-via-resource-injection/servlet/com/tests/TestAroundInvokeInterceptor.java b/appserver/tests/appserv-tests/devtests/cdi/managed-beans/managed-bean-via-resource-injection/servlet/com/tests/TestAroundInvokeInterceptor.java
index 379dfbf..590431d 100644
--- a/appserver/tests/appserv-tests/devtests/cdi/managed-beans/managed-bean-via-resource-injection/servlet/com/tests/TestAroundInvokeInterceptor.java
+++ b/appserver/tests/appserv-tests/devtests/cdi/managed-beans/managed-bean-via-resource-injection/servlet/com/tests/TestAroundInvokeInterceptor.java
@@ -16,7 +16,7 @@
 
 package com.tests;
 
-import javax.interceptor.*;
+import jakarta.interceptor.*;
 
 @Tester @Interceptor
 public class TestAroundInvokeInterceptor {
diff --git a/appserver/tests/appserv-tests/devtests/cdi/managed-beans/managed-bean-via-resource-injection/servlet/com/tests/Tester.java b/appserver/tests/appserv-tests/devtests/cdi/managed-beans/managed-bean-via-resource-injection/servlet/com/tests/Tester.java
index a966727..de28fc4 100644
--- a/appserver/tests/appserv-tests/devtests/cdi/managed-beans/managed-bean-via-resource-injection/servlet/com/tests/Tester.java
+++ b/appserver/tests/appserv-tests/devtests/cdi/managed-beans/managed-bean-via-resource-injection/servlet/com/tests/Tester.java
@@ -16,7 +16,7 @@
 
 package com.tests;
 
-import javax.interceptor.*;
+import jakarta.interceptor.*;
 import java.lang.annotation.*;
 import static java.lang.annotation.ElementType.*;
 import static java.lang.annotation.RetentionPolicy.*;
diff --git a/appserver/tests/appserv-tests/devtests/cdi/portable-extensions/bean-interface/servlet/test/beans/TransactionInterceptor.java b/appserver/tests/appserv-tests/devtests/cdi/portable-extensions/bean-interface/servlet/test/beans/TransactionInterceptor.java
index 0b78e5f..e45e653 100644
--- a/appserver/tests/appserv-tests/devtests/cdi/portable-extensions/bean-interface/servlet/test/beans/TransactionInterceptor.java
+++ b/appserver/tests/appserv-tests/devtests/cdi/portable-extensions/bean-interface/servlet/test/beans/TransactionInterceptor.java
@@ -17,9 +17,9 @@
 package test.beans;
 
 import javax.inject.Inject;
-import javax.interceptor.AroundInvoke;
-import javax.interceptor.Interceptor;
-import javax.interceptor.InvocationContext;
+import jakarta.interceptor.AroundInvoke;
+import jakarta.interceptor.Interceptor;
+import jakarta.interceptor.InvocationContext;
 
 import test.extension.MyExtension;
 
diff --git a/appserver/tests/appserv-tests/devtests/cdi/portable-extensions/bean-interface/servlet/test/beans/Transactional.java b/appserver/tests/appserv-tests/devtests/cdi/portable-extensions/bean-interface/servlet/test/beans/Transactional.java
index eef70c9..98f85d4 100644
--- a/appserver/tests/appserv-tests/devtests/cdi/portable-extensions/bean-interface/servlet/test/beans/Transactional.java
+++ b/appserver/tests/appserv-tests/devtests/cdi/portable-extensions/bean-interface/servlet/test/beans/Transactional.java
@@ -23,7 +23,7 @@
 import java.lang.annotation.RetentionPolicy;
 import java.lang.annotation.Target;
 
-import javax.interceptor.InterceptorBinding;
+import jakarta.interceptor.InterceptorBinding;
 
 
 @Target({TYPE, METHOD})
diff --git a/appserver/tests/appserv-tests/devtests/cdi/portable-extensions/bean-manager/servlet/test/beans/TransactionInterceptor.java b/appserver/tests/appserv-tests/devtests/cdi/portable-extensions/bean-manager/servlet/test/beans/TransactionInterceptor.java
index 0b78e5f..e45e653 100644
--- a/appserver/tests/appserv-tests/devtests/cdi/portable-extensions/bean-manager/servlet/test/beans/TransactionInterceptor.java
+++ b/appserver/tests/appserv-tests/devtests/cdi/portable-extensions/bean-manager/servlet/test/beans/TransactionInterceptor.java
@@ -17,9 +17,9 @@
 package test.beans;
 
 import javax.inject.Inject;
-import javax.interceptor.AroundInvoke;
-import javax.interceptor.Interceptor;
-import javax.interceptor.InvocationContext;
+import jakarta.interceptor.AroundInvoke;
+import jakarta.interceptor.Interceptor;
+import jakarta.interceptor.InvocationContext;
 
 import test.extension.MyExtension;
 
diff --git a/appserver/tests/appserv-tests/devtests/cdi/portable-extensions/bean-manager/servlet/test/beans/Transactional.java b/appserver/tests/appserv-tests/devtests/cdi/portable-extensions/bean-manager/servlet/test/beans/Transactional.java
index eef70c9..98f85d4 100644
--- a/appserver/tests/appserv-tests/devtests/cdi/portable-extensions/bean-manager/servlet/test/beans/Transactional.java
+++ b/appserver/tests/appserv-tests/devtests/cdi/portable-extensions/bean-manager/servlet/test/beans/Transactional.java
@@ -23,7 +23,7 @@
 import java.lang.annotation.RetentionPolicy;
 import java.lang.annotation.Target;
 
-import javax.interceptor.InterceptorBinding;
+import jakarta.interceptor.InterceptorBinding;
 
 
 @Target({TYPE, METHOD})
diff --git a/appserver/tests/appserv-tests/devtests/cdi/portable-extensions/injection-target/servlet/test/beans/TransactionInterceptor.java b/appserver/tests/appserv-tests/devtests/cdi/portable-extensions/injection-target/servlet/test/beans/TransactionInterceptor.java
index 0b78e5f..e45e653 100644
--- a/appserver/tests/appserv-tests/devtests/cdi/portable-extensions/injection-target/servlet/test/beans/TransactionInterceptor.java
+++ b/appserver/tests/appserv-tests/devtests/cdi/portable-extensions/injection-target/servlet/test/beans/TransactionInterceptor.java
@@ -17,9 +17,9 @@
 package test.beans;
 
 import javax.inject.Inject;
-import javax.interceptor.AroundInvoke;
-import javax.interceptor.Interceptor;
-import javax.interceptor.InvocationContext;
+import jakarta.interceptor.AroundInvoke;
+import jakarta.interceptor.Interceptor;
+import jakarta.interceptor.InvocationContext;
 
 import test.extension.MyExtension;
 
diff --git a/appserver/tests/appserv-tests/devtests/cdi/portable-extensions/injection-target/servlet/test/beans/Transactional.java b/appserver/tests/appserv-tests/devtests/cdi/portable-extensions/injection-target/servlet/test/beans/Transactional.java
index eef70c9..98f85d4 100644
--- a/appserver/tests/appserv-tests/devtests/cdi/portable-extensions/injection-target/servlet/test/beans/Transactional.java
+++ b/appserver/tests/appserv-tests/devtests/cdi/portable-extensions/injection-target/servlet/test/beans/Transactional.java
@@ -23,7 +23,7 @@
 import java.lang.annotation.RetentionPolicy;
 import java.lang.annotation.Target;
 
-import javax.interceptor.InterceptorBinding;
+import jakarta.interceptor.InterceptorBinding;
 
 
 @Target({TYPE, METHOD})
diff --git a/appserver/tests/appserv-tests/devtests/cdi/portable-extensions/new-bean-registration-extension-in-lib/servlet/test/beans/TransactionInterceptor.java b/appserver/tests/appserv-tests/devtests/cdi/portable-extensions/new-bean-registration-extension-in-lib/servlet/test/beans/TransactionInterceptor.java
index 374113e..116ec7e 100644
--- a/appserver/tests/appserv-tests/devtests/cdi/portable-extensions/new-bean-registration-extension-in-lib/servlet/test/beans/TransactionInterceptor.java
+++ b/appserver/tests/appserv-tests/devtests/cdi/portable-extensions/new-bean-registration-extension-in-lib/servlet/test/beans/TransactionInterceptor.java
@@ -17,9 +17,9 @@
 package test.beans;
 
 import javax.inject.Inject;
-import javax.interceptor.AroundInvoke;
-import javax.interceptor.Interceptor;
-import javax.interceptor.InvocationContext;
+import jakarta.interceptor.AroundInvoke;
+import jakarta.interceptor.Interceptor;
+import jakarta.interceptor.InvocationContext;
 
 import test.extension.ServiceFrameworkExtension;
 
diff --git a/appserver/tests/appserv-tests/devtests/cdi/portable-extensions/new-bean-registration-extension-in-lib/servlet/test/beans/Transactional.java b/appserver/tests/appserv-tests/devtests/cdi/portable-extensions/new-bean-registration-extension-in-lib/servlet/test/beans/Transactional.java
index eef70c9..98f85d4 100644
--- a/appserver/tests/appserv-tests/devtests/cdi/portable-extensions/new-bean-registration-extension-in-lib/servlet/test/beans/Transactional.java
+++ b/appserver/tests/appserv-tests/devtests/cdi/portable-extensions/new-bean-registration-extension-in-lib/servlet/test/beans/Transactional.java
@@ -23,7 +23,7 @@
 import java.lang.annotation.RetentionPolicy;
 import java.lang.annotation.Target;
 
-import javax.interceptor.InterceptorBinding;
+import jakarta.interceptor.InterceptorBinding;
 
 
 @Target({TYPE, METHOD})
diff --git a/appserver/tests/appserv-tests/devtests/cdi/portable-extensions/new-bean-registration/servlet/test/beans/TransactionInterceptor.java b/appserver/tests/appserv-tests/devtests/cdi/portable-extensions/new-bean-registration/servlet/test/beans/TransactionInterceptor.java
index 374113e..116ec7e 100644
--- a/appserver/tests/appserv-tests/devtests/cdi/portable-extensions/new-bean-registration/servlet/test/beans/TransactionInterceptor.java
+++ b/appserver/tests/appserv-tests/devtests/cdi/portable-extensions/new-bean-registration/servlet/test/beans/TransactionInterceptor.java
@@ -17,9 +17,9 @@
 package test.beans;
 
 import javax.inject.Inject;
-import javax.interceptor.AroundInvoke;
-import javax.interceptor.Interceptor;
-import javax.interceptor.InvocationContext;
+import jakarta.interceptor.AroundInvoke;
+import jakarta.interceptor.Interceptor;
+import jakarta.interceptor.InvocationContext;
 
 import test.extension.ServiceFrameworkExtension;
 
diff --git a/appserver/tests/appserv-tests/devtests/cdi/portable-extensions/new-bean-registration/servlet/test/beans/Transactional.java b/appserver/tests/appserv-tests/devtests/cdi/portable-extensions/new-bean-registration/servlet/test/beans/Transactional.java
index eef70c9..98f85d4 100644
--- a/appserver/tests/appserv-tests/devtests/cdi/portable-extensions/new-bean-registration/servlet/test/beans/Transactional.java
+++ b/appserver/tests/appserv-tests/devtests/cdi/portable-extensions/new-bean-registration/servlet/test/beans/Transactional.java
@@ -23,7 +23,7 @@
 import java.lang.annotation.RetentionPolicy;
 import java.lang.annotation.Target;
 
-import javax.interceptor.InterceptorBinding;
+import jakarta.interceptor.InterceptorBinding;
 
 
 @Target({TYPE, METHOD})
diff --git a/appserver/tests/appserv-tests/devtests/cdi/portable-extensions/package-private-extension-constructor/servlet/test/beans/TransactionInterceptor.java b/appserver/tests/appserv-tests/devtests/cdi/portable-extensions/package-private-extension-constructor/servlet/test/beans/TransactionInterceptor.java
index 13d1aea..1a132f9 100644
--- a/appserver/tests/appserv-tests/devtests/cdi/portable-extensions/package-private-extension-constructor/servlet/test/beans/TransactionInterceptor.java
+++ b/appserver/tests/appserv-tests/devtests/cdi/portable-extensions/package-private-extension-constructor/servlet/test/beans/TransactionInterceptor.java
@@ -17,9 +17,9 @@
 package test.beans;
 
 import javax.inject.Inject;
-import javax.interceptor.AroundInvoke;
-import javax.interceptor.Interceptor;
-import javax.interceptor.InvocationContext;
+import jakarta.interceptor.AroundInvoke;
+import jakarta.interceptor.Interceptor;
+import jakarta.interceptor.InvocationContext;
 
 import test.extension.PackagePrivateConstructorExtension;
 
diff --git a/appserver/tests/appserv-tests/devtests/cdi/portable-extensions/package-private-extension-constructor/servlet/test/beans/Transactional.java b/appserver/tests/appserv-tests/devtests/cdi/portable-extensions/package-private-extension-constructor/servlet/test/beans/Transactional.java
index eef70c9..98f85d4 100644
--- a/appserver/tests/appserv-tests/devtests/cdi/portable-extensions/package-private-extension-constructor/servlet/test/beans/Transactional.java
+++ b/appserver/tests/appserv-tests/devtests/cdi/portable-extensions/package-private-extension-constructor/servlet/test/beans/Transactional.java
@@ -23,7 +23,7 @@
 import java.lang.annotation.RetentionPolicy;
 import java.lang.annotation.Target;
 
-import javax.interceptor.InterceptorBinding;
+import jakarta.interceptor.InterceptorBinding;
 
 
 @Target({TYPE, METHOD})
diff --git a/appserver/tests/appserv-tests/devtests/cdi/portable-extensions/simple-portable-extension/servlet/test/beans/TransactionInterceptor.java b/appserver/tests/appserv-tests/devtests/cdi/portable-extensions/simple-portable-extension/servlet/test/beans/TransactionInterceptor.java
index 0b78e5f..e45e653 100644
--- a/appserver/tests/appserv-tests/devtests/cdi/portable-extensions/simple-portable-extension/servlet/test/beans/TransactionInterceptor.java
+++ b/appserver/tests/appserv-tests/devtests/cdi/portable-extensions/simple-portable-extension/servlet/test/beans/TransactionInterceptor.java
@@ -17,9 +17,9 @@
 package test.beans;
 
 import javax.inject.Inject;
-import javax.interceptor.AroundInvoke;
-import javax.interceptor.Interceptor;
-import javax.interceptor.InvocationContext;
+import jakarta.interceptor.AroundInvoke;
+import jakarta.interceptor.Interceptor;
+import jakarta.interceptor.InvocationContext;
 
 import test.extension.MyExtension;
 
diff --git a/appserver/tests/appserv-tests/devtests/cdi/portable-extensions/simple-portable-extension/servlet/test/beans/Transactional.java b/appserver/tests/appserv-tests/devtests/cdi/portable-extensions/simple-portable-extension/servlet/test/beans/Transactional.java
index eef70c9..98f85d4 100644
--- a/appserver/tests/appserv-tests/devtests/cdi/portable-extensions/simple-portable-extension/servlet/test/beans/Transactional.java
+++ b/appserver/tests/appserv-tests/devtests/cdi/portable-extensions/simple-portable-extension/servlet/test/beans/Transactional.java
@@ -23,7 +23,7 @@
 import java.lang.annotation.RetentionPolicy;
 import java.lang.annotation.Target;
 
-import javax.interceptor.InterceptorBinding;
+import jakarta.interceptor.InterceptorBinding;
 
 
 @Target({TYPE, METHOD})
diff --git a/appserver/tests/appserv-tests/devtests/cdi/smoke-tests/simple-managed-bean-interceptor-nonnull-package/servlet/com/tests/TestAroundInvokeInterceptor.java b/appserver/tests/appserv-tests/devtests/cdi/smoke-tests/simple-managed-bean-interceptor-nonnull-package/servlet/com/tests/TestAroundInvokeInterceptor.java
index 379dfbf..590431d 100644
--- a/appserver/tests/appserv-tests/devtests/cdi/smoke-tests/simple-managed-bean-interceptor-nonnull-package/servlet/com/tests/TestAroundInvokeInterceptor.java
+++ b/appserver/tests/appserv-tests/devtests/cdi/smoke-tests/simple-managed-bean-interceptor-nonnull-package/servlet/com/tests/TestAroundInvokeInterceptor.java
@@ -16,7 +16,7 @@
 
 package com.tests;
 
-import javax.interceptor.*;
+import jakarta.interceptor.*;
 
 @Tester @Interceptor
 public class TestAroundInvokeInterceptor {
diff --git a/appserver/tests/appserv-tests/devtests/cdi/smoke-tests/simple-managed-bean-interceptor-nonnull-package/servlet/com/tests/Tester.java b/appserver/tests/appserv-tests/devtests/cdi/smoke-tests/simple-managed-bean-interceptor-nonnull-package/servlet/com/tests/Tester.java
index a966727..de28fc4 100644
--- a/appserver/tests/appserv-tests/devtests/cdi/smoke-tests/simple-managed-bean-interceptor-nonnull-package/servlet/com/tests/Tester.java
+++ b/appserver/tests/appserv-tests/devtests/cdi/smoke-tests/simple-managed-bean-interceptor-nonnull-package/servlet/com/tests/Tester.java
@@ -16,7 +16,7 @@
 
 package com.tests;
 
-import javax.interceptor.*;
+import jakarta.interceptor.*;
 import java.lang.annotation.*;
 import static java.lang.annotation.ElementType.*;
 import static java.lang.annotation.RetentionPolicy.*;
diff --git a/appserver/tests/appserv-tests/devtests/cdi/smoke-tests/simple-managed-bean-interceptor/servlet/TestAroundInvokeInterceptor.java b/appserver/tests/appserv-tests/devtests/cdi/smoke-tests/simple-managed-bean-interceptor/servlet/TestAroundInvokeInterceptor.java
index 8b2414e..98ccd4c 100644
--- a/appserver/tests/appserv-tests/devtests/cdi/smoke-tests/simple-managed-bean-interceptor/servlet/TestAroundInvokeInterceptor.java
+++ b/appserver/tests/appserv-tests/devtests/cdi/smoke-tests/simple-managed-bean-interceptor/servlet/TestAroundInvokeInterceptor.java
@@ -14,7 +14,7 @@
  * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
  */
 
-import javax.interceptor.*;
+import jakarta.interceptor.*;
 
 @Tester @Interceptor
 public class TestAroundInvokeInterceptor {
diff --git a/appserver/tests/appserv-tests/devtests/cdi/smoke-tests/simple-managed-bean-interceptor/servlet/Tester.java b/appserver/tests/appserv-tests/devtests/cdi/smoke-tests/simple-managed-bean-interceptor/servlet/Tester.java
index 0555ac6..015040b 100644
--- a/appserver/tests/appserv-tests/devtests/cdi/smoke-tests/simple-managed-bean-interceptor/servlet/Tester.java
+++ b/appserver/tests/appserv-tests/devtests/cdi/smoke-tests/simple-managed-bean-interceptor/servlet/Tester.java
@@ -14,7 +14,7 @@
  * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
  */
 
-import javax.interceptor.*;
+import jakarta.interceptor.*;
 import java.lang.annotation.*;
 import static java.lang.annotation.ElementType.*;
 import static java.lang.annotation.RetentionPolicy.*;
diff --git a/appserver/tests/appserv-tests/devtests/cdi/specialization/alternative-leaks/servlet/test/beans/artifacts/RequiresNewTransactionInterceptor.java b/appserver/tests/appserv-tests/devtests/cdi/specialization/alternative-leaks/servlet/test/beans/artifacts/RequiresNewTransactionInterceptor.java
index a10a125..0422634 100644
--- a/appserver/tests/appserv-tests/devtests/cdi/specialization/alternative-leaks/servlet/test/beans/artifacts/RequiresNewTransactionInterceptor.java
+++ b/appserver/tests/appserv-tests/devtests/cdi/specialization/alternative-leaks/servlet/test/beans/artifacts/RequiresNewTransactionInterceptor.java
@@ -17,9 +17,9 @@
 package test.beans.artifacts;
 
 import javax.inject.Inject;
-import javax.interceptor.AroundInvoke;
-import javax.interceptor.Interceptor;
-import javax.interceptor.InvocationContext;
+import jakarta.interceptor.AroundInvoke;
+import jakarta.interceptor.Interceptor;
+import jakarta.interceptor.InvocationContext;
 
 import test.beans.nonmock.TestDependentBean;
 
diff --git a/appserver/tests/appserv-tests/devtests/cdi/specialization/alternative-leaks/servlet/test/beans/artifacts/TransactionInterceptor.java b/appserver/tests/appserv-tests/devtests/cdi/specialization/alternative-leaks/servlet/test/beans/artifacts/TransactionInterceptor.java
index f02f31b..913c049 100644
--- a/appserver/tests/appserv-tests/devtests/cdi/specialization/alternative-leaks/servlet/test/beans/artifacts/TransactionInterceptor.java
+++ b/appserver/tests/appserv-tests/devtests/cdi/specialization/alternative-leaks/servlet/test/beans/artifacts/TransactionInterceptor.java
@@ -17,9 +17,9 @@
 package test.beans.artifacts;
 
 import javax.inject.Inject;
-import javax.interceptor.AroundInvoke;
-import javax.interceptor.Interceptor;
-import javax.interceptor.InvocationContext;
+import jakarta.interceptor.AroundInvoke;
+import jakarta.interceptor.Interceptor;
+import jakarta.interceptor.InvocationContext;
 
 import test.beans.nonmock.TestDependentBean;
 
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 79cff9b..8889920 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
@@ -24,7 +24,7 @@
 import java.lang.annotation.Target;
 
 import javax.enterprise.util.Nonbinding;
-import javax.interceptor.InterceptorBinding;
+import jakarta.interceptor.InterceptorBinding;
 
 @Target({TYPE, METHOD})
 @Retention(RetentionPolicy.RUNTIME)
diff --git a/appserver/tests/appserv-tests/devtests/cdi/specialization/specialization-simple/servlet/test/beans/artifacts/RequiresNewTransactionInterceptor.java b/appserver/tests/appserv-tests/devtests/cdi/specialization/specialization-simple/servlet/test/beans/artifacts/RequiresNewTransactionInterceptor.java
index a10a125..0422634 100644
--- a/appserver/tests/appserv-tests/devtests/cdi/specialization/specialization-simple/servlet/test/beans/artifacts/RequiresNewTransactionInterceptor.java
+++ b/appserver/tests/appserv-tests/devtests/cdi/specialization/specialization-simple/servlet/test/beans/artifacts/RequiresNewTransactionInterceptor.java
@@ -17,9 +17,9 @@
 package test.beans.artifacts;
 
 import javax.inject.Inject;
-import javax.interceptor.AroundInvoke;
-import javax.interceptor.Interceptor;
-import javax.interceptor.InvocationContext;
+import jakarta.interceptor.AroundInvoke;
+import jakarta.interceptor.Interceptor;
+import jakarta.interceptor.InvocationContext;
 
 import test.beans.nonmock.TestDependentBean;
 
diff --git a/appserver/tests/appserv-tests/devtests/cdi/specialization/specialization-simple/servlet/test/beans/artifacts/TransactionInterceptor.java b/appserver/tests/appserv-tests/devtests/cdi/specialization/specialization-simple/servlet/test/beans/artifacts/TransactionInterceptor.java
index f02f31b..913c049 100644
--- a/appserver/tests/appserv-tests/devtests/cdi/specialization/specialization-simple/servlet/test/beans/artifacts/TransactionInterceptor.java
+++ b/appserver/tests/appserv-tests/devtests/cdi/specialization/specialization-simple/servlet/test/beans/artifacts/TransactionInterceptor.java
@@ -17,9 +17,9 @@
 package test.beans.artifacts;
 
 import javax.inject.Inject;
-import javax.interceptor.AroundInvoke;
-import javax.interceptor.Interceptor;
-import javax.interceptor.InvocationContext;
+import jakarta.interceptor.AroundInvoke;
+import jakarta.interceptor.Interceptor;
+import jakarta.interceptor.InvocationContext;
 
 import test.beans.nonmock.TestDependentBean;
 
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 79cff9b..8889920 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
@@ -24,7 +24,7 @@
 import java.lang.annotation.Target;
 
 import javax.enterprise.util.Nonbinding;
-import javax.interceptor.InterceptorBinding;
+import jakarta.interceptor.InterceptorBinding;
 
 @Target({TYPE, METHOD})
 @Retention(RetentionPolicy.RUNTIME)
diff --git a/appserver/tests/appserv-tests/devtests/cdi/stereotypes/alternative-stereotypes/servlet/test/beans/artifacts/RequiresNewTransactionInterceptor.java b/appserver/tests/appserv-tests/devtests/cdi/stereotypes/alternative-stereotypes/servlet/test/beans/artifacts/RequiresNewTransactionInterceptor.java
index a10a125..0422634 100644
--- a/appserver/tests/appserv-tests/devtests/cdi/stereotypes/alternative-stereotypes/servlet/test/beans/artifacts/RequiresNewTransactionInterceptor.java
+++ b/appserver/tests/appserv-tests/devtests/cdi/stereotypes/alternative-stereotypes/servlet/test/beans/artifacts/RequiresNewTransactionInterceptor.java
@@ -17,9 +17,9 @@
 package test.beans.artifacts;
 
 import javax.inject.Inject;
-import javax.interceptor.AroundInvoke;
-import javax.interceptor.Interceptor;
-import javax.interceptor.InvocationContext;
+import jakarta.interceptor.AroundInvoke;
+import jakarta.interceptor.Interceptor;
+import jakarta.interceptor.InvocationContext;
 
 import test.beans.nonmock.TestDependentBean;
 
diff --git a/appserver/tests/appserv-tests/devtests/cdi/stereotypes/alternative-stereotypes/servlet/test/beans/artifacts/TransactionInterceptor.java b/appserver/tests/appserv-tests/devtests/cdi/stereotypes/alternative-stereotypes/servlet/test/beans/artifacts/TransactionInterceptor.java
index f02f31b..913c049 100644
--- a/appserver/tests/appserv-tests/devtests/cdi/stereotypes/alternative-stereotypes/servlet/test/beans/artifacts/TransactionInterceptor.java
+++ b/appserver/tests/appserv-tests/devtests/cdi/stereotypes/alternative-stereotypes/servlet/test/beans/artifacts/TransactionInterceptor.java
@@ -17,9 +17,9 @@
 package test.beans.artifacts;
 
 import javax.inject.Inject;
-import javax.interceptor.AroundInvoke;
-import javax.interceptor.Interceptor;
-import javax.interceptor.InvocationContext;
+import jakarta.interceptor.AroundInvoke;
+import jakarta.interceptor.Interceptor;
+import jakarta.interceptor.InvocationContext;
 
 import test.beans.nonmock.TestDependentBean;
 
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 79cff9b..8889920 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
@@ -24,7 +24,7 @@
 import java.lang.annotation.Target;
 
 import javax.enterprise.util.Nonbinding;
-import javax.interceptor.InterceptorBinding;
+import jakarta.interceptor.InterceptorBinding;
 
 @Target({TYPE, METHOD})
 @Retention(RetentionPolicy.RUNTIME)
diff --git a/appserver/tests/appserv-tests/devtests/cdi/stereotypes/interceptor-bindings-for-stereotypes/servlet/test/beans/RequiresNewTransactionInterceptor.java b/appserver/tests/appserv-tests/devtests/cdi/stereotypes/interceptor-bindings-for-stereotypes/servlet/test/beans/RequiresNewTransactionInterceptor.java
index 73f5964..566c4b0 100644
--- a/appserver/tests/appserv-tests/devtests/cdi/stereotypes/interceptor-bindings-for-stereotypes/servlet/test/beans/RequiresNewTransactionInterceptor.java
+++ b/appserver/tests/appserv-tests/devtests/cdi/stereotypes/interceptor-bindings-for-stereotypes/servlet/test/beans/RequiresNewTransactionInterceptor.java
@@ -17,9 +17,9 @@
 package test.beans;
 
 import javax.inject.Inject;
-import javax.interceptor.AroundInvoke;
-import javax.interceptor.Interceptor;
-import javax.interceptor.InvocationContext;
+import jakarta.interceptor.AroundInvoke;
+import jakarta.interceptor.Interceptor;
+import jakarta.interceptor.InvocationContext;
 
 @Interceptor
 @Transactional(requiresNew=true, rolesAllowed={"admin", "manager"})
diff --git a/appserver/tests/appserv-tests/devtests/cdi/stereotypes/interceptor-bindings-for-stereotypes/servlet/test/beans/TransactionInterceptor.java b/appserver/tests/appserv-tests/devtests/cdi/stereotypes/interceptor-bindings-for-stereotypes/servlet/test/beans/TransactionInterceptor.java
index f762992..641c3d0 100644
--- a/appserver/tests/appserv-tests/devtests/cdi/stereotypes/interceptor-bindings-for-stereotypes/servlet/test/beans/TransactionInterceptor.java
+++ b/appserver/tests/appserv-tests/devtests/cdi/stereotypes/interceptor-bindings-for-stereotypes/servlet/test/beans/TransactionInterceptor.java
@@ -17,9 +17,9 @@
 package test.beans;
 
 import javax.inject.Inject;
-import javax.interceptor.AroundInvoke;
-import javax.interceptor.Interceptor;
-import javax.interceptor.InvocationContext;
+import jakarta.interceptor.AroundInvoke;
+import jakarta.interceptor.Interceptor;
+import jakarta.interceptor.InvocationContext;
 
 @Interceptor
 @Transactional
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 b8937b9..d2ed8a6 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
@@ -24,7 +24,7 @@
 import java.lang.annotation.Target;
 
 import javax.enterprise.util.Nonbinding;
-import javax.interceptor.InterceptorBinding;
+import jakarta.interceptor.InterceptorBinding;
 
 @Target({TYPE, METHOD})
 @Retention(RetentionPolicy.RUNTIME)
diff --git a/appserver/tests/appserv-tests/devtests/cdi/stereotypes/stereotype-stacking/servlet/test/beans/interceptors/Secure.java b/appserver/tests/appserv-tests/devtests/cdi/stereotypes/stereotype-stacking/servlet/test/beans/interceptors/Secure.java
index 187d737..19ba9cb 100644
--- a/appserver/tests/appserv-tests/devtests/cdi/stereotypes/stereotype-stacking/servlet/test/beans/interceptors/Secure.java
+++ b/appserver/tests/appserv-tests/devtests/cdi/stereotypes/stereotype-stacking/servlet/test/beans/interceptors/Secure.java
@@ -24,7 +24,7 @@
 import java.lang.annotation.Target;
 
 import javax.inject.Qualifier;
-import javax.interceptor.InterceptorBinding;
+import jakarta.interceptor.InterceptorBinding;
 
 
 @Target({ TYPE, METHOD })
diff --git a/appserver/tests/appserv-tests/devtests/cdi/stereotypes/stereotype-stacking/servlet/test/beans/interceptors/SecurityInterceptor.java b/appserver/tests/appserv-tests/devtests/cdi/stereotypes/stereotype-stacking/servlet/test/beans/interceptors/SecurityInterceptor.java
index 629ecb2..0559627 100644
--- a/appserver/tests/appserv-tests/devtests/cdi/stereotypes/stereotype-stacking/servlet/test/beans/interceptors/SecurityInterceptor.java
+++ b/appserver/tests/appserv-tests/devtests/cdi/stereotypes/stereotype-stacking/servlet/test/beans/interceptors/SecurityInterceptor.java
@@ -17,9 +17,9 @@
 package test.beans.interceptors;
 
 import javax.inject.Inject;
-import javax.interceptor.AroundInvoke;
-import javax.interceptor.Interceptor;
-import javax.interceptor.InvocationContext;
+import jakarta.interceptor.AroundInvoke;
+import jakarta.interceptor.Interceptor;
+import jakarta.interceptor.InvocationContext;
 
 import test.beans.TestDependentBean;
 
diff --git a/appserver/tests/appserv-tests/devtests/cdi/stereotypes/stereotype-stacking/servlet/test/beans/interceptors/TransactionInterceptor.java b/appserver/tests/appserv-tests/devtests/cdi/stereotypes/stereotype-stacking/servlet/test/beans/interceptors/TransactionInterceptor.java
index 9380dd8..2c2807e 100644
--- a/appserver/tests/appserv-tests/devtests/cdi/stereotypes/stereotype-stacking/servlet/test/beans/interceptors/TransactionInterceptor.java
+++ b/appserver/tests/appserv-tests/devtests/cdi/stereotypes/stereotype-stacking/servlet/test/beans/interceptors/TransactionInterceptor.java
@@ -17,9 +17,9 @@
 package test.beans.interceptors;
 
 import javax.inject.Inject;
-import javax.interceptor.AroundInvoke;
-import javax.interceptor.Interceptor;
-import javax.interceptor.InvocationContext;
+import jakarta.interceptor.AroundInvoke;
+import jakarta.interceptor.Interceptor;
+import jakarta.interceptor.InvocationContext;
 
 import test.beans.TestDependentBean;
 
diff --git a/appserver/tests/appserv-tests/devtests/cdi/stereotypes/stereotype-stacking/servlet/test/beans/interceptors/Transactional.java b/appserver/tests/appserv-tests/devtests/cdi/stereotypes/stereotype-stacking/servlet/test/beans/interceptors/Transactional.java
index f5b9db3..6f2708a 100644
--- a/appserver/tests/appserv-tests/devtests/cdi/stereotypes/stereotype-stacking/servlet/test/beans/interceptors/Transactional.java
+++ b/appserver/tests/appserv-tests/devtests/cdi/stereotypes/stereotype-stacking/servlet/test/beans/interceptors/Transactional.java
@@ -23,7 +23,7 @@
 import java.lang.annotation.RetentionPolicy;
 import java.lang.annotation.Target;
 
-import javax.interceptor.InterceptorBinding;
+import jakarta.interceptor.InterceptorBinding;
 
 @Target({TYPE, METHOD})
 @Retention(RetentionPolicy.RUNTIME)
diff --git a/appserver/tests/appserv-tests/devtests/connector/v3/ejb32-mdb/ejb/EnsureProxied.java b/appserver/tests/appserv-tests/devtests/connector/v3/ejb32-mdb/ejb/EnsureProxied.java
index f1f380b..3bd9348 100644
--- a/appserver/tests/appserv-tests/devtests/connector/v3/ejb32-mdb/ejb/EnsureProxied.java
+++ b/appserver/tests/appserv-tests/devtests/connector/v3/ejb32-mdb/ejb/EnsureProxied.java
@@ -16,8 +16,8 @@
 
 package com.sun.s1asdev.ejb.ejb32.mdb.ejb;
 
-import javax.interceptor.AroundInvoke;
-import javax.interceptor.InvocationContext;
+import jakarta.interceptor.AroundInvoke;
+import jakarta.interceptor.InvocationContext;
 
 /**
  * @author David Blevins
diff --git a/appserver/tests/appserv-tests/devtests/connector/v3/ejb32-mdb/ejb/ModernBean.java b/appserver/tests/appserv-tests/devtests/connector/v3/ejb32-mdb/ejb/ModernBean.java
index b6e7a64..71ca853 100644
--- a/appserver/tests/appserv-tests/devtests/connector/v3/ejb32-mdb/ejb/ModernBean.java
+++ b/appserver/tests/appserv-tests/devtests/connector/v3/ejb32-mdb/ejb/ModernBean.java
@@ -23,7 +23,7 @@
 import jakarta.ejb.EJB;
 import jakarta.ejb.MessageDriven;
 import jakarta.ejb.MessageDrivenContext;
-import javax.interceptor.Interceptors;
+import jakarta.interceptor.Interceptors;
 
 /**
  * @author David Blevins
diff --git a/appserver/tests/appserv-tests/devtests/deployment/annotation/ejb/src/InterceptorA.java b/appserver/tests/appserv-tests/devtests/deployment/annotation/ejb/src/InterceptorA.java
index 85740a0..85cb042 100644
--- a/appserver/tests/appserv-tests/devtests/deployment/annotation/ejb/src/InterceptorA.java
+++ b/appserver/tests/appserv-tests/devtests/deployment/annotation/ejb/src/InterceptorA.java
@@ -19,8 +19,8 @@
 import jakarta.annotation.PostConstruct;
 import jakarta.annotation.Resource;
 import jakarta.ejb.EJB;
-import javax.interceptor.AroundInvoke;
-import javax.interceptor.InvocationContext;
+import jakarta.interceptor.AroundInvoke;
+import jakarta.interceptor.InvocationContext;
 import javax.sql.DataSource;
 
 @Resource(name="jdbc/myDS", type=DataSource.class)
diff --git a/appserver/tests/appserv-tests/devtests/deployment/annotation/ejb/src/InterceptorB.java b/appserver/tests/appserv-tests/devtests/deployment/annotation/ejb/src/InterceptorB.java
index 57b7426..550c6fb 100644
--- a/appserver/tests/appserv-tests/devtests/deployment/annotation/ejb/src/InterceptorB.java
+++ b/appserver/tests/appserv-tests/devtests/deployment/annotation/ejb/src/InterceptorB.java
@@ -19,8 +19,8 @@
 import jakarta.annotation.PreDestroy;
 import jakarta.annotation.Resource;
 import jakarta.ejb.SessionContext;
-import javax.interceptor.AroundInvoke;
-import javax.interceptor.InvocationContext;
+import jakarta.interceptor.AroundInvoke;
+import jakarta.interceptor.InvocationContext;
 
 public class InterceptorB extends InterceptorA {
     @Resource SessionContext sessionCtx;
diff --git a/appserver/tests/appserv-tests/devtests/deployment/annotation/ejb/src/StatelessTest1.java b/appserver/tests/appserv-tests/devtests/deployment/annotation/ejb/src/StatelessTest1.java
index d9c0c7a..d4708a5 100644
--- a/appserver/tests/appserv-tests/devtests/deployment/annotation/ejb/src/StatelessTest1.java
+++ b/appserver/tests/appserv-tests/devtests/deployment/annotation/ejb/src/StatelessTest1.java
@@ -24,7 +24,7 @@
 import jakarta.ejb.TransactionAttribute;
 import jakarta.ejb.TransactionAttributeType;
 import jakarta.ejb.TransactionManagementType;
-import javax.interceptor.Interceptors;
+import jakarta.interceptor.Interceptors;
 
 /**
  * @author Shing Wai Chan
diff --git a/appserver/tests/appserv-tests/devtests/deployment/ejb30/ear/session2/ejb/MyCallbackHandler.java b/appserver/tests/appserv-tests/devtests/deployment/ejb30/ear/session2/ejb/MyCallbackHandler.java
index 9842edf..29fecba 100644
--- a/appserver/tests/appserv-tests/devtests/deployment/ejb30/ear/session2/ejb/MyCallbackHandler.java
+++ b/appserver/tests/appserv-tests/devtests/deployment/ejb30/ear/session2/ejb/MyCallbackHandler.java
@@ -17,7 +17,7 @@
 package com.sun.s1asdev.ejb.ejb30.hello.session2;
 
 import jakarta.annotation.PreDestroy;
-import javax.interceptor.InvocationContext;
+import jakarta.interceptor.InvocationContext;
 
 public class MyCallbackHandler {
 
diff --git a/appserver/tests/appserv-tests/devtests/deployment/ejb30/ear/session2/ejb/SfulEJB.java b/appserver/tests/appserv-tests/devtests/deployment/ejb30/ear/session2/ejb/SfulEJB.java
index da9d18c..f45baf5 100644
--- a/appserver/tests/appserv-tests/devtests/deployment/ejb30/ear/session2/ejb/SfulEJB.java
+++ b/appserver/tests/appserv-tests/devtests/deployment/ejb30/ear/session2/ejb/SfulEJB.java
@@ -20,7 +20,7 @@
 import jakarta.ejb.Remote;
 import jakarta.ejb.EJB;
 import jakarta.annotation.PostConstruct;
-import javax.interceptor.Interceptors;
+import jakarta.interceptor.Interceptors;
 import jakarta.ejb.EJBs;
 import jakarta.ejb.Remove;
 import jakarta.annotation.PreDestroy;
diff --git a/appserver/tests/appserv-tests/devtests/deployment/ejb30/ear/session2/ejb/SfulEJB2.java b/appserver/tests/appserv-tests/devtests/deployment/ejb30/ear/session2/ejb/SfulEJB2.java
index 0b431e0..91df6f7 100644
--- a/appserver/tests/appserv-tests/devtests/deployment/ejb30/ear/session2/ejb/SfulEJB2.java
+++ b/appserver/tests/appserv-tests/devtests/deployment/ejb30/ear/session2/ejb/SfulEJB2.java
@@ -20,7 +20,7 @@
 import jakarta.ejb.Remote;
 import jakarta.ejb.EJB;
 import jakarta.annotation.PostConstruct;
-import javax.interceptor.Interceptors;
+import jakarta.interceptor.Interceptors;
 import jakarta.ejb.EJBs;
 import jakarta.ejb.Remove;
 import jakarta.ejb.SessionSynchronization;
diff --git a/appserver/tests/appserv-tests/devtests/deployment/ejb31/ejblite/javamodule/war/FooManagedBean.java b/appserver/tests/appserv-tests/devtests/deployment/ejb31/ejblite/javamodule/war/FooManagedBean.java
index 0af74c2..ea60a8e 100644
--- a/appserver/tests/appserv-tests/devtests/deployment/ejb31/ejblite/javamodule/war/FooManagedBean.java
+++ b/appserver/tests/appserv-tests/devtests/deployment/ejb31/ejblite/javamodule/war/FooManagedBean.java
@@ -23,9 +23,9 @@
 import org.omg.CORBA.ORB;
 import jakarta.persistence.PersistenceContext;
 import jakarta.persistence.EntityManager;
-import javax.interceptor.Interceptors;
-import javax.interceptor.AroundInvoke;
-import javax.interceptor.InvocationContext;
+import jakarta.interceptor.Interceptors;
+import jakarta.interceptor.AroundInvoke;
+import jakarta.interceptor.InvocationContext;
 
 @ManagedBean("foomanagedbean")
 @Interceptors(InterceptorA.class)
diff --git a/appserver/tests/appserv-tests/devtests/deployment/ejb31/ejblite/javamodule/war/InterceptorA.java b/appserver/tests/appserv-tests/devtests/deployment/ejb31/ejblite/javamodule/war/InterceptorA.java
index 067d8f3..1003600 100644
--- a/appserver/tests/appserv-tests/devtests/deployment/ejb31/ejblite/javamodule/war/InterceptorA.java
+++ b/appserver/tests/appserv-tests/devtests/deployment/ejb31/ejblite/javamodule/war/InterceptorA.java
@@ -24,8 +24,8 @@
 import jakarta.persistence.PersistenceContext;
 import jakarta.persistence.EntityManager;
 
-import javax.interceptor.InvocationContext;
-import javax.interceptor.AroundInvoke;
+import jakarta.interceptor.InvocationContext;
+import jakarta.interceptor.AroundInvoke;
 
 
 public class InterceptorA extends InterceptorSuper {
diff --git a/appserver/tests/appserv-tests/devtests/deployment/ejb31/ejblite/javamodule/war/InterceptorB.java b/appserver/tests/appserv-tests/devtests/deployment/ejb31/ejblite/javamodule/war/InterceptorB.java
index b72ac76..c643637 100644
--- a/appserver/tests/appserv-tests/devtests/deployment/ejb31/ejblite/javamodule/war/InterceptorB.java
+++ b/appserver/tests/appserv-tests/devtests/deployment/ejb31/ejblite/javamodule/war/InterceptorB.java
@@ -18,8 +18,8 @@
 
 import jakarta.annotation.*;
 
-import javax.interceptor.InvocationContext;
-import javax.interceptor.AroundInvoke;
+import jakarta.interceptor.InvocationContext;
+import jakarta.interceptor.AroundInvoke;
 import java.util.Map;
 
 import jakarta.ejb.EJBException;
diff --git a/appserver/tests/appserv-tests/devtests/deployment/ejb31/ejblite/javamodule/war/InterceptorSuper.java b/appserver/tests/appserv-tests/devtests/deployment/ejb31/ejblite/javamodule/war/InterceptorSuper.java
index 93e5ded..4adbd03 100644
--- a/appserver/tests/appserv-tests/devtests/deployment/ejb31/ejblite/javamodule/war/InterceptorSuper.java
+++ b/appserver/tests/appserv-tests/devtests/deployment/ejb31/ejblite/javamodule/war/InterceptorSuper.java
@@ -16,8 +16,8 @@
 
 package com.acme;
 
-import javax.interceptor.InvocationContext;
-import javax.interceptor.AroundInvoke;
+import jakarta.interceptor.InvocationContext;
+import jakarta.interceptor.AroundInvoke;
 
 
 public class InterceptorSuper {
diff --git a/appserver/tests/appserv-tests/devtests/deployment/ejb31/ejblite/javamodule/war/ManagedSuper.java b/appserver/tests/appserv-tests/devtests/deployment/ejb31/ejblite/javamodule/war/ManagedSuper.java
index a4a80da..5b0df58 100644
--- a/appserver/tests/appserv-tests/devtests/deployment/ejb31/ejblite/javamodule/war/ManagedSuper.java
+++ b/appserver/tests/appserv-tests/devtests/deployment/ejb31/ejblite/javamodule/war/ManagedSuper.java
@@ -21,7 +21,7 @@
 import jakarta.annotation.Resource;
 import javax.sql.DataSource;
 
-import javax.interceptor.*;
+import jakarta.interceptor.*;
 
 public class ManagedSuper {
 
diff --git a/appserver/tests/appserv-tests/devtests/deployment/ejb31/ejblite/javamodule/war/StatefulBean.java b/appserver/tests/appserv-tests/devtests/deployment/ejb31/ejblite/javamodule/war/StatefulBean.java
index e5a3a6a..9dcf979 100644
--- a/appserver/tests/appserv-tests/devtests/deployment/ejb31/ejblite/javamodule/war/StatefulBean.java
+++ b/appserver/tests/appserv-tests/devtests/deployment/ejb31/ejblite/javamodule/war/StatefulBean.java
@@ -18,7 +18,7 @@
 
 import jakarta.ejb.Stateful;
 import jakarta.ejb.*;
-import javax.interceptor.Interceptors;
+import jakarta.interceptor.Interceptors;
 
 import jakarta.annotation.PostConstruct;
 import jakarta.annotation.PreDestroy;
diff --git a/appserver/tests/appserv-tests/devtests/deployment/ejb31/ejblite/javamodule/war/StatelessBean.java b/appserver/tests/appserv-tests/devtests/deployment/ejb31/ejblite/javamodule/war/StatelessBean.java
index c52310f..f6148a5 100644
--- a/appserver/tests/appserv-tests/devtests/deployment/ejb31/ejblite/javamodule/war/StatelessBean.java
+++ b/appserver/tests/appserv-tests/devtests/deployment/ejb31/ejblite/javamodule/war/StatelessBean.java
@@ -18,7 +18,7 @@
 
 import jakarta.ejb.Stateless;
 import jakarta.ejb.*;
-import javax.interceptor.Interceptors;
+import jakarta.interceptor.Interceptors;
 
 import jakarta.annotation.PostConstruct;
 import jakarta.annotation.PreDestroy;
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb30/hello/mdb/ejb/InterceptorA.java b/appserver/tests/appserv-tests/devtests/ejb/ejb30/hello/mdb/ejb/InterceptorA.java
index 2ca4192..72d0408 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb30/hello/mdb/ejb/InterceptorA.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb30/hello/mdb/ejb/InterceptorA.java
@@ -16,8 +16,8 @@
 
 package com.sun.s1asdev.ejb.ejb30.hello.mdb;
 
-import javax.interceptor.AroundInvoke;
-import javax.interceptor.InvocationContext;
+import jakarta.interceptor.AroundInvoke;
+import jakarta.interceptor.InvocationContext;
 
 public class InterceptorA {
 
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb30/hello/mdb/ejb/MessageBean.java b/appserver/tests/appserv-tests/devtests/ejb/ejb30/hello/mdb/ejb/MessageBean.java
index 75a6c3d..e4d85c8 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb30/hello/mdb/ejb/MessageBean.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb30/hello/mdb/ejb/MessageBean.java
@@ -36,7 +36,7 @@
 
 import jakarta.annotation.Resource;
 
-@javax.interceptor.Interceptors(InterceptorA.class)
+@jakarta.interceptor.Interceptors(InterceptorA.class)
 @TransactionManagement(TransactionManagementType.BEAN)
 @MessageDriven(mappedName="jms/ejb_ejb30_hello_mdb_InQueue", description="mymessagedriven bean description")
  public class MessageBean implements MessageListener {
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb30/hello/mdb2/ejb/MessageBean.java b/appserver/tests/appserv-tests/devtests/ejb/ejb30/hello/mdb2/ejb/MessageBean.java
index aec028a..7fe594b 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb30/hello/mdb2/ejb/MessageBean.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb30/hello/mdb2/ejb/MessageBean.java
@@ -25,8 +25,8 @@
 import jakarta.ejb.EJB;
 import jakarta.ejb.TransactionAttribute;
 import jakarta.ejb.TransactionAttributeType;
-import javax.interceptor.AroundInvoke;
-import javax.interceptor.InvocationContext;
+import jakarta.interceptor.AroundInvoke;
+import jakarta.interceptor.InvocationContext;
 import jakarta.ejb.MessageDrivenContext;
 
 import javax.naming.InitialContext;
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb30/hello/session2/ejb/MyCallbackHandler.java b/appserver/tests/appserv-tests/devtests/ejb/ejb30/hello/session2/ejb/MyCallbackHandler.java
index 29fe7ca..0e4c3dd 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb30/hello/session2/ejb/MyCallbackHandler.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb30/hello/session2/ejb/MyCallbackHandler.java
@@ -17,7 +17,7 @@
 package com.sun.s1asdev.ejb.ejb30.hello.session2;
 
 import jakarta.annotation.PreDestroy;
-import javax.interceptor.InvocationContext;
+import jakarta.interceptor.InvocationContext;
 import jakarta.ejb.EJBException;
 
 public class MyCallbackHandler {
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb30/hello/session2/ejb/SfulEJB.java b/appserver/tests/appserv-tests/devtests/ejb/ejb30/hello/session2/ejb/SfulEJB.java
index da9d18c..f45baf5 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb30/hello/session2/ejb/SfulEJB.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb30/hello/session2/ejb/SfulEJB.java
@@ -20,7 +20,7 @@
 import jakarta.ejb.Remote;
 import jakarta.ejb.EJB;
 import jakarta.annotation.PostConstruct;
-import javax.interceptor.Interceptors;
+import jakarta.interceptor.Interceptors;
 import jakarta.ejb.EJBs;
 import jakarta.ejb.Remove;
 import jakarta.annotation.PreDestroy;
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb30/hello/session2/ejb/SfulEJB2.java b/appserver/tests/appserv-tests/devtests/ejb/ejb30/hello/session2/ejb/SfulEJB2.java
index 0b431e0..91df6f7 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb30/hello/session2/ejb/SfulEJB2.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb30/hello/session2/ejb/SfulEJB2.java
@@ -20,7 +20,7 @@
 import jakarta.ejb.Remote;
 import jakarta.ejb.EJB;
 import jakarta.annotation.PostConstruct;
-import javax.interceptor.Interceptors;
+import jakarta.interceptor.Interceptors;
 import jakarta.ejb.EJBs;
 import jakarta.ejb.Remove;
 import jakarta.ejb.SessionSynchronization;
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb30/hello/session2full/ejb/MyCallbackHandler.java b/appserver/tests/appserv-tests/devtests/ejb/ejb30/hello/session2full/ejb/MyCallbackHandler.java
index a23b489..3288c63 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb30/hello/session2full/ejb/MyCallbackHandler.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb30/hello/session2full/ejb/MyCallbackHandler.java
@@ -16,7 +16,7 @@
 
 package com.sun.s1asdev.ejb.ejb30.hello.session2full;
 
-import javax.interceptor.InvocationContext;
+import jakarta.interceptor.InvocationContext;
 
 public class MyCallbackHandler {
 
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb30/hello/session5/ejb/MyInterceptor.java b/appserver/tests/appserv-tests/devtests/ejb/ejb30/hello/session5/ejb/MyInterceptor.java
index c1f734c..ef74b3b 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb30/hello/session5/ejb/MyInterceptor.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb30/hello/session5/ejb/MyInterceptor.java
@@ -16,8 +16,8 @@
 
 package com.sun.s1asdev.ejb.ejb30.hello.session5;
 
-import javax.interceptor.AroundInvoke;
-import javax.interceptor.InvocationContext;
+import jakarta.interceptor.AroundInvoke;
+import jakarta.interceptor.InvocationContext;
 import jakarta.annotation.PostConstruct;
 
 public class MyInterceptor
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb30/hello/session5/ejb/MyInterceptor2.java b/appserver/tests/appserv-tests/devtests/ejb/ejb30/hello/session5/ejb/MyInterceptor2.java
index 6f96785..8f0c8f2 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb30/hello/session5/ejb/MyInterceptor2.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb30/hello/session5/ejb/MyInterceptor2.java
@@ -16,8 +16,8 @@
 
 package com.sun.s1asdev.ejb.ejb30.hello.session5;
 
-import javax.interceptor.AroundInvoke;
-import javax.interceptor.InvocationContext;
+import jakarta.interceptor.AroundInvoke;
+import jakarta.interceptor.InvocationContext;
 import jakarta.annotation.PostConstruct;
 
 public class MyInterceptor2
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb30/hello/session5/ejb/SfulEJB.java b/appserver/tests/appserv-tests/devtests/ejb/ejb30/hello/session5/ejb/SfulEJB.java
index 9252fc3..8ddd1a4 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb30/hello/session5/ejb/SfulEJB.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb30/hello/session5/ejb/SfulEJB.java
@@ -18,7 +18,7 @@
 
 import jakarta.ejb.Stateful;
 import jakarta.ejb.Remote;
-import javax.interceptor.Interceptors;
+import jakarta.interceptor.Interceptors;
 import jakarta.ejb.EJBException;
 
 @Stateful
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb30/interceptors/bindings/ejb/Common.java b/appserver/tests/appserv-tests/devtests/ejb/ejb30/interceptors/bindings/ejb/Common.java
index f9dd39e..85ad44f 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb30/interceptors/bindings/ejb/Common.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb30/interceptors/bindings/ejb/Common.java
@@ -19,7 +19,7 @@
 import java.util.List;
 import java.util.LinkedList;
 
-import javax.interceptor.InvocationContext;
+import jakarta.interceptor.InvocationContext;
 import jakarta.ejb.EJBException;
 
 public class Common {
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb30/interceptors/bindings/ejb/InterceptorA.java b/appserver/tests/appserv-tests/devtests/ejb/ejb30/interceptors/bindings/ejb/InterceptorA.java
index e53f28f..f24f29e 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb30/interceptors/bindings/ejb/InterceptorA.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb30/interceptors/bindings/ejb/InterceptorA.java
@@ -16,8 +16,8 @@
 
 package com.sun.s1asdev.ejb.ejb30.interceptors.bindings;
 
-import javax.interceptor.AroundInvoke;
-import javax.interceptor.InvocationContext;
+import jakarta.interceptor.AroundInvoke;
+import jakarta.interceptor.InvocationContext;
 import jakarta.annotation.PostConstruct;
 import javax.naming.InitialContext;
 import jakarta.ejb.SessionContext;
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb30/interceptors/bindings/ejb/InterceptorB.java b/appserver/tests/appserv-tests/devtests/ejb/ejb30/interceptors/bindings/ejb/InterceptorB.java
index 685222f..497bb9b 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb30/interceptors/bindings/ejb/InterceptorB.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb30/interceptors/bindings/ejb/InterceptorB.java
@@ -16,8 +16,8 @@
 
 package com.sun.s1asdev.ejb.ejb30.interceptors.bindings;
 
-import javax.interceptor.AroundInvoke;
-import javax.interceptor.InvocationContext;
+import jakarta.interceptor.AroundInvoke;
+import jakarta.interceptor.InvocationContext;
 import jakarta.annotation.PostConstruct;
 
 public class InterceptorB {
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb30/interceptors/bindings/ejb/InterceptorC.java b/appserver/tests/appserv-tests/devtests/ejb/ejb30/interceptors/bindings/ejb/InterceptorC.java
index c67b791..20f6fb6 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb30/interceptors/bindings/ejb/InterceptorC.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb30/interceptors/bindings/ejb/InterceptorC.java
@@ -16,8 +16,8 @@
 
 package com.sun.s1asdev.ejb.ejb30.interceptors.bindings;
 
-import javax.interceptor.AroundInvoke;
-import javax.interceptor.InvocationContext;
+import jakarta.interceptor.AroundInvoke;
+import jakarta.interceptor.InvocationContext;
 import jakarta.annotation.PostConstruct;
 
 public class InterceptorC {
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb30/interceptors/bindings/ejb/InterceptorD.java b/appserver/tests/appserv-tests/devtests/ejb/ejb30/interceptors/bindings/ejb/InterceptorD.java
index 5907143..7c1669b 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb30/interceptors/bindings/ejb/InterceptorD.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb30/interceptors/bindings/ejb/InterceptorD.java
@@ -16,8 +16,8 @@
 
 package com.sun.s1asdev.ejb.ejb30.interceptors.bindings;
 
-import javax.interceptor.AroundInvoke;
-import javax.interceptor.InvocationContext;
+import jakarta.interceptor.AroundInvoke;
+import jakarta.interceptor.InvocationContext;
 import jakarta.annotation.PostConstruct;
 
 public class InterceptorD {
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb30/interceptors/bindings/ejb/InterceptorE.java b/appserver/tests/appserv-tests/devtests/ejb/ejb30/interceptors/bindings/ejb/InterceptorE.java
index c57ebf6..136d2cf 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb30/interceptors/bindings/ejb/InterceptorE.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb30/interceptors/bindings/ejb/InterceptorE.java
@@ -16,8 +16,8 @@
 
 package com.sun.s1asdev.ejb.ejb30.interceptors.bindings;
 
-import javax.interceptor.AroundInvoke;
-import javax.interceptor.InvocationContext;
+import jakarta.interceptor.AroundInvoke;
+import jakarta.interceptor.InvocationContext;
 import jakarta.annotation.PostConstruct;
 
 public class InterceptorE {
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb30/interceptors/bindings/ejb/InterceptorF.java b/appserver/tests/appserv-tests/devtests/ejb/ejb30/interceptors/bindings/ejb/InterceptorF.java
index a76be48..772fb40 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb30/interceptors/bindings/ejb/InterceptorF.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb30/interceptors/bindings/ejb/InterceptorF.java
@@ -16,8 +16,8 @@
 
 package com.sun.s1asdev.ejb.ejb30.interceptors.bindings;
 
-import javax.interceptor.AroundInvoke;
-import javax.interceptor.InvocationContext;
+import jakarta.interceptor.AroundInvoke;
+import jakarta.interceptor.InvocationContext;
 import jakarta.annotation.PostConstruct;
 
 public class InterceptorF {
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb30/interceptors/bindings/ejb/InterceptorG.java b/appserver/tests/appserv-tests/devtests/ejb/ejb30/interceptors/bindings/ejb/InterceptorG.java
index 2eaf0f8..eb400b2 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb30/interceptors/bindings/ejb/InterceptorG.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb30/interceptors/bindings/ejb/InterceptorG.java
@@ -16,8 +16,8 @@
 
 package com.sun.s1asdev.ejb.ejb30.interceptors.bindings;
 
-import javax.interceptor.AroundInvoke;
-import javax.interceptor.InvocationContext;
+import jakarta.interceptor.AroundInvoke;
+import jakarta.interceptor.InvocationContext;
 import jakarta.annotation.PostConstruct;
 
 public class InterceptorG {
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb30/interceptors/bindings/ejb/SfulEJB.java b/appserver/tests/appserv-tests/devtests/ejb/ejb30/interceptors/bindings/ejb/SfulEJB.java
index aac4548..a565ed8 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb30/interceptors/bindings/ejb/SfulEJB.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb30/interceptors/bindings/ejb/SfulEJB.java
@@ -18,11 +18,11 @@
 
 
 import jakarta.ejb.Stateful;
-import javax.interceptor.Interceptors;
-import javax.interceptor.ExcludeDefaultInterceptors;
-import javax.interceptor.ExcludeClassInterceptors;
-import javax.interceptor.AroundInvoke;
-import javax.interceptor.InvocationContext;
+import jakarta.interceptor.Interceptors;
+import jakarta.interceptor.ExcludeDefaultInterceptors;
+import jakarta.interceptor.ExcludeClassInterceptors;
+import jakarta.interceptor.AroundInvoke;
+import jakarta.interceptor.InvocationContext;
 import jakarta.ejb.EJBException;
 
 @Stateful
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb30/interceptors/bindings/ejb/SfulEJB2.java b/appserver/tests/appserv-tests/devtests/ejb/ejb30/interceptors/bindings/ejb/SfulEJB2.java
index 45b3a10..f5d19ed 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb30/interceptors/bindings/ejb/SfulEJB2.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb30/interceptors/bindings/ejb/SfulEJB2.java
@@ -17,12 +17,12 @@
 package com.sun.s1asdev.ejb.ejb30.interceptors.bindings;
 
 import jakarta.ejb.Stateful;
-import javax.interceptor.AroundInvoke;
+import jakarta.interceptor.AroundInvoke;
 import jakarta.ejb.EJBException;
-import javax.interceptor.InvocationContext;
-import javax.interceptor.Interceptors;
-import javax.interceptor.ExcludeDefaultInterceptors;
-import javax.interceptor.ExcludeClassInterceptors;
+import jakarta.interceptor.InvocationContext;
+import jakarta.interceptor.Interceptors;
+import jakarta.interceptor.ExcludeDefaultInterceptors;
+import jakarta.interceptor.ExcludeClassInterceptors;
 
 @Stateful
 @Interceptors({InterceptorC.class, InterceptorD.class})
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb30/interceptors/bindings/ejb/SlessEJB3.java b/appserver/tests/appserv-tests/devtests/ejb/ejb30/interceptors/bindings/ejb/SlessEJB3.java
index e07b46a..480566f 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb30/interceptors/bindings/ejb/SlessEJB3.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb30/interceptors/bindings/ejb/SlessEJB3.java
@@ -18,11 +18,11 @@
 
 
 import jakarta.ejb.Stateless;
-import javax.interceptor.Interceptors;
-import javax.interceptor.ExcludeDefaultInterceptors;
-import javax.interceptor.ExcludeClassInterceptors;
-import javax.interceptor.AroundInvoke;
-import javax.interceptor.InvocationContext;
+import jakarta.interceptor.Interceptors;
+import jakarta.interceptor.ExcludeDefaultInterceptors;
+import jakarta.interceptor.ExcludeClassInterceptors;
+import jakarta.interceptor.AroundInvoke;
+import jakarta.interceptor.InvocationContext;
 
 @Stateless
 // total ordering DCBA expressed in .xml
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb30/interceptors/bindings/ejb/SlessEJB4.java b/appserver/tests/appserv-tests/devtests/ejb/ejb30/interceptors/bindings/ejb/SlessEJB4.java
index 59097e4..724ccf6 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb30/interceptors/bindings/ejb/SlessEJB4.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb30/interceptors/bindings/ejb/SlessEJB4.java
@@ -19,11 +19,11 @@
 
 import jakarta.ejb.Stateless;
 import jakarta.ejb.EJBException;
-import javax.interceptor.Interceptors;
-import javax.interceptor.ExcludeDefaultInterceptors;
-import javax.interceptor.ExcludeClassInterceptors;
-import javax.interceptor.AroundInvoke;
-import javax.interceptor.InvocationContext;
+import jakarta.interceptor.Interceptors;
+import jakarta.interceptor.ExcludeDefaultInterceptors;
+import jakarta.interceptor.ExcludeClassInterceptors;
+import jakarta.interceptor.AroundInvoke;
+import jakarta.interceptor.InvocationContext;
 
 
 // Exclude default interceptors, but re-add one of them at class-level
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb30/interceptors/bindings/ejb/SlessEJB5.java b/appserver/tests/appserv-tests/devtests/ejb/ejb30/interceptors/bindings/ejb/SlessEJB5.java
index 60ce772..0a573d0 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb30/interceptors/bindings/ejb/SlessEJB5.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb30/interceptors/bindings/ejb/SlessEJB5.java
@@ -19,11 +19,11 @@
 
 import jakarta.ejb.Stateless;
 import jakarta.ejb.EJBException;
-import javax.interceptor.Interceptors;
-import javax.interceptor.ExcludeDefaultInterceptors;
-import javax.interceptor.ExcludeClassInterceptors;
-import javax.interceptor.AroundInvoke;
-import javax.interceptor.InvocationContext;
+import jakarta.interceptor.Interceptors;
+import jakarta.interceptor.ExcludeDefaultInterceptors;
+import jakarta.interceptor.ExcludeClassInterceptors;
+import jakarta.interceptor.AroundInvoke;
+import jakarta.interceptor.InvocationContext;
 
 
 // Define some interceptors via annotations and some via
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb30/interceptors/bindings/ejb/SlessEJB6.java b/appserver/tests/appserv-tests/devtests/ejb/ejb30/interceptors/bindings/ejb/SlessEJB6.java
index 7eb4a73..ed905f6 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb30/interceptors/bindings/ejb/SlessEJB6.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb30/interceptors/bindings/ejb/SlessEJB6.java
@@ -19,11 +19,11 @@
 
 import jakarta.ejb.Stateless;
 import jakarta.ejb.EJBException;
-import javax.interceptor.Interceptors;
-import javax.interceptor.ExcludeDefaultInterceptors;
-import javax.interceptor.ExcludeClassInterceptors;
-import javax.interceptor.AroundInvoke;
-import javax.interceptor.InvocationContext;
+import jakarta.interceptor.Interceptors;
+import jakarta.interceptor.ExcludeDefaultInterceptors;
+import jakarta.interceptor.ExcludeClassInterceptors;
+import jakarta.interceptor.AroundInvoke;
+import jakarta.interceptor.InvocationContext;
 
 
 // Each interceptor list must at least have InterceptorG for
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb30/interceptors/inheritence/ejb/BaseInterceptor.java b/appserver/tests/appserv-tests/devtests/ejb/ejb30/interceptors/inheritence/ejb/BaseInterceptor.java
index 6ca24ab..c3a08d6 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb30/interceptors/inheritence/ejb/BaseInterceptor.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb30/interceptors/inheritence/ejb/BaseInterceptor.java
@@ -19,8 +19,8 @@
 import java.util.List;
 import java.util.ArrayList;
 
-import javax.interceptor.InvocationContext;
-import javax.interceptor.AroundInvoke;
+import jakarta.interceptor.InvocationContext;
+import jakarta.interceptor.AroundInvoke;
 import jakarta.annotation.PostConstruct;
 import jakarta.ejb.PrePassivate;
 import jakarta.ejb.PostActivate;
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb30/interceptors/inheritence/ejb/BaseLevel2Interceptor.java b/appserver/tests/appserv-tests/devtests/ejb/ejb30/interceptors/inheritence/ejb/BaseLevel2Interceptor.java
index eb35767..eba31f3 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb30/interceptors/inheritence/ejb/BaseLevel2Interceptor.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb30/interceptors/inheritence/ejb/BaseLevel2Interceptor.java
@@ -16,8 +16,8 @@
 
 package com.sun.s1asdev.ejb.ejb30.interceptors.session;
 
-import javax.interceptor.InvocationContext;
-import javax.interceptor.AroundInvoke;
+import jakarta.interceptor.InvocationContext;
+import jakarta.interceptor.AroundInvoke;
 import jakarta.annotation.PostConstruct;
 
 public class BaseLevel2Interceptor
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb30/interceptors/inheritence/ejb/BaseLifecycleInterceptor.java b/appserver/tests/appserv-tests/devtests/ejb/ejb30/interceptors/inheritence/ejb/BaseLifecycleInterceptor.java
index 54bb437..f8f77cf 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb30/interceptors/inheritence/ejb/BaseLifecycleInterceptor.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb30/interceptors/inheritence/ejb/BaseLifecycleInterceptor.java
@@ -16,8 +16,8 @@
 
 package com.sun.s1asdev.ejb.ejb30.interceptors.session;
 
-import javax.interceptor.InvocationContext;
-import javax.interceptor.AroundInvoke;
+import jakarta.interceptor.InvocationContext;
+import jakarta.interceptor.AroundInvoke;
 import jakarta.ejb.PrePassivate;
 import jakarta.ejb.PostActivate;
 import jakarta.ejb.EJB;
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb30/interceptors/inheritence/ejb/DistinctMethodsInterceptor.java b/appserver/tests/appserv-tests/devtests/ejb/ejb30/interceptors/inheritence/ejb/DistinctMethodsInterceptor.java
index ef9e9a9..6545c6a 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb30/interceptors/inheritence/ejb/DistinctMethodsInterceptor.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb30/interceptors/inheritence/ejb/DistinctMethodsInterceptor.java
@@ -19,8 +19,8 @@
 import java.util.List;
 import java.util.ArrayList;
 
-import javax.interceptor.InvocationContext;
-import javax.interceptor.AroundInvoke;
+import jakarta.interceptor.InvocationContext;
+import jakarta.interceptor.AroundInvoke;
 import jakarta.annotation.PostConstruct;
 
 public class DistinctMethodsInterceptor extends BaseLevel2Interceptor {
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb30/interceptors/inheritence/ejb/DummyBaseEJB.java b/appserver/tests/appserv-tests/devtests/ejb/ejb30/interceptors/inheritence/ejb/DummyBaseEJB.java
index 3c6c340..524e27a 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb30/interceptors/inheritence/ejb/DummyBaseEJB.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb30/interceptors/inheritence/ejb/DummyBaseEJB.java
@@ -20,9 +20,9 @@
 import java.util.ArrayList;
 
 import jakarta.ejb.Stateless;
-import javax.interceptor.Interceptors;
-import javax.interceptor.InvocationContext;
-import javax.interceptor.AroundInvoke;
+import jakarta.interceptor.Interceptors;
+import jakarta.interceptor.InvocationContext;
+import jakarta.interceptor.AroundInvoke;
 import jakarta.ejb.EJBException;
 import jakarta.annotation.PostConstruct;
 
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb30/interceptors/inheritence/ejb/DummyEJB.java b/appserver/tests/appserv-tests/devtests/ejb/ejb30/interceptors/inheritence/ejb/DummyEJB.java
index 83c4943..f6e2804 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb30/interceptors/inheritence/ejb/DummyEJB.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb30/interceptors/inheritence/ejb/DummyEJB.java
@@ -17,9 +17,9 @@
 package com.sun.s1asdev.ejb.ejb30.interceptors.session;
 
 import jakarta.ejb.Stateless;
-import javax.interceptor.Interceptors;
-import javax.interceptor.InvocationContext;
-import javax.interceptor.AroundInvoke;
+import jakarta.interceptor.Interceptors;
+import jakarta.interceptor.InvocationContext;
+import jakarta.interceptor.AroundInvoke;
 import jakarta.ejb.EJBException;
 import jakarta.annotation.PostConstruct;
 
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb30/interceptors/inheritence/ejb/DummyLevel2EJB.java b/appserver/tests/appserv-tests/devtests/ejb/ejb30/interceptors/inheritence/ejb/DummyLevel2EJB.java
index 4a8d95b..199a132 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb30/interceptors/inheritence/ejb/DummyLevel2EJB.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb30/interceptors/inheritence/ejb/DummyLevel2EJB.java
@@ -17,9 +17,9 @@
 package com.sun.s1asdev.ejb.ejb30.interceptors.session;
 
 import jakarta.ejb.Stateless;
-import javax.interceptor.Interceptors;
-import javax.interceptor.InvocationContext;
-import javax.interceptor.AroundInvoke;
+import jakarta.interceptor.Interceptors;
+import jakarta.interceptor.InvocationContext;
+import jakarta.interceptor.AroundInvoke;
 import jakarta.ejb.EJBException;
 import jakarta.annotation.PostConstruct;
 
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb30/interceptors/inheritence/ejb/LifecycleCallbackInterceptor.java b/appserver/tests/appserv-tests/devtests/ejb/ejb30/interceptors/inheritence/ejb/LifecycleCallbackInterceptor.java
index 402a420..0421ece 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb30/interceptors/inheritence/ejb/LifecycleCallbackInterceptor.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb30/interceptors/inheritence/ejb/LifecycleCallbackInterceptor.java
@@ -18,9 +18,9 @@
 
 
 
-import javax.interceptor.InvocationContext;
+import jakarta.interceptor.InvocationContext;
 
-import javax.interceptor.AroundInvoke;
+import jakarta.interceptor.AroundInvoke;
 
 import jakarta.ejb.PrePassivate;
 
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb30/interceptors/inheritence/ejb/OverridingMethodsInterceptor.java b/appserver/tests/appserv-tests/devtests/ejb/ejb30/interceptors/inheritence/ejb/OverridingMethodsInterceptor.java
index 688ac9e..f5f8bf3 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb30/interceptors/inheritence/ejb/OverridingMethodsInterceptor.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb30/interceptors/inheritence/ejb/OverridingMethodsInterceptor.java
@@ -19,8 +19,8 @@
 import java.util.List;
 import java.util.ArrayList;
 
-import javax.interceptor.InvocationContext;
-import javax.interceptor.AroundInvoke;
+import jakarta.interceptor.InvocationContext;
+import jakarta.interceptor.AroundInvoke;
 import jakarta.annotation.PostConstruct;
 
 public class OverridingMethodsInterceptor
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb30/interceptors/inheritence/ejb/SfulEJB.java b/appserver/tests/appserv-tests/devtests/ejb/ejb30/interceptors/inheritence/ejb/SfulEJB.java
index 9acb73c..cbefc15 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb30/interceptors/inheritence/ejb/SfulEJB.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb30/interceptors/inheritence/ejb/SfulEJB.java
@@ -20,11 +20,11 @@
 
 import jakarta.ejb.Stateful;
 
-import javax.interceptor.InvocationContext;
+import jakarta.interceptor.InvocationContext;
 
-import javax.interceptor.AroundInvoke;
+import jakarta.interceptor.AroundInvoke;
 
-import javax.interceptor.Interceptors;
+import jakarta.interceptor.Interceptors;
 
 import jakarta.ejb.EJB;
 
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb30/interceptors/intro/ejb/ArgumentsVerifier.java b/appserver/tests/appserv-tests/devtests/ejb/ejb30/interceptors/intro/ejb/ArgumentsVerifier.java
index 4f1733b..0c75a35 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb30/interceptors/intro/ejb/ArgumentsVerifier.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb30/interceptors/intro/ejb/ArgumentsVerifier.java
@@ -18,8 +18,8 @@
 
 import java.lang.reflect.Method;
 
-import javax.interceptor.InvocationContext;
-import javax.interceptor.AroundInvoke;
+import jakarta.interceptor.InvocationContext;
+import jakarta.interceptor.AroundInvoke;
 
 public class ArgumentsVerifier {
 
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb30/interceptors/intro/ejb/SlessEJB.java b/appserver/tests/appserv-tests/devtests/ejb/ejb30/interceptors/intro/ejb/SlessEJB.java
index 9571a1e..c905417 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb30/interceptors/intro/ejb/SlessEJB.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb30/interceptors/intro/ejb/SlessEJB.java
@@ -17,7 +17,7 @@
 package com.sun.s1asdev.ejb.ejb30.interceptors.intro;
 
 import jakarta.ejb.Stateless;
-import javax.interceptor.Interceptors;
+import jakarta.interceptor.Interceptors;
 
 
 @Stateless
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb30/interceptors/mdb/ejb/BaseInterceptor.java b/appserver/tests/appserv-tests/devtests/ejb/ejb30/interceptors/mdb/ejb/BaseInterceptor.java
index 37b9abf..a754cc8 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb30/interceptors/mdb/ejb/BaseInterceptor.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb30/interceptors/mdb/ejb/BaseInterceptor.java
@@ -16,8 +16,8 @@
 
 package com.sun.s1asdev.ejb.ejb30.interceptors.mdb;
 
-import javax.interceptor.InvocationContext;
-import javax.interceptor.AroundInvoke;
+import jakarta.interceptor.InvocationContext;
+import jakarta.interceptor.AroundInvoke;
 
 public class BaseInterceptor {
 
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb30/interceptors/mdb/ejb/MessageBean.java b/appserver/tests/appserv-tests/devtests/ejb/ejb30/interceptors/mdb/ejb/MessageBean.java
index 6a9216d..b4de9ed 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb30/interceptors/mdb/ejb/MessageBean.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb30/interceptors/mdb/ejb/MessageBean.java
@@ -32,9 +32,9 @@
 import jakarta.jms.QueueSender;
 import jakarta.jms.TextMessage;
 import jakarta.jms.Session;
-import javax.interceptor.ExcludeClassInterceptors;
-import javax.interceptor.ExcludeDefaultInterceptors;
-import javax.interceptor.Interceptors;
+import jakarta.interceptor.ExcludeClassInterceptors;
+import jakarta.interceptor.ExcludeDefaultInterceptors;
+import jakarta.interceptor.Interceptors;
 
 
 @MessageDriven
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb30/interceptors/session/ejb/ArgumentsVerifier.java b/appserver/tests/appserv-tests/devtests/ejb/ejb30/interceptors/session/ejb/ArgumentsVerifier.java
index 9a3b93a..efa2f8d 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb30/interceptors/session/ejb/ArgumentsVerifier.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb30/interceptors/session/ejb/ArgumentsVerifier.java
@@ -18,8 +18,8 @@
 
 import java.lang.reflect.Method;
 
-import javax.interceptor.InvocationContext;
-import javax.interceptor.AroundInvoke;
+import jakarta.interceptor.InvocationContext;
+import jakarta.interceptor.AroundInvoke;
 
 public class ArgumentsVerifier {
 
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb30/interceptors/session/ejb/BaseInterceptor.java b/appserver/tests/appserv-tests/devtests/ejb/ejb30/interceptors/session/ejb/BaseInterceptor.java
index bdc53c7..b0a93ea 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb30/interceptors/session/ejb/BaseInterceptor.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb30/interceptors/session/ejb/BaseInterceptor.java
@@ -16,8 +16,8 @@
 
 package com.sun.s1asdev.ejb.ejb30.interceptors.session;
 
-import javax.interceptor.InvocationContext;
-import javax.interceptor.AroundInvoke;
+import jakarta.interceptor.InvocationContext;
+import jakarta.interceptor.AroundInvoke;
 import jakarta.annotation.PostConstruct;
 import jakarta.ejb.PrePassivate;
 import jakarta.ejb.PostActivate;
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb30/interceptors/session/ejb/BlockingInterceptor.java b/appserver/tests/appserv-tests/devtests/ejb/ejb30/interceptors/session/ejb/BlockingInterceptor.java
index 38e8a85..e480182 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb30/interceptors/session/ejb/BlockingInterceptor.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb30/interceptors/session/ejb/BlockingInterceptor.java
@@ -16,8 +16,8 @@
 
 package com.sun.s1asdev.ejb.ejb30.interceptors.session;
 
-import javax.interceptor.InvocationContext;
-import javax.interceptor.AroundInvoke;
+import jakarta.interceptor.InvocationContext;
+import jakarta.interceptor.AroundInvoke;
 import jakarta.annotation.PostConstruct;
 
 public class BlockingInterceptor {
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb30/interceptors/session/ejb/DummyEJB.java b/appserver/tests/appserv-tests/devtests/ejb/ejb30/interceptors/session/ejb/DummyEJB.java
index 8314cc3..826e81d 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb30/interceptors/session/ejb/DummyEJB.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb30/interceptors/session/ejb/DummyEJB.java
@@ -17,9 +17,9 @@
 package com.sun.s1asdev.ejb.ejb30.interceptors.session;
 
 import jakarta.ejb.Stateless;
-import javax.interceptor.Interceptors;
-import javax.interceptor.InvocationContext;
-import javax.interceptor.AroundInvoke;
+import jakarta.interceptor.Interceptors;
+import jakarta.interceptor.InvocationContext;
+import jakarta.interceptor.AroundInvoke;
 import jakarta.ejb.EJBException;
 import jakarta.annotation.PostConstruct;
 
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb30/interceptors/session/ejb/ErrorRecoveryInterceptor.java b/appserver/tests/appserv-tests/devtests/ejb/ejb30/interceptors/session/ejb/ErrorRecoveryInterceptor.java
index 23731f0..38338af 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb30/interceptors/session/ejb/ErrorRecoveryInterceptor.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb30/interceptors/session/ejb/ErrorRecoveryInterceptor.java
@@ -18,8 +18,8 @@
 
 import java.lang.reflect.Method;
 
-import javax.interceptor.InvocationContext;
-import javax.interceptor.AroundInvoke;
+import jakarta.interceptor.InvocationContext;
+import jakarta.interceptor.AroundInvoke;
 
 import jakarta.ejb.*;
 import jakarta.annotation.*;
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb30/interceptors/session/ejb/LifecycleCallbackInterceptor.java b/appserver/tests/appserv-tests/devtests/ejb/ejb30/interceptors/session/ejb/LifecycleCallbackInterceptor.java
index e54dc33..df8131a 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb30/interceptors/session/ejb/LifecycleCallbackInterceptor.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb30/interceptors/session/ejb/LifecycleCallbackInterceptor.java
@@ -16,9 +16,9 @@
 
 package com.sun.s1asdev.ejb.ejb30.interceptors.session;
 
-import javax.interceptor.InvocationContext;
-import javax.interceptor.AroundInvoke;
-import javax.interceptor.InvocationContext;
+import jakarta.interceptor.InvocationContext;
+import jakarta.interceptor.AroundInvoke;
+import jakarta.interceptor.InvocationContext;
 import jakarta.ejb.PrePassivate;
 import jakarta.ejb.PostActivate;
 import jakarta.ejb.EJB;
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb30/interceptors/session/ejb/SfulEJB.java b/appserver/tests/appserv-tests/devtests/ejb/ejb30/interceptors/session/ejb/SfulEJB.java
index d46814f..4381fea 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb30/interceptors/session/ejb/SfulEJB.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb30/interceptors/session/ejb/SfulEJB.java
@@ -20,9 +20,9 @@
 import java.util.HashMap;
 
 import jakarta.ejb.Stateful;
-import javax.interceptor.InvocationContext;
-import javax.interceptor.AroundInvoke;
-import javax.interceptor.Interceptors;
+import jakarta.interceptor.InvocationContext;
+import jakarta.interceptor.AroundInvoke;
+import jakarta.interceptor.Interceptors;
 
 
 import jakarta.ejb.*;
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb30/interceptors/session/ejb/SlessEJB.java b/appserver/tests/appserv-tests/devtests/ejb/ejb30/interceptors/session/ejb/SlessEJB.java
index 6394dd0..613e54a 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb30/interceptors/session/ejb/SlessEJB.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb30/interceptors/session/ejb/SlessEJB.java
@@ -17,7 +17,7 @@
 package com.sun.s1asdev.ejb.ejb30.interceptors.session;
 
 import jakarta.ejb.Stateless;
-import javax.interceptor.Interceptors;
+import jakarta.interceptor.Interceptors;
 
 
 //Default is @Local
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb31/ejblite/javamodule/war/FooManagedBean.java b/appserver/tests/appserv-tests/devtests/ejb/ejb31/ejblite/javamodule/war/FooManagedBean.java
index a596bee..37bdb80 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb31/ejblite/javamodule/war/FooManagedBean.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb31/ejblite/javamodule/war/FooManagedBean.java
@@ -22,9 +22,9 @@
 import jakarta.annotation.Resource;
 import jakarta.persistence.PersistenceContext;
 import jakarta.persistence.EntityManager;
-import javax.interceptor.Interceptors;
-import javax.interceptor.AroundInvoke;
-import javax.interceptor.InvocationContext;
+import jakarta.interceptor.Interceptors;
+import jakarta.interceptor.AroundInvoke;
+import jakarta.interceptor.InvocationContext;
 
 @ManagedBean("foomanagedbean")
 @Interceptors(InterceptorA.class)
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb31/ejblite/javamodule/war/InterceptorA.java b/appserver/tests/appserv-tests/devtests/ejb/ejb31/ejblite/javamodule/war/InterceptorA.java
index d3122ca..6e15166 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb31/ejblite/javamodule/war/InterceptorA.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb31/ejblite/javamodule/war/InterceptorA.java
@@ -23,8 +23,8 @@
 import jakarta.persistence.PersistenceContext;
 import jakarta.persistence.EntityManager;
 
-import javax.interceptor.InvocationContext;
-import javax.interceptor.AroundInvoke;
+import jakarta.interceptor.InvocationContext;
+import jakarta.interceptor.AroundInvoke;
 
 
 public class InterceptorA extends InterceptorSuper {
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb31/ejblite/javamodule/war/InterceptorB.java b/appserver/tests/appserv-tests/devtests/ejb/ejb31/ejblite/javamodule/war/InterceptorB.java
index b72ac76..c643637 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb31/ejblite/javamodule/war/InterceptorB.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb31/ejblite/javamodule/war/InterceptorB.java
@@ -18,8 +18,8 @@
 
 import jakarta.annotation.*;
 
-import javax.interceptor.InvocationContext;
-import javax.interceptor.AroundInvoke;
+import jakarta.interceptor.InvocationContext;
+import jakarta.interceptor.AroundInvoke;
 import java.util.Map;
 
 import jakarta.ejb.EJBException;
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb31/ejblite/javamodule/war/InterceptorSuper.java b/appserver/tests/appserv-tests/devtests/ejb/ejb31/ejblite/javamodule/war/InterceptorSuper.java
index 93e5ded..4adbd03 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb31/ejblite/javamodule/war/InterceptorSuper.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb31/ejblite/javamodule/war/InterceptorSuper.java
@@ -16,8 +16,8 @@
 
 package com.acme;
 
-import javax.interceptor.InvocationContext;
-import javax.interceptor.AroundInvoke;
+import jakarta.interceptor.InvocationContext;
+import jakarta.interceptor.AroundInvoke;
 
 
 public class InterceptorSuper {
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb31/ejblite/javamodule/war/ManagedSuper.java b/appserver/tests/appserv-tests/devtests/ejb/ejb31/ejblite/javamodule/war/ManagedSuper.java
index a4a80da..5b0df58 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb31/ejblite/javamodule/war/ManagedSuper.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb31/ejblite/javamodule/war/ManagedSuper.java
@@ -21,7 +21,7 @@
 import jakarta.annotation.Resource;
 import javax.sql.DataSource;
 
-import javax.interceptor.*;
+import jakarta.interceptor.*;
 
 public class ManagedSuper {
 
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb31/ejblite/javamodule/war/StatefulBean.java b/appserver/tests/appserv-tests/devtests/ejb/ejb31/ejblite/javamodule/war/StatefulBean.java
index e5a3a6a..9dcf979 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb31/ejblite/javamodule/war/StatefulBean.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb31/ejblite/javamodule/war/StatefulBean.java
@@ -18,7 +18,7 @@
 
 import jakarta.ejb.Stateful;
 import jakarta.ejb.*;
-import javax.interceptor.Interceptors;
+import jakarta.interceptor.Interceptors;
 
 import jakarta.annotation.PostConstruct;
 import jakarta.annotation.PreDestroy;
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb31/ejblite/javamodule/war/StatelessBean.java b/appserver/tests/appserv-tests/devtests/ejb/ejb31/ejblite/javamodule/war/StatelessBean.java
index c52310f..f6148a5 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb31/ejblite/javamodule/war/StatelessBean.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb31/ejblite/javamodule/war/StatelessBean.java
@@ -18,7 +18,7 @@
 
 import jakarta.ejb.Stateless;
 import jakarta.ejb.*;
-import javax.interceptor.Interceptors;
+import jakarta.interceptor.Interceptors;
 
 import jakarta.annotation.PostConstruct;
 import jakarta.annotation.PreDestroy;
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb31/ejblite/jaxrs/war/FooManagedBean.java b/appserver/tests/appserv-tests/devtests/ejb/ejb31/ejblite/jaxrs/war/FooManagedBean.java
index e90cf9d..b25b5b3 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb31/ejblite/jaxrs/war/FooManagedBean.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb31/ejblite/jaxrs/war/FooManagedBean.java
@@ -16,7 +16,7 @@
 
 package com.acme;
 
-import javax.interceptor.Interceptors;
+import jakarta.interceptor.Interceptors;
 
 import jakarta.annotation.PostConstruct;
 import jakarta.annotation.ManagedBean;
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb31/ejblite/jaxrs/war/InterceptorA.java b/appserver/tests/appserv-tests/devtests/ejb/ejb31/ejblite/jaxrs/war/InterceptorA.java
index 167ccfc..7ca7529 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb31/ejblite/jaxrs/war/InterceptorA.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb31/ejblite/jaxrs/war/InterceptorA.java
@@ -20,8 +20,8 @@
 
 import jakarta.annotation.Resource;
 
-import javax.interceptor.InvocationContext;
-import javax.interceptor.AroundInvoke;
+import jakarta.interceptor.InvocationContext;
+import jakarta.interceptor.AroundInvoke;
 
 
 public class InterceptorA {
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb31/ejblite/jaxrs/war/JerseyInterceptor.java b/appserver/tests/appserv-tests/devtests/ejb/ejb31/ejblite/jaxrs/war/JerseyInterceptor.java
index bd323fa..a178650 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb31/ejblite/jaxrs/war/JerseyInterceptor.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb31/ejblite/jaxrs/war/JerseyInterceptor.java
@@ -16,7 +16,7 @@
 
 package com.sun.jersey;
 
-import javax.interceptor.InvocationContext;
+import jakarta.interceptor.InvocationContext;
 import jakarta.annotation.PostConstruct;
 
 import com.acme.SingletonBean;
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb31/ejblite/jaxrs/war/StatelessBean.java b/appserver/tests/appserv-tests/devtests/ejb/ejb31/ejblite/jaxrs/war/StatelessBean.java
index bd5e5a2..b10e34c 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb31/ejblite/jaxrs/war/StatelessBean.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb31/ejblite/jaxrs/war/StatelessBean.java
@@ -18,7 +18,7 @@
 
 import jakarta.ejb.Stateless;
 import jakarta.ejb.*;
-import javax.interceptor.Interceptors;
+import jakarta.interceptor.Interceptors;
 
 import jakarta.annotation.PostConstruct;
 import jakarta.annotation.PreDestroy;
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb31/ejblite/managedbean/war/InterceptorA.java b/appserver/tests/appserv-tests/devtests/ejb/ejb31/ejblite/managedbean/war/InterceptorA.java
index f2c0a92..4a771fa 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb31/ejblite/managedbean/war/InterceptorA.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb31/ejblite/managedbean/war/InterceptorA.java
@@ -24,8 +24,8 @@
 import jakarta.persistence.PersistenceContext;
 import jakarta.persistence.EntityManager;
 
-import javax.interceptor.InvocationContext;
-import javax.interceptor.AroundInvoke;
+import jakarta.interceptor.InvocationContext;
+import jakarta.interceptor.AroundInvoke;
 
 
 public class InterceptorA extends InterceptorSuper {
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb31/ejblite/managedbean/war/InterceptorB.java b/appserver/tests/appserv-tests/devtests/ejb/ejb31/ejblite/managedbean/war/InterceptorB.java
index 5be352f..9179563 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb31/ejblite/managedbean/war/InterceptorB.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb31/ejblite/managedbean/war/InterceptorB.java
@@ -24,8 +24,8 @@
 import jakarta.persistence.PersistenceContext;
 import jakarta.persistence.EntityManager;
 
-import javax.interceptor.InvocationContext;
-import javax.interceptor.AroundInvoke;
+import jakarta.interceptor.InvocationContext;
+import jakarta.interceptor.AroundInvoke;
 
 
 public class InterceptorB {
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb31/ejblite/managedbean/war/InterceptorSuper.java b/appserver/tests/appserv-tests/devtests/ejb/ejb31/ejblite/managedbean/war/InterceptorSuper.java
index d4b4821..7280cf6 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb31/ejblite/managedbean/war/InterceptorSuper.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb31/ejblite/managedbean/war/InterceptorSuper.java
@@ -18,8 +18,8 @@
 
 import jakarta.annotation.*;
 
-import javax.interceptor.InvocationContext;
-import javax.interceptor.AroundInvoke;
+import jakarta.interceptor.InvocationContext;
+import jakarta.interceptor.AroundInvoke;
 
 
 public class InterceptorSuper {
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb31/ejblite/managedbean/war/ManagedBean1Class1MethodLevelInt.java b/appserver/tests/appserv-tests/devtests/ejb/ejb31/ejblite/managedbean/war/ManagedBean1Class1MethodLevelInt.java
index 7366aa2..eaa810f 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb31/ejblite/managedbean/war/ManagedBean1Class1MethodLevelInt.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb31/ejblite/managedbean/war/ManagedBean1Class1MethodLevelInt.java
@@ -17,9 +17,9 @@
 package com.acme;
 
 import jakarta.annotation.*;
-import javax.interceptor.Interceptors;
-import javax.interceptor.AroundInvoke;
-import javax.interceptor.InvocationContext;
+import jakarta.interceptor.Interceptors;
+import jakarta.interceptor.AroundInvoke;
+import jakarta.interceptor.InvocationContext;
 
 @ManagedBean("ManagedBean1Class1MethodLevelInt")
     @Interceptors(InterceptorB.class)
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb31/ejblite/managedbean/war/ManagedBean1Int.java b/appserver/tests/appserv-tests/devtests/ejb/ejb31/ejblite/managedbean/war/ManagedBean1Int.java
index 63aeea6..36ed250 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb31/ejblite/managedbean/war/ManagedBean1Int.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb31/ejblite/managedbean/war/ManagedBean1Int.java
@@ -17,9 +17,9 @@
 package com.acme;
 
 import jakarta.annotation.*;
-import javax.interceptor.Interceptors;
-import javax.interceptor.AroundInvoke;
-import javax.interceptor.InvocationContext;
+import jakarta.interceptor.Interceptors;
+import jakarta.interceptor.AroundInvoke;
+import jakarta.interceptor.InvocationContext;
 
 @ManagedBean("ManagedBean1Int")
 @Interceptors(InterceptorA.class)
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb31/ejblite/managedbean/war/ManagedBean1MethodLevelIntExcludeClass.java b/appserver/tests/appserv-tests/devtests/ejb/ejb31/ejblite/managedbean/war/ManagedBean1MethodLevelIntExcludeClass.java
index 77a0fc7..eecadc0 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb31/ejblite/managedbean/war/ManagedBean1MethodLevelIntExcludeClass.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb31/ejblite/managedbean/war/ManagedBean1MethodLevelIntExcludeClass.java
@@ -17,10 +17,10 @@
 package com.acme;
 
 import jakarta.annotation.*;
-import javax.interceptor.Interceptors;
-import javax.interceptor.AroundInvoke;
-import javax.interceptor.InvocationContext;
-import javax.interceptor.ExcludeClassInterceptors;
+import jakarta.interceptor.Interceptors;
+import jakarta.interceptor.AroundInvoke;
+import jakarta.interceptor.InvocationContext;
+import jakarta.interceptor.ExcludeClassInterceptors;
 
 @ManagedBean("ManagedBean1MethodLevelIntExcludeClass")
     @Interceptors(InterceptorB.class)
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb31/ejblite/managedbean/war/ManagedBean2Int.java b/appserver/tests/appserv-tests/devtests/ejb/ejb31/ejblite/managedbean/war/ManagedBean2Int.java
index 2028e5f..58a0b6b 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb31/ejblite/managedbean/war/ManagedBean2Int.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb31/ejblite/managedbean/war/ManagedBean2Int.java
@@ -17,9 +17,9 @@
 package com.acme;
 
 import jakarta.annotation.*;
-import javax.interceptor.Interceptors;
-import javax.interceptor.AroundInvoke;
-import javax.interceptor.InvocationContext;
+import jakarta.interceptor.Interceptors;
+import jakarta.interceptor.AroundInvoke;
+import jakarta.interceptor.InvocationContext;
 
 @ManagedBean("ManagedBean2Int")
     @Interceptors({InterceptorA.class, InterceptorB.class})
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb31/ejblite/managedbean/war/ManagedBean2IntExcludeClass.java b/appserver/tests/appserv-tests/devtests/ejb/ejb31/ejblite/managedbean/war/ManagedBean2IntExcludeClass.java
index 7ea7af9..4f8646c 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb31/ejblite/managedbean/war/ManagedBean2IntExcludeClass.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb31/ejblite/managedbean/war/ManagedBean2IntExcludeClass.java
@@ -17,10 +17,10 @@
 package com.acme;
 
 import jakarta.annotation.*;
-import javax.interceptor.Interceptors;
-import javax.interceptor.AroundInvoke;
-import javax.interceptor.InvocationContext;
-import javax.interceptor.ExcludeClassInterceptors; 
+import jakarta.interceptor.Interceptors;
+import jakarta.interceptor.AroundInvoke;
+import jakarta.interceptor.InvocationContext;
+import jakarta.interceptor.ExcludeClassInterceptors; 
 
 @ManagedBean("ManagedBean2IntExcludeClass")
     @Interceptors({InterceptorA.class, InterceptorB.class})
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb31/ejblite/managedbean/war/ManagedBean2IntPlusBean.java b/appserver/tests/appserv-tests/devtests/ejb/ejb31/ejblite/managedbean/war/ManagedBean2IntPlusBean.java
index 508027a..0fee3de 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb31/ejblite/managedbean/war/ManagedBean2IntPlusBean.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb31/ejblite/managedbean/war/ManagedBean2IntPlusBean.java
@@ -17,9 +17,9 @@
 package com.acme;
 
 import jakarta.annotation.*;
-import javax.interceptor.Interceptors;
-import javax.interceptor.AroundInvoke;
-import javax.interceptor.InvocationContext;
+import jakarta.interceptor.Interceptors;
+import jakarta.interceptor.AroundInvoke;
+import jakarta.interceptor.InvocationContext;
 
 @ManagedBean("ManagedBean2IntPlusBean")
     @Interceptors({InterceptorA.class, InterceptorB.class})
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb31/ejblite/managedbean/war/ManagedBean2MethodLevelInt.java b/appserver/tests/appserv-tests/devtests/ejb/ejb31/ejblite/managedbean/war/ManagedBean2MethodLevelInt.java
index 61a5ec5..acb323a 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb31/ejblite/managedbean/war/ManagedBean2MethodLevelInt.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb31/ejblite/managedbean/war/ManagedBean2MethodLevelInt.java
@@ -17,9 +17,9 @@
 package com.acme;
 
 import jakarta.annotation.*;
-import javax.interceptor.Interceptors;
-import javax.interceptor.AroundInvoke;
-import javax.interceptor.InvocationContext;
+import jakarta.interceptor.Interceptors;
+import jakarta.interceptor.AroundInvoke;
+import jakarta.interceptor.InvocationContext;
 
 @ManagedBean("ManagedBean2MethodLevelInt")
 public class ManagedBean2MethodLevelInt extends ManagedBeanSuper {
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb31/ejblite/managedbean/war/ManagedBeanExtra.java b/appserver/tests/appserv-tests/devtests/ejb/ejb31/ejblite/managedbean/war/ManagedBeanExtra.java
index a86fcec..4bec099 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb31/ejblite/managedbean/war/ManagedBeanExtra.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb31/ejblite/managedbean/war/ManagedBeanExtra.java
@@ -17,9 +17,9 @@
 package com.acme;
 
 import jakarta.annotation.*;
-import javax.interceptor.Interceptors;
-import javax.interceptor.AroundInvoke;
-import javax.interceptor.InvocationContext;
+import jakarta.interceptor.Interceptors;
+import jakarta.interceptor.AroundInvoke;
+import jakarta.interceptor.InvocationContext;
 
 @ManagedBean
 public class ManagedBeanExtra {
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb31/ejblite/managedbean/war/ManagedBeanNoIntPlusBean.java b/appserver/tests/appserv-tests/devtests/ejb/ejb31/ejblite/managedbean/war/ManagedBeanNoIntPlusBean.java
index 29d8861..d00d87a 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb31/ejblite/managedbean/war/ManagedBeanNoIntPlusBean.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb31/ejblite/managedbean/war/ManagedBeanNoIntPlusBean.java
@@ -17,9 +17,9 @@
 package com.acme;
 
 import jakarta.annotation.*;
-import javax.interceptor.Interceptors;
-import javax.interceptor.AroundInvoke;
-import javax.interceptor.InvocationContext;
+import jakarta.interceptor.Interceptors;
+import jakarta.interceptor.AroundInvoke;
+import jakarta.interceptor.InvocationContext;
 
 @ManagedBean("ManagedBeanNoIntPlusBean")
 public class ManagedBeanNoIntPlusBean extends ManagedBeanSuper {
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/ear/ejb/FooManagedBean.java b/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/ear/ejb/FooManagedBean.java
index 3b80cd2..ff1a453 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/ear/ejb/FooManagedBean.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/ear/ejb/FooManagedBean.java
@@ -20,7 +20,7 @@
 
 import jakarta.ejb.EJB;
 import jakarta.annotation.Resource;
-import javax.interceptor.Interceptors;
+import jakarta.interceptor.Interceptors;
 import org.omg.CORBA.ORB;
 import jakarta.persistence.PersistenceContext;
 import jakarta.persistence.EntityManager;
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/ear/ejb/InterceptorA.java b/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/ear/ejb/InterceptorA.java
index e5165e8..7307cae 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/ear/ejb/InterceptorA.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/ear/ejb/InterceptorA.java
@@ -24,8 +24,8 @@
 import jakarta.persistence.PersistenceContext;
 import jakarta.persistence.EntityManager;
 
-import javax.interceptor.InvocationContext;
-import javax.interceptor.AroundInvoke;
+import jakarta.interceptor.InvocationContext;
+import jakarta.interceptor.AroundInvoke;
 
 
 public class InterceptorA extends InterceptorSuper {
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/ear/ejb/InterceptorSuper.java b/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/ear/ejb/InterceptorSuper.java
index 93e5ded..4adbd03 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/ear/ejb/InterceptorSuper.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/ear/ejb/InterceptorSuper.java
@@ -16,8 +16,8 @@
 
 package com.acme;
 
-import javax.interceptor.InvocationContext;
-import javax.interceptor.AroundInvoke;
+import jakarta.interceptor.InvocationContext;
+import jakarta.interceptor.AroundInvoke;
 
 
 public class InterceptorSuper {
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/jcdifull/ejb/Another.java b/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/jcdifull/ejb/Another.java
index 9f23056..82ef895 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/jcdifull/ejb/Another.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/jcdifull/ejb/Another.java
@@ -23,7 +23,7 @@
 import java.lang.annotation.RetentionPolicy;
 import java.lang.annotation.Target;
 
-import javax.interceptor.InterceptorBinding;
+import jakarta.interceptor.InterceptorBinding;
 
 @Target({TYPE, METHOD})
 @Retention(RetentionPolicy.RUNTIME)
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/jcdifull/ejb/AnotherInterceptor.java b/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/jcdifull/ejb/AnotherInterceptor.java
index 05ac902..aeb7c6a 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/jcdifull/ejb/AnotherInterceptor.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/jcdifull/ejb/AnotherInterceptor.java
@@ -16,9 +16,9 @@
 
 package test.beans.interceptors;
 
-import javax.interceptor.AroundInvoke;
-import javax.interceptor.Interceptor;
-import javax.interceptor.InvocationContext;
+import jakarta.interceptor.AroundInvoke;
+import jakarta.interceptor.Interceptor;
+import jakarta.interceptor.InvocationContext;
 
 import com.acme.StatelessBean;
 
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/jcdifull/ejb/Bar.java b/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/jcdifull/ejb/Bar.java
index d1e89ef..9163c0e 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/jcdifull/ejb/Bar.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/jcdifull/ejb/Bar.java
@@ -18,7 +18,7 @@
 
 import jakarta.ejb.*;
 import jakarta.annotation.*;
-import javax.interceptor.*;
+import jakarta.interceptor.*;
 
 import javax.inject.Inject;
 
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/jcdifull/ejb/DependentWithInjectedDataSource.java b/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/jcdifull/ejb/DependentWithInjectedDataSource.java
index c4a941e..ab763bd 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/jcdifull/ejb/DependentWithInjectedDataSource.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/jcdifull/ejb/DependentWithInjectedDataSource.java
@@ -18,7 +18,7 @@
 
 import jakarta.ejb.*;
 import jakarta.annotation.*;
-import javax.interceptor.*;
+import jakarta.interceptor.*;
 
 import javax.inject.Inject;
 
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/jcdifull/ejb/FooManagedBean.java b/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/jcdifull/ejb/FooManagedBean.java
index ec8968b..0d2b830 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/jcdifull/ejb/FooManagedBean.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/jcdifull/ejb/FooManagedBean.java
@@ -16,7 +16,7 @@
 
 package com.acme;
 
-import javax.interceptor.Interceptors;
+import jakarta.interceptor.Interceptors;
 
 import jakarta.annotation.PostConstruct;
 import jakarta.annotation.ManagedBean;
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/jcdifull/ejb/InterceptorA.java b/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/jcdifull/ejb/InterceptorA.java
index 2b7ba02..b6f03ec 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/jcdifull/ejb/InterceptorA.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/jcdifull/ejb/InterceptorA.java
@@ -18,8 +18,8 @@
 
 import jakarta.annotation.*;
 
-import javax.interceptor.InvocationContext;
-import javax.interceptor.AroundInvoke;
+import jakarta.interceptor.InvocationContext;
+import jakarta.interceptor.AroundInvoke;
 
 
 public class InterceptorA {
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 f4e5b14..2ff543c 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
@@ -18,7 +18,7 @@
 
 import jakarta.ejb.*;
 import jakarta.annotation.*;
-import javax.interceptor.*;
+import jakarta.interceptor.*;
 
 import javax.inject.Inject;
 
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 827fd2e..ca282fb 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
@@ -18,7 +18,7 @@
 
 import jakarta.ejb.*;
 import jakarta.annotation.*;
-import javax.interceptor.*;
+import jakarta.interceptor.*;
 
 import javax.inject.Inject;
 
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/jcdifull/ejb/SingletonBeanA.java b/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/jcdifull/ejb/SingletonBeanA.java
index eb03ce4..8d943bd 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/jcdifull/ejb/SingletonBeanA.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/jcdifull/ejb/SingletonBeanA.java
@@ -18,7 +18,7 @@
 
 import jakarta.ejb.*;
 import jakarta.annotation.*;
-import javax.interceptor.*;
+import jakarta.interceptor.*;
 
 import javax.inject.Inject;
 
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/jcdifull/ejb/SingletonStartupWithInjectedDependent.java b/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/jcdifull/ejb/SingletonStartupWithInjectedDependent.java
index e471c70..21bc403 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/jcdifull/ejb/SingletonStartupWithInjectedDependent.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/jcdifull/ejb/SingletonStartupWithInjectedDependent.java
@@ -18,7 +18,7 @@
 
 import jakarta.ejb.*;
 import jakarta.annotation.*;
-import javax.interceptor.*;
+import jakarta.interceptor.*;
 
 import javax.inject.Inject;
 
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 34e580d..d73e188 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
@@ -18,9 +18,9 @@
 
 import jakarta.ejb.*;
 import jakarta.annotation.*;
-import javax.interceptor.ExcludeClassInterceptors;
-import javax.interceptor.ExcludeDefaultInterceptors;
-import javax.interceptor.Interceptors;
+import jakarta.interceptor.ExcludeClassInterceptors;
+import jakarta.interceptor.ExcludeDefaultInterceptors;
+import jakarta.interceptor.Interceptors;
 
 import java.util.ArrayList;
 import java.util.List;
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/passact/ejb/HelloBean.java b/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/passact/ejb/HelloBean.java
index 4cf02f2..b0df4ef 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/passact/ejb/HelloBean.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/passact/ejb/HelloBean.java
@@ -17,7 +17,7 @@
 package com.acme;
 
 import jakarta.ejb.*;
-import javax.interceptor.Interceptors;
+import jakarta.interceptor.Interceptors;
 import jakarta.annotation.*;
 import java.util.concurrent.Future;
 
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/passact/ejb/NonSerializableInterceptor.java b/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/passact/ejb/NonSerializableInterceptor.java
index e4c4a59..42b78e3 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/passact/ejb/NonSerializableInterceptor.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/passact/ejb/NonSerializableInterceptor.java
@@ -17,8 +17,8 @@
 package com.acme;
 
 import jakarta.annotation.*;
-import javax.interceptor.InvocationContext;
-import javax.interceptor.AroundInvoke;
+import jakarta.interceptor.InvocationContext;
+import jakarta.interceptor.AroundInvoke;
 import jakarta.ejb.EJBException;
 
 public class NonSerializableInterceptor {
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb31/timer31/aroundtimeout/ejb/Common.java b/appserver/tests/appserv-tests/devtests/ejb/ejb31/timer31/aroundtimeout/ejb/Common.java
index c1c2a53..b6eb3a7 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb31/timer31/aroundtimeout/ejb/Common.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb31/timer31/aroundtimeout/ejb/Common.java
@@ -23,7 +23,7 @@
 import java.util.HashSet;
 import java.util.Collections;
 
-import javax.interceptor.InvocationContext;
+import jakarta.interceptor.InvocationContext;
 import jakarta.ejb.EJBException;
 import jakarta.ejb.Timer;
 
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb31/timer31/aroundtimeout/ejb/InterceptorA.java b/appserver/tests/appserv-tests/devtests/ejb/ejb31/timer31/aroundtimeout/ejb/InterceptorA.java
index 1054f3a..699640b 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb31/timer31/aroundtimeout/ejb/InterceptorA.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb31/timer31/aroundtimeout/ejb/InterceptorA.java
@@ -16,8 +16,8 @@
 
 package com.sun.s1asdev.ejb.ejb31.aroundtimeout;
 
-import javax.interceptor.AroundTimeout;
-import javax.interceptor.InvocationContext;
+import jakarta.interceptor.AroundTimeout;
+import jakarta.interceptor.InvocationContext;
 import jakarta.annotation.PostConstruct;
 import javax.naming.InitialContext;
 import jakarta.ejb.SessionContext;
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb31/timer31/aroundtimeout/ejb/InterceptorB.java b/appserver/tests/appserv-tests/devtests/ejb/ejb31/timer31/aroundtimeout/ejb/InterceptorB.java
index 9c04c48..741452d 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb31/timer31/aroundtimeout/ejb/InterceptorB.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb31/timer31/aroundtimeout/ejb/InterceptorB.java
@@ -16,7 +16,7 @@
 
 package com.sun.s1asdev.ejb.ejb31.aroundtimeout;
 
-import javax.interceptor.InvocationContext;
+import jakarta.interceptor.InvocationContext;
 import jakarta.annotation.PostConstruct;
 
 public class InterceptorB {
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb31/timer31/aroundtimeout/ejb/InterceptorC.java b/appserver/tests/appserv-tests/devtests/ejb/ejb31/timer31/aroundtimeout/ejb/InterceptorC.java
index 527e689..d015b9b 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb31/timer31/aroundtimeout/ejb/InterceptorC.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb31/timer31/aroundtimeout/ejb/InterceptorC.java
@@ -16,8 +16,8 @@
 
 package com.sun.s1asdev.ejb.ejb31.aroundtimeout;
 
-import javax.interceptor.AroundTimeout;
-import javax.interceptor.InvocationContext;
+import jakarta.interceptor.AroundTimeout;
+import jakarta.interceptor.InvocationContext;
 import jakarta.annotation.PostConstruct;
 
 public class InterceptorC {
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb31/timer31/aroundtimeout/ejb/InterceptorD.java b/appserver/tests/appserv-tests/devtests/ejb/ejb31/timer31/aroundtimeout/ejb/InterceptorD.java
index d5e42fe..104ef8e 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb31/timer31/aroundtimeout/ejb/InterceptorD.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb31/timer31/aroundtimeout/ejb/InterceptorD.java
@@ -16,9 +16,9 @@
 
 package com.sun.s1asdev.ejb.ejb31.aroundtimeout;
 
-import javax.interceptor.AroundTimeout;
-import javax.interceptor.AroundInvoke;
-import javax.interceptor.InvocationContext;
+import jakarta.interceptor.AroundTimeout;
+import jakarta.interceptor.AroundInvoke;
+import jakarta.interceptor.InvocationContext;
 import jakarta.annotation.PostConstruct;
 
 public class InterceptorD {
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb31/timer31/aroundtimeout/ejb/InterceptorE.java b/appserver/tests/appserv-tests/devtests/ejb/ejb31/timer31/aroundtimeout/ejb/InterceptorE.java
index 810f88f..56cb0cf 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb31/timer31/aroundtimeout/ejb/InterceptorE.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb31/timer31/aroundtimeout/ejb/InterceptorE.java
@@ -16,8 +16,8 @@
 
 package com.sun.s1asdev.ejb.ejb31.aroundtimeout;
 
-import javax.interceptor.AroundTimeout;
-import javax.interceptor.InvocationContext;
+import jakarta.interceptor.AroundTimeout;
+import jakarta.interceptor.InvocationContext;
 import jakarta.annotation.PostConstruct;
 
 public class InterceptorE {
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb31/timer31/aroundtimeout/ejb/InterceptorF.java b/appserver/tests/appserv-tests/devtests/ejb/ejb31/timer31/aroundtimeout/ejb/InterceptorF.java
index 9033401..34c91ab 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb31/timer31/aroundtimeout/ejb/InterceptorF.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb31/timer31/aroundtimeout/ejb/InterceptorF.java
@@ -16,8 +16,8 @@
 
 package com.sun.s1asdev.ejb.ejb31.aroundtimeout;
 
-import javax.interceptor.AroundTimeout;
-import javax.interceptor.InvocationContext;
+import jakarta.interceptor.AroundTimeout;
+import jakarta.interceptor.InvocationContext;
 import jakarta.annotation.PostConstruct;
 
 public class InterceptorF {
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb31/timer31/aroundtimeout/ejb/InterceptorG.java b/appserver/tests/appserv-tests/devtests/ejb/ejb31/timer31/aroundtimeout/ejb/InterceptorG.java
index e5976d6..c747fc1 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb31/timer31/aroundtimeout/ejb/InterceptorG.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb31/timer31/aroundtimeout/ejb/InterceptorG.java
@@ -16,9 +16,9 @@
 
 package com.sun.s1asdev.ejb.ejb31.aroundtimeout;
 
-import javax.interceptor.AroundTimeout;
-import javax.interceptor.AroundInvoke;
-import javax.interceptor.InvocationContext;
+import jakarta.interceptor.AroundTimeout;
+import jakarta.interceptor.AroundInvoke;
+import jakarta.interceptor.InvocationContext;
 import jakarta.annotation.PostConstruct;
 
 public class InterceptorG {
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb31/timer31/aroundtimeout/ejb/SlessEJB3.java b/appserver/tests/appserv-tests/devtests/ejb/ejb31/timer31/aroundtimeout/ejb/SlessEJB3.java
index 101e4f5..018cf92 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb31/timer31/aroundtimeout/ejb/SlessEJB3.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb31/timer31/aroundtimeout/ejb/SlessEJB3.java
@@ -20,12 +20,12 @@
 import jakarta.ejb.Stateless;
 import jakarta.ejb.Schedule;
 import jakarta.ejb.EJBException;
-import javax.interceptor.Interceptors;
-import javax.interceptor.ExcludeDefaultInterceptors;
-import javax.interceptor.ExcludeClassInterceptors;
-import javax.interceptor.AroundTimeout;
-import javax.interceptor.AroundInvoke;
-import javax.interceptor.InvocationContext;
+import jakarta.interceptor.Interceptors;
+import jakarta.interceptor.ExcludeDefaultInterceptors;
+import jakarta.interceptor.ExcludeClassInterceptors;
+import jakarta.interceptor.AroundTimeout;
+import jakarta.interceptor.AroundInvoke;
+import jakarta.interceptor.InvocationContext;
 
 @Stateless
 // total ordering DCBA expressed in .xml
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb31/timer31/aroundtimeout/ejb/SlessEJB4.java b/appserver/tests/appserv-tests/devtests/ejb/ejb31/timer31/aroundtimeout/ejb/SlessEJB4.java
index 32db506..812be99 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb31/timer31/aroundtimeout/ejb/SlessEJB4.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb31/timer31/aroundtimeout/ejb/SlessEJB4.java
@@ -22,10 +22,10 @@
 import jakarta.ejb.Timer;
 import jakarta.ejb.TimerService;
 import jakarta.ejb.EJBException;
-import javax.interceptor.Interceptors;
-import javax.interceptor.ExcludeDefaultInterceptors;
-import javax.interceptor.ExcludeClassInterceptors;
-import javax.interceptor.InvocationContext;
+import jakarta.interceptor.Interceptors;
+import jakarta.interceptor.ExcludeDefaultInterceptors;
+import jakarta.interceptor.ExcludeClassInterceptors;
+import jakarta.interceptor.InvocationContext;
 import javax.naming.InitialContext;
 import jakarta.annotation.Resource;
 
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb31/timer31/aroundtimeout/ejb/SlessEJB5.java b/appserver/tests/appserv-tests/devtests/ejb/ejb31/timer31/aroundtimeout/ejb/SlessEJB5.java
index 4413953..ebda1ba 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb31/timer31/aroundtimeout/ejb/SlessEJB5.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb31/timer31/aroundtimeout/ejb/SlessEJB5.java
@@ -21,10 +21,10 @@
 import jakarta.ejb.Schedule;
 import jakarta.ejb.Timer;
 import jakarta.ejb.EJBException;
-import javax.interceptor.Interceptors;
-import javax.interceptor.ExcludeDefaultInterceptors;
-import javax.interceptor.ExcludeClassInterceptors;
-import javax.interceptor.InvocationContext;
+import jakarta.interceptor.Interceptors;
+import jakarta.interceptor.ExcludeDefaultInterceptors;
+import jakarta.interceptor.ExcludeClassInterceptors;
+import jakarta.interceptor.InvocationContext;
 
 
 // Define some aroundtimeout via annotations and some via
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb31/timer31/aroundtimeout/ejb/SlessEJB6.java b/appserver/tests/appserv-tests/devtests/ejb/ejb31/timer31/aroundtimeout/ejb/SlessEJB6.java
index d6599b2..b62a976 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb31/timer31/aroundtimeout/ejb/SlessEJB6.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb31/timer31/aroundtimeout/ejb/SlessEJB6.java
@@ -22,10 +22,10 @@
 import jakarta.ejb.Timer;
 import jakarta.ejb.EJB;
 import jakarta.ejb.EJBException;
-import javax.interceptor.Interceptors;
-import javax.interceptor.ExcludeDefaultInterceptors;
-import javax.interceptor.ExcludeClassInterceptors;
-import javax.interceptor.InvocationContext;
+import jakarta.interceptor.Interceptors;
+import jakarta.interceptor.ExcludeDefaultInterceptors;
+import jakarta.interceptor.ExcludeClassInterceptors;
+import jakarta.interceptor.InvocationContext;
 
 
 // Each interceptor list must at least have InterceptorG for
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb31/timer31/aroundtimeout/ejb/SlessEJB7.java b/appserver/tests/appserv-tests/devtests/ejb/ejb31/timer31/aroundtimeout/ejb/SlessEJB7.java
index 09716b8..87b5107 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb31/timer31/aroundtimeout/ejb/SlessEJB7.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb31/timer31/aroundtimeout/ejb/SlessEJB7.java
@@ -20,12 +20,12 @@
 import jakarta.ejb.Stateless;
 import jakarta.ejb.Schedule;
 import jakarta.ejb.EJBException;
-import javax.interceptor.Interceptors;
-import javax.interceptor.ExcludeDefaultInterceptors;
-import javax.interceptor.ExcludeClassInterceptors;
-import javax.interceptor.AroundTimeout;
-import javax.interceptor.AroundInvoke;
-import javax.interceptor.InvocationContext;
+import jakarta.interceptor.Interceptors;
+import jakarta.interceptor.ExcludeDefaultInterceptors;
+import jakarta.interceptor.ExcludeClassInterceptors;
+import jakarta.interceptor.AroundTimeout;
+import jakarta.interceptor.AroundInvoke;
+import jakarta.interceptor.InvocationContext;
 
 // No-interface view
 @Stateless
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb31/timer31/mdb/ejb/InterceptorA.java b/appserver/tests/appserv-tests/devtests/ejb/ejb31/timer31/mdb/ejb/InterceptorA.java
index 87f7473..b35a245 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb31/timer31/mdb/ejb/InterceptorA.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb31/timer31/mdb/ejb/InterceptorA.java
@@ -16,9 +16,9 @@
 
 package com.acme;
 
-import javax.interceptor.AroundInvoke;
-import javax.interceptor.AroundTimeout;
-import javax.interceptor.InvocationContext;
+import jakarta.interceptor.AroundInvoke;
+import jakarta.interceptor.AroundTimeout;
+import jakarta.interceptor.InvocationContext;
 
 public class InterceptorA {
 
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb31/timer31/mdb/ejb/MessageBean.java b/appserver/tests/appserv-tests/devtests/ejb/ejb31/timer31/mdb/ejb/MessageBean.java
index dfdfef7..ad18dfc 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb31/timer31/mdb/ejb/MessageBean.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb31/timer31/mdb/ejb/MessageBean.java
@@ -20,9 +20,9 @@
 import jakarta.ejb.EJB;
 import jakarta.ejb.Schedule;
 import jakarta.ejb.Timer;
-import javax.interceptor.AroundTimeout;
-import javax.interceptor.InvocationContext;
-import javax.interceptor.Interceptors;
+import jakarta.interceptor.AroundTimeout;
+import jakarta.interceptor.InvocationContext;
+import jakarta.interceptor.Interceptors;
 
 import jakarta.annotation.Resource;
 import jakarta.ejb.MessageDrivenContext;
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb31/timer31/reschedule_after_failures/ejb/StlesEJB.java b/appserver/tests/appserv-tests/devtests/ejb/ejb31/timer31/reschedule_after_failures/ejb/StlesEJB.java
index a9c068c..fbedaeb 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb31/timer31/reschedule_after_failures/ejb/StlesEJB.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb31/timer31/reschedule_after_failures/ejb/StlesEJB.java
@@ -17,7 +17,7 @@
 package com.sun.s1asdev.ejb31.timer.reschedule_after_failures;
 
 import jakarta.ejb.*;
-import javax.interceptor.InvocationContext;
+import jakarta.interceptor.InvocationContext;
 import jakarta.annotation.Resource;
 
 import java.util.Map;
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb31/timer31/schedule_exp/ejb/StlesEJB.java b/appserver/tests/appserv-tests/devtests/ejb/ejb31/timer31/schedule_exp/ejb/StlesEJB.java
index 447f521..51e9fa7 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb31/timer31/schedule_exp/ejb/StlesEJB.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb31/timer31/schedule_exp/ejb/StlesEJB.java
@@ -17,8 +17,8 @@
 package com.sun.s1asdev.ejb31.timer.schedule_exp;
 
 import jakarta.ejb.*;
-import javax.interceptor.AroundTimeout;
-import javax.interceptor.InvocationContext;
+import jakarta.interceptor.AroundTimeout;
+import jakarta.interceptor.InvocationContext;
 import jakarta.annotation.Resource;
 
 import java.util.Map;
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/aroundconstruct/annotation/ejb/BaseBean.java b/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/aroundconstruct/annotation/ejb/BaseBean.java
index a82a0aa..99385dc 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/aroundconstruct/annotation/ejb/BaseBean.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/aroundconstruct/annotation/ejb/BaseBean.java
@@ -18,7 +18,7 @@
 
 import jakarta.ejb.*;
 import jakarta.annotation.*;
-import javax.interceptor.*;
+import jakarta.interceptor.*;
 
 
 public class BaseBean {
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/aroundconstruct/annotation/ejb/InterceptorA.java b/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/aroundconstruct/annotation/ejb/InterceptorA.java
index 8dd900c..8406927 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/aroundconstruct/annotation/ejb/InterceptorA.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/aroundconstruct/annotation/ejb/InterceptorA.java
@@ -16,9 +16,9 @@
 
 package com.acme;
 
-import javax.interceptor.InvocationContext;
-import javax.interceptor.AroundInvoke;
-import javax.interceptor.AroundConstruct;
+import jakarta.interceptor.InvocationContext;
+import jakarta.interceptor.AroundInvoke;
+import jakarta.interceptor.AroundConstruct;
 import jakarta.annotation.PostConstruct;
 import jakarta.annotation.PreDestroy;
 
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/aroundconstruct/annotation/ejb/InterceptorB.java b/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/aroundconstruct/annotation/ejb/InterceptorB.java
index 3df8c70..95927b2 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/aroundconstruct/annotation/ejb/InterceptorB.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/aroundconstruct/annotation/ejb/InterceptorB.java
@@ -16,9 +16,9 @@
 
 package com.acme;
 
-import javax.interceptor.InvocationContext;
-import javax.interceptor.AroundInvoke;
-import javax.interceptor.AroundConstruct;
+import jakarta.interceptor.InvocationContext;
+import jakarta.interceptor.AroundInvoke;
+import jakarta.interceptor.AroundConstruct;
 import jakarta.annotation.PostConstruct;
 import jakarta.annotation.PreDestroy;
 
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/aroundconstruct/annotation/ejb/SfulEJB.java b/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/aroundconstruct/annotation/ejb/SfulEJB.java
index edfd099..11d3292 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/aroundconstruct/annotation/ejb/SfulEJB.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/aroundconstruct/annotation/ejb/SfulEJB.java
@@ -16,9 +16,9 @@
 
 package com.acme;
 
-import javax.interceptor.InvocationContext;
-import javax.interceptor.AroundInvoke;
-import javax.interceptor.Interceptors;
+import jakarta.interceptor.InvocationContext;
+import jakarta.interceptor.AroundInvoke;
+import jakarta.interceptor.Interceptors;
 
 
 import jakarta.ejb.*;
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/aroundconstruct/annotation/ejb/SingletonBean.java b/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/aroundconstruct/annotation/ejb/SingletonBean.java
index 980fb66..7176402 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/aroundconstruct/annotation/ejb/SingletonBean.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/aroundconstruct/annotation/ejb/SingletonBean.java
@@ -18,7 +18,7 @@
 
 import jakarta.ejb.*;
 import jakarta.annotation.*;
-import javax.interceptor.*;
+import jakarta.interceptor.*;
 
 @Singleton
 //@Startup
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/aroundconstruct/annotation/ejb/SlessEJB.java b/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/aroundconstruct/annotation/ejb/SlessEJB.java
index 9b951ab..27406f5 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/aroundconstruct/annotation/ejb/SlessEJB.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/aroundconstruct/annotation/ejb/SlessEJB.java
@@ -17,7 +17,7 @@
 package com.acme;
 
 import jakarta.ejb.*;
-import javax.interceptor.*;
+import jakarta.interceptor.*;
 import jakarta.annotation.*;
 
 @Stateless
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/aroundconstruct/annotation/ejb/SlessEJB2.java b/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/aroundconstruct/annotation/ejb/SlessEJB2.java
index 168c62d..3ab9a45 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/aroundconstruct/annotation/ejb/SlessEJB2.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/aroundconstruct/annotation/ejb/SlessEJB2.java
@@ -17,7 +17,7 @@
 package com.acme;
 
 import jakarta.ejb.Stateless;
-import javax.interceptor.*;
+import jakarta.interceptor.*;
 import jakarta.annotation.*;
 
 @Stateless
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/aroundconstruct/annotation/ejb/SomeManagedBean.java b/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/aroundconstruct/annotation/ejb/SomeManagedBean.java
index f85c917..09e3afa 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/aroundconstruct/annotation/ejb/SomeManagedBean.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/aroundconstruct/annotation/ejb/SomeManagedBean.java
@@ -20,7 +20,7 @@
 
 import jakarta.ejb.EJB;
 import jakarta.annotation.Resource;
-import javax.interceptor.Interceptors;
+import jakarta.interceptor.Interceptors;
 import org.omg.CORBA.ORB;
 import jakarta.persistence.PersistenceContext;
 import jakarta.persistence.EntityManager;
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/aroundconstruct/annotation/ejb/SomeManagedBean2.java b/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/aroundconstruct/annotation/ejb/SomeManagedBean2.java
index 6305d95..dde1c43 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/aroundconstruct/annotation/ejb/SomeManagedBean2.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/aroundconstruct/annotation/ejb/SomeManagedBean2.java
@@ -20,7 +20,7 @@
 
 import jakarta.ejb.EJB;
 import jakarta.annotation.Resource;
-import javax.interceptor.Interceptors;
+import jakarta.interceptor.Interceptors;
 import org.omg.CORBA.ORB;
 import jakarta.persistence.PersistenceContext;
 import jakarta.persistence.EntityManager;
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/aroundconstruct/annotation/ejb/SomeManagedBean3.java b/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/aroundconstruct/annotation/ejb/SomeManagedBean3.java
index b31e17a..dfe08fa 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/aroundconstruct/annotation/ejb/SomeManagedBean3.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/aroundconstruct/annotation/ejb/SomeManagedBean3.java
@@ -20,7 +20,7 @@
 
 import jakarta.ejb.EJB;
 import jakarta.annotation.Resource;
-import javax.interceptor.Interceptors;
+import jakarta.interceptor.Interceptors;
 import org.omg.CORBA.ORB;
 import jakarta.persistence.PersistenceContext;
 import jakarta.persistence.EntityManager;
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/aroundconstruct/descriptor/ejb/BaseBean.java b/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/aroundconstruct/descriptor/ejb/BaseBean.java
index 52b1737..5d64303 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/aroundconstruct/descriptor/ejb/BaseBean.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/aroundconstruct/descriptor/ejb/BaseBean.java
@@ -18,7 +18,7 @@
 
 import jakarta.ejb.*;
 import jakarta.annotation.*;
-import javax.interceptor.*;
+import jakarta.interceptor.*;
 
 
 public class BaseBean {
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/aroundconstruct/descriptor/ejb/InterceptorA.java b/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/aroundconstruct/descriptor/ejb/InterceptorA.java
index c12b3f2..bfab451 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/aroundconstruct/descriptor/ejb/InterceptorA.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/aroundconstruct/descriptor/ejb/InterceptorA.java
@@ -16,8 +16,8 @@
 
 package com.acme;
 
-import javax.interceptor.InvocationContext;
-import javax.interceptor.AroundInvoke;
+import jakarta.interceptor.InvocationContext;
+import jakarta.interceptor.AroundInvoke;
 import jakarta.annotation.PostConstruct;
 import jakarta.annotation.PreDestroy;
 
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/aroundconstruct/descriptor/ejb/InterceptorB.java b/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/aroundconstruct/descriptor/ejb/InterceptorB.java
index dbcc485..2855bc5 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/aroundconstruct/descriptor/ejb/InterceptorB.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/aroundconstruct/descriptor/ejb/InterceptorB.java
@@ -16,8 +16,8 @@
 
 package com.acme;
 
-import javax.interceptor.InvocationContext;
-import javax.interceptor.AroundInvoke;
+import jakarta.interceptor.InvocationContext;
+import jakarta.interceptor.AroundInvoke;
 import jakarta.annotation.PostConstruct;
 import jakarta.annotation.PreDestroy;
 
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/aroundconstruct/descriptor/ejb/SfulEJB.java b/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/aroundconstruct/descriptor/ejb/SfulEJB.java
index 8253139..7be7138 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/aroundconstruct/descriptor/ejb/SfulEJB.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/aroundconstruct/descriptor/ejb/SfulEJB.java
@@ -16,9 +16,9 @@
 
 package com.acme;
 
-import javax.interceptor.InvocationContext;
-import javax.interceptor.AroundInvoke;
-import javax.interceptor.Interceptors;
+import jakarta.interceptor.InvocationContext;
+import jakarta.interceptor.AroundInvoke;
+import jakarta.interceptor.Interceptors;
 
 
 import jakarta.ejb.*;
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/aroundconstruct/descriptor/ejb/SingletonBean.java b/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/aroundconstruct/descriptor/ejb/SingletonBean.java
index dbd5530..35a2893 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/aroundconstruct/descriptor/ejb/SingletonBean.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/aroundconstruct/descriptor/ejb/SingletonBean.java
@@ -18,7 +18,7 @@
 
 import jakarta.ejb.*;
 import jakarta.annotation.*;
-import javax.interceptor.*;
+import jakarta.interceptor.*;
 
 @Singleton
 //@Startup
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/aroundconstruct/descriptor/ejb/SlessEJB.java b/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/aroundconstruct/descriptor/ejb/SlessEJB.java
index 16968c1..3afc124 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/aroundconstruct/descriptor/ejb/SlessEJB.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/aroundconstruct/descriptor/ejb/SlessEJB.java
@@ -17,7 +17,7 @@
 package com.acme;
 
 import jakarta.ejb.*;
-import javax.interceptor.*;
+import jakarta.interceptor.*;
 import jakarta.annotation.*;
 
 @Stateless
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/aroundconstruct/descriptor/ejb/SlessEJB2.java b/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/aroundconstruct/descriptor/ejb/SlessEJB2.java
index da30d59..c4d6fd1 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/aroundconstruct/descriptor/ejb/SlessEJB2.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/aroundconstruct/descriptor/ejb/SlessEJB2.java
@@ -17,7 +17,7 @@
 package com.acme;
 
 import jakarta.ejb.Stateless;
-import javax.interceptor.*;
+import jakarta.interceptor.*;
 import jakarta.annotation.*;
 
 @Stateless
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/constructor-level/annotation/ejb/BaseBean.java b/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/constructor-level/annotation/ejb/BaseBean.java
index 7d12d60..6fb1cf9 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/constructor-level/annotation/ejb/BaseBean.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/constructor-level/annotation/ejb/BaseBean.java
@@ -18,7 +18,7 @@
 
 import jakarta.ejb.*;
 import jakarta.annotation.*;
-import javax.interceptor.*;
+import jakarta.interceptor.*;
 import java.lang.reflect.*;
 
 
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/constructor-level/annotation/ejb/InterceptorA.java b/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/constructor-level/annotation/ejb/InterceptorA.java
index df1a909..7c75b92 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/constructor-level/annotation/ejb/InterceptorA.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/constructor-level/annotation/ejb/InterceptorA.java
@@ -16,9 +16,9 @@
 
 package com.acme;
 
-import javax.interceptor.InvocationContext;
-import javax.interceptor.AroundInvoke;
-import javax.interceptor.AroundConstruct;
+import jakarta.interceptor.InvocationContext;
+import jakarta.interceptor.AroundInvoke;
+import jakarta.interceptor.AroundConstruct;
 import jakarta.annotation.PostConstruct;
 import jakarta.annotation.PreDestroy;
 
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/constructor-level/annotation/ejb/InterceptorB.java b/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/constructor-level/annotation/ejb/InterceptorB.java
index 3c79255..1d2465f 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/constructor-level/annotation/ejb/InterceptorB.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/constructor-level/annotation/ejb/InterceptorB.java
@@ -16,9 +16,9 @@
 
 package com.acme;
 
-import javax.interceptor.InvocationContext;
-import javax.interceptor.AroundInvoke;
-import javax.interceptor.AroundConstruct;
+import jakarta.interceptor.InvocationContext;
+import jakarta.interceptor.AroundInvoke;
+import jakarta.interceptor.AroundConstruct;
 import jakarta.annotation.PostConstruct;
 import jakarta.annotation.PreDestroy;
 
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/constructor-level/annotation/ejb/InterceptorC.java b/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/constructor-level/annotation/ejb/InterceptorC.java
index 1aea5b7..0211ed5 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/constructor-level/annotation/ejb/InterceptorC.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/constructor-level/annotation/ejb/InterceptorC.java
@@ -16,9 +16,9 @@
 
 package com.acme;
 
-import javax.interceptor.InvocationContext;
-import javax.interceptor.AroundInvoke;
-import javax.interceptor.AroundConstruct;
+import jakarta.interceptor.InvocationContext;
+import jakarta.interceptor.AroundInvoke;
+import jakarta.interceptor.AroundConstruct;
 import jakarta.annotation.PostConstruct;
 import jakarta.annotation.PreDestroy;
 
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/constructor-level/annotation/ejb/SfulEJB.java b/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/constructor-level/annotation/ejb/SfulEJB.java
index da687a4..582421f 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/constructor-level/annotation/ejb/SfulEJB.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/constructor-level/annotation/ejb/SfulEJB.java
@@ -16,9 +16,9 @@
 
 package com.acme;
 
-import javax.interceptor.InvocationContext;
-import javax.interceptor.AroundInvoke;
-import javax.interceptor.Interceptors;
+import jakarta.interceptor.InvocationContext;
+import jakarta.interceptor.AroundInvoke;
+import jakarta.interceptor.Interceptors;
 
 
 import jakarta.ejb.*;
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/constructor-level/annotation/ejb/SingletonBean.java b/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/constructor-level/annotation/ejb/SingletonBean.java
index af151e6..364227b 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/constructor-level/annotation/ejb/SingletonBean.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/constructor-level/annotation/ejb/SingletonBean.java
@@ -18,7 +18,7 @@
 
 import jakarta.ejb.*;
 import jakarta.annotation.*;
-import javax.interceptor.*;
+import jakarta.interceptor.*;
 
 @Singleton
 @Interceptors(InterceptorA.class)
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/constructor-level/annotation/ejb/SlessEJB.java b/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/constructor-level/annotation/ejb/SlessEJB.java
index e33fdb4..bc7644e 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/constructor-level/annotation/ejb/SlessEJB.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/constructor-level/annotation/ejb/SlessEJB.java
@@ -17,7 +17,7 @@
 package com.acme;
 
 import jakarta.ejb.*;
-import javax.interceptor.*;
+import jakarta.interceptor.*;
 import jakarta.annotation.*;
 
 @Stateless
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/constructor-level/annotation/ejb/SlessEJB2.java b/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/constructor-level/annotation/ejb/SlessEJB2.java
index d418ee0..95179b8 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/constructor-level/annotation/ejb/SlessEJB2.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/constructor-level/annotation/ejb/SlessEJB2.java
@@ -17,7 +17,7 @@
 package com.acme;
 
 import jakarta.ejb.Stateless;
-import javax.interceptor.*;
+import jakarta.interceptor.*;
 import jakarta.annotation.*;
 
 @Stateless
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/constructor-level/annotation/ejb/SlessEJB3.java b/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/constructor-level/annotation/ejb/SlessEJB3.java
index 745658a..3344190 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/constructor-level/annotation/ejb/SlessEJB3.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/constructor-level/annotation/ejb/SlessEJB3.java
@@ -17,7 +17,7 @@
 package com.acme;
 
 import jakarta.ejb.*;
-import javax.interceptor.*;
+import jakarta.interceptor.*;
 import jakarta.annotation.*;
 
 @Stateless
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/constructor-level/annotation/ejb/SomeManagedBean.java b/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/constructor-level/annotation/ejb/SomeManagedBean.java
index bfdc0ec..0138d72 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/constructor-level/annotation/ejb/SomeManagedBean.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/constructor-level/annotation/ejb/SomeManagedBean.java
@@ -20,7 +20,7 @@
 
 import jakarta.ejb.EJB;
 import jakarta.annotation.Resource;
-import javax.interceptor.Interceptors;
+import jakarta.interceptor.Interceptors;
 import org.omg.CORBA.ORB;
 import jakarta.persistence.PersistenceContext;
 import jakarta.persistence.EntityManager;
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/constructor-level/annotation/ejb/SomeManagedBean2.java b/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/constructor-level/annotation/ejb/SomeManagedBean2.java
index d8d9fbf..db8a8c7 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/constructor-level/annotation/ejb/SomeManagedBean2.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/constructor-level/annotation/ejb/SomeManagedBean2.java
@@ -20,8 +20,8 @@
 
 import jakarta.ejb.EJB;
 import jakarta.annotation.Resource;
-import javax.interceptor.ExcludeClassInterceptors;
-import javax.interceptor.Interceptors;
+import jakarta.interceptor.ExcludeClassInterceptors;
+import jakarta.interceptor.Interceptors;
 import org.omg.CORBA.ORB;
 import jakarta.persistence.PersistenceContext;
 import jakarta.persistence.EntityManager;
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/constructor-level/annotation/ejb/SomeManagedBean3.java b/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/constructor-level/annotation/ejb/SomeManagedBean3.java
index 44e9af4..4622352 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/constructor-level/annotation/ejb/SomeManagedBean3.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/constructor-level/annotation/ejb/SomeManagedBean3.java
@@ -20,8 +20,8 @@
 
 import jakarta.ejb.EJB;
 import jakarta.annotation.Resource;
-import javax.interceptor.ExcludeClassInterceptors;
-import javax.interceptor.Interceptors;
+import jakarta.interceptor.ExcludeClassInterceptors;
+import jakarta.interceptor.Interceptors;
 import org.omg.CORBA.ORB;
 import jakarta.persistence.PersistenceContext;
 import jakarta.persistence.EntityManager;
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/constructor-level/descriptor/ejb/BaseBean.java b/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/constructor-level/descriptor/ejb/BaseBean.java
index 282c1d7..5cfd62e 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/constructor-level/descriptor/ejb/BaseBean.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/constructor-level/descriptor/ejb/BaseBean.java
@@ -18,7 +18,7 @@
 
 import jakarta.ejb.*;
 import jakarta.annotation.*;
-import javax.interceptor.*;
+import jakarta.interceptor.*;
 import java.lang.reflect.*;
 
 
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/constructor-level/descriptor/ejb/InterceptorA.java b/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/constructor-level/descriptor/ejb/InterceptorA.java
index 11fe0df..683347f 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/constructor-level/descriptor/ejb/InterceptorA.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/constructor-level/descriptor/ejb/InterceptorA.java
@@ -16,7 +16,7 @@
 
 package com.acme;
 
-import javax.interceptor.InvocationContext;
+import jakarta.interceptor.InvocationContext;
 
 public class InterceptorA {
 
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/constructor-level/descriptor/ejb/InterceptorB.java b/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/constructor-level/descriptor/ejb/InterceptorB.java
index 364ba43..c912227 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/constructor-level/descriptor/ejb/InterceptorB.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/constructor-level/descriptor/ejb/InterceptorB.java
@@ -16,7 +16,7 @@
 
 package com.acme;
 
-import javax.interceptor.InvocationContext;
+import jakarta.interceptor.InvocationContext;
 
 public class InterceptorB {
 
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/constructor-level/descriptor/ejb/InterceptorC.java b/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/constructor-level/descriptor/ejb/InterceptorC.java
index f986f28..5896224 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/constructor-level/descriptor/ejb/InterceptorC.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/constructor-level/descriptor/ejb/InterceptorC.java
@@ -16,7 +16,7 @@
 
 package com.acme;
 
-import javax.interceptor.InvocationContext;
+import jakarta.interceptor.InvocationContext;
 
 public class InterceptorC {
 
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/constructor-level/descriptor/ejb/SfulEJB.java b/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/constructor-level/descriptor/ejb/SfulEJB.java
index 7199209..ffb584d 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/constructor-level/descriptor/ejb/SfulEJB.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/constructor-level/descriptor/ejb/SfulEJB.java
@@ -16,9 +16,9 @@
 
 package com.acme;
 
-import javax.interceptor.InvocationContext;
-import javax.interceptor.AroundInvoke;
-import javax.interceptor.Interceptors;
+import jakarta.interceptor.InvocationContext;
+import jakarta.interceptor.AroundInvoke;
+import jakarta.interceptor.Interceptors;
 
 
 import jakarta.ejb.*;
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/constructor-level/descriptor/ejb/SingletonBean.java b/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/constructor-level/descriptor/ejb/SingletonBean.java
index e070b7b..c19d4a9 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/constructor-level/descriptor/ejb/SingletonBean.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/constructor-level/descriptor/ejb/SingletonBean.java
@@ -18,7 +18,7 @@
 
 import jakarta.ejb.*;
 import jakarta.annotation.*;
-import javax.interceptor.*;
+import jakarta.interceptor.*;
 
 @Singleton
 public class SingletonBean extends BaseBean implements Snglt {
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/constructor-level/descriptor/ejb/SlessEJB.java b/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/constructor-level/descriptor/ejb/SlessEJB.java
index 9a2ff30..8f21f84 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/constructor-level/descriptor/ejb/SlessEJB.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/constructor-level/descriptor/ejb/SlessEJB.java
@@ -17,7 +17,7 @@
 package com.acme;
 
 import jakarta.ejb.*;
-import javax.interceptor.*;
+import jakarta.interceptor.*;
 import jakarta.annotation.*;
 
 @Stateless
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/constructor-level/descriptor/ejb/SlessEJB2.java b/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/constructor-level/descriptor/ejb/SlessEJB2.java
index 5b392da..77849e5 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/constructor-level/descriptor/ejb/SlessEJB2.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/constructor-level/descriptor/ejb/SlessEJB2.java
@@ -17,7 +17,7 @@
 package com.acme;
 
 import jakarta.ejb.Stateless;
-import javax.interceptor.*;
+import jakarta.interceptor.*;
 import jakarta.annotation.*;
 
 @Stateless
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/constructor-level/descriptor/ejb/SlessEJB3.java b/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/constructor-level/descriptor/ejb/SlessEJB3.java
index 457c3d2..98fe626 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/constructor-level/descriptor/ejb/SlessEJB3.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/constructor-level/descriptor/ejb/SlessEJB3.java
@@ -17,7 +17,7 @@
 package com.acme;
 
 import jakarta.ejb.*;
-import javax.interceptor.*;
+import jakarta.interceptor.*;
 import jakarta.annotation.*;
 
 @Stateless
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/get_method_lc/annotation/ejb/BaseBean.java b/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/get_method_lc/annotation/ejb/BaseBean.java
index 752249c..003b416 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/get_method_lc/annotation/ejb/BaseBean.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/get_method_lc/annotation/ejb/BaseBean.java
@@ -18,7 +18,7 @@
 
 import jakarta.ejb.*;
 import jakarta.annotation.*;
-import javax.interceptor.*;
+import jakarta.interceptor.*;
 import java.lang.reflect.*;
 
 
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/get_method_lc/annotation/ejb/InterceptorA.java b/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/get_method_lc/annotation/ejb/InterceptorA.java
index 6edf366..8aee77f 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/get_method_lc/annotation/ejb/InterceptorA.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/get_method_lc/annotation/ejb/InterceptorA.java
@@ -16,9 +16,9 @@
 
 package com.acme;
 
-import javax.interceptor.InvocationContext;
-import javax.interceptor.AroundInvoke;
-import javax.interceptor.AroundConstruct;
+import jakarta.interceptor.InvocationContext;
+import jakarta.interceptor.AroundInvoke;
+import jakarta.interceptor.AroundConstruct;
 import jakarta.annotation.PostConstruct;
 import jakarta.annotation.PreDestroy;
 
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/get_method_lc/annotation/ejb/InterceptorB.java b/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/get_method_lc/annotation/ejb/InterceptorB.java
index ed79b38..9cef594 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/get_method_lc/annotation/ejb/InterceptorB.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/get_method_lc/annotation/ejb/InterceptorB.java
@@ -16,9 +16,9 @@
 
 package com.acme;
 
-import javax.interceptor.InvocationContext;
-import javax.interceptor.AroundInvoke;
-import javax.interceptor.AroundConstruct;
+import jakarta.interceptor.InvocationContext;
+import jakarta.interceptor.AroundInvoke;
+import jakarta.interceptor.AroundConstruct;
 import jakarta.annotation.PostConstruct;
 import jakarta.annotation.PreDestroy;
 
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/get_method_lc/annotation/ejb/InterceptorC.java b/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/get_method_lc/annotation/ejb/InterceptorC.java
index e63a504..947d907 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/get_method_lc/annotation/ejb/InterceptorC.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/get_method_lc/annotation/ejb/InterceptorC.java
@@ -16,9 +16,9 @@
 
 package com.acme;
 
-import javax.interceptor.InvocationContext;
-import javax.interceptor.AroundInvoke;
-import javax.interceptor.AroundConstruct;
+import jakarta.interceptor.InvocationContext;
+import jakarta.interceptor.AroundInvoke;
+import jakarta.interceptor.AroundConstruct;
 import jakarta.annotation.PostConstruct;
 import jakarta.annotation.PreDestroy;
 
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/get_method_lc/annotation/ejb/SfulEJB.java b/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/get_method_lc/annotation/ejb/SfulEJB.java
index 7bfa7d2..6ef028e 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/get_method_lc/annotation/ejb/SfulEJB.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/get_method_lc/annotation/ejb/SfulEJB.java
@@ -16,9 +16,9 @@
 
 package com.acme;
 
-import javax.interceptor.InvocationContext;
-import javax.interceptor.AroundInvoke;
-import javax.interceptor.Interceptors;
+import jakarta.interceptor.InvocationContext;
+import jakarta.interceptor.AroundInvoke;
+import jakarta.interceptor.Interceptors;
 
 
 import jakarta.ejb.*;
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/get_method_lc/annotation/ejb/SingletonBean.java b/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/get_method_lc/annotation/ejb/SingletonBean.java
index fc7d740..9b15694 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/get_method_lc/annotation/ejb/SingletonBean.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/get_method_lc/annotation/ejb/SingletonBean.java
@@ -18,7 +18,7 @@
 
 import jakarta.ejb.*;
 import jakarta.annotation.*;
-import javax.interceptor.*;
+import jakarta.interceptor.*;
 
 @Singleton
 @Interceptors(InterceptorA.class)
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/get_method_lc/annotation/ejb/SlessEJB.java b/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/get_method_lc/annotation/ejb/SlessEJB.java
index 18b48ce..f89ef0e 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/get_method_lc/annotation/ejb/SlessEJB.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/get_method_lc/annotation/ejb/SlessEJB.java
@@ -17,7 +17,7 @@
 package com.acme;
 
 import jakarta.ejb.*;
-import javax.interceptor.*;
+import jakarta.interceptor.*;
 import jakarta.annotation.*;
 
 @Stateless
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/get_method_lc/annotation/ejb/SlessEJB2.java b/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/get_method_lc/annotation/ejb/SlessEJB2.java
index a479865..1495518 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/get_method_lc/annotation/ejb/SlessEJB2.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/get_method_lc/annotation/ejb/SlessEJB2.java
@@ -17,7 +17,7 @@
 package com.acme;
 
 import jakarta.ejb.Stateless;
-import javax.interceptor.*;
+import jakarta.interceptor.*;
 import jakarta.annotation.*;
 
 @Stateless
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/get_method_lc/annotation/ejb/SlessEJB3.java b/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/get_method_lc/annotation/ejb/SlessEJB3.java
index 9fb18dc..b28a3ba 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/get_method_lc/annotation/ejb/SlessEJB3.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/get_method_lc/annotation/ejb/SlessEJB3.java
@@ -17,7 +17,7 @@
 package com.acme;
 
 import jakarta.ejb.*;
-import javax.interceptor.*;
+import jakarta.interceptor.*;
 import jakarta.annotation.*;
 
 @Stateless
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/get_method_lc/annotation/ejb/SomeManagedBean.java b/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/get_method_lc/annotation/ejb/SomeManagedBean.java
index 5afae1c..5b5ab4c 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/get_method_lc/annotation/ejb/SomeManagedBean.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/get_method_lc/annotation/ejb/SomeManagedBean.java
@@ -20,7 +20,7 @@
 
 import jakarta.ejb.EJB;
 import jakarta.annotation.Resource;
-import javax.interceptor.Interceptors;
+import jakarta.interceptor.Interceptors;
 import org.omg.CORBA.ORB;
 import jakarta.persistence.PersistenceContext;
 import jakarta.persistence.EntityManager;
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/get_method_lc/annotation/ejb/SomeManagedBeanBase.java b/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/get_method_lc/annotation/ejb/SomeManagedBeanBase.java
index af86180..562d8db 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/get_method_lc/annotation/ejb/SomeManagedBeanBase.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/get_method_lc/annotation/ejb/SomeManagedBeanBase.java
@@ -20,7 +20,7 @@
 
 import jakarta.ejb.EJB;
 import jakarta.annotation.Resource;
-import javax.interceptor.Interceptors;
+import jakarta.interceptor.Interceptors;
 import org.omg.CORBA.ORB;
 import jakarta.persistence.PersistenceContext;
 import jakarta.persistence.EntityManager;
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/get_method_lc/descriptor/ejb/BaseBean.java b/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/get_method_lc/descriptor/ejb/BaseBean.java
index 9a6d8d1..65fb797 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/get_method_lc/descriptor/ejb/BaseBean.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/get_method_lc/descriptor/ejb/BaseBean.java
@@ -18,7 +18,7 @@
 
 import jakarta.ejb.*;
 import jakarta.annotation.*;
-import javax.interceptor.*;
+import jakarta.interceptor.*;
 import java.lang.reflect.*;
 
 
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/get_method_lc/descriptor/ejb/InterceptorA.java b/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/get_method_lc/descriptor/ejb/InterceptorA.java
index 61d49ab..48cda07 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/get_method_lc/descriptor/ejb/InterceptorA.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/get_method_lc/descriptor/ejb/InterceptorA.java
@@ -16,7 +16,7 @@
 
 package com.acme;
 
-import javax.interceptor.InvocationContext;
+import jakarta.interceptor.InvocationContext;
 
 public class InterceptorA {
 
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/get_method_lc/descriptor/ejb/InterceptorB.java b/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/get_method_lc/descriptor/ejb/InterceptorB.java
index 727193f..63ea26a 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/get_method_lc/descriptor/ejb/InterceptorB.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/get_method_lc/descriptor/ejb/InterceptorB.java
@@ -16,7 +16,7 @@
 
 package com.acme;
 
-import javax.interceptor.InvocationContext;
+import jakarta.interceptor.InvocationContext;
 
 public class InterceptorB {
 
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/get_method_lc/descriptor/ejb/InterceptorC.java b/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/get_method_lc/descriptor/ejb/InterceptorC.java
index f41a533..24c56ff 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/get_method_lc/descriptor/ejb/InterceptorC.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/get_method_lc/descriptor/ejb/InterceptorC.java
@@ -16,7 +16,7 @@
 
 package com.acme;
 
-import javax.interceptor.InvocationContext;
+import jakarta.interceptor.InvocationContext;
 
 public class InterceptorC {
 
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/get_method_lc/descriptor/ejb/SfulEJB.java b/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/get_method_lc/descriptor/ejb/SfulEJB.java
index 0af939a..6f181b0 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/get_method_lc/descriptor/ejb/SfulEJB.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/get_method_lc/descriptor/ejb/SfulEJB.java
@@ -16,9 +16,9 @@
 
 package com.acme;
 
-import javax.interceptor.InvocationContext;
-import javax.interceptor.AroundInvoke;
-import javax.interceptor.Interceptors;
+import jakarta.interceptor.InvocationContext;
+import jakarta.interceptor.AroundInvoke;
+import jakarta.interceptor.Interceptors;
 
 
 import jakarta.ejb.*;
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/get_method_lc/descriptor/ejb/SingletonBean.java b/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/get_method_lc/descriptor/ejb/SingletonBean.java
index 27bb0b0..a6b10c7 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/get_method_lc/descriptor/ejb/SingletonBean.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/get_method_lc/descriptor/ejb/SingletonBean.java
@@ -18,7 +18,7 @@
 
 import jakarta.ejb.*;
 import jakarta.annotation.*;
-import javax.interceptor.*;
+import jakarta.interceptor.*;
 
 @Singleton
 public class SingletonBean extends BaseBean implements Snglt {
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/get_method_lc/descriptor/ejb/SlessEJB.java b/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/get_method_lc/descriptor/ejb/SlessEJB.java
index c18e6ac..51c1db0 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/get_method_lc/descriptor/ejb/SlessEJB.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/get_method_lc/descriptor/ejb/SlessEJB.java
@@ -17,7 +17,7 @@
 package com.acme;
 
 import jakarta.ejb.*;
-import javax.interceptor.*;
+import jakarta.interceptor.*;
 import jakarta.annotation.*;
 
 @Stateless
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/get_method_lc/descriptor/ejb/SlessEJB2.java b/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/get_method_lc/descriptor/ejb/SlessEJB2.java
index 5b392da..77849e5 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/get_method_lc/descriptor/ejb/SlessEJB2.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/get_method_lc/descriptor/ejb/SlessEJB2.java
@@ -17,7 +17,7 @@
 package com.acme;
 
 import jakarta.ejb.Stateless;
-import javax.interceptor.*;
+import jakarta.interceptor.*;
 import jakarta.annotation.*;
 
 @Stateless
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/get_method_lc/descriptor/ejb/SlessEJB3.java b/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/get_method_lc/descriptor/ejb/SlessEJB3.java
index 0373cde..36d132c 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/get_method_lc/descriptor/ejb/SlessEJB3.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/get_method_lc/descriptor/ejb/SlessEJB3.java
@@ -17,7 +17,7 @@
 package com.acme;
 
 import jakarta.ejb.*;
-import javax.interceptor.*;
+import jakarta.interceptor.*;
 import jakarta.annotation.*;
 
 @Stateless
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/interceptors-inheritance/ejb/BaseBean.java b/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/interceptors-inheritance/ejb/BaseBean.java
index 4c82c2f..ca7ab45 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/interceptors-inheritance/ejb/BaseBean.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/interceptors-inheritance/ejb/BaseBean.java
@@ -18,7 +18,7 @@
 
 import jakarta.ejb.*;
 import jakarta.annotation.*;
-import javax.interceptor.*;
+import jakarta.interceptor.*;
 
 
 public class BaseBean {
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/interceptors-inheritance/ejb/BaseInterceptor.java b/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/interceptors-inheritance/ejb/BaseInterceptor.java
index 61e75f2..83e19cf 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/interceptors-inheritance/ejb/BaseInterceptor.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/interceptors-inheritance/ejb/BaseInterceptor.java
@@ -16,8 +16,8 @@
 
 package com.acme;
 
-import javax.interceptor.InvocationContext;
-import javax.interceptor.AroundInvoke;
+import jakarta.interceptor.InvocationContext;
+import jakarta.interceptor.AroundInvoke;
 import jakarta.annotation.PostConstruct;
 import jakarta.annotation.PreDestroy;
 
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/interceptors-inheritance/ejb/InterceptorA.java b/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/interceptors-inheritance/ejb/InterceptorA.java
index 91145cd..8d240e2 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/interceptors-inheritance/ejb/InterceptorA.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/interceptors-inheritance/ejb/InterceptorA.java
@@ -16,8 +16,8 @@
 
 package com.acme;
 
-import javax.interceptor.InvocationContext;
-import javax.interceptor.AroundInvoke;
+import jakarta.interceptor.InvocationContext;
+import jakarta.interceptor.AroundInvoke;
 import jakarta.annotation.PostConstruct;
 import jakarta.annotation.PreDestroy;
 
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/interceptors-inheritance/ejb/SfulEJB.java b/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/interceptors-inheritance/ejb/SfulEJB.java
index c353361..171dea1 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/interceptors-inheritance/ejb/SfulEJB.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/interceptors-inheritance/ejb/SfulEJB.java
@@ -16,9 +16,9 @@
 
 package com.acme;
 
-import javax.interceptor.InvocationContext;
-import javax.interceptor.AroundInvoke;
-import javax.interceptor.Interceptors;
+import jakarta.interceptor.InvocationContext;
+import jakarta.interceptor.AroundInvoke;
+import jakarta.interceptor.Interceptors;
 
 
 import jakarta.ejb.*;
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/interceptors-inheritance/ejb/SingletonBean.java b/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/interceptors-inheritance/ejb/SingletonBean.java
index 73560cc..8a53360 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/interceptors-inheritance/ejb/SingletonBean.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/interceptors-inheritance/ejb/SingletonBean.java
@@ -18,7 +18,7 @@
 
 import jakarta.ejb.*;
 import jakarta.annotation.*;
-import javax.interceptor.*;
+import jakarta.interceptor.*;
 
 @Singleton
 @Startup
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/interceptors-inheritance/ejb/SlessEJB.java b/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/interceptors-inheritance/ejb/SlessEJB.java
index 288f81b..168ebc2 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/interceptors-inheritance/ejb/SlessEJB.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/interceptors-inheritance/ejb/SlessEJB.java
@@ -17,7 +17,7 @@
 package com.acme;
 
 import jakarta.ejb.Stateless;
-import javax.interceptor.*;
+import jakarta.interceptor.*;
 import jakarta.annotation.*;
 
 @Stateless
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/lc-method-constructor-level/annotation/ejb/BaseBean.java b/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/lc-method-constructor-level/annotation/ejb/BaseBean.java
index 3d9fd86..f77514b 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/lc-method-constructor-level/annotation/ejb/BaseBean.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/lc-method-constructor-level/annotation/ejb/BaseBean.java
@@ -18,7 +18,7 @@
 
 import jakarta.ejb.*;
 import jakarta.annotation.*;
-import javax.interceptor.*;
+import jakarta.interceptor.*;
 import java.lang.reflect.*;
 
 
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/lc-method-constructor-level/annotation/ejb/InterceptorA.java b/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/lc-method-constructor-level/annotation/ejb/InterceptorA.java
index 41e91e3..6ced981 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/lc-method-constructor-level/annotation/ejb/InterceptorA.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/lc-method-constructor-level/annotation/ejb/InterceptorA.java
@@ -16,9 +16,9 @@
 
 package com.acme;
 
-import javax.interceptor.InvocationContext;
-import javax.interceptor.AroundInvoke;
-import javax.interceptor.AroundConstruct;
+import jakarta.interceptor.InvocationContext;
+import jakarta.interceptor.AroundInvoke;
+import jakarta.interceptor.AroundConstruct;
 import jakarta.annotation.PostConstruct;
 import jakarta.annotation.PreDestroy;
 
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/lc-method-constructor-level/annotation/ejb/InterceptorB.java b/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/lc-method-constructor-level/annotation/ejb/InterceptorB.java
index ed79b38..9cef594 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/lc-method-constructor-level/annotation/ejb/InterceptorB.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/lc-method-constructor-level/annotation/ejb/InterceptorB.java
@@ -16,9 +16,9 @@
 
 package com.acme;
 
-import javax.interceptor.InvocationContext;
-import javax.interceptor.AroundInvoke;
-import javax.interceptor.AroundConstruct;
+import jakarta.interceptor.InvocationContext;
+import jakarta.interceptor.AroundInvoke;
+import jakarta.interceptor.AroundConstruct;
 import jakarta.annotation.PostConstruct;
 import jakarta.annotation.PreDestroy;
 
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/lc-method-constructor-level/annotation/ejb/InterceptorC.java b/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/lc-method-constructor-level/annotation/ejb/InterceptorC.java
index e63a504..947d907 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/lc-method-constructor-level/annotation/ejb/InterceptorC.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/lc-method-constructor-level/annotation/ejb/InterceptorC.java
@@ -16,9 +16,9 @@
 
 package com.acme;
 
-import javax.interceptor.InvocationContext;
-import javax.interceptor.AroundInvoke;
-import javax.interceptor.AroundConstruct;
+import jakarta.interceptor.InvocationContext;
+import jakarta.interceptor.AroundInvoke;
+import jakarta.interceptor.AroundConstruct;
 import jakarta.annotation.PostConstruct;
 import jakarta.annotation.PreDestroy;
 
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/lc-method-constructor-level/annotation/ejb/SfulEJB.java b/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/lc-method-constructor-level/annotation/ejb/SfulEJB.java
index a2550d1..45ac3b0 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/lc-method-constructor-level/annotation/ejb/SfulEJB.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/lc-method-constructor-level/annotation/ejb/SfulEJB.java
@@ -16,9 +16,9 @@
 
 package com.acme;
 
-import javax.interceptor.InvocationContext;
-import javax.interceptor.AroundInvoke;
-import javax.interceptor.Interceptors;
+import jakarta.interceptor.InvocationContext;
+import jakarta.interceptor.AroundInvoke;
+import jakarta.interceptor.Interceptors;
 
 
 import jakarta.ejb.*;
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/lc-method-constructor-level/annotation/ejb/SingletonBean.java b/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/lc-method-constructor-level/annotation/ejb/SingletonBean.java
index 8a21559..9e1b454 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/lc-method-constructor-level/annotation/ejb/SingletonBean.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/lc-method-constructor-level/annotation/ejb/SingletonBean.java
@@ -18,7 +18,7 @@
 
 import jakarta.ejb.*;
 import jakarta.annotation.*;
-import javax.interceptor.*;
+import jakarta.interceptor.*;
 
 @Singleton
 @Interceptors(InterceptorA.class)
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/lc-method-constructor-level/annotation/ejb/SlessEJB.java b/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/lc-method-constructor-level/annotation/ejb/SlessEJB.java
index 18b48ce..f89ef0e 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/lc-method-constructor-level/annotation/ejb/SlessEJB.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/lc-method-constructor-level/annotation/ejb/SlessEJB.java
@@ -17,7 +17,7 @@
 package com.acme;
 
 import jakarta.ejb.*;
-import javax.interceptor.*;
+import jakarta.interceptor.*;
 import jakarta.annotation.*;
 
 @Stateless
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/lc-method-constructor-level/annotation/ejb/SlessEJB2.java b/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/lc-method-constructor-level/annotation/ejb/SlessEJB2.java
index d418ee0..95179b8 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/lc-method-constructor-level/annotation/ejb/SlessEJB2.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/lc-method-constructor-level/annotation/ejb/SlessEJB2.java
@@ -17,7 +17,7 @@
 package com.acme;
 
 import jakarta.ejb.Stateless;
-import javax.interceptor.*;
+import jakarta.interceptor.*;
 import jakarta.annotation.*;
 
 @Stateless
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/lc-method-constructor-level/annotation/ejb/SlessEJB3.java b/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/lc-method-constructor-level/annotation/ejb/SlessEJB3.java
index c0f50c7..830f262 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/lc-method-constructor-level/annotation/ejb/SlessEJB3.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/lc-method-constructor-level/annotation/ejb/SlessEJB3.java
@@ -17,7 +17,7 @@
 package com.acme;
 
 import jakarta.ejb.*;
-import javax.interceptor.*;
+import jakarta.interceptor.*;
 import jakarta.annotation.*;
 
 @Stateless
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/lc-method-constructor-level/annotation/ejb/SomeManagedBean.java b/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/lc-method-constructor-level/annotation/ejb/SomeManagedBean.java
index 4a0f5d2..d5c061b 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/lc-method-constructor-level/annotation/ejb/SomeManagedBean.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/lc-method-constructor-level/annotation/ejb/SomeManagedBean.java
@@ -20,7 +20,7 @@
 
 import jakarta.ejb.EJB;
 import jakarta.annotation.Resource;
-import javax.interceptor.Interceptors;
+import jakarta.interceptor.Interceptors;
 import org.omg.CORBA.ORB;
 import jakarta.persistence.PersistenceContext;
 import jakarta.persistence.EntityManager;
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/lc-method-constructor-level/annotation/ejb/SomeManagedBean2.java b/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/lc-method-constructor-level/annotation/ejb/SomeManagedBean2.java
index 38e62bc..14bee20 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/lc-method-constructor-level/annotation/ejb/SomeManagedBean2.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/lc-method-constructor-level/annotation/ejb/SomeManagedBean2.java
@@ -20,8 +20,8 @@
 
 import jakarta.ejb.EJB;
 import jakarta.annotation.Resource;
-import javax.interceptor.ExcludeClassInterceptors;
-import javax.interceptor.Interceptors;
+import jakarta.interceptor.ExcludeClassInterceptors;
+import jakarta.interceptor.Interceptors;
 import org.omg.CORBA.ORB;
 import jakarta.persistence.PersistenceContext;
 import jakarta.persistence.EntityManager;
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/lc-method-constructor-level/annotation/ejb/SomeManagedBean3.java b/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/lc-method-constructor-level/annotation/ejb/SomeManagedBean3.java
index 562a2e3..52d307c 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/lc-method-constructor-level/annotation/ejb/SomeManagedBean3.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/lc-method-constructor-level/annotation/ejb/SomeManagedBean3.java
@@ -20,8 +20,8 @@
 
 import jakarta.ejb.EJB;
 import jakarta.annotation.Resource;
-import javax.interceptor.ExcludeClassInterceptors;
-import javax.interceptor.Interceptors;
+import jakarta.interceptor.ExcludeClassInterceptors;
+import jakarta.interceptor.Interceptors;
 import org.omg.CORBA.ORB;
 import jakarta.persistence.PersistenceContext;
 import jakarta.persistence.EntityManager;
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/lc-method-constructor-level/descriptor/ejb/BaseBean.java b/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/lc-method-constructor-level/descriptor/ejb/BaseBean.java
index 9a6d8d1..65fb797 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/lc-method-constructor-level/descriptor/ejb/BaseBean.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/lc-method-constructor-level/descriptor/ejb/BaseBean.java
@@ -18,7 +18,7 @@
 
 import jakarta.ejb.*;
 import jakarta.annotation.*;
-import javax.interceptor.*;
+import jakarta.interceptor.*;
 import java.lang.reflect.*;
 
 
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/lc-method-constructor-level/descriptor/ejb/InterceptorA.java b/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/lc-method-constructor-level/descriptor/ejb/InterceptorA.java
index 61d49ab..48cda07 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/lc-method-constructor-level/descriptor/ejb/InterceptorA.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/lc-method-constructor-level/descriptor/ejb/InterceptorA.java
@@ -16,7 +16,7 @@
 
 package com.acme;
 
-import javax.interceptor.InvocationContext;
+import jakarta.interceptor.InvocationContext;
 
 public class InterceptorA {
 
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/lc-method-constructor-level/descriptor/ejb/InterceptorB.java b/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/lc-method-constructor-level/descriptor/ejb/InterceptorB.java
index 727193f..63ea26a 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/lc-method-constructor-level/descriptor/ejb/InterceptorB.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/lc-method-constructor-level/descriptor/ejb/InterceptorB.java
@@ -16,7 +16,7 @@
 
 package com.acme;
 
-import javax.interceptor.InvocationContext;
+import jakarta.interceptor.InvocationContext;
 
 public class InterceptorB {
 
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/lc-method-constructor-level/descriptor/ejb/InterceptorC.java b/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/lc-method-constructor-level/descriptor/ejb/InterceptorC.java
index f41a533..24c56ff 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/lc-method-constructor-level/descriptor/ejb/InterceptorC.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/lc-method-constructor-level/descriptor/ejb/InterceptorC.java
@@ -16,7 +16,7 @@
 
 package com.acme;
 
-import javax.interceptor.InvocationContext;
+import jakarta.interceptor.InvocationContext;
 
 public class InterceptorC {
 
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/lc-method-constructor-level/descriptor/ejb/SfulEJB.java b/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/lc-method-constructor-level/descriptor/ejb/SfulEJB.java
index cc04f28..0154a3a 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/lc-method-constructor-level/descriptor/ejb/SfulEJB.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/lc-method-constructor-level/descriptor/ejb/SfulEJB.java
@@ -16,9 +16,9 @@
 
 package com.acme;
 
-import javax.interceptor.InvocationContext;
-import javax.interceptor.AroundInvoke;
-import javax.interceptor.Interceptors;
+import jakarta.interceptor.InvocationContext;
+import jakarta.interceptor.AroundInvoke;
+import jakarta.interceptor.Interceptors;
 
 
 import jakarta.ejb.*;
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/lc-method-constructor-level/descriptor/ejb/SingletonBean.java b/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/lc-method-constructor-level/descriptor/ejb/SingletonBean.java
index c3d5166..c1e655b 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/lc-method-constructor-level/descriptor/ejb/SingletonBean.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/lc-method-constructor-level/descriptor/ejb/SingletonBean.java
@@ -18,7 +18,7 @@
 
 import jakarta.ejb.*;
 import jakarta.annotation.*;
-import javax.interceptor.*;
+import jakarta.interceptor.*;
 
 @Singleton
 public class SingletonBean extends BaseBean implements Snglt {
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/lc-method-constructor-level/descriptor/ejb/SlessEJB.java b/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/lc-method-constructor-level/descriptor/ejb/SlessEJB.java
index b61f44e..683f3f4 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/lc-method-constructor-level/descriptor/ejb/SlessEJB.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/lc-method-constructor-level/descriptor/ejb/SlessEJB.java
@@ -17,7 +17,7 @@
 package com.acme;
 
 import jakarta.ejb.*;
-import javax.interceptor.*;
+import jakarta.interceptor.*;
 import jakarta.annotation.*;
 
 @Stateless
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/lc-method-constructor-level/descriptor/ejb/SlessEJB2.java b/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/lc-method-constructor-level/descriptor/ejb/SlessEJB2.java
index 5b392da..77849e5 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/lc-method-constructor-level/descriptor/ejb/SlessEJB2.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/lc-method-constructor-level/descriptor/ejb/SlessEJB2.java
@@ -17,7 +17,7 @@
 package com.acme;
 
 import jakarta.ejb.Stateless;
-import javax.interceptor.*;
+import jakarta.interceptor.*;
 import jakarta.annotation.*;
 
 @Stateless
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/lc-method-constructor-level/descriptor/ejb/SlessEJB3.java b/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/lc-method-constructor-level/descriptor/ejb/SlessEJB3.java
index 7c9aeaf..16b5365 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/lc-method-constructor-level/descriptor/ejb/SlessEJB3.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/lc-method-constructor-level/descriptor/ejb/SlessEJB3.java
@@ -17,7 +17,7 @@
 package com.acme;
 
 import jakarta.ejb.*;
-import javax.interceptor.*;
+import jakarta.interceptor.*;
 import jakarta.annotation.*;
 
 @Stateless
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb32/mdb/ejb/EnsureProxied.java b/appserver/tests/appserv-tests/devtests/ejb/ejb32/mdb/ejb/EnsureProxied.java
index f1f380b..3bd9348 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb32/mdb/ejb/EnsureProxied.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb32/mdb/ejb/EnsureProxied.java
@@ -16,8 +16,8 @@
 
 package com.sun.s1asdev.ejb.ejb32.mdb.ejb;
 
-import javax.interceptor.AroundInvoke;
-import javax.interceptor.InvocationContext;
+import jakarta.interceptor.AroundInvoke;
+import jakarta.interceptor.InvocationContext;
 
 /**
  * @author David Blevins
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb32/mdb/ejb/ModernBean.java b/appserver/tests/appserv-tests/devtests/ejb/ejb32/mdb/ejb/ModernBean.java
index b6e7a64..71ca853 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb32/mdb/ejb/ModernBean.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb32/mdb/ejb/ModernBean.java
@@ -23,7 +23,7 @@
 import jakarta.ejb.EJB;
 import jakarta.ejb.MessageDriven;
 import jakarta.ejb.MessageDrivenContext;
-import javax.interceptor.Interceptors;
+import jakarta.interceptor.Interceptors;
 
 /**
  * @author David Blevins
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb32/methodintf/ejb/SingletonBean.java b/appserver/tests/appserv-tests/devtests/ejb/ejb32/methodintf/ejb/SingletonBean.java
index 080364b..813872c 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb32/methodintf/ejb/SingletonBean.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb32/methodintf/ejb/SingletonBean.java
@@ -17,7 +17,7 @@
 package ejb32.methodintf;
 
 import jakarta.ejb.*;
-import javax.interceptor.*;
+import jakarta.interceptor.*;
 import jakarta.annotation.*;
 import javax.naming.InitialContext;
 
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb32/methodintf/ejb/StfulEJB.java b/appserver/tests/appserv-tests/devtests/ejb/ejb32/methodintf/ejb/StfulEJB.java
index e404df1..44ff8b6 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb32/methodintf/ejb/StfulEJB.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb32/methodintf/ejb/StfulEJB.java
@@ -17,7 +17,7 @@
 package ejb32.methodintf;
 
 import jakarta.ejb.*;
-import javax.interceptor.*;
+import jakarta.interceptor.*;
 import jakarta.annotation.*;
 
 @Stateful
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb32/methodintf/ejb/StlesEJB.java b/appserver/tests/appserv-tests/devtests/ejb/ejb32/methodintf/ejb/StlesEJB.java
index 48b54ae..b17611b 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb32/methodintf/ejb/StlesEJB.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb32/methodintf/ejb/StlesEJB.java
@@ -17,7 +17,7 @@
 package ejb32.methodintf;
 
 import jakarta.ejb.*;
-import javax.interceptor.*;
+import jakarta.interceptor.*;
 import jakarta.annotation.*;
 
 @Stateless
diff --git a/appserver/tests/appserv-tests/devtests/jms/injection/jmsContext/basic/ejbInterceptorRequestScoped/ejb/InterceptorInjection.java b/appserver/tests/appserv-tests/devtests/jms/injection/jmsContext/basic/ejbInterceptorRequestScoped/ejb/InterceptorInjection.java
index 5eda27a..af58f7f 100644
--- a/appserver/tests/appserv-tests/devtests/jms/injection/jmsContext/basic/ejbInterceptorRequestScoped/ejb/InterceptorInjection.java
+++ b/appserver/tests/appserv-tests/devtests/jms/injection/jmsContext/basic/ejbInterceptorRequestScoped/ejb/InterceptorInjection.java
@@ -18,7 +18,7 @@
 
 import jakarta.annotation.Resource;
 import javax.inject.Inject;
-import javax.interceptor.*;
+import jakarta.interceptor.*;
 import jakarta.ejb.*;
 import jakarta.jms.*;
 
diff --git a/appserver/tests/appserv-tests/devtests/jms/injection/jmsContext/basic/ejbInterceptorRequestScoped/ejb/MyInterceptor.java b/appserver/tests/appserv-tests/devtests/jms/injection/jmsContext/basic/ejbInterceptorRequestScoped/ejb/MyInterceptor.java
index e9124d4..610f241 100644
--- a/appserver/tests/appserv-tests/devtests/jms/injection/jmsContext/basic/ejbInterceptorRequestScoped/ejb/MyInterceptor.java
+++ b/appserver/tests/appserv-tests/devtests/jms/injection/jmsContext/basic/ejbInterceptorRequestScoped/ejb/MyInterceptor.java
@@ -18,8 +18,8 @@
 
 import jakarta.annotation.Resource;
 import javax.inject.Inject;
-import javax.interceptor.AroundInvoke;
-import javax.interceptor.InvocationContext;
+import jakarta.interceptor.AroundInvoke;
+import jakarta.interceptor.InvocationContext;
 import jakarta.jms.*;
 import jakarta.ejb.*;
 import javax.naming.*;
diff --git a/appserver/tests/appserv-tests/devtests/jms/injection/jmsContext/basic/ejbInterceptorTransactionScoped/ejb/InterceptorInjection.java b/appserver/tests/appserv-tests/devtests/jms/injection/jmsContext/basic/ejbInterceptorTransactionScoped/ejb/InterceptorInjection.java
index 85bac6d..97a42e2 100644
--- a/appserver/tests/appserv-tests/devtests/jms/injection/jmsContext/basic/ejbInterceptorTransactionScoped/ejb/InterceptorInjection.java
+++ b/appserver/tests/appserv-tests/devtests/jms/injection/jmsContext/basic/ejbInterceptorTransactionScoped/ejb/InterceptorInjection.java
@@ -18,7 +18,7 @@
 
 import jakarta.annotation.Resource;
 import javax.inject.Inject;
-import javax.interceptor.*;
+import jakarta.interceptor.*;
 import jakarta.ejb.*;
 import jakarta.jms.*;
 
diff --git a/appserver/tests/appserv-tests/devtests/jms/injection/jmsContext/basic/ejbInterceptorTransactionScoped/ejb/MyInterceptor.java b/appserver/tests/appserv-tests/devtests/jms/injection/jmsContext/basic/ejbInterceptorTransactionScoped/ejb/MyInterceptor.java
index aaa69cf..d381f42 100644
--- a/appserver/tests/appserv-tests/devtests/jms/injection/jmsContext/basic/ejbInterceptorTransactionScoped/ejb/MyInterceptor.java
+++ b/appserver/tests/appserv-tests/devtests/jms/injection/jmsContext/basic/ejbInterceptorTransactionScoped/ejb/MyInterceptor.java
@@ -17,8 +17,8 @@
 package org.glassfish.test.jms.injection.ejb;
 
 import javax.inject.Inject;
-import javax.interceptor.AroundInvoke;
-import javax.interceptor.InvocationContext;
+import jakarta.interceptor.AroundInvoke;
+import jakarta.interceptor.InvocationContext;
 import jakarta.jms.*;
 import jakarta.ejb.*;
 import javax.naming.*;
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 00a904d..d3ec02e 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
@@ -31,7 +31,7 @@
 
 import static java.util.Comparator.comparing;
 import static java.util.stream.Collectors.toList;
-import static javax.interceptor.Interceptor.Priority.APPLICATION;
+import static jakarta.interceptor.Interceptor.Priority.APPLICATION;
 import static javax.security.enterprise.identitystore.CredentialValidationResult.INVALID_RESULT;
 import static javax.security.enterprise.identitystore.CredentialValidationResult.Status.VALID;
 import static javax.security.enterprise.identitystore.IdentityStore.ValidationType.PROVIDE_GROUPS;
diff --git a/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/ejbwebservicesinwar-interceptor/endpoint/Hello.java b/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/ejbwebservicesinwar-interceptor/endpoint/Hello.java
index a3b9a7c..a044778 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/ejbwebservicesinwar-interceptor/endpoint/Hello.java
+++ b/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/ejbwebservicesinwar-interceptor/endpoint/Hello.java
@@ -35,7 +35,7 @@
 	public Hello() {}
 
 	@WebMethod(operationName="sayHello", action="urn:SayHello")
-        @javax.interceptor.Interceptors(SimpleInterceptor.class)
+        @jakarta.interceptor.Interceptors(SimpleInterceptor.class)
 	public String sayHello(Object who) {
 		return "Hello " + who  ;
 
diff --git a/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/ejbwebservicesinwar-interceptor/endpoint/SimpleInterceptor.java b/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/ejbwebservicesinwar-interceptor/endpoint/SimpleInterceptor.java
index 3637fea..09b4fb6 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/ejbwebservicesinwar-interceptor/endpoint/SimpleInterceptor.java
+++ b/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/ejbwebservicesinwar-interceptor/endpoint/SimpleInterceptor.java
@@ -18,8 +18,8 @@
 
 public class SimpleInterceptor {
 
-    @javax.interceptor.AroundInvoke
-    public Object intercept(javax.interceptor.InvocationContext ic) {
+    @jakarta.interceptor.AroundInvoke
+    public Object intercept(jakarta.interceptor.InvocationContext ic) {
         Object o = ic.getMethod().getName();
         System.out.println("Inside interceptor");
         return o;
diff --git a/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/msgctxinterceptor/endpoint/HelloEJB.java b/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/msgctxinterceptor/endpoint/HelloEJB.java
index 0fe6ebf..1020a1b 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/msgctxinterceptor/endpoint/HelloEJB.java
+++ b/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/msgctxinterceptor/endpoint/HelloEJB.java
@@ -24,8 +24,8 @@
 import jakarta.annotation.Resource;
 import jakarta.xml.ws.WebServiceContext;
 
-import javax.interceptor.AroundInvoke;
-import javax.interceptor.InvocationContext;
+import jakarta.interceptor.AroundInvoke;
+import jakarta.interceptor.InvocationContext;
 
 @WebService(endpointInterface="endpoint.Hello")
 @Stateless
diff --git a/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/wsctxtinterceptor/endpoint/HelloEJB.java b/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/wsctxtinterceptor/endpoint/HelloEJB.java
index 06aea64..b82bcfa 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/wsctxtinterceptor/endpoint/HelloEJB.java
+++ b/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/wsctxtinterceptor/endpoint/HelloEJB.java
@@ -24,8 +24,8 @@
 import jakarta.annotation.Resource;
 import jakarta.xml.ws.WebServiceContext;
 
-import javax.interceptor.AroundInvoke;
-import javax.interceptor.InvocationContext;
+import jakarta.interceptor.AroundInvoke;
+import jakarta.interceptor.InvocationContext;
 
 @WebService(endpointInterface="endpoint.Hello")
 @Stateless
diff --git a/appserver/tests/cdi/cases/multiBeansXml/ejb1/src/main/java/com/oracle/cdi/cases/devtests/multiejb1/Interceptor1.java b/appserver/tests/cdi/cases/multiBeansXml/ejb1/src/main/java/com/oracle/cdi/cases/devtests/multiejb1/Interceptor1.java
index c9cb807..4421b53 100644
--- a/appserver/tests/cdi/cases/multiBeansXml/ejb1/src/main/java/com/oracle/cdi/cases/devtests/multiejb1/Interceptor1.java
+++ b/appserver/tests/cdi/cases/multiBeansXml/ejb1/src/main/java/com/oracle/cdi/cases/devtests/multiejb1/Interceptor1.java
@@ -18,9 +18,9 @@
 
 import java.util.List;
 
-import javax.interceptor.AroundInvoke;
-import javax.interceptor.Interceptor;
-import javax.interceptor.InvocationContext;
+import jakarta.interceptor.AroundInvoke;
+import jakarta.interceptor.Interceptor;
+import jakarta.interceptor.InvocationContext;
 
 /**
  * @author jwells
diff --git a/appserver/tests/cdi/cases/multiBeansXml/ejb1/src/main/java/com/oracle/cdi/cases/devtests/multiejb1/RecordingInterceptor.java b/appserver/tests/cdi/cases/multiBeansXml/ejb1/src/main/java/com/oracle/cdi/cases/devtests/multiejb1/RecordingInterceptor.java
index 34d5abf..90eb96e 100644
--- a/appserver/tests/cdi/cases/multiBeansXml/ejb1/src/main/java/com/oracle/cdi/cases/devtests/multiejb1/RecordingInterceptor.java
+++ b/appserver/tests/cdi/cases/multiBeansXml/ejb1/src/main/java/com/oracle/cdi/cases/devtests/multiejb1/RecordingInterceptor.java
@@ -24,7 +24,7 @@
 import static java.lang.annotation.ElementType.TYPE;
 import static java.lang.annotation.RetentionPolicy.RUNTIME;
 
-import javax.interceptor.InterceptorBinding;
+import jakarta.interceptor.InterceptorBinding;
 
 /**
  * @author jwells
diff --git a/appserver/tests/cdi/cases/multiBeansXml/ejb2/src/main/java/com/oracle/cdi/cases/devtests/multiejb2/Interceptor2.java b/appserver/tests/cdi/cases/multiBeansXml/ejb2/src/main/java/com/oracle/cdi/cases/devtests/multiejb2/Interceptor2.java
index a255cda..104d29f 100644
--- a/appserver/tests/cdi/cases/multiBeansXml/ejb2/src/main/java/com/oracle/cdi/cases/devtests/multiejb2/Interceptor2.java
+++ b/appserver/tests/cdi/cases/multiBeansXml/ejb2/src/main/java/com/oracle/cdi/cases/devtests/multiejb2/Interceptor2.java
@@ -18,9 +18,9 @@
 
 import java.util.List;
 
-import javax.interceptor.AroundInvoke;
-import javax.interceptor.Interceptor;
-import javax.interceptor.InvocationContext;
+import jakarta.interceptor.AroundInvoke;
+import jakarta.interceptor.Interceptor;
+import jakarta.interceptor.InvocationContext;
 
 /**
  * @author jwells
diff --git a/appserver/tests/cdi/cases/multiBeansXml/ejb2/src/main/java/com/oracle/cdi/cases/devtests/multiejb2/RecordingInterceptor.java b/appserver/tests/cdi/cases/multiBeansXml/ejb2/src/main/java/com/oracle/cdi/cases/devtests/multiejb2/RecordingInterceptor.java
index b877c51..87d4f07 100644
--- a/appserver/tests/cdi/cases/multiBeansXml/ejb2/src/main/java/com/oracle/cdi/cases/devtests/multiejb2/RecordingInterceptor.java
+++ b/appserver/tests/cdi/cases/multiBeansXml/ejb2/src/main/java/com/oracle/cdi/cases/devtests/multiejb2/RecordingInterceptor.java
@@ -24,7 +24,7 @@
 import java.lang.annotation.Retention;
 import java.lang.annotation.Target;
 
-import javax.interceptor.InterceptorBinding;
+import jakarta.interceptor.InterceptorBinding;
 
 /**
  * @author jwells
diff --git a/appserver/tests/quicklook/weld/numberguess/src/java/numberguess/InterceptorA.java b/appserver/tests/quicklook/weld/numberguess/src/java/numberguess/InterceptorA.java
index ebe869d..a355424 100644
--- a/appserver/tests/quicklook/weld/numberguess/src/java/numberguess/InterceptorA.java
+++ b/appserver/tests/quicklook/weld/numberguess/src/java/numberguess/InterceptorA.java
@@ -16,7 +16,7 @@
 
 package numberguess;
 
-import javax.interceptor.*;
+import jakarta.interceptor.*;
 import jakarta.annotation.*;
 import jakarta.ejb.EJB;
 import javax.inject.Inject;
diff --git a/appserver/tests/quicklook/weld/numberguess/src/java/numberguess/InterceptorB.java b/appserver/tests/quicklook/weld/numberguess/src/java/numberguess/InterceptorB.java
index c346144..8da8429 100644
--- a/appserver/tests/quicklook/weld/numberguess/src/java/numberguess/InterceptorB.java
+++ b/appserver/tests/quicklook/weld/numberguess/src/java/numberguess/InterceptorB.java
@@ -18,7 +18,7 @@
 
 import java.io.Serializable;
 
-import javax.interceptor.*;
+import jakarta.interceptor.*;
 import jakarta.annotation.*;
 
 import jakarta.ejb.EJB;
diff --git a/appserver/tests/quicklook/weld/numberguess/src/java/numberguess/SomeBindingType.java b/appserver/tests/quicklook/weld/numberguess/src/java/numberguess/SomeBindingType.java
index 3e9d635..3cad7f3 100644
--- a/appserver/tests/quicklook/weld/numberguess/src/java/numberguess/SomeBindingType.java
+++ b/appserver/tests/quicklook/weld/numberguess/src/java/numberguess/SomeBindingType.java
@@ -16,7 +16,7 @@
 
 package numberguess;
 
-import javax.interceptor.*;
+import jakarta.interceptor.*;
 
 import java.lang.annotation.Target;
 import static java.lang.annotation.ElementType.*;
diff --git a/appserver/tests/quicklook/weld/numberguess/src/java/numberguess/StatefulBean.java b/appserver/tests/quicklook/weld/numberguess/src/java/numberguess/StatefulBean.java
index 7c7711e..2f44750 100644
--- a/appserver/tests/quicklook/weld/numberguess/src/java/numberguess/StatefulBean.java
+++ b/appserver/tests/quicklook/weld/numberguess/src/java/numberguess/StatefulBean.java
@@ -23,7 +23,7 @@
 import jakarta.ejb.EJBException;
 import jakarta.ejb.SessionContext;
 import jakarta.ejb.Stateful;
-import javax.interceptor.Interceptors;
+import jakarta.interceptor.Interceptors;
 
 @Stateful
 @SomeBindingType
diff --git a/appserver/tests/quicklook/weld/osgiweld/metadata/weld-osgi.properties b/appserver/tests/quicklook/weld/osgiweld/metadata/weld-osgi.properties
index 8d7a7a3..cee3c4c 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,javax.transaction";version="2.2.9.Final",org.jboss.weld.ejb.spi.helpers;uses:="org.jboss.weld.ejb.spi,org.jboss.weld.ejb.api";version="2.2.9.Final",org.jboss.weld.servlet.spi.helpers;uses:="javax.servlet.http,org.jboss.weld.servlet.spi";version="2.2.9.Final",org.jboss.weld.bootstrap.spi.helpers;uses:="org.jboss.weld.bootstrap.spi,org.jboss.weld.resources.spi,org.jboss.weld.ejb.spi";version="2.2.9.Final",org.jboss.weld.serialization.spi;uses:="org.jboss.weld.serialization.spi.helpers,org.jboss.weld.bootstrap.api,javax.enterprise.context.spi";version="2.2.9.Final",org.jboss.weld.resources.spi;uses:="org.jboss.weld.bootstrap.api";version="2.2.9.Final",org.jboss.weld.resources.spi.helpers;uses:="org.jboss.weld.resources.spi";version="2.2.9.Final",org.jboss.weld.validation.spi;uses:="org.jboss.weld.bootstrap.api,jakarta.validation";version="2.2.9.Final",org.jboss.weld;uses:="javax.enterprise.inject.spi,javax.enterprise.util,javax.enterprise.inject,org.jboss.weld.manager,org.jboss.weld.bean.builtin,com.google.common.collect,org.jboss.weld.bootstrap,org.jboss.weld.bootstrap.api,org.jboss.weld.bootstrap.spi,org.jboss.weld.bootstrap.api.helpers,com.google.common.cache";version="2.2.9.Final",org.jboss.weld.bean;uses:="javax.enterprise.inject.spi,org.jboss.weld.manager,javax.enterprise.inject,org.jboss.weld.bootstrap,org.jboss.weld.serialization.spi,org.jboss.weld.bootstrap.api,javax.enterprise.context,javax.inject,org.jboss.weld.interceptor.spi.model,org.jboss.weld.util,com.google.common.base,javax.enterprise.context.spi,org.jboss.weld.injection,org.jboss.weld.ejb.spi,javax.enterprise.event,javax.interceptor,org.jboss.weld.interceptor.spi.metadata,org.jboss.weld.context,org.jboss.weld.ejb,org.jboss.weld.ejb.api,javax.decorator,org.jboss.weld.bean.proxy";version="2.2.9.Final",org.jboss.weld.bean.builtin;uses:="javax.enterprise.inject,javax.enterprise.context,com.google.common.collect,org.jboss.weld.bootstrap,org.jboss.weld.serialization.spi,org.jboss.weld.bean,javax.enterprise.inject.spi,org.jboss.weld.manager,org.jboss.weld.bootstrap.api,org.jboss.weld.context,javax.enterprise.context.spi,org.jboss.weld.injection,org.jboss.weld.util,org.jboss.weld.bean.proxy,org.jboss.weld.bootstrap.spi,org.jboss.weld.construction.api,org.jboss.weld.ejb.spi,org.jboss.weld.manager.api,org.jboss.weld,javax.enterprise.util,org.jboss.weld.event,javax.enterprise.event,org.jboss.weld.ejb,com.google.common.base";version="2.2.9.Final",org.jboss.weld.bean.proxy;uses:="javax.enterprise.inject.spi,org.jboss.weld.util,javax.enterprise.context,com.google.common.collect,javax.enterprise.context.spi,org.jboss.weld.serialization.spi,org.jboss.weld.bootstrap.api,org.jboss.weld,com.google.common.cache,org.jboss.weld.manager,org.jboss.weld.injection,org.jboss.weld.context,org.jboss.weld.serialization.spi.helpers,org.jboss.weld.bean,javax.inject,org.jboss.weld.ejb,org.jboss.weld.ejb.api,org.jboss.weld.resources.spi,org.jboss.weld.bootstrap.api.helpers";version="2.2.9.Final",org.jboss.weld.bootstrap;uses:="org.jboss.weld.ejb,javax.enterprise.inject.spi,org.jboss.weld.manager,javax.enterprise.inject,org.jboss.weld.bootstrap.api,org.jboss.weld.util,org.jboss.weld.event,org.jboss.weld.bean,org.jboss.weld.bean.builtin,javax.annotation,org.jboss.weld.bootstrap.spi,org.jboss.weld.resources.spi,javax.interceptor,org.jboss.weld.interceptor.spi.model,javax.decorator,org.jboss.weld.ejb.spi,com.google.common.cache,org.jboss.weld,com.google.common.collect,javax.enterprise.event,com.google.common.base,org.jboss.weld.security.spi,javax.enterprise.context.spi,org.jboss.weld.transaction.spi,org.jboss.weld.servlet,org.jboss.weld.bootstrap.api.helpers,org.jboss.weld.manager.api,org.jboss.weld.interceptor.spi.metadata,javax.enterprise.context,javax.inject,org.jboss.weld.context,org.jboss.weld.servlet.spi.helpers,org.jboss.weld.bootstrap.spi.helpers,org.jboss.weld.servlet.spi,org.jboss.weld.serialization.spi,org.jboss.weld.injection,org.jboss.weld.bean.proxy";version="2.2.9.Final",org.jboss.weld.context;uses:="org.jboss.weld.bean,org.jboss.weld.context.api,javax.enterprise.context.spi,org.jboss.weld.serialization.spi,org.jboss.weld.bootstrap.api,javax.enterprise.context,org.jboss.weld,org.jboss.weld.manager,org.jboss.weld.event,org.jboss.weld.injection.spi,org.jboss.weld.construction.api,org.jboss.weld.serialization.spi.helpers,org.jboss.weld.util,javax.enterprise.inject.spi";version="2.2.9.Final",org.jboss.weld.ejb;uses:="javax.interceptor,org.jboss.weld.manager,javax.enterprise.inject,org.jboss.weld.event,org.jboss.weld.context,org.jboss.weld.bootstrap.api,org.jboss.weld.bean,org.jboss.weld.util,javax.enterprise.inject.spi,org.jboss.weld.resources.spi,com.google.common.base,org.jboss.weld.ejb.spi,com.google.common.collect,org.jboss.weld.ejb.spi.helpers,org.jboss.weld.injection,org.jboss.weld.bootstrap.api.helpers,org.jboss.weld";version="2.2.9.Final",org.jboss.weld.el;uses:="javax.enterprise.inject.spi,org.jboss.weld.manager,javax.enterprise.context,org.jboss.weld.context,javax.enterprise.context.spi,javax.el";version="2.2.9.Final",org.jboss.weld.event;uses:="org.jboss.weld.injection,javax.enterprise.inject.spi,org.jboss.weld.manager,javax.enterprise.inject,org.jboss.weld.context,org.jboss.weld,org.jboss.weld.bean.builtin,javax.enterprise.util,javax.enterprise.context.spi,org.jboss.weld.util,javax.enterprise.event,com.google.common.collect,org.jboss.weld.bean,org.jboss.weld.bootstrap.api,com.google.common.base,javax.enterprise.context,javax.inject,com.google.common.cache,org.jboss.weld.transaction.spi,javax.transaction";version="2.2.9.Final",org.jboss.weld.injection;uses:="javax.enterprise.inject.spi,org.jboss.weld.manager,javax.enterprise.inject,org.jboss.weld.util,org.jboss.weld.injection.spi,org.jboss.weld.context,javax.enterprise.context.spi,org.jboss.weld.construction.api,org.jboss.weld.bootstrap.api,org.jboss.weld,org.jboss.weld.bean.proxy,javax.enterprise.event,javax.inject,org.jboss.weld.bean.builtin,org.jboss.weld.event,org.jboss.weld.ejb,com.google.common.collect";version="2.2.9.Final",org.jboss.weld.jsf;uses:="org.jboss.weld.manager,javax.enterprise.inject,jakarta.faces.application,org.jboss.weld.bootstrap.api.helpers,org.jboss.weld.context,org.jboss.weld,jakarta.faces.context,org.jboss.weld.bootstrap.api,org.jboss.weld.util,org.jboss.weld.resources.spi";version="2.2.9.Final",org.jboss.weld.manager;uses:="org.jboss.weld.bootstrap.api,org.jboss.weld.bean,javax.enterprise.inject.spi,com.google.common.base,com.google.common.collect,javax.enterprise.util,org.jboss.weld.ejb,javax.enterprise.inject,org.jboss.weld.interceptor.spi.model,javax.enterprise.context.spi,org.jboss.weld.injection,org.jboss.weld.util,javax.enterprise.context,org.jboss.weld.ejb.spi,org.jboss.weld.event,javax.el,org.jboss.weld.bean.proxy,org.jboss.weld.construction.api,org.jboss.weld.bootstrap,org.jboss.weld.serialization.spi,org.jboss.weld.el,org.jboss.weld.bean.builtin,org.jboss.weld.context,org.jboss.weld,org.jboss.weld.manager.api,org.jboss.weld.bootstrap.spi,javax.interceptor,org.jboss.weld.injection.spi,javax.decorator";version="2.2.9.Final",org.jboss.weld.servlet;uses:="javax.servlet.http,org.jboss.weld.util,org.jboss.weld.manager,org.jboss.weld.event,javax.enterprise.inject,org.jboss.weld.context,javax.servlet,org.jboss.weld.servlet.spi,javax.inject,org.jboss.weld.jsf,javax.enterprise.context,jakarta.faces.context,org.jboss.weld.bootstrap.api.helpers,javax.enterprise.context.spi,org.jboss.weld,org.jboss.weld.bootstrap.api,org.jboss.weld.resources.spi,javax.enterprise.inject.spi,org.jboss.weld.bean.builtin,org.jboss.weld.servlet.api,org.jboss.weld.servlet.api.helpers";version="2.2.9.Final",org.jboss.weld.util;uses:="javax.enterprise.inject.spi,org.jboss.weld.bootstrap.api,org.jboss.weld.resources.spi,com.google.common.base,javax.annotation,org.jboss.weld.interceptor.spi.model,com.google.common.collect,org.jboss.weld.manager,javax.enterprise.inject,org.jboss.weld.injection,javax.inject,javax.enterprise.event,javax.interceptor,org.jboss.weld.ejb,javax.enterprise.context.spi,javax.decorator,javax.enterprise.context,org.jboss.weld.ejb.spi,org.jboss.weld.bean,org.jboss.weld.bootstrap,org.jboss.weld.bean.proxy,org.jboss.weld.serialization.spi,org.jboss.weld.bootstrap.spi,javax.el,org.jboss.weld.event";version="2.2.9.Final"
\ No newline at end of file
+exports = org.jboss.weld.bootstrap.api.helpers;uses:="org.jboss.weld.bootstrap.api,org.jboss.weld.bootstrap.spi,org.jboss.weld.manager.api";version="2.2.9.Final",org.jboss.weld.servlet.api.helpers;uses:="javax.servlet,javax.servlet.http,org.jboss.weld.servlet.api";version="2.2.9.Final",org.jboss.weld.context.api;uses:="javax.enterprise.context.spi";version="2.2.9.Final",org.jboss.weld.construction.api;uses:="javax.enterprise.inject.spi,javax.enterprise.context.spi";version="2.2.9.Final",org.jboss.weld.ejb.api;version="2.2.9.Final",org.jboss.weld.bootstrap.api;uses:="javax.enterprise.inject.spi,org.jboss.weld.bootstrap.spi,org.jboss.weld.manager.api,org.jboss.weld.transaction.spi,org.jboss.weld.resources.spi,org.jboss.weld.security.spi,org.jboss.weld.injection.spi,org.jboss.weld.bootstrap.api.helpers";version="2.2.9.Final",org.jboss.weld.servlet.api;uses:="javax.servlet,javax.servlet.http";version="2.2.9.Final",org.jboss.weld.manager.api;uses:="org.jboss.weld.bootstrap.api,javax.enterprise.inject.spi,org.jboss.weld.serialization.spi,javax.enterprise.inject,org.jboss.weld.construction.api,org.jboss.weld.ejb.spi,javax.enterprise.context.spi";version="2.2.9.Final",org.jboss.weld.ejb.spi;uses:="org.jboss.weld.bootstrap.api,org.jboss.weld.ejb.api,javax.enterprise.inject.spi";version="2.2.9.Final",org.jboss.weld.serialization.spi.helpers;uses:="javax.enterprise.context.spi,org.jboss.weld.context.api";version="2.2.9.Final",org.jboss.weld.injection.spi.helpers;uses:="javax.enterprise.inject.spi,org.jboss.weld.injection.spi,javax.annotation,org.jboss.weld.bootstrap.api,javax.naming,jakarta.persistence";version="2.2.9.Final",org.jboss.weld.servlet.spi;uses:="org.jboss.weld.bootstrap.api,javax.servlet.http";version="2.2.9.Final",org.jboss.weld.security.spi;uses:="org.jboss.weld.bootstrap.api";version="2.2.9.Final",org.jboss.weld.interceptor.spi.metadata;uses:="org.jboss.weld.manager,javax.enterprise.context.spi,org.jboss.weld.interceptor.spi.model";version="2.2.9.Final",org.jboss.weld.bootstrap.spi;uses:="org.jboss.weld.bootstrap.api,org.jboss.weld.ejb.spi,javax.enterprise.inject.spi";version="2.2.9.Final",org.jboss.weld.interceptor.spi.model;uses:="org.jboss.weld.interceptor.spi.metadata,javax.enterprise.inject.spi";version="2.2.9.Final",org.jboss.weld.injection.spi;uses:="org.jboss.weld.bootstrap.api,javax.enterprise.inject.spi,jakarta.persistence";version="2.2.9.Final",org.jboss.weld.transaction.spi;uses:="org.jboss.weld.bootstrap.api,javax.transaction";version="2.2.9.Final",org.jboss.weld.ejb.spi.helpers;uses:="org.jboss.weld.ejb.spi,org.jboss.weld.ejb.api";version="2.2.9.Final",org.jboss.weld.servlet.spi.helpers;uses:="javax.servlet.http,org.jboss.weld.servlet.spi";version="2.2.9.Final",org.jboss.weld.bootstrap.spi.helpers;uses:="org.jboss.weld.bootstrap.spi,org.jboss.weld.resources.spi,org.jboss.weld.ejb.spi";version="2.2.9.Final",org.jboss.weld.serialization.spi;uses:="org.jboss.weld.serialization.spi.helpers,org.jboss.weld.bootstrap.api,javax.enterprise.context.spi";version="2.2.9.Final",org.jboss.weld.resources.spi;uses:="org.jboss.weld.bootstrap.api";version="2.2.9.Final",org.jboss.weld.resources.spi.helpers;uses:="org.jboss.weld.resources.spi";version="2.2.9.Final",org.jboss.weld.validation.spi;uses:="org.jboss.weld.bootstrap.api,jakarta.validation";version="2.2.9.Final",org.jboss.weld;uses:="javax.enterprise.inject.spi,javax.enterprise.util,javax.enterprise.inject,org.jboss.weld.manager,org.jboss.weld.bean.builtin,com.google.common.collect,org.jboss.weld.bootstrap,org.jboss.weld.bootstrap.api,org.jboss.weld.bootstrap.spi,org.jboss.weld.bootstrap.api.helpers,com.google.common.cache";version="2.2.9.Final",org.jboss.weld.bean;uses:="javax.enterprise.inject.spi,org.jboss.weld.manager,javax.enterprise.inject,org.jboss.weld.bootstrap,org.jboss.weld.serialization.spi,org.jboss.weld.bootstrap.api,javax.enterprise.context,javax.inject,org.jboss.weld.interceptor.spi.model,org.jboss.weld.util,com.google.common.base,javax.enterprise.context.spi,org.jboss.weld.injection,org.jboss.weld.ejb.spi,javax.enterprise.event,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,javax.inject,org.jboss.weld.ejb,org.jboss.weld.ejb.api,org.jboss.weld.resources.spi,org.jboss.weld.bootstrap.api.helpers";version="2.2.9.Final",org.jboss.weld.bootstrap;uses:="org.jboss.weld.ejb,javax.enterprise.inject.spi,org.jboss.weld.manager,javax.enterprise.inject,org.jboss.weld.bootstrap.api,org.jboss.weld.util,org.jboss.weld.event,org.jboss.weld.bean,org.jboss.weld.bean.builtin,javax.annotation,org.jboss.weld.bootstrap.spi,org.jboss.weld.resources.spi,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,javax.inject,org.jboss.weld.context,org.jboss.weld.servlet.spi.helpers,org.jboss.weld.bootstrap.spi.helpers,org.jboss.weld.servlet.spi,org.jboss.weld.serialization.spi,org.jboss.weld.injection,org.jboss.weld.bean.proxy";version="2.2.9.Final",org.jboss.weld.context;uses:="org.jboss.weld.bean,org.jboss.weld.context.api,javax.enterprise.context.spi,org.jboss.weld.serialization.spi,org.jboss.weld.bootstrap.api,javax.enterprise.context,org.jboss.weld,org.jboss.weld.manager,org.jboss.weld.event,org.jboss.weld.injection.spi,org.jboss.weld.construction.api,org.jboss.weld.serialization.spi.helpers,org.jboss.weld.util,javax.enterprise.inject.spi";version="2.2.9.Final",org.jboss.weld.ejb;uses:="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,javax.inject,com.google.common.cache,org.jboss.weld.transaction.spi,javax.transaction";version="2.2.9.Final",org.jboss.weld.injection;uses:="javax.enterprise.inject.spi,org.jboss.weld.manager,javax.enterprise.inject,org.jboss.weld.util,org.jboss.weld.injection.spi,org.jboss.weld.context,javax.enterprise.context.spi,org.jboss.weld.construction.api,org.jboss.weld.bootstrap.api,org.jboss.weld,org.jboss.weld.bean.proxy,javax.enterprise.event,javax.inject,org.jboss.weld.bean.builtin,org.jboss.weld.event,org.jboss.weld.ejb,com.google.common.collect";version="2.2.9.Final",org.jboss.weld.jsf;uses:="org.jboss.weld.manager,javax.enterprise.inject,jakarta.faces.application,org.jboss.weld.bootstrap.api.helpers,org.jboss.weld.context,org.jboss.weld,jakarta.faces.context,org.jboss.weld.bootstrap.api,org.jboss.weld.util,org.jboss.weld.resources.spi";version="2.2.9.Final",org.jboss.weld.manager;uses:="org.jboss.weld.bootstrap.api,org.jboss.weld.bean,javax.enterprise.inject.spi,com.google.common.base,com.google.common.collect,javax.enterprise.util,org.jboss.weld.ejb,javax.enterprise.inject,org.jboss.weld.interceptor.spi.model,javax.enterprise.context.spi,org.jboss.weld.injection,org.jboss.weld.util,javax.enterprise.context,org.jboss.weld.ejb.spi,org.jboss.weld.event,javax.el,org.jboss.weld.bean.proxy,org.jboss.weld.construction.api,org.jboss.weld.bootstrap,org.jboss.weld.serialization.spi,org.jboss.weld.el,org.jboss.weld.bean.builtin,org.jboss.weld.context,org.jboss.weld,org.jboss.weld.manager.api,org.jboss.weld.bootstrap.spi,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,javax.inject,org.jboss.weld.jsf,javax.enterprise.context,jakarta.faces.context,org.jboss.weld.bootstrap.api.helpers,javax.enterprise.context.spi,org.jboss.weld,org.jboss.weld.bootstrap.api,org.jboss.weld.resources.spi,javax.enterprise.inject.spi,org.jboss.weld.bean.builtin,org.jboss.weld.servlet.api,org.jboss.weld.servlet.api.helpers";version="2.2.9.Final",org.jboss.weld.util;uses:="javax.enterprise.inject.spi,org.jboss.weld.bootstrap.api,org.jboss.weld.resources.spi,com.google.common.base,javax.annotation,org.jboss.weld.interceptor.spi.model,com.google.common.collect,org.jboss.weld.manager,javax.enterprise.inject,org.jboss.weld.injection,javax.inject,javax.enterprise.event,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