Jakarta Inject API namespace transition
Signed-off-by: Gaurav Gupta <gaurav.gupta@payara.fish>
diff --git a/appserver/admin/admin-core/src/main/java/com/sun/enterprise/admin/UpgradeService.java b/appserver/admin/admin-core/src/main/java/com/sun/enterprise/admin/UpgradeService.java
index 5dab49f..428e0a9 100644
--- a/appserver/admin/admin-core/src/main/java/com/sun/enterprise/admin/UpgradeService.java
+++ b/appserver/admin/admin-core/src/main/java/com/sun/enterprise/admin/UpgradeService.java
@@ -22,8 +22,8 @@
import java.util.List;
import java.util.ArrayList;
-import javax.inject.Inject;
-import javax.inject.Named;
+import jakarta.inject.Inject;
+import jakarta.inject.Named;
import com.sun.enterprise.config.serverbeans.*;
import org.glassfish.api.admin.config.ConfigurationUpgrade;
diff --git a/appserver/admingui/plugin-service/src/main/java/org/glassfish/admingui/plugin/ConsolePluginService.java b/appserver/admingui/plugin-service/src/main/java/org/glassfish/admingui/plugin/ConsolePluginService.java
index 6f59764..566103d 100644
--- a/appserver/admingui/plugin-service/src/main/java/org/glassfish/admingui/plugin/ConsolePluginService.java
+++ b/appserver/admingui/plugin-service/src/main/java/org/glassfish/admingui/plugin/ConsolePluginService.java
@@ -45,7 +45,7 @@
import org.glassfish.admingui.connector.IntegrationPoint;
import org.glassfish.admingui.connector.ConsoleConfig;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
/**
diff --git a/appserver/appclient/client/acc-standalone/pom.xml b/appserver/appclient/client/acc-standalone/pom.xml
index 1ffb356..b7e28da 100755
--- a/appserver/appclient/client/acc-standalone/pom.xml
+++ b/appserver/appclient/client/acc-standalone/pom.xml
@@ -110,7 +110,7 @@
<prefix>../modules</prefix>
<stripVersion>true</stripVersion>
<excludeArtifactIds>jakarta.json</excludeArtifactIds>
- <excludeArtifactIds>javax.inject</excludeArtifactIds>
+ <excludeArtifactIds>jakarta.inject</excludeArtifactIds>
</configuration>
</execution>
</executions>
diff --git a/appserver/appclient/client/acc/src/main/java/org/glassfish/appclient/client/acc/ACCJCDIServiceImpl.java b/appserver/appclient/client/acc/src/main/java/org/glassfish/appclient/client/acc/ACCJCDIServiceImpl.java
index 8a7063f..703a8a5 100644
--- a/appserver/appclient/client/acc/src/main/java/org/glassfish/appclient/client/acc/ACCJCDIServiceImpl.java
+++ b/appserver/appclient/client/acc/src/main/java/org/glassfish/appclient/client/acc/ACCJCDIServiceImpl.java
@@ -33,7 +33,7 @@
import jakarta.enterprise.inject.spi.AnnotatedType;
import jakarta.enterprise.inject.spi.BeanManager;
import jakarta.enterprise.inject.spi.InjectionTarget;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
import javax.naming.NamingException;
import jakarta.servlet.ServletContext;
import java.util.*;
diff --git a/appserver/appclient/client/acc/src/main/java/org/glassfish/appclient/client/acc/ACCStartupContext.java b/appserver/appclient/client/acc/src/main/java/org/glassfish/appclient/client/acc/ACCStartupContext.java
index 2bd984d..8a4ab87 100644
--- a/appserver/appclient/client/acc/src/main/java/org/glassfish/appclient/client/acc/ACCStartupContext.java
+++ b/appserver/appclient/client/acc/src/main/java/org/glassfish/appclient/client/acc/ACCStartupContext.java
@@ -24,7 +24,7 @@
import java.util.Properties;
import org.jvnet.hk2.annotations.Service;
-import javax.inject.Singleton;
+import jakarta.inject.Singleton;
/**
* Start-up context for the ACC. Note that this context is used also for
diff --git a/appserver/appclient/client/acc/src/main/java/org/glassfish/appclient/client/acc/AppClientContainer.java b/appserver/appclient/client/acc/src/main/java/org/glassfish/appclient/client/acc/AppClientContainer.java
index 8cca1e2..b38e84c 100644
--- a/appserver/appclient/client/acc/src/main/java/org/glassfish/appclient/client/acc/AppClientContainer.java
+++ b/appserver/appclient/client/acc/src/main/java/org/glassfish/appclient/client/acc/AppClientContainer.java
@@ -42,7 +42,7 @@
import java.util.concurrent.atomic.AtomicReference;
import java.util.logging.Level;
import java.util.logging.Logger;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
import javax.naming.NamingException;
import jakarta.persistence.EntityManagerFactory;
import javax.security.auth.callback.CallbackHandler;
diff --git a/appserver/appclient/client/acc/src/main/java/org/glassfish/appclient/client/acc/AppClientContainerSecurityHelper.java b/appserver/appclient/client/acc/src/main/java/org/glassfish/appclient/client/acc/AppClientContainerSecurityHelper.java
index 63b1954..964c2cc 100644
--- a/appserver/appclient/client/acc/src/main/java/org/glassfish/appclient/client/acc/AppClientContainerSecurityHelper.java
+++ b/appserver/appclient/client/acc/src/main/java/org/glassfish/appclient/client/acc/AppClientContainerSecurityHelper.java
@@ -31,7 +31,7 @@
import java.util.Properties;
import java.util.logging.Level;
import java.util.logging.Logger;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
import javax.security.auth.callback.CallbackHandler;
import org.glassfish.appclient.client.acc.config.ClientCredential;
import org.glassfish.appclient.client.acc.config.MessageSecurityConfig;
diff --git a/appserver/appclient/client/acc/src/main/java/org/glassfish/appclient/client/acc/AppClientInfo.java b/appserver/appclient/client/acc/src/main/java/org/glassfish/appclient/client/acc/AppClientInfo.java
index 6302ccc..35c41ed 100644
--- a/appserver/appclient/client/acc/src/main/java/org/glassfish/appclient/client/acc/AppClientInfo.java
+++ b/appserver/appclient/client/acc/src/main/java/org/glassfish/appclient/client/acc/AppClientInfo.java
@@ -35,8 +35,8 @@
import java.util.*;
import java.util.logging.Level;
import java.util.logging.Logger;
-import javax.inject.Inject;
-import javax.inject.Provider;
+import jakarta.inject.Inject;
+import jakarta.inject.Provider;
import org.glassfish.apf.AnnotationProcessorException;
import org.glassfish.api.deployment.InstrumentableClassLoader;
diff --git a/appserver/appclient/client/acc/src/main/java/org/glassfish/appclient/client/acc/StandAloneAppClientInfo.java b/appserver/appclient/client/acc/src/main/java/org/glassfish/appclient/client/acc/StandAloneAppClientInfo.java
index 85a9598..03489d9 100644
--- a/appserver/appclient/client/acc/src/main/java/org/glassfish/appclient/client/acc/StandAloneAppClientInfo.java
+++ b/appserver/appclient/client/acc/src/main/java/org/glassfish/appclient/client/acc/StandAloneAppClientInfo.java
@@ -33,7 +33,7 @@
import org.xml.sax.SAXParseException;
import javax.enterprise.deploy.shared.ModuleType;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
import java.io.File;
import java.io.FileNotFoundException;
import java.io.IOException;
diff --git a/appserver/appclient/client/acc/src/main/java/org/glassfish/appclient/common/ACCAppClientArchivist.java b/appserver/appclient/client/acc/src/main/java/org/glassfish/appclient/common/ACCAppClientArchivist.java
index 3af3496..8191672 100644
--- a/appserver/appclient/client/acc/src/main/java/org/glassfish/appclient/common/ACCAppClientArchivist.java
+++ b/appserver/appclient/client/acc/src/main/java/org/glassfish/appclient/common/ACCAppClientArchivist.java
@@ -27,7 +27,7 @@
import org.jvnet.hk2.annotations.Optional;
import org.jvnet.hk2.annotations.Service;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
import org.glassfish.hk2.api.PerLookup;
import org.xml.sax.SAXException;
diff --git a/appserver/appclient/server/connector/src/main/java/org/glassfish/appclient/server/connector/AppClientSniffer.java b/appserver/appclient/server/connector/src/main/java/org/glassfish/appclient/server/connector/AppClientSniffer.java
index 543a7f7..3a2f39b 100644
--- a/appserver/appclient/server/connector/src/main/java/org/glassfish/appclient/server/connector/AppClientSniffer.java
+++ b/appserver/appclient/server/connector/src/main/java/org/glassfish/appclient/server/connector/AppClientSniffer.java
@@ -18,14 +18,14 @@
import java.util.jar.Manifest;
import org.glassfish.internal.deployment.GenericSniffer;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
import org.glassfish.api.deployment.archive.ReadableArchive;
import org.glassfish.api.deployment.archive.ArchiveType;
import org.jvnet.hk2.annotations.Service;
-import javax.inject.Singleton;
+import jakarta.inject.Singleton;
import java.io.IOException;
import java.util.jar.Attributes;
diff --git a/appserver/appclient/server/connector/src/main/java/org/glassfish/appclient/server/connector/CarDetector.java b/appserver/appclient/server/connector/src/main/java/org/glassfish/appclient/server/connector/CarDetector.java
index 17c0ac2..1cc69d5 100644
--- a/appserver/appclient/server/connector/src/main/java/org/glassfish/appclient/server/connector/CarDetector.java
+++ b/appserver/appclient/server/connector/src/main/java/org/glassfish/appclient/server/connector/CarDetector.java
@@ -21,8 +21,8 @@
import java.util.jar.Manifest;
import java.util.jar.Attributes;
-import javax.inject.Inject;
-import javax.inject.Singleton;
+import jakarta.inject.Inject;
+import jakarta.inject.Singleton;
import org.glassfish.api.deployment.archive.ArchiveDetector;
import org.glassfish.api.deployment.archive.ArchiveHandler;
diff --git a/appserver/appclient/server/connector/src/main/java/org/glassfish/appclient/server/connector/CarType.java b/appserver/appclient/server/connector/src/main/java/org/glassfish/appclient/server/connector/CarType.java
index cea0713..b2fdb48 100644
--- a/appserver/appclient/server/connector/src/main/java/org/glassfish/appclient/server/connector/CarType.java
+++ b/appserver/appclient/server/connector/src/main/java/org/glassfish/appclient/server/connector/CarType.java
@@ -26,7 +26,7 @@
* @author sanjeeb.sahoo@oracle.com
*/
@Service(name = CarType.ARCHIVE_TYPE)
-@javax.inject.Singleton
+@jakarta.inject.Singleton
public class CarType extends ArchiveType {
/**
* same as what's returned by {@link javax.enterprise.deploy.shared.ModuleType#CAR#toString()}
diff --git a/appserver/appclient/server/core/src/main/java/org/glassfish/appclient/server/admin/GetRelativeJWSURICommand.java b/appserver/appclient/server/core/src/main/java/org/glassfish/appclient/server/admin/GetRelativeJWSURICommand.java
index 75fe270..99e3642 100644
--- a/appserver/appclient/server/core/src/main/java/org/glassfish/appclient/server/admin/GetRelativeJWSURICommand.java
+++ b/appserver/appclient/server/core/src/main/java/org/glassfish/appclient/server/admin/GetRelativeJWSURICommand.java
@@ -21,7 +21,7 @@
import com.sun.enterprise.config.serverbeans.Module;
import com.sun.enterprise.util.LocalStringManager;
import com.sun.enterprise.util.LocalStringManagerImpl;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
import org.glassfish.api.ActionReport;
import org.glassfish.api.Param;
import org.glassfish.api.admin.*;
diff --git a/appserver/appclient/server/core/src/main/java/org/glassfish/appclient/server/core/AppClientDeployer.java b/appserver/appclient/server/core/src/main/java/org/glassfish/appclient/server/core/AppClientDeployer.java
index a3522cc..474f3df 100644
--- a/appserver/appclient/server/core/src/main/java/org/glassfish/appclient/server/core/AppClientDeployer.java
+++ b/appserver/appclient/server/core/src/main/java/org/glassfish/appclient/server/core/AppClientDeployer.java
@@ -32,8 +32,8 @@
import java.util.Set;
import java.util.jar.Attributes;
import java.util.logging.Logger;
-import javax.inject.Inject;
-import javax.inject.Named;
+import jakarta.inject.Inject;
+import jakarta.inject.Named;
import org.glassfish.api.deployment.DeploymentContext;
import org.glassfish.api.deployment.MetaData;
@@ -44,7 +44,7 @@
import org.jvnet.hk2.annotations.Service;
import org.glassfish.hk2.api.PostConstruct;
-import javax.inject.Singleton;
+import jakarta.inject.Singleton;
import org.glassfish.api.admin.ServerEnvironment;
import org.glassfish.appclient.server.core.jws.JWSAdapterManager;
import org.glassfish.appclient.server.core.jws.JavaWebStartInfo;
diff --git a/appserver/appclient/server/core/src/main/java/org/glassfish/appclient/server/core/AppClientGroupFacadeGenerator.java b/appserver/appclient/server/core/src/main/java/org/glassfish/appclient/server/core/AppClientGroupFacadeGenerator.java
index 69c1780..f683c07 100644
--- a/appserver/appclient/server/core/src/main/java/org/glassfish/appclient/server/core/AppClientGroupFacadeGenerator.java
+++ b/appserver/appclient/server/core/src/main/java/org/glassfish/appclient/server/core/AppClientGroupFacadeGenerator.java
@@ -29,7 +29,7 @@
import java.util.jar.Manifest;
import java.util.logging.Level;
import java.util.logging.Logger;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
import org.glassfish.api.deployment.DeployCommandParameters;
import org.glassfish.api.deployment.DeploymentContext;
import org.glassfish.deployment.common.ClientArtifactsManager;
diff --git a/appserver/appclient/server/core/src/main/java/org/glassfish/appclient/server/core/AppClientServerApplication.java b/appserver/appclient/server/core/src/main/java/org/glassfish/appclient/server/core/AppClientServerApplication.java
index 1b4a43a..10ab00e 100644
--- a/appserver/appclient/server/core/src/main/java/org/glassfish/appclient/server/core/AppClientServerApplication.java
+++ b/appserver/appclient/server/core/src/main/java/org/glassfish/appclient/server/core/AppClientServerApplication.java
@@ -25,7 +25,7 @@
import java.security.AccessController;
import java.security.PrivilegedAction;
import java.util.logging.Logger;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
import org.glassfish.api.deployment.ApplicationContainer;
import org.glassfish.api.deployment.ApplicationContext;
import org.glassfish.api.deployment.DeploymentContext;
diff --git a/appserver/appclient/server/core/src/main/java/org/glassfish/appclient/server/core/CarHandler.java b/appserver/appclient/server/core/src/main/java/org/glassfish/appclient/server/core/CarHandler.java
index 0ad4c70..fb891f6 100644
--- a/appserver/appclient/server/core/src/main/java/org/glassfish/appclient/server/core/CarHandler.java
+++ b/appserver/appclient/server/core/src/main/java/org/glassfish/appclient/server/core/CarHandler.java
@@ -26,8 +26,8 @@
import org.glassfish.appclient.server.connector.CarDetector;
import org.jvnet.hk2.annotations.Service;
-import javax.inject.Inject;
-import javax.inject.Named;
+import jakarta.inject.Inject;
+import jakarta.inject.Named;
import javax.xml.stream.XMLStreamException;
import javax.xml.stream.XMLStreamReader;
import java.io.IOException;
diff --git a/appserver/appclient/server/core/src/main/java/org/glassfish/appclient/server/core/jws/DeveloperContentHandler.java b/appserver/appclient/server/core/src/main/java/org/glassfish/appclient/server/core/jws/DeveloperContentHandler.java
index 0d1c7e4..45f6a45 100644
--- a/appserver/appclient/server/core/src/main/java/org/glassfish/appclient/server/core/jws/DeveloperContentHandler.java
+++ b/appserver/appclient/server/core/src/main/java/org/glassfish/appclient/server/core/jws/DeveloperContentHandler.java
@@ -26,7 +26,7 @@
import java.net.URI;
import java.net.URISyntaxException;
import java.util.Map;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
import javax.xml.parsers.DocumentBuilder;
import javax.xml.parsers.DocumentBuilderFactory;
import javax.xml.parsers.ParserConfigurationException;
diff --git a/appserver/appclient/server/core/src/main/java/org/glassfish/appclient/server/core/jws/DeveloperContentService.java b/appserver/appclient/server/core/src/main/java/org/glassfish/appclient/server/core/jws/DeveloperContentService.java
index 28c172b..323ff2a 100644
--- a/appserver/appclient/server/core/src/main/java/org/glassfish/appclient/server/core/jws/DeveloperContentService.java
+++ b/appserver/appclient/server/core/src/main/java/org/glassfish/appclient/server/core/jws/DeveloperContentService.java
@@ -19,12 +19,12 @@
import com.sun.enterprise.module.bootstrap.StartupContext;
import java.io.File;
import java.util.List;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
import org.glassfish.api.admin.ServerEnvironment;
import org.jvnet.hk2.annotations.Service;
import org.glassfish.hk2.api.PostConstruct;
-import javax.inject.Singleton;
+import jakarta.inject.Singleton;
/**
* Maintains the in-memory representation for the customization points of
diff --git a/appserver/appclient/server/core/src/main/java/org/glassfish/appclient/server/core/jws/ExtensionFileManager.java b/appserver/appclient/server/core/src/main/java/org/glassfish/appclient/server/core/jws/ExtensionFileManager.java
index 880b7de..9db4581 100644
--- a/appserver/appclient/server/core/src/main/java/org/glassfish/appclient/server/core/jws/ExtensionFileManager.java
+++ b/appserver/appclient/server/core/src/main/java/org/glassfish/appclient/server/core/jws/ExtensionFileManager.java
@@ -34,12 +34,12 @@
import java.util.jar.Manifest;
import java.util.logging.Level;
import java.util.logging.Logger;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
import org.glassfish.internal.api.ServerContext;
import org.jvnet.hk2.annotations.Service;
import org.glassfish.hk2.api.PostConstruct;
-import javax.inject.Singleton;
+import jakarta.inject.Singleton;
import org.glassfish.logging.annotation.LogMessageInfo;
/**
diff --git a/appserver/appclient/server/core/src/main/java/org/glassfish/appclient/server/core/jws/JWSAdapterManager.java b/appserver/appclient/server/core/src/main/java/org/glassfish/appclient/server/core/jws/JWSAdapterManager.java
index e092fb2..85285a1 100644
--- a/appserver/appclient/server/core/src/main/java/org/glassfish/appclient/server/core/jws/JWSAdapterManager.java
+++ b/appserver/appclient/server/core/src/main/java/org/glassfish/appclient/server/core/jws/JWSAdapterManager.java
@@ -38,8 +38,8 @@
import java.util.jar.Manifest;
import java.util.logging.Level;
import java.util.logging.Logger;
-import javax.inject.Inject;
-import javax.inject.Named;
+import jakarta.inject.Inject;
+import jakarta.inject.Named;
import org.glassfish.api.admin.ServerEnvironment;
import org.glassfish.api.container.EndpointRegistrationException;
import org.glassfish.api.container.RequestDispatcher;
@@ -57,7 +57,7 @@
import org.jvnet.hk2.annotations.Service;
import org.glassfish.hk2.api.PostConstruct;
-import javax.inject.Singleton;
+import jakarta.inject.Singleton;
import org.glassfish.logging.annotation.LogMessageInfo;
/**
diff --git a/appserver/appclient/server/core/src/main/java/org/glassfish/appclient/server/core/jws/JavaWebStartInfo.java b/appserver/appclient/server/core/src/main/java/org/glassfish/appclient/server/core/jws/JavaWebStartInfo.java
index 125893f..abb65e5 100644
--- a/appserver/appclient/server/core/src/main/java/org/glassfish/appclient/server/core/jws/JavaWebStartInfo.java
+++ b/appserver/appclient/server/core/src/main/java/org/glassfish/appclient/server/core/jws/JavaWebStartInfo.java
@@ -39,7 +39,7 @@
import java.util.jar.Manifest;
import java.util.logging.Level;
import java.util.logging.Logger;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
import org.glassfish.api.admin.ServerEnvironment;
import org.glassfish.api.container.EndpointRegistrationException;
import org.glassfish.api.deployment.DeploymentContext;
diff --git a/appserver/appclient/server/core/src/main/java/org/glassfish/appclient/server/core/jws/servedcontent/ASJarSigner.java b/appserver/appclient/server/core/src/main/java/org/glassfish/appclient/server/core/jws/servedcontent/ASJarSigner.java
index 5ac9962..2bf36e5 100644
--- a/appserver/appclient/server/core/src/main/java/org/glassfish/appclient/server/core/jws/servedcontent/ASJarSigner.java
+++ b/appserver/appclient/server/core/src/main/java/org/glassfish/appclient/server/core/jws/servedcontent/ASJarSigner.java
@@ -30,7 +30,7 @@
import org.jvnet.hk2.annotations.Service;
import org.glassfish.hk2.api.PostConstruct;
-import javax.inject.Singleton;
+import jakarta.inject.Singleton;
import org.glassfish.appclient.server.core.jws.JavaWebStartInfo;
/**
diff --git a/appserver/batch/glassfish-batch-commands/src/main/java/org/glassfish/batch/AbstractListCommand.java b/appserver/batch/glassfish-batch-commands/src/main/java/org/glassfish/batch/AbstractListCommand.java
index 9b54453..bebd0cb 100644
--- a/appserver/batch/glassfish-batch-commands/src/main/java/org/glassfish/batch/AbstractListCommand.java
+++ b/appserver/batch/glassfish-batch-commands/src/main/java/org/glassfish/batch/AbstractListCommand.java
@@ -25,7 +25,7 @@
import javax.batch.operations.JobOperator;
import javax.batch.runtime.BatchRuntime;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
import java.util.*;
import java.util.logging.Level;
import java.util.logging.Logger;
diff --git a/appserver/batch/glassfish-batch-commands/src/main/java/org/glassfish/batch/AbstractListCommandProxy.java b/appserver/batch/glassfish-batch-commands/src/main/java/org/glassfish/batch/AbstractListCommandProxy.java
index b6d2277..c96eb10 100644
--- a/appserver/batch/glassfish-batch-commands/src/main/java/org/glassfish/batch/AbstractListCommandProxy.java
+++ b/appserver/batch/glassfish-batch-commands/src/main/java/org/glassfish/batch/AbstractListCommandProxy.java
@@ -30,7 +30,7 @@
import org.glassfish.internal.api.Target;
import org.jvnet.hk2.annotations.Service;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
import java.util.Properties;
import java.util.logging.Level;
import java.util.logging.Logger;
diff --git a/appserver/batch/glassfish-batch-commands/src/main/java/org/glassfish/batch/ListBatchJobExecutionsProxy.java b/appserver/batch/glassfish-batch-commands/src/main/java/org/glassfish/batch/ListBatchJobExecutionsProxy.java
index 13f5199..e899baa 100644
--- a/appserver/batch/glassfish-batch-commands/src/main/java/org/glassfish/batch/ListBatchJobExecutionsProxy.java
+++ b/appserver/batch/glassfish-batch-commands/src/main/java/org/glassfish/batch/ListBatchJobExecutionsProxy.java
@@ -30,7 +30,7 @@
import org.glassfish.internal.api.Target;
import org.jvnet.hk2.annotations.Service;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
import java.util.Properties;
import java.util.logging.Level;
import java.util.logging.Logger;
diff --git a/appserver/batch/glassfish-batch-commands/src/main/java/org/glassfish/batch/ListBatchRuntimeConfiguration.java b/appserver/batch/glassfish-batch-commands/src/main/java/org/glassfish/batch/ListBatchRuntimeConfiguration.java
index 5ee6bfa..46e9466 100644
--- a/appserver/batch/glassfish-batch-commands/src/main/java/org/glassfish/batch/ListBatchRuntimeConfiguration.java
+++ b/appserver/batch/glassfish-batch-commands/src/main/java/org/glassfish/batch/ListBatchRuntimeConfiguration.java
@@ -32,7 +32,7 @@
import org.glassfish.internal.api.Target;
import org.jvnet.hk2.annotations.Service;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
import java.util.*;
/**
diff --git a/appserver/batch/glassfish-batch-commands/src/main/java/org/glassfish/batch/SetBatchRuntimeConfiguration.java b/appserver/batch/glassfish-batch-commands/src/main/java/org/glassfish/batch/SetBatchRuntimeConfiguration.java
index 1b5372c..0b25d1b 100644
--- a/appserver/batch/glassfish-batch-commands/src/main/java/org/glassfish/batch/SetBatchRuntimeConfiguration.java
+++ b/appserver/batch/glassfish-batch-commands/src/main/java/org/glassfish/batch/SetBatchRuntimeConfiguration.java
@@ -34,7 +34,7 @@
import org.jvnet.hk2.config.SingleConfigCode;
import org.jvnet.hk2.config.TransactionFailure;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
import java.beans.PropertyVetoException;
import java.util.*;
import java.util.logging.Level;
diff --git a/appserver/batch/glassfish-batch-connector/src/main/java/org/glassfish/batch/spi/impl/BatchRuntimeHelper.java b/appserver/batch/glassfish-batch-connector/src/main/java/org/glassfish/batch/spi/impl/BatchRuntimeHelper.java
index f513c28..157382a 100644
--- a/appserver/batch/glassfish-batch-connector/src/main/java/org/glassfish/batch/spi/impl/BatchRuntimeHelper.java
+++ b/appserver/batch/glassfish-batch-connector/src/main/java/org/glassfish/batch/spi/impl/BatchRuntimeHelper.java
@@ -36,8 +36,8 @@
import javax.batch.operations.JobOperator;
import javax.batch.runtime.BatchRuntime;
-import javax.inject.Inject;
-import javax.inject.Named;
+import jakarta.inject.Inject;
+import jakarta.inject.Named;
import javax.naming.InitialContext;
import javax.naming.NamingException;
import java.net.URL;
diff --git a/appserver/batch/glassfish-batch-connector/src/main/java/org/glassfish/batch/spi/impl/GlassFishBatchSecurityHelper.java b/appserver/batch/glassfish-batch-connector/src/main/java/org/glassfish/batch/spi/impl/GlassFishBatchSecurityHelper.java
index 9684075..e29ca80 100644
--- a/appserver/batch/glassfish-batch-connector/src/main/java/org/glassfish/batch/spi/impl/GlassFishBatchSecurityHelper.java
+++ b/appserver/batch/glassfish-batch-connector/src/main/java/org/glassfish/batch/spi/impl/GlassFishBatchSecurityHelper.java
@@ -24,7 +24,7 @@
import org.glassfish.internal.api.Target;
import org.jvnet.hk2.annotations.Service;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
@Service
public class GlassFishBatchSecurityHelper
diff --git a/appserver/batch/glassfish-batch-connector/src/main/java/org/glassfish/batch/spi/impl/ManagedServiceActivator.java b/appserver/batch/glassfish-batch-connector/src/main/java/org/glassfish/batch/spi/impl/ManagedServiceActivator.java
index fa4718c..9b73328 100644
--- a/appserver/batch/glassfish-batch-connector/src/main/java/org/glassfish/batch/spi/impl/ManagedServiceActivator.java
+++ b/appserver/batch/glassfish-batch-connector/src/main/java/org/glassfish/batch/spi/impl/ManagedServiceActivator.java
@@ -18,7 +18,7 @@
import org.jvnet.hk2.annotations.Service;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
/**
* @author Mahesh Kannan
diff --git a/appserver/common/amx-javaee/src/main/java/org/glassfish/admin/amx/impl/j2ee/loader/AMXJ2EEStartupService.java b/appserver/common/amx-javaee/src/main/java/org/glassfish/admin/amx/impl/j2ee/loader/AMXJ2EEStartupService.java
index fdbfa46..c8ddd07 100644
--- a/appserver/common/amx-javaee/src/main/java/org/glassfish/admin/amx/impl/j2ee/loader/AMXJ2EEStartupService.java
+++ b/appserver/common/amx-javaee/src/main/java/org/glassfish/admin/amx/impl/j2ee/loader/AMXJ2EEStartupService.java
@@ -37,7 +37,7 @@
import org.glassfish.api.amx.AMXLoader;
import org.glassfish.hk2.api.ServiceLocator;
import org.glassfish.internal.data.ApplicationRegistry;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
import org.jvnet.hk2.annotations.Service;
import org.jvnet.hk2.config.*;
diff --git a/appserver/common/amx-javaee/src/main/java/org/glassfish/admin/amx/impl/j2ee/loader/J2EEInjectedValues.java b/appserver/common/amx-javaee/src/main/java/org/glassfish/admin/amx/impl/j2ee/loader/J2EEInjectedValues.java
index 29298fc..dcd64b1 100644
--- a/appserver/common/amx-javaee/src/main/java/org/glassfish/admin/amx/impl/j2ee/loader/J2EEInjectedValues.java
+++ b/appserver/common/amx-javaee/src/main/java/org/glassfish/admin/amx/impl/j2ee/loader/J2EEInjectedValues.java
@@ -17,7 +17,7 @@
package org.glassfish.admin.amx.impl.j2ee.loader;
import org.glassfish.admin.amx.impl.util.InjectedValues;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
import org.jvnet.hk2.annotations.Service;
import org.glassfish.internal.data.ApplicationRegistry;
diff --git a/appserver/common/annotation-framework/src/main/java/org/glassfish/apf/AnnotationHandlerFor.java b/appserver/common/annotation-framework/src/main/java/org/glassfish/apf/AnnotationHandlerFor.java
index a5aea98..aa7debc 100644
--- a/appserver/common/annotation-framework/src/main/java/org/glassfish/apf/AnnotationHandlerFor.java
+++ b/appserver/common/annotation-framework/src/main/java/org/glassfish/apf/AnnotationHandlerFor.java
@@ -24,7 +24,7 @@
import java.lang.annotation.Retention;
import java.lang.annotation.Target;
-import javax.inject.Qualifier;
+import jakarta.inject.Qualifier;
import static java.lang.annotation.RetentionPolicy.RUNTIME;
diff --git a/appserver/common/annotation-framework/src/test/java/org/glassfish/apf/test/AnnotationUtilsTest.java b/appserver/common/annotation-framework/src/test/java/org/glassfish/apf/test/AnnotationUtilsTest.java
index 47b1d99..a30dffa 100644
--- a/appserver/common/annotation-framework/src/test/java/org/glassfish/apf/test/AnnotationUtilsTest.java
+++ b/appserver/common/annotation-framework/src/test/java/org/glassfish/apf/test/AnnotationUtilsTest.java
@@ -16,7 +16,7 @@
package org.glassfish.apf.test;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
import org.glassfish.apf.AnnotationHandler;
import org.glassfish.apf.impl.AnnotationUtils;
diff --git a/appserver/common/container-common/src/main/java/com/sun/enterprise/container/common/impl/ComponentEnvManagerImpl.java b/appserver/common/container-common/src/main/java/com/sun/enterprise/container/common/impl/ComponentEnvManagerImpl.java
index 9085592..e0af9cc 100644
--- a/appserver/common/container-common/src/main/java/com/sun/enterprise/container/common/impl/ComponentEnvManagerImpl.java
+++ b/appserver/common/container-common/src/main/java/com/sun/enterprise/container/common/impl/ComponentEnvManagerImpl.java
@@ -43,7 +43,7 @@
import com.sun.enterprise.deployment.ResourceDescriptor;
import com.sun.enterprise.deployment.util.DOLUtils;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
import javax.naming.Context;
import javax.naming.NameNotFoundException;
import javax.naming.NamingException;
diff --git a/appserver/common/container-common/src/main/java/com/sun/enterprise/container/common/impl/ContainerUtilImpl.java b/appserver/common/container-common/src/main/java/com/sun/enterprise/container/common/impl/ContainerUtilImpl.java
index 3d5a75e..8f16170 100644
--- a/appserver/common/container-common/src/main/java/com/sun/enterprise/container/common/impl/ContainerUtilImpl.java
+++ b/appserver/common/container-common/src/main/java/com/sun/enterprise/container/common/impl/ContainerUtilImpl.java
@@ -20,7 +20,7 @@
import com.sun.enterprise.container.common.spi.util.ComponentEnvManager;
import com.sun.enterprise.container.common.spi.util.ContainerUtil;
import org.glassfish.api.invocation.InvocationManager;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
import org.jvnet.hk2.annotations.Service;
import org.glassfish.hk2.api.PreDestroy;
diff --git a/appserver/common/container-common/src/main/java/com/sun/enterprise/container/common/impl/JavaCompNamingProxy.java b/appserver/common/container-common/src/main/java/com/sun/enterprise/container/common/impl/JavaCompNamingProxy.java
index 0302b64..f19fe7b 100644
--- a/appserver/common/container-common/src/main/java/com/sun/enterprise/container/common/impl/JavaCompNamingProxy.java
+++ b/appserver/common/container-common/src/main/java/com/sun/enterprise/container/common/impl/JavaCompNamingProxy.java
@@ -16,7 +16,7 @@
package com.sun.enterprise.container.common.impl;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
import javax.naming.NamingException;
import org.glassfish.api.admin.ProcessEnvironment;
diff --git a/appserver/common/container-common/src/main/java/com/sun/enterprise/container/common/impl/JavaModuleNamingProxy.java b/appserver/common/container-common/src/main/java/com/sun/enterprise/container/common/impl/JavaModuleNamingProxy.java
index bb701d9..3805ce9 100644
--- a/appserver/common/container-common/src/main/java/com/sun/enterprise/container/common/impl/JavaModuleNamingProxy.java
+++ b/appserver/common/container-common/src/main/java/com/sun/enterprise/container/common/impl/JavaModuleNamingProxy.java
@@ -26,7 +26,7 @@
import com.sun.enterprise.deployment.*;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
import org.jvnet.hk2.annotations.Service;
import org.glassfish.hk2.api.PostConstruct;
import org.glassfish.hk2.api.ServiceLocator;
diff --git a/appserver/common/container-common/src/main/java/com/sun/enterprise/container/common/impl/managedbean/ManagedBeanManagerImpl.java b/appserver/common/container-common/src/main/java/com/sun/enterprise/container/common/impl/managedbean/ManagedBeanManagerImpl.java
index 045ec92..8f21055 100644
--- a/appserver/common/container-common/src/main/java/com/sun/enterprise/container/common/impl/managedbean/ManagedBeanManagerImpl.java
+++ b/appserver/common/container-common/src/main/java/com/sun/enterprise/container/common/impl/managedbean/ManagedBeanManagerImpl.java
@@ -28,7 +28,7 @@
import java.util.logging.Level;
import java.util.logging.Logger;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
import javax.naming.InitialContext;
import org.glassfish.api.admin.ProcessEnvironment;
@@ -265,7 +265,7 @@
if (isCDIBundle) {
Constructor<?>[] ctors = clz.getDeclaredConstructors();
for(Constructor<?> ctor : ctors) {
- if (ctor.getAnnotation(javax.inject.Inject.class) != null) {
+ if (ctor.getAnnotation(jakarta.inject.Inject.class) != null) {
// @Inject constructor
return ctor;
}
diff --git a/appserver/common/container-common/src/main/java/com/sun/enterprise/container/common/impl/util/DummyCallFlowAgentImpl.java b/appserver/common/container-common/src/main/java/com/sun/enterprise/container/common/impl/util/DummyCallFlowAgentImpl.java
index 97d5c19..b55b2ed 100644
--- a/appserver/common/container-common/src/main/java/com/sun/enterprise/container/common/impl/util/DummyCallFlowAgentImpl.java
+++ b/appserver/common/container-common/src/main/java/com/sun/enterprise/container/common/impl/util/DummyCallFlowAgentImpl.java
@@ -18,7 +18,7 @@
import org.jvnet.hk2.annotations.Service;
-import javax.inject.Singleton;
+import jakarta.inject.Singleton;
import com.sun.enterprise.container.common.spi.util.CallFlowAgent;
import com.sun.enterprise.container.common.spi.util.EntityManagerMethod;
import com.sun.enterprise.container.common.spi.util.EntityManagerQueryMethod;
diff --git a/appserver/common/container-common/src/main/java/com/sun/enterprise/container/common/impl/util/InjectionManagerImpl.java b/appserver/common/container-common/src/main/java/com/sun/enterprise/container/common/impl/util/InjectionManagerImpl.java
index 439aeaf..f0bdbd0 100644
--- a/appserver/common/container-common/src/main/java/com/sun/enterprise/container/common/impl/util/InjectionManagerImpl.java
+++ b/appserver/common/container-common/src/main/java/com/sun/enterprise/container/common/impl/util/InjectionManagerImpl.java
@@ -30,7 +30,7 @@
import org.glassfish.api.invocation.ComponentInvocation;
import org.glassfish.api.invocation.InvocationManager;
import org.glassfish.api.naming.GlassfishNamingManager;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
import org.jvnet.hk2.annotations.Service;
import javax.naming.NamingException;
diff --git a/appserver/common/container-common/src/main/java/com/sun/enterprise/container/common/impl/util/JavaEEIOUtilsImpl.java b/appserver/common/container-common/src/main/java/com/sun/enterprise/container/common/impl/util/JavaEEIOUtilsImpl.java
index 4df4979..c27dd1c 100644
--- a/appserver/common/container-common/src/main/java/com/sun/enterprise/container/common/impl/util/JavaEEIOUtilsImpl.java
+++ b/appserver/common/container-common/src/main/java/com/sun/enterprise/container/common/impl/util/JavaEEIOUtilsImpl.java
@@ -17,7 +17,7 @@
package com.sun.enterprise.container.common.impl.util;
import org.jvnet.hk2.annotations.Contract;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
import org.jvnet.hk2.annotations.Service;
import org.glassfish.hk2.api.PostConstruct;
import org.glassfish.hk2.api.ServiceLocator;
diff --git a/appserver/common/container-common/src/main/java/com/sun/enterprise/container/common/impl/util/JavaEEObjectStreamHandlerForJNDIContext.java b/appserver/common/container-common/src/main/java/com/sun/enterprise/container/common/impl/util/JavaEEObjectStreamHandlerForJNDIContext.java
index 9f64f59..358766d 100644
--- a/appserver/common/container-common/src/main/java/com/sun/enterprise/container/common/impl/util/JavaEEObjectStreamHandlerForJNDIContext.java
+++ b/appserver/common/container-common/src/main/java/com/sun/enterprise/container/common/impl/util/JavaEEObjectStreamHandlerForJNDIContext.java
@@ -18,7 +18,7 @@
import com.sun.enterprise.container.common.spi.util.JavaEEObjectStreamHandler;
import org.glassfish.api.naming.GlassfishNamingManager;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
import org.jvnet.hk2.annotations.Service;
import javax.naming.Context;
diff --git a/appserver/common/container-common/src/main/java/com/sun/enterprise/container/common/spi/util/JavaEEObjectInputStream.java b/appserver/common/container-common/src/main/java/com/sun/enterprise/container/common/spi/util/JavaEEObjectInputStream.java
index 3029e37..0809774 100644
--- a/appserver/common/container-common/src/main/java/com/sun/enterprise/container/common/spi/util/JavaEEObjectInputStream.java
+++ b/appserver/common/container-common/src/main/java/com/sun/enterprise/container/common/spi/util/JavaEEObjectInputStream.java
@@ -18,8 +18,8 @@
import org.jvnet.hk2.annotations.Service;
-import javax.inject.Inject;
-import javax.inject.Singleton;
+import jakarta.inject.Inject;
+import jakarta.inject.Singleton;
import org.glassfish.hk2.api.PostConstruct;
import java.io.*;
diff --git a/appserver/common/container-common/src/main/java/com/sun/enterprise/container/common/spi/util/JavaEEObjectOutputStream.java b/appserver/common/container-common/src/main/java/com/sun/enterprise/container/common/spi/util/JavaEEObjectOutputStream.java
index aa5ce33..c8fd275 100644
--- a/appserver/common/container-common/src/main/java/com/sun/enterprise/container/common/spi/util/JavaEEObjectOutputStream.java
+++ b/appserver/common/container-common/src/main/java/com/sun/enterprise/container/common/spi/util/JavaEEObjectOutputStream.java
@@ -18,8 +18,8 @@
import org.jvnet.hk2.annotations.Service;
-import javax.inject.Inject;
-import javax.inject.Singleton;
+import jakarta.inject.Inject;
+import jakarta.inject.Singleton;
import org.glassfish.hk2.api.PostConstruct;
import java.io.ObjectOutputStream;
diff --git a/appserver/common/container-common/src/main/java/com/sun/enterprise/container/common/spi/util/JavaEEObjectStreamFactory.java b/appserver/common/container-common/src/main/java/com/sun/enterprise/container/common/spi/util/JavaEEObjectStreamFactory.java
index daf71ad..794d6b3 100644
--- a/appserver/common/container-common/src/main/java/com/sun/enterprise/container/common/spi/util/JavaEEObjectStreamFactory.java
+++ b/appserver/common/container-common/src/main/java/com/sun/enterprise/container/common/spi/util/JavaEEObjectStreamFactory.java
@@ -19,11 +19,11 @@
import com.sun.logging.*;
import org.jvnet.hk2.annotations.Service;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
import org.glassfish.hk2.api.PerLookup;
import org.glassfish.hk2.api.ServiceLocator;
-import javax.inject.Singleton;
+import jakarta.inject.Singleton;
import java.io.*;
import java.security.PrivilegedExceptionAction;
diff --git a/appserver/common/container-common/src/main/java/org/glassfish/javaee/services/CommonResourceProxy.java b/appserver/common/container-common/src/main/java/org/glassfish/javaee/services/CommonResourceProxy.java
index 1fb70e5..bd905a0 100644
--- a/appserver/common/container-common/src/main/java/org/glassfish/javaee/services/CommonResourceProxy.java
+++ b/appserver/common/container-common/src/main/java/org/glassfish/javaee/services/CommonResourceProxy.java
@@ -26,7 +26,7 @@
import org.glassfish.resourcebase.resources.util.ResourceManagerFactory;
import org.jvnet.hk2.annotations.Service;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
import javax.naming.Context;
import javax.naming.NamingException;
import java.io.Serializable;
diff --git a/appserver/common/glassfish-naming/src/main/java/com/sun/enterprise/naming/GlassFishNamingBuilder.java b/appserver/common/glassfish-naming/src/main/java/com/sun/enterprise/naming/GlassFishNamingBuilder.java
index 7549c9b..9912a62 100644
--- a/appserver/common/glassfish-naming/src/main/java/com/sun/enterprise/naming/GlassFishNamingBuilder.java
+++ b/appserver/common/glassfish-naming/src/main/java/com/sun/enterprise/naming/GlassFishNamingBuilder.java
@@ -25,7 +25,7 @@
import org.glassfish.hk2.api.PostConstruct;
import org.glassfish.hk2.api.PreDestroy;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
import javax.naming.Context;
import javax.naming.NamingException;
import javax.naming.NoInitialContextException;
diff --git a/appserver/common/glassfish-naming/src/main/java/com/sun/enterprise/naming/impl/ClientNamingConfiguratorImpl.java b/appserver/common/glassfish-naming/src/main/java/com/sun/enterprise/naming/impl/ClientNamingConfiguratorImpl.java
index 55589b2..2b38a28 100644
--- a/appserver/common/glassfish-naming/src/main/java/com/sun/enterprise/naming/impl/ClientNamingConfiguratorImpl.java
+++ b/appserver/common/glassfish-naming/src/main/java/com/sun/enterprise/naming/impl/ClientNamingConfiguratorImpl.java
@@ -17,7 +17,7 @@
package com.sun.enterprise.naming.impl;
import org.jvnet.hk2.annotations.Service;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
import org.glassfish.hk2.api.ServiceLocator;
import org.glassfish.hk2.api.PostConstruct;
diff --git a/appserver/common/glassfish-naming/src/main/java/com/sun/enterprise/naming/impl/GlassfishNamingManagerImpl.java b/appserver/common/glassfish-naming/src/main/java/com/sun/enterprise/naming/impl/GlassfishNamingManagerImpl.java
index fb16f6e..8625a2f 100644
--- a/appserver/common/glassfish-naming/src/main/java/com/sun/enterprise/naming/impl/GlassfishNamingManagerImpl.java
+++ b/appserver/common/glassfish-naming/src/main/java/com/sun/enterprise/naming/impl/GlassfishNamingManagerImpl.java
@@ -25,10 +25,10 @@
import org.glassfish.logging.annotation.LogMessageInfo;
import org.jvnet.hk2.annotations.Service;
-import javax.inject.Singleton;
+import jakarta.inject.Singleton;
import org.omg.CORBA.ORB;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
import javax.naming.Binding;
import javax.naming.CompositeName;
import javax.naming.Context;
diff --git a/appserver/common/glassfish-naming/src/main/java/com/sun/enterprise/naming/util/NamingUtilsImpl.java b/appserver/common/glassfish-naming/src/main/java/com/sun/enterprise/naming/util/NamingUtilsImpl.java
index 193c0d5..e296ab7 100644
--- a/appserver/common/glassfish-naming/src/main/java/com/sun/enterprise/naming/util/NamingUtilsImpl.java
+++ b/appserver/common/glassfish-naming/src/main/java/com/sun/enterprise/naming/util/NamingUtilsImpl.java
@@ -24,7 +24,7 @@
import org.jvnet.hk2.annotations.Service;
-import javax.inject.Singleton;
+import jakarta.inject.Singleton;
import javax.naming.Context;
import java.io.*;
diff --git a/appserver/concurrent/concurrent-impl/src/main/java/org/glassfish/concurrent/admin/ContextServiceManager.java b/appserver/concurrent/concurrent-impl/src/main/java/org/glassfish/concurrent/admin/ContextServiceManager.java
index 41f59c3..3a755ea 100644
--- a/appserver/concurrent/concurrent-impl/src/main/java/org/glassfish/concurrent/admin/ContextServiceManager.java
+++ b/appserver/concurrent/concurrent-impl/src/main/java/org/glassfish/concurrent/admin/ContextServiceManager.java
@@ -35,7 +35,7 @@
import org.jvnet.hk2.config.TransactionFailure;
import org.jvnet.hk2.config.types.Property;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
import jakarta.resource.ResourceException;
import java.beans.PropertyVetoException;
import java.util.HashMap;
diff --git a/appserver/concurrent/concurrent-impl/src/main/java/org/glassfish/concurrent/admin/CreateContextService.java b/appserver/concurrent/concurrent-impl/src/main/java/org/glassfish/concurrent/admin/CreateContextService.java
index ecfc2d7..a33739b 100644
--- a/appserver/concurrent/concurrent-impl/src/main/java/org/glassfish/concurrent/admin/CreateContextService.java
+++ b/appserver/concurrent/concurrent-impl/src/main/java/org/glassfish/concurrent/admin/CreateContextService.java
@@ -34,7 +34,7 @@
import org.glassfish.resourcebase.resources.api.ResourceStatus;
import org.jvnet.hk2.annotations.Service;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
import java.util.HashMap;
import java.util.Properties;
diff --git a/appserver/concurrent/concurrent-impl/src/main/java/org/glassfish/concurrent/admin/CreateManagedExecutorService.java b/appserver/concurrent/concurrent-impl/src/main/java/org/glassfish/concurrent/admin/CreateManagedExecutorService.java
index 1e4cade..4845578 100644
--- a/appserver/concurrent/concurrent-impl/src/main/java/org/glassfish/concurrent/admin/CreateManagedExecutorService.java
+++ b/appserver/concurrent/concurrent-impl/src/main/java/org/glassfish/concurrent/admin/CreateManagedExecutorService.java
@@ -31,7 +31,7 @@
import org.glassfish.resourcebase.resources.api.ResourceStatus;
import org.jvnet.hk2.annotations.Service;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
import java.util.HashMap;
diff --git a/appserver/concurrent/concurrent-impl/src/main/java/org/glassfish/concurrent/admin/CreateManagedScheduledExecutorService.java b/appserver/concurrent/concurrent-impl/src/main/java/org/glassfish/concurrent/admin/CreateManagedScheduledExecutorService.java
index 908cd45..10eba14 100644
--- a/appserver/concurrent/concurrent-impl/src/main/java/org/glassfish/concurrent/admin/CreateManagedScheduledExecutorService.java
+++ b/appserver/concurrent/concurrent-impl/src/main/java/org/glassfish/concurrent/admin/CreateManagedScheduledExecutorService.java
@@ -29,7 +29,7 @@
import org.glassfish.resourcebase.resources.api.ResourceStatus;
import org.jvnet.hk2.annotations.Service;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
import java.util.HashMap;
diff --git a/appserver/concurrent/concurrent-impl/src/main/java/org/glassfish/concurrent/admin/CreateManagedThreadFactory.java b/appserver/concurrent/concurrent-impl/src/main/java/org/glassfish/concurrent/admin/CreateManagedThreadFactory.java
index 6577bca..3371023 100644
--- a/appserver/concurrent/concurrent-impl/src/main/java/org/glassfish/concurrent/admin/CreateManagedThreadFactory.java
+++ b/appserver/concurrent/concurrent-impl/src/main/java/org/glassfish/concurrent/admin/CreateManagedThreadFactory.java
@@ -34,7 +34,7 @@
import org.glassfish.resourcebase.resources.api.ResourceStatus;
import org.jvnet.hk2.annotations.Service;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
import java.util.HashMap;
import java.util.Properties;
diff --git a/appserver/concurrent/concurrent-impl/src/main/java/org/glassfish/concurrent/admin/DeleteContextService.java b/appserver/concurrent/concurrent-impl/src/main/java/org/glassfish/concurrent/admin/DeleteContextService.java
index a129156..c46602d 100644
--- a/appserver/concurrent/concurrent-impl/src/main/java/org/glassfish/concurrent/admin/DeleteContextService.java
+++ b/appserver/concurrent/concurrent-impl/src/main/java/org/glassfish/concurrent/admin/DeleteContextService.java
@@ -32,7 +32,7 @@
import org.glassfish.resourcebase.resources.api.ResourceStatus;
import org.jvnet.hk2.annotations.Service;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
/**
* Delete Context Service Command
diff --git a/appserver/concurrent/concurrent-impl/src/main/java/org/glassfish/concurrent/admin/DeleteManagedExecutorService.java b/appserver/concurrent/concurrent-impl/src/main/java/org/glassfish/concurrent/admin/DeleteManagedExecutorService.java
index b999ea1..5df36b0 100644
--- a/appserver/concurrent/concurrent-impl/src/main/java/org/glassfish/concurrent/admin/DeleteManagedExecutorService.java
+++ b/appserver/concurrent/concurrent-impl/src/main/java/org/glassfish/concurrent/admin/DeleteManagedExecutorService.java
@@ -32,7 +32,7 @@
import org.glassfish.resourcebase.resources.api.ResourceStatus;
import org.jvnet.hk2.annotations.Service;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
/**
* Delete Managed Executor Service Command
diff --git a/appserver/concurrent/concurrent-impl/src/main/java/org/glassfish/concurrent/admin/DeleteManagedScheduledExecutorService.java b/appserver/concurrent/concurrent-impl/src/main/java/org/glassfish/concurrent/admin/DeleteManagedScheduledExecutorService.java
index 185277b..a6b5342 100644
--- a/appserver/concurrent/concurrent-impl/src/main/java/org/glassfish/concurrent/admin/DeleteManagedScheduledExecutorService.java
+++ b/appserver/concurrent/concurrent-impl/src/main/java/org/glassfish/concurrent/admin/DeleteManagedScheduledExecutorService.java
@@ -32,7 +32,7 @@
import org.glassfish.resourcebase.resources.api.ResourceStatus;
import org.jvnet.hk2.annotations.Service;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
/**
* Delete Managed Scheduled Executor Service Command
diff --git a/appserver/concurrent/concurrent-impl/src/main/java/org/glassfish/concurrent/admin/DeleteManagedThreadFactory.java b/appserver/concurrent/concurrent-impl/src/main/java/org/glassfish/concurrent/admin/DeleteManagedThreadFactory.java
index 9760b32..cdf8744 100644
--- a/appserver/concurrent/concurrent-impl/src/main/java/org/glassfish/concurrent/admin/DeleteManagedThreadFactory.java
+++ b/appserver/concurrent/concurrent-impl/src/main/java/org/glassfish/concurrent/admin/DeleteManagedThreadFactory.java
@@ -32,7 +32,7 @@
import org.glassfish.resourcebase.resources.api.ResourceStatus;
import org.jvnet.hk2.annotations.Service;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
/**
* Delete Managed Thread Factory Command
diff --git a/appserver/concurrent/concurrent-impl/src/main/java/org/glassfish/concurrent/admin/ListContextServices.java b/appserver/concurrent/concurrent-impl/src/main/java/org/glassfish/concurrent/admin/ListContextServices.java
index 1852cb8..0bfb3ab 100644
--- a/appserver/concurrent/concurrent-impl/src/main/java/org/glassfish/concurrent/admin/ListContextServices.java
+++ b/appserver/concurrent/concurrent-impl/src/main/java/org/glassfish/concurrent/admin/ListContextServices.java
@@ -32,7 +32,7 @@
import org.glassfish.resourcebase.resources.util.BindableResourcesHelper;
import org.jvnet.hk2.annotations.Service;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
import java.util.*;
import org.glassfish.concurrent.runtime.deployer.DefaultContextService;
diff --git a/appserver/concurrent/concurrent-impl/src/main/java/org/glassfish/concurrent/admin/ListManagedExecutorServices.java b/appserver/concurrent/concurrent-impl/src/main/java/org/glassfish/concurrent/admin/ListManagedExecutorServices.java
index e074b0f..bac107e 100644
--- a/appserver/concurrent/concurrent-impl/src/main/java/org/glassfish/concurrent/admin/ListManagedExecutorServices.java
+++ b/appserver/concurrent/concurrent-impl/src/main/java/org/glassfish/concurrent/admin/ListManagedExecutorServices.java
@@ -32,7 +32,7 @@
import org.glassfish.resourcebase.resources.util.BindableResourcesHelper;
import org.jvnet.hk2.annotations.Service;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
import java.util.*;
import org.glassfish.concurrent.runtime.deployer.DefaultManagedExecutorService;
diff --git a/appserver/concurrent/concurrent-impl/src/main/java/org/glassfish/concurrent/admin/ListManagedScheduledExecutorServices.java b/appserver/concurrent/concurrent-impl/src/main/java/org/glassfish/concurrent/admin/ListManagedScheduledExecutorServices.java
index 88faa77..c4d3b7c 100644
--- a/appserver/concurrent/concurrent-impl/src/main/java/org/glassfish/concurrent/admin/ListManagedScheduledExecutorServices.java
+++ b/appserver/concurrent/concurrent-impl/src/main/java/org/glassfish/concurrent/admin/ListManagedScheduledExecutorServices.java
@@ -33,7 +33,7 @@
import org.glassfish.resourcebase.resources.util.BindableResourcesHelper;
import org.jvnet.hk2.annotations.Service;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
import java.util.*;
import org.glassfish.concurrent.runtime.deployer.DefaultManagedScheduledExecutorService;
diff --git a/appserver/concurrent/concurrent-impl/src/main/java/org/glassfish/concurrent/admin/ListManagedThreadFactories.java b/appserver/concurrent/concurrent-impl/src/main/java/org/glassfish/concurrent/admin/ListManagedThreadFactories.java
index fcd6089..a86a891 100644
--- a/appserver/concurrent/concurrent-impl/src/main/java/org/glassfish/concurrent/admin/ListManagedThreadFactories.java
+++ b/appserver/concurrent/concurrent-impl/src/main/java/org/glassfish/concurrent/admin/ListManagedThreadFactories.java
@@ -32,7 +32,7 @@
import org.glassfish.resourcebase.resources.util.BindableResourcesHelper;
import org.jvnet.hk2.annotations.Service;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
import java.util.*;
import org.glassfish.concurrent.runtime.deployer.DefaultManagedThreadFactory;
diff --git a/appserver/concurrent/concurrent-impl/src/main/java/org/glassfish/concurrent/admin/ManagedExecutorServiceBaseManager.java b/appserver/concurrent/concurrent-impl/src/main/java/org/glassfish/concurrent/admin/ManagedExecutorServiceBaseManager.java
index b2e3470..d7e15a4 100644
--- a/appserver/concurrent/concurrent-impl/src/main/java/org/glassfish/concurrent/admin/ManagedExecutorServiceBaseManager.java
+++ b/appserver/concurrent/concurrent-impl/src/main/java/org/glassfish/concurrent/admin/ManagedExecutorServiceBaseManager.java
@@ -34,7 +34,7 @@
import org.jvnet.hk2.config.TransactionFailure;
import org.jvnet.hk2.config.types.Property;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
import jakarta.resource.ResourceException;
import java.beans.PropertyVetoException;
import java.util.HashMap;
diff --git a/appserver/concurrent/concurrent-impl/src/main/java/org/glassfish/concurrent/admin/ManagedThreadFactoryManager.java b/appserver/concurrent/concurrent-impl/src/main/java/org/glassfish/concurrent/admin/ManagedThreadFactoryManager.java
index c6d791d..6cbc602 100644
--- a/appserver/concurrent/concurrent-impl/src/main/java/org/glassfish/concurrent/admin/ManagedThreadFactoryManager.java
+++ b/appserver/concurrent/concurrent-impl/src/main/java/org/glassfish/concurrent/admin/ManagedThreadFactoryManager.java
@@ -35,7 +35,7 @@
import org.jvnet.hk2.config.TransactionFailure;
import org.jvnet.hk2.config.types.Property;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
import jakarta.resource.ResourceException;
import java.beans.PropertyVetoException;
import java.util.HashMap;
diff --git a/appserver/concurrent/concurrent-impl/src/main/java/org/glassfish/concurrent/runtime/ConcurrentRuntime.java b/appserver/concurrent/concurrent-impl/src/main/java/org/glassfish/concurrent/runtime/ConcurrentRuntime.java
index fba12c0..33fa73b 100644
--- a/appserver/concurrent/concurrent-impl/src/main/java/org/glassfish/concurrent/runtime/ConcurrentRuntime.java
+++ b/appserver/concurrent/concurrent-impl/src/main/java/org/glassfish/concurrent/runtime/ConcurrentRuntime.java
@@ -32,8 +32,8 @@
import org.glassfish.resourcebase.resources.api.ResourceInfo;
import org.jvnet.hk2.annotations.Service;
-import javax.inject.Inject;
-import javax.inject.Singleton;
+import jakarta.inject.Inject;
+import jakarta.inject.Singleton;
import java.util.*;
import java.util.concurrent.ScheduledExecutorService;
import java.util.concurrent.TimeUnit;
diff --git a/appserver/concurrent/concurrent-impl/src/main/java/org/glassfish/concurrent/runtime/deployer/ContextServiceDeployer.java b/appserver/concurrent/concurrent-impl/src/main/java/org/glassfish/concurrent/runtime/deployer/ContextServiceDeployer.java
index c307ff1..79216bf 100644
--- a/appserver/concurrent/concurrent-impl/src/main/java/org/glassfish/concurrent/runtime/deployer/ContextServiceDeployer.java
+++ b/appserver/concurrent/concurrent-impl/src/main/java/org/glassfish/concurrent/runtime/deployer/ContextServiceDeployer.java
@@ -33,8 +33,8 @@
import org.glassfish.resources.naming.SerializableObjectRefAddr;
import org.jvnet.hk2.annotations.Service;
-import javax.inject.Inject;
-import javax.inject.Singleton;
+import jakarta.inject.Inject;
+import jakarta.inject.Singleton;
import javax.naming.NamingException;
import javax.naming.RefAddr;
import java.util.Collection;
diff --git a/appserver/concurrent/concurrent-impl/src/main/java/org/glassfish/concurrent/runtime/deployer/DefaultContextService.java b/appserver/concurrent/concurrent-impl/src/main/java/org/glassfish/concurrent/runtime/deployer/DefaultContextService.java
index 0149fcb..696a4ac 100644
--- a/appserver/concurrent/concurrent-impl/src/main/java/org/glassfish/concurrent/runtime/deployer/DefaultContextService.java
+++ b/appserver/concurrent/concurrent-impl/src/main/java/org/glassfish/concurrent/runtime/deployer/DefaultContextService.java
@@ -22,7 +22,7 @@
import org.jvnet.hk2.annotations.Service;
import jakarta.enterprise.concurrent.ContextService;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
import javax.naming.NamingException;
/**
diff --git a/appserver/concurrent/concurrent-impl/src/main/java/org/glassfish/concurrent/runtime/deployer/DefaultManagedExecutorService.java b/appserver/concurrent/concurrent-impl/src/main/java/org/glassfish/concurrent/runtime/deployer/DefaultManagedExecutorService.java
index f8798c1..acf8a98 100644
--- a/appserver/concurrent/concurrent-impl/src/main/java/org/glassfish/concurrent/runtime/deployer/DefaultManagedExecutorService.java
+++ b/appserver/concurrent/concurrent-impl/src/main/java/org/glassfish/concurrent/runtime/deployer/DefaultManagedExecutorService.java
@@ -21,7 +21,7 @@
import org.glassfish.api.naming.NamespacePrefixes;
import org.jvnet.hk2.annotations.Service;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
import javax.naming.NamingException;
/**
diff --git a/appserver/concurrent/concurrent-impl/src/main/java/org/glassfish/concurrent/runtime/deployer/DefaultManagedScheduledExecutorService.java b/appserver/concurrent/concurrent-impl/src/main/java/org/glassfish/concurrent/runtime/deployer/DefaultManagedScheduledExecutorService.java
index 91392ff..29dea14 100644
--- a/appserver/concurrent/concurrent-impl/src/main/java/org/glassfish/concurrent/runtime/deployer/DefaultManagedScheduledExecutorService.java
+++ b/appserver/concurrent/concurrent-impl/src/main/java/org/glassfish/concurrent/runtime/deployer/DefaultManagedScheduledExecutorService.java
@@ -21,7 +21,7 @@
import org.glassfish.api.naming.NamespacePrefixes;
import org.jvnet.hk2.annotations.Service;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
import javax.naming.NamingException;
/**
diff --git a/appserver/concurrent/concurrent-impl/src/main/java/org/glassfish/concurrent/runtime/deployer/DefaultManagedThreadFactory.java b/appserver/concurrent/concurrent-impl/src/main/java/org/glassfish/concurrent/runtime/deployer/DefaultManagedThreadFactory.java
index dec7275..954be59 100644
--- a/appserver/concurrent/concurrent-impl/src/main/java/org/glassfish/concurrent/runtime/deployer/DefaultManagedThreadFactory.java
+++ b/appserver/concurrent/concurrent-impl/src/main/java/org/glassfish/concurrent/runtime/deployer/DefaultManagedThreadFactory.java
@@ -21,7 +21,7 @@
import org.glassfish.api.naming.NamespacePrefixes;
import org.jvnet.hk2.annotations.Service;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
import javax.naming.NamingException;
/**
diff --git a/appserver/concurrent/concurrent-impl/src/main/java/org/glassfish/concurrent/runtime/deployer/ManagedExecutorServiceDeployer.java b/appserver/concurrent/concurrent-impl/src/main/java/org/glassfish/concurrent/runtime/deployer/ManagedExecutorServiceDeployer.java
index 3627b1d..69c90ad 100644
--- a/appserver/concurrent/concurrent-impl/src/main/java/org/glassfish/concurrent/runtime/deployer/ManagedExecutorServiceDeployer.java
+++ b/appserver/concurrent/concurrent-impl/src/main/java/org/glassfish/concurrent/runtime/deployer/ManagedExecutorServiceDeployer.java
@@ -33,8 +33,8 @@
import org.glassfish.resources.naming.SerializableObjectRefAddr;
import org.jvnet.hk2.annotations.Service;
-import javax.inject.Inject;
-import javax.inject.Singleton;
+import jakarta.inject.Inject;
+import jakarta.inject.Singleton;
import javax.naming.NamingException;
import javax.naming.RefAddr;
import java.util.Collection;
diff --git a/appserver/concurrent/concurrent-impl/src/main/java/org/glassfish/concurrent/runtime/deployer/ManagedScheduledExecutorServiceDeployer.java b/appserver/concurrent/concurrent-impl/src/main/java/org/glassfish/concurrent/runtime/deployer/ManagedScheduledExecutorServiceDeployer.java
index 630f5a1..80ab8b8 100644
--- a/appserver/concurrent/concurrent-impl/src/main/java/org/glassfish/concurrent/runtime/deployer/ManagedScheduledExecutorServiceDeployer.java
+++ b/appserver/concurrent/concurrent-impl/src/main/java/org/glassfish/concurrent/runtime/deployer/ManagedScheduledExecutorServiceDeployer.java
@@ -33,8 +33,8 @@
import org.glassfish.resources.naming.SerializableObjectRefAddr;
import org.jvnet.hk2.annotations.Service;
-import javax.inject.Inject;
-import javax.inject.Singleton;
+import jakarta.inject.Inject;
+import jakarta.inject.Singleton;
import javax.naming.NamingException;
import javax.naming.RefAddr;
import java.util.Collection;
diff --git a/appserver/concurrent/concurrent-impl/src/main/java/org/glassfish/concurrent/runtime/deployer/ManagedThreadFactoryDeployer.java b/appserver/concurrent/concurrent-impl/src/main/java/org/glassfish/concurrent/runtime/deployer/ManagedThreadFactoryDeployer.java
index ab5fe45..a7a2629 100644
--- a/appserver/concurrent/concurrent-impl/src/main/java/org/glassfish/concurrent/runtime/deployer/ManagedThreadFactoryDeployer.java
+++ b/appserver/concurrent/concurrent-impl/src/main/java/org/glassfish/concurrent/runtime/deployer/ManagedThreadFactoryDeployer.java
@@ -33,8 +33,8 @@
import org.glassfish.resources.naming.SerializableObjectRefAddr;
import org.jvnet.hk2.annotations.Service;
-import javax.inject.Inject;
-import javax.inject.Singleton;
+import jakarta.inject.Inject;
+import jakarta.inject.Singleton;
import javax.naming.NamingException;
import javax.naming.RefAddr;
import java.util.Collection;
diff --git a/appserver/connectors/admin/src/main/java/org/glassfish/connectors/admin/cli/AdminObjectManager.java b/appserver/connectors/admin/src/main/java/org/glassfish/connectors/admin/cli/AdminObjectManager.java
index 45e5cc3..dc0651f 100644
--- a/appserver/connectors/admin/src/main/java/org/glassfish/connectors/admin/cli/AdminObjectManager.java
+++ b/appserver/connectors/admin/src/main/java/org/glassfish/connectors/admin/cli/AdminObjectManager.java
@@ -33,7 +33,7 @@
import org.jvnet.hk2.config.TransactionFailure;
import org.jvnet.hk2.config.types.Property;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
import jakarta.resource.ResourceException;
import java.beans.PropertyVetoException;
import java.util.HashMap;
diff --git a/appserver/connectors/admin/src/main/java/org/glassfish/connectors/admin/cli/ConnectionPoolUtil.java b/appserver/connectors/admin/src/main/java/org/glassfish/connectors/admin/cli/ConnectionPoolUtil.java
index 07a988e..718802f 100644
--- a/appserver/connectors/admin/src/main/java/org/glassfish/connectors/admin/cli/ConnectionPoolUtil.java
+++ b/appserver/connectors/admin/src/main/java/org/glassfish/connectors/admin/cli/ConnectionPoolUtil.java
@@ -24,9 +24,9 @@
import com.sun.enterprise.config.serverbeans.Module;
import org.jvnet.hk2.annotations.Service;
-import javax.inject.Singleton;
+import jakarta.inject.Singleton;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
@Service
@Singleton
diff --git a/appserver/connectors/admin/src/main/java/org/glassfish/connectors/admin/cli/ConnectorConnectionPoolManager.java b/appserver/connectors/admin/src/main/java/org/glassfish/connectors/admin/cli/ConnectorConnectionPoolManager.java
index e438383..fe37bff 100644
--- a/appserver/connectors/admin/src/main/java/org/glassfish/connectors/admin/cli/ConnectorConnectionPoolManager.java
+++ b/appserver/connectors/admin/src/main/java/org/glassfish/connectors/admin/cli/ConnectorConnectionPoolManager.java
@@ -33,7 +33,7 @@
import org.jvnet.hk2.config.TransactionFailure;
import org.jvnet.hk2.config.types.Property;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
import jakarta.resource.ResourceException;
import java.beans.PropertyVetoException;
import java.util.HashMap;
diff --git a/appserver/connectors/admin/src/main/java/org/glassfish/connectors/admin/cli/ConnectorResourceManager.java b/appserver/connectors/admin/src/main/java/org/glassfish/connectors/admin/cli/ConnectorResourceManager.java
index f91dd70..79379cc 100644
--- a/appserver/connectors/admin/src/main/java/org/glassfish/connectors/admin/cli/ConnectorResourceManager.java
+++ b/appserver/connectors/admin/src/main/java/org/glassfish/connectors/admin/cli/ConnectorResourceManager.java
@@ -36,7 +36,7 @@
import org.jvnet.hk2.config.TransactionFailure;
import org.jvnet.hk2.config.types.Property;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
import jakarta.resource.ResourceException;
import java.beans.PropertyVetoException;
import java.util.HashMap;
diff --git a/appserver/connectors/admin/src/main/java/org/glassfish/connectors/admin/cli/CreateAdminObject.java b/appserver/connectors/admin/src/main/java/org/glassfish/connectors/admin/cli/CreateAdminObject.java
index 1e4e0dc..4981aa4 100644
--- a/appserver/connectors/admin/src/main/java/org/glassfish/connectors/admin/cli/CreateAdminObject.java
+++ b/appserver/connectors/admin/src/main/java/org/glassfish/connectors/admin/cli/CreateAdminObject.java
@@ -34,8 +34,8 @@
import org.glassfish.resourcebase.resources.api.ResourceStatus;
import org.jvnet.hk2.annotations.Service;
-import javax.inject.Inject;
-import javax.inject.Provider;
+import jakarta.inject.Inject;
+import jakarta.inject.Provider;
import java.util.HashMap;
import java.util.Properties;
import java.util.logging.Level;
diff --git a/appserver/connectors/admin/src/main/java/org/glassfish/connectors/admin/cli/CreateConnectorConnectionPool.java b/appserver/connectors/admin/src/main/java/org/glassfish/connectors/admin/cli/CreateConnectorConnectionPool.java
index 386340c..80c8fac 100644
--- a/appserver/connectors/admin/src/main/java/org/glassfish/connectors/admin/cli/CreateConnectorConnectionPool.java
+++ b/appserver/connectors/admin/src/main/java/org/glassfish/connectors/admin/cli/CreateConnectorConnectionPool.java
@@ -29,8 +29,8 @@
import org.glassfish.resources.admin.cli.ResourceConstants;
import org.jvnet.hk2.annotations.Service;
-import javax.inject.Inject;
-import javax.inject.Provider;
+import jakarta.inject.Inject;
+import jakarta.inject.Provider;
import java.util.HashMap;
import java.util.Properties;
import java.util.logging.Level;
diff --git a/appserver/connectors/admin/src/main/java/org/glassfish/connectors/admin/cli/CreateConnectorResource.java b/appserver/connectors/admin/src/main/java/org/glassfish/connectors/admin/cli/CreateConnectorResource.java
index 40f4bcf..c0b268b 100644
--- a/appserver/connectors/admin/src/main/java/org/glassfish/connectors/admin/cli/CreateConnectorResource.java
+++ b/appserver/connectors/admin/src/main/java/org/glassfish/connectors/admin/cli/CreateConnectorResource.java
@@ -32,7 +32,7 @@
import org.glassfish.resources.admin.cli.ResourceConstants;
import org.jvnet.hk2.annotations.Service;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
import java.util.HashMap;
import java.util.Properties;
import java.util.logging.Level;
diff --git a/appserver/connectors/admin/src/main/java/org/glassfish/connectors/admin/cli/CreateConnectorSecurityMap.java b/appserver/connectors/admin/src/main/java/org/glassfish/connectors/admin/cli/CreateConnectorSecurityMap.java
index 86c63e5..690c1b0 100644
--- a/appserver/connectors/admin/src/main/java/org/glassfish/connectors/admin/cli/CreateConnectorSecurityMap.java
+++ b/appserver/connectors/admin/src/main/java/org/glassfish/connectors/admin/cli/CreateConnectorSecurityMap.java
@@ -39,7 +39,7 @@
import java.util.Collection;
import java.util.List;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
import static org.glassfish.connectors.admin.cli.CLIConstants.SM.*;
diff --git a/appserver/connectors/admin/src/main/java/org/glassfish/connectors/admin/cli/CreateConnectorWorkSecurityMap.java b/appserver/connectors/admin/src/main/java/org/glassfish/connectors/admin/cli/CreateConnectorWorkSecurityMap.java
index a2e87ab..aac44d2 100644
--- a/appserver/connectors/admin/src/main/java/org/glassfish/connectors/admin/cli/CreateConnectorWorkSecurityMap.java
+++ b/appserver/connectors/admin/src/main/java/org/glassfish/connectors/admin/cli/CreateConnectorWorkSecurityMap.java
@@ -43,7 +43,7 @@
import java.util.logging.Level;
import java.util.logging.Logger;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
import static org.glassfish.connectors.admin.cli.CLIConstants.DESCRIPTION;
import static org.glassfish.connectors.admin.cli.CLIConstants.WSM.*;
diff --git a/appserver/connectors/admin/src/main/java/org/glassfish/connectors/admin/cli/CreateResourceAdapterConfig.java b/appserver/connectors/admin/src/main/java/org/glassfish/connectors/admin/cli/CreateResourceAdapterConfig.java
index 6ce3bd0..8f76a21 100644
--- a/appserver/connectors/admin/src/main/java/org/glassfish/connectors/admin/cli/CreateResourceAdapterConfig.java
+++ b/appserver/connectors/admin/src/main/java/org/glassfish/connectors/admin/cli/CreateResourceAdapterConfig.java
@@ -33,7 +33,7 @@
import org.jvnet.hk2.annotations.Service;
import com.sun.enterprise.config.serverbeans.Module;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
import java.util.HashMap;
import java.util.Properties;
import java.util.logging.Level;
diff --git a/appserver/connectors/admin/src/main/java/org/glassfish/connectors/admin/cli/DeleteAdminObject.java b/appserver/connectors/admin/src/main/java/org/glassfish/connectors/admin/cli/DeleteAdminObject.java
index 419b8f1..19f38b2 100644
--- a/appserver/connectors/admin/src/main/java/org/glassfish/connectors/admin/cli/DeleteAdminObject.java
+++ b/appserver/connectors/admin/src/main/java/org/glassfish/connectors/admin/cli/DeleteAdminObject.java
@@ -35,7 +35,7 @@
import org.jvnet.hk2.config.SingleConfigCode;
import org.jvnet.hk2.config.TransactionFailure;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
import java.beans.PropertyVetoException;
/**
diff --git a/appserver/connectors/admin/src/main/java/org/glassfish/connectors/admin/cli/DeleteConnectorConnectionPool.java b/appserver/connectors/admin/src/main/java/org/glassfish/connectors/admin/cli/DeleteConnectorConnectionPool.java
index 491e91b..148e6b9 100644
--- a/appserver/connectors/admin/src/main/java/org/glassfish/connectors/admin/cli/DeleteConnectorConnectionPool.java
+++ b/appserver/connectors/admin/src/main/java/org/glassfish/connectors/admin/cli/DeleteConnectorConnectionPool.java
@@ -36,7 +36,7 @@
import org.jvnet.hk2.config.SingleConfigCode;
import org.jvnet.hk2.config.TransactionFailure;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
import java.beans.PropertyVetoException;
import java.util.Collection;
import java.util.logging.Level;
diff --git a/appserver/connectors/admin/src/main/java/org/glassfish/connectors/admin/cli/DeleteConnectorResource.java b/appserver/connectors/admin/src/main/java/org/glassfish/connectors/admin/cli/DeleteConnectorResource.java
index 2278e2d..1fc8453 100644
--- a/appserver/connectors/admin/src/main/java/org/glassfish/connectors/admin/cli/DeleteConnectorResource.java
+++ b/appserver/connectors/admin/src/main/java/org/glassfish/connectors/admin/cli/DeleteConnectorResource.java
@@ -36,7 +36,7 @@
import org.jvnet.hk2.config.SingleConfigCode;
import org.jvnet.hk2.config.TransactionFailure;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
import java.beans.PropertyVetoException;
/**
diff --git a/appserver/connectors/admin/src/main/java/org/glassfish/connectors/admin/cli/DeleteConnectorSecurityMap.java b/appserver/connectors/admin/src/main/java/org/glassfish/connectors/admin/cli/DeleteConnectorSecurityMap.java
index 2d3707b..2a9fb08 100644
--- a/appserver/connectors/admin/src/main/java/org/glassfish/connectors/admin/cli/DeleteConnectorSecurityMap.java
+++ b/appserver/connectors/admin/src/main/java/org/glassfish/connectors/admin/cli/DeleteConnectorSecurityMap.java
@@ -41,7 +41,7 @@
import java.util.logging.Level;
import java.util.logging.Logger;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
/**
* Delete Connector Work Security Map
diff --git a/appserver/connectors/admin/src/main/java/org/glassfish/connectors/admin/cli/DeleteConnectorWorkSecurityMap.java b/appserver/connectors/admin/src/main/java/org/glassfish/connectors/admin/cli/DeleteConnectorWorkSecurityMap.java
index b882a7f..577ceb9 100644
--- a/appserver/connectors/admin/src/main/java/org/glassfish/connectors/admin/cli/DeleteConnectorWorkSecurityMap.java
+++ b/appserver/connectors/admin/src/main/java/org/glassfish/connectors/admin/cli/DeleteConnectorWorkSecurityMap.java
@@ -40,7 +40,7 @@
import java.util.logging.Level;
import java.util.logging.Logger;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
/**
* Delete Connector Work Security Map
diff --git a/appserver/connectors/admin/src/main/java/org/glassfish/connectors/admin/cli/DeleteResourceAdapterConfig.java b/appserver/connectors/admin/src/main/java/org/glassfish/connectors/admin/cli/DeleteResourceAdapterConfig.java
index 6cabbf0..660971c 100644
--- a/appserver/connectors/admin/src/main/java/org/glassfish/connectors/admin/cli/DeleteResourceAdapterConfig.java
+++ b/appserver/connectors/admin/src/main/java/org/glassfish/connectors/admin/cli/DeleteResourceAdapterConfig.java
@@ -37,7 +37,7 @@
import java.beans.PropertyVetoException;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
/**
* Delete RA Config command
diff --git a/appserver/connectors/admin/src/main/java/org/glassfish/connectors/admin/cli/FlushConnectionPool.java b/appserver/connectors/admin/src/main/java/org/glassfish/connectors/admin/cli/FlushConnectionPool.java
index 981beb3..15e7980 100644
--- a/appserver/connectors/admin/src/main/java/org/glassfish/connectors/admin/cli/FlushConnectionPool.java
+++ b/appserver/connectors/admin/src/main/java/org/glassfish/connectors/admin/cli/FlushConnectionPool.java
@@ -36,7 +36,7 @@
import org.jvnet.hk2.annotations.Service;
import com.sun.enterprise.config.serverbeans.Module;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
@Service(name = "flush-connection-pool")
@PerLookup
diff --git a/appserver/connectors/admin/src/main/java/org/glassfish/connectors/admin/cli/ListAdminObjects.java b/appserver/connectors/admin/src/main/java/org/glassfish/connectors/admin/cli/ListAdminObjects.java
index 0fcaae6..be0a610 100644
--- a/appserver/connectors/admin/src/main/java/org/glassfish/connectors/admin/cli/ListAdminObjects.java
+++ b/appserver/connectors/admin/src/main/java/org/glassfish/connectors/admin/cli/ListAdminObjects.java
@@ -31,7 +31,7 @@
import org.glassfish.resourcebase.resources.util.BindableResourcesHelper;
import org.jvnet.hk2.annotations.Service;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
import java.util.ArrayList;
import java.util.Collection;
diff --git a/appserver/connectors/admin/src/main/java/org/glassfish/connectors/admin/cli/ListConnectorConnectionPools.java b/appserver/connectors/admin/src/main/java/org/glassfish/connectors/admin/cli/ListConnectorConnectionPools.java
index db83422..de273e8 100644
--- a/appserver/connectors/admin/src/main/java/org/glassfish/connectors/admin/cli/ListConnectorConnectionPools.java
+++ b/appserver/connectors/admin/src/main/java/org/glassfish/connectors/admin/cli/ListConnectorConnectionPools.java
@@ -35,7 +35,7 @@
import java.util.logging.Level;
import java.util.logging.Logger;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
/**
* List Connector Connection Pools command
diff --git a/appserver/connectors/admin/src/main/java/org/glassfish/connectors/admin/cli/ListConnectorResources.java b/appserver/connectors/admin/src/main/java/org/glassfish/connectors/admin/cli/ListConnectorResources.java
index 2460d40..f0e46b8 100644
--- a/appserver/connectors/admin/src/main/java/org/glassfish/connectors/admin/cli/ListConnectorResources.java
+++ b/appserver/connectors/admin/src/main/java/org/glassfish/connectors/admin/cli/ListConnectorResources.java
@@ -30,7 +30,7 @@
import org.glassfish.hk2.api.PerLookup;
import org.jvnet.hk2.annotations.Service;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
import java.util.Collection;
/**
diff --git a/appserver/connectors/admin/src/main/java/org/glassfish/connectors/admin/cli/ListConnectorSecurityMaps.java b/appserver/connectors/admin/src/main/java/org/glassfish/connectors/admin/cli/ListConnectorSecurityMaps.java
index 5a4fe05..717e968 100644
--- a/appserver/connectors/admin/src/main/java/org/glassfish/connectors/admin/cli/ListConnectorSecurityMaps.java
+++ b/appserver/connectors/admin/src/main/java/org/glassfish/connectors/admin/cli/ListConnectorSecurityMaps.java
@@ -38,7 +38,7 @@
import java.util.logging.Level;
import java.util.logging.Logger;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
import org.glassfish.internal.api.RelativePathResolver;
import org.jvnet.hk2.config.ConfigBean;
import org.jvnet.hk2.config.Dom;
diff --git a/appserver/connectors/admin/src/main/java/org/glassfish/connectors/admin/cli/ListConnectorWorkSecurityMaps.java b/appserver/connectors/admin/src/main/java/org/glassfish/connectors/admin/cli/ListConnectorWorkSecurityMaps.java
index 4d6c57b..b19acf7 100644
--- a/appserver/connectors/admin/src/main/java/org/glassfish/connectors/admin/cli/ListConnectorWorkSecurityMaps.java
+++ b/appserver/connectors/admin/src/main/java/org/glassfish/connectors/admin/cli/ListConnectorWorkSecurityMaps.java
@@ -35,7 +35,7 @@
import java.util.logging.Logger;
import org.glassfish.api.admin.*;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
/**
* List Connector Work Security Maps
diff --git a/appserver/connectors/admin/src/main/java/org/glassfish/connectors/admin/cli/ListResourceAdapterConfigs.java b/appserver/connectors/admin/src/main/java/org/glassfish/connectors/admin/cli/ListResourceAdapterConfigs.java
index 3f15c3d..8669627 100644
--- a/appserver/connectors/admin/src/main/java/org/glassfish/connectors/admin/cli/ListResourceAdapterConfigs.java
+++ b/appserver/connectors/admin/src/main/java/org/glassfish/connectors/admin/cli/ListResourceAdapterConfigs.java
@@ -39,7 +39,7 @@
import java.util.logging.Level;
import java.util.logging.Logger;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
/**
* List Resource Adapter Configs command
diff --git a/appserver/connectors/admin/src/main/java/org/glassfish/connectors/admin/cli/ListResources.java b/appserver/connectors/admin/src/main/java/org/glassfish/connectors/admin/cli/ListResources.java
index 7710154..73c3d52 100644
--- a/appserver/connectors/admin/src/main/java/org/glassfish/connectors/admin/cli/ListResources.java
+++ b/appserver/connectors/admin/src/main/java/org/glassfish/connectors/admin/cli/ListResources.java
@@ -28,7 +28,7 @@
import org.jvnet.hk2.annotations.Service;
import com.sun.enterprise.config.serverbeans.Module;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
diff --git a/appserver/connectors/admin/src/main/java/org/glassfish/connectors/admin/cli/PingConnectionPool.java b/appserver/connectors/admin/src/main/java/org/glassfish/connectors/admin/cli/PingConnectionPool.java
index 40e2241..6640bfb 100644
--- a/appserver/connectors/admin/src/main/java/org/glassfish/connectors/admin/cli/PingConnectionPool.java
+++ b/appserver/connectors/admin/src/main/java/org/glassfish/connectors/admin/cli/PingConnectionPool.java
@@ -30,7 +30,7 @@
import org.jvnet.hk2.annotations.Service;
import com.sun.enterprise.config.serverbeans.Module;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
/**
* Ping Connection Pool Command
diff --git a/appserver/connectors/admin/src/main/java/org/glassfish/connectors/admin/cli/UpdateConnectorSecurityMap.java b/appserver/connectors/admin/src/main/java/org/glassfish/connectors/admin/cli/UpdateConnectorSecurityMap.java
index 98b9957..9e87588 100644
--- a/appserver/connectors/admin/src/main/java/org/glassfish/connectors/admin/cli/UpdateConnectorSecurityMap.java
+++ b/appserver/connectors/admin/src/main/java/org/glassfish/connectors/admin/cli/UpdateConnectorSecurityMap.java
@@ -43,7 +43,7 @@
import org.glassfish.api.admin.RestEndpoint;
import org.glassfish.api.admin.RestEndpoints;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
/**
* Update Connector SecurityMap command
diff --git a/appserver/connectors/admin/src/main/java/org/glassfish/connectors/admin/cli/UpdateConnectorWorkSecurityMap.java b/appserver/connectors/admin/src/main/java/org/glassfish/connectors/admin/cli/UpdateConnectorWorkSecurityMap.java
index 6ce5fc0..e731a1b 100644
--- a/appserver/connectors/admin/src/main/java/org/glassfish/connectors/admin/cli/UpdateConnectorWorkSecurityMap.java
+++ b/appserver/connectors/admin/src/main/java/org/glassfish/connectors/admin/cli/UpdateConnectorWorkSecurityMap.java
@@ -37,7 +37,7 @@
import java.util.*;
import org.glassfish.api.admin.*;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
/**
* Update Connector Work Security Map command
diff --git a/appserver/connectors/admin/src/main/java/org/glassfish/connectors/admin/cli/internal/GetActivationSpecClass.java b/appserver/connectors/admin/src/main/java/org/glassfish/connectors/admin/cli/internal/GetActivationSpecClass.java
index 49075c2..6cac15c 100644
--- a/appserver/connectors/admin/src/main/java/org/glassfish/connectors/admin/cli/internal/GetActivationSpecClass.java
+++ b/appserver/connectors/admin/src/main/java/org/glassfish/connectors/admin/cli/internal/GetActivationSpecClass.java
@@ -30,7 +30,7 @@
import org.jvnet.hk2.annotations.Service;
import org.glassfish.hk2.api.PerLookup;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
/**
* @author Jagadish Ramu
diff --git a/appserver/connectors/admin/src/main/java/org/glassfish/connectors/admin/cli/internal/GetAdminObjectClassNames.java b/appserver/connectors/admin/src/main/java/org/glassfish/connectors/admin/cli/internal/GetAdminObjectClassNames.java
index b46ba27..708b7f1 100644
--- a/appserver/connectors/admin/src/main/java/org/glassfish/connectors/admin/cli/internal/GetAdminObjectClassNames.java
+++ b/appserver/connectors/admin/src/main/java/org/glassfish/connectors/admin/cli/internal/GetAdminObjectClassNames.java
@@ -33,7 +33,7 @@
import org.glassfish.api.admin.RestEndpoints;
import org.glassfish.api.admin.RestParam;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
/**
* @author Jagadish Ramu
diff --git a/appserver/connectors/admin/src/main/java/org/glassfish/connectors/admin/cli/internal/GetAdminObjectConfigProps.java b/appserver/connectors/admin/src/main/java/org/glassfish/connectors/admin/cli/internal/GetAdminObjectConfigProps.java
index 84a6bf1..13fc310 100644
--- a/appserver/connectors/admin/src/main/java/org/glassfish/connectors/admin/cli/internal/GetAdminObjectConfigProps.java
+++ b/appserver/connectors/admin/src/main/java/org/glassfish/connectors/admin/cli/internal/GetAdminObjectConfigProps.java
@@ -35,7 +35,7 @@
import org.glassfish.api.admin.RestEndpoint;
import org.glassfish.api.admin.RestEndpoints;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
/**
* @author Jagadish Ramu
diff --git a/appserver/connectors/admin/src/main/java/org/glassfish/connectors/admin/cli/internal/GetAdminObjectInterfaceNames.java b/appserver/connectors/admin/src/main/java/org/glassfish/connectors/admin/cli/internal/GetAdminObjectInterfaceNames.java
index 71998d5..19d11f3 100644
--- a/appserver/connectors/admin/src/main/java/org/glassfish/connectors/admin/cli/internal/GetAdminObjectInterfaceNames.java
+++ b/appserver/connectors/admin/src/main/java/org/glassfish/connectors/admin/cli/internal/GetAdminObjectInterfaceNames.java
@@ -32,7 +32,7 @@
import org.glassfish.api.admin.RestEndpoint;
import org.glassfish.api.admin.RestEndpoints;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
/**
* @author Jagadish Ramu
diff --git a/appserver/connectors/admin/src/main/java/org/glassfish/connectors/admin/cli/internal/GetBuiltInCustomResources.java b/appserver/connectors/admin/src/main/java/org/glassfish/connectors/admin/cli/internal/GetBuiltInCustomResources.java
index 8223f59..c0003c3 100644
--- a/appserver/connectors/admin/src/main/java/org/glassfish/connectors/admin/cli/internal/GetBuiltInCustomResources.java
+++ b/appserver/connectors/admin/src/main/java/org/glassfish/connectors/admin/cli/internal/GetBuiltInCustomResources.java
@@ -31,7 +31,7 @@
import org.glassfish.api.admin.RestEndpoint;
import org.glassfish.api.admin.RestEndpoints;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
/**
* @author Jagadish Ramu
diff --git a/appserver/connectors/admin/src/main/java/org/glassfish/connectors/admin/cli/internal/GetConnectionDefinitionNames.java b/appserver/connectors/admin/src/main/java/org/glassfish/connectors/admin/cli/internal/GetConnectionDefinitionNames.java
index baf4621..dbb7213 100644
--- a/appserver/connectors/admin/src/main/java/org/glassfish/connectors/admin/cli/internal/GetConnectionDefinitionNames.java
+++ b/appserver/connectors/admin/src/main/java/org/glassfish/connectors/admin/cli/internal/GetConnectionDefinitionNames.java
@@ -32,7 +32,7 @@
import org.glassfish.api.admin.RestEndpoint;
import org.glassfish.api.admin.RestEndpoints;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
/**
* @author Jagadish Ramu
diff --git a/appserver/connectors/admin/src/main/java/org/glassfish/connectors/admin/cli/internal/GetConnectionDefinitionPropertiesAndDefaults.java b/appserver/connectors/admin/src/main/java/org/glassfish/connectors/admin/cli/internal/GetConnectionDefinitionPropertiesAndDefaults.java
index 22a5a00..6ccc95c 100644
--- a/appserver/connectors/admin/src/main/java/org/glassfish/connectors/admin/cli/internal/GetConnectionDefinitionPropertiesAndDefaults.java
+++ b/appserver/connectors/admin/src/main/java/org/glassfish/connectors/admin/cli/internal/GetConnectionDefinitionPropertiesAndDefaults.java
@@ -32,7 +32,7 @@
import org.glassfish.api.admin.RestEndpoint;
import org.glassfish.api.admin.RestEndpoints;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
/**
* @author Jagadish Ramu
diff --git a/appserver/connectors/admin/src/main/java/org/glassfish/connectors/admin/cli/internal/GetConnectorConfigJavaBeans.java b/appserver/connectors/admin/src/main/java/org/glassfish/connectors/admin/cli/internal/GetConnectorConfigJavaBeans.java
index dfd564c..5047531 100644
--- a/appserver/connectors/admin/src/main/java/org/glassfish/connectors/admin/cli/internal/GetConnectorConfigJavaBeans.java
+++ b/appserver/connectors/admin/src/main/java/org/glassfish/connectors/admin/cli/internal/GetConnectorConfigJavaBeans.java
@@ -32,7 +32,7 @@
import org.glassfish.api.admin.RestEndpoint;
import org.glassfish.api.admin.RestEndpoints;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
/**
* @author Jagadish Ramu
diff --git a/appserver/connectors/admin/src/main/java/org/glassfish/connectors/admin/cli/internal/GetMCFConfigProperties.java b/appserver/connectors/admin/src/main/java/org/glassfish/connectors/admin/cli/internal/GetMCFConfigProperties.java
index 6c958e1..a5f2fe4 100644
--- a/appserver/connectors/admin/src/main/java/org/glassfish/connectors/admin/cli/internal/GetMCFConfigProperties.java
+++ b/appserver/connectors/admin/src/main/java/org/glassfish/connectors/admin/cli/internal/GetMCFConfigProperties.java
@@ -34,7 +34,7 @@
import org.glassfish.api.admin.RestEndpoint;
import org.glassfish.api.admin.RestEndpoints;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
/**
* @author Jagadish Ramu
diff --git a/appserver/connectors/admin/src/main/java/org/glassfish/connectors/admin/cli/internal/GetMessageListenerConfigProperties.java b/appserver/connectors/admin/src/main/java/org/glassfish/connectors/admin/cli/internal/GetMessageListenerConfigProperties.java
index aa72530..7b87809 100644
--- a/appserver/connectors/admin/src/main/java/org/glassfish/connectors/admin/cli/internal/GetMessageListenerConfigProperties.java
+++ b/appserver/connectors/admin/src/main/java/org/glassfish/connectors/admin/cli/internal/GetMessageListenerConfigProperties.java
@@ -34,7 +34,7 @@
import org.glassfish.api.admin.RestEndpoint;
import org.glassfish.api.admin.RestEndpoints;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
/**
* @author Jagadish Ramu
diff --git a/appserver/connectors/admin/src/main/java/org/glassfish/connectors/admin/cli/internal/GetMessageListenerConfigPropertyTypes.java b/appserver/connectors/admin/src/main/java/org/glassfish/connectors/admin/cli/internal/GetMessageListenerConfigPropertyTypes.java
index d7d7d28..585aded 100644
--- a/appserver/connectors/admin/src/main/java/org/glassfish/connectors/admin/cli/internal/GetMessageListenerConfigPropertyTypes.java
+++ b/appserver/connectors/admin/src/main/java/org/glassfish/connectors/admin/cli/internal/GetMessageListenerConfigPropertyTypes.java
@@ -32,7 +32,7 @@
import org.glassfish.api.admin.RestEndpoint;
import org.glassfish.api.admin.RestEndpoints;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
/**
* @author Jagadish Ramu
diff --git a/appserver/connectors/admin/src/main/java/org/glassfish/connectors/admin/cli/internal/GetMessageListenerTypes.java b/appserver/connectors/admin/src/main/java/org/glassfish/connectors/admin/cli/internal/GetMessageListenerTypes.java
index cff6ed7..0fe4b2d 100644
--- a/appserver/connectors/admin/src/main/java/org/glassfish/connectors/admin/cli/internal/GetMessageListenerTypes.java
+++ b/appserver/connectors/admin/src/main/java/org/glassfish/connectors/admin/cli/internal/GetMessageListenerTypes.java
@@ -32,7 +32,7 @@
import org.glassfish.api.admin.RestEndpoint;
import org.glassfish.api.admin.RestEndpoints;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
/**
* @author Jagadish Ramu
diff --git a/appserver/connectors/admin/src/main/java/org/glassfish/connectors/admin/cli/internal/GetResourceAdapterConfigProperties.java b/appserver/connectors/admin/src/main/java/org/glassfish/connectors/admin/cli/internal/GetResourceAdapterConfigProperties.java
index f80eb77..7cc38bd 100644
--- a/appserver/connectors/admin/src/main/java/org/glassfish/connectors/admin/cli/internal/GetResourceAdapterConfigProperties.java
+++ b/appserver/connectors/admin/src/main/java/org/glassfish/connectors/admin/cli/internal/GetResourceAdapterConfigProperties.java
@@ -34,7 +34,7 @@
import org.glassfish.api.admin.RestEndpoint;
import org.glassfish.api.admin.RestEndpoints;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
/**
* @author Jagadish Ramu
diff --git a/appserver/connectors/admin/src/main/java/org/glassfish/connectors/admin/cli/internal/GetSystemRarsAllowingPoolCreation.java b/appserver/connectors/admin/src/main/java/org/glassfish/connectors/admin/cli/internal/GetSystemRarsAllowingPoolCreation.java
index 1a1b6fe..b0a4b67 100644
--- a/appserver/connectors/admin/src/main/java/org/glassfish/connectors/admin/cli/internal/GetSystemRarsAllowingPoolCreation.java
+++ b/appserver/connectors/admin/src/main/java/org/glassfish/connectors/admin/cli/internal/GetSystemRarsAllowingPoolCreation.java
@@ -31,7 +31,7 @@
import org.glassfish.api.admin.RestEndpoint;
import org.glassfish.api.admin.RestEndpoints;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
/**
* @author Jagadish Ramu
diff --git a/appserver/connectors/connectors-connector/src/main/java/com/sun/enterprise/connectors/connector/module/ConnectorSniffer.java b/appserver/connectors/connectors-connector/src/main/java/com/sun/enterprise/connectors/connector/module/ConnectorSniffer.java
index e47bad0..f1074de 100644
--- a/appserver/connectors/connectors-connector/src/main/java/com/sun/enterprise/connectors/connector/module/ConnectorSniffer.java
+++ b/appserver/connectors/connectors-connector/src/main/java/com/sun/enterprise/connectors/connector/module/ConnectorSniffer.java
@@ -25,7 +25,7 @@
import org.glassfish.deployment.common.DeploymentUtils;
import org.jvnet.hk2.annotations.Service;
-import javax.inject.Singleton;
+import jakarta.inject.Singleton;
import java.io.IOException;
import java.util.logging.Logger;
@@ -33,7 +33,7 @@
import java.util.ArrayList;
import java.lang.annotation.Annotation;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
/**
* Sniffer for detecting resource-adapter modules
diff --git a/appserver/connectors/connectors-connector/src/main/java/com/sun/enterprise/connectors/connector/module/RarDetector.java b/appserver/connectors/connectors-connector/src/main/java/com/sun/enterprise/connectors/connector/module/RarDetector.java
index 6ace7b7..45577e9 100644
--- a/appserver/connectors/connectors-connector/src/main/java/com/sun/enterprise/connectors/connector/module/RarDetector.java
+++ b/appserver/connectors/connectors-connector/src/main/java/com/sun/enterprise/connectors/connector/module/RarDetector.java
@@ -26,12 +26,12 @@
import org.jvnet.hk2.annotations.Service;
import org.glassfish.hk2.api.ServiceLocator;
-import javax.inject.Singleton;
+import jakarta.inject.Singleton;
import java.io.IOException;
import java.util.logging.Logger;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
/**
* Detects rar type archives.
diff --git a/appserver/connectors/connectors-connector/src/main/java/com/sun/enterprise/connectors/connector/module/RarType.java b/appserver/connectors/connectors-connector/src/main/java/com/sun/enterprise/connectors/connector/module/RarType.java
index d219aaf..ca2b129 100644
--- a/appserver/connectors/connectors-connector/src/main/java/com/sun/enterprise/connectors/connector/module/RarType.java
+++ b/appserver/connectors/connectors-connector/src/main/java/com/sun/enterprise/connectors/connector/module/RarType.java
@@ -26,7 +26,7 @@
* @author sanjeeb.sahoo@oracle.com
*/
@Service(name = RarType.ARCHIVE_TYPE)
-@javax.inject.Singleton
+@jakarta.inject.Singleton
public class RarType extends ArchiveType {
/**
* same as what's returned by {@link javax.enterprise.deploy.shared.ModuleType#RAR#toString()}
diff --git a/appserver/connectors/connectors-inbound-runtime/src/main/java/com/sun/enterprise/connectors/inbound/ConnectorMessageBeanClientFactory.java b/appserver/connectors/connectors-inbound-runtime/src/main/java/com/sun/enterprise/connectors/inbound/ConnectorMessageBeanClientFactory.java
index c2cf961..f7fc306 100755
--- a/appserver/connectors/connectors-inbound-runtime/src/main/java/com/sun/enterprise/connectors/inbound/ConnectorMessageBeanClientFactory.java
+++ b/appserver/connectors/connectors-inbound-runtime/src/main/java/com/sun/enterprise/connectors/inbound/ConnectorMessageBeanClientFactory.java
@@ -22,7 +22,7 @@
import org.glassfish.ejb.spi.MessageBeanClient;
import org.jvnet.hk2.annotations.Service;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
/**
* MessageBeanClientFactory for connector message bean clients.
diff --git a/appserver/connectors/connectors-inbound-runtime/src/main/java/com/sun/enterprise/connectors/inbound/InboundRecoveryHandler.java b/appserver/connectors/connectors-inbound-runtime/src/main/java/com/sun/enterprise/connectors/inbound/InboundRecoveryHandler.java
index 221596d..d14a6e6 100644
--- a/appserver/connectors/connectors-inbound-runtime/src/main/java/com/sun/enterprise/connectors/inbound/InboundRecoveryHandler.java
+++ b/appserver/connectors/connectors-inbound-runtime/src/main/java/com/sun/enterprise/connectors/inbound/InboundRecoveryHandler.java
@@ -24,8 +24,8 @@
import java.util.Vector;
import java.util.logging.Level;
import java.util.logging.Logger;
-import javax.inject.Inject;
-import javax.inject.Provider;
+import jakarta.inject.Inject;
+import jakarta.inject.Provider;
import jakarta.resource.spi.ActivationSpec;
import javax.transaction.xa.XAResource;
diff --git a/appserver/connectors/connectors-internal-api/src/main/java/com/sun/appserv/connectors/internal/ConnectorResourceManagerLifecycleListener.java b/appserver/connectors/connectors-internal-api/src/main/java/com/sun/appserv/connectors/internal/ConnectorResourceManagerLifecycleListener.java
index 6411441..70a7599 100644
--- a/appserver/connectors/connectors-internal-api/src/main/java/com/sun/appserv/connectors/internal/ConnectorResourceManagerLifecycleListener.java
+++ b/appserver/connectors/connectors-internal-api/src/main/java/com/sun/appserv/connectors/internal/ConnectorResourceManagerLifecycleListener.java
@@ -21,9 +21,9 @@
import java.util.logging.Level;
import java.util.logging.Logger;
-import javax.inject.Inject;
-import javax.inject.Provider;
-import javax.inject.Singleton;
+import jakarta.inject.Inject;
+import jakarta.inject.Provider;
+import jakarta.inject.Singleton;
import javax.naming.NamingException;
import org.glassfish.api.ActionReport;
diff --git a/appserver/connectors/connectors-internal-api/src/main/java/com/sun/appserv/connectors/internal/api/AppSpecificConnectorClassLoaderUtil.java b/appserver/connectors/connectors-internal-api/src/main/java/com/sun/appserv/connectors/internal/api/AppSpecificConnectorClassLoaderUtil.java
index c3a6f1e..992629d 100644
--- a/appserver/connectors/connectors-internal-api/src/main/java/com/sun/appserv/connectors/internal/api/AppSpecificConnectorClassLoaderUtil.java
+++ b/appserver/connectors/connectors-internal-api/src/main/java/com/sun/appserv/connectors/internal/api/AppSpecificConnectorClassLoaderUtil.java
@@ -25,9 +25,9 @@
import java.util.StringTokenizer;
import java.util.logging.Level;
import java.util.logging.Logger;
-import javax.inject.Inject;
-import javax.inject.Named;
-import javax.inject.Provider;
+import jakarta.inject.Inject;
+import jakarta.inject.Named;
+import jakarta.inject.Provider;
import com.sun.enterprise.config.serverbeans.Applications;
import com.sun.enterprise.config.serverbeans.BindableResource;
diff --git a/appserver/connectors/connectors-internal-api/src/main/java/com/sun/appserv/connectors/internal/api/ConnectorClassLoaderServiceImpl.java b/appserver/connectors/connectors-internal-api/src/main/java/com/sun/appserv/connectors/internal/api/ConnectorClassLoaderServiceImpl.java
index d374378..0fc251f 100644
--- a/appserver/connectors/connectors-internal-api/src/main/java/com/sun/appserv/connectors/internal/api/ConnectorClassLoaderServiceImpl.java
+++ b/appserver/connectors/connectors-internal-api/src/main/java/com/sun/appserv/connectors/internal/api/ConnectorClassLoaderServiceImpl.java
@@ -27,8 +27,8 @@
import com.sun.logging.LogDomains;
-import javax.inject.Inject;
-import javax.inject.Provider;
+import jakarta.inject.Inject;
+import jakarta.inject.Provider;
/**
* We support two policies:
diff --git a/appserver/connectors/connectors-internal-api/src/main/java/com/sun/appserv/connectors/internal/api/ConnectorDescriptorProxy.java b/appserver/connectors/connectors-internal-api/src/main/java/com/sun/appserv/connectors/internal/api/ConnectorDescriptorProxy.java
index 0565f13..154872a 100644
--- a/appserver/connectors/connectors-internal-api/src/main/java/com/sun/appserv/connectors/internal/api/ConnectorDescriptorProxy.java
+++ b/appserver/connectors/connectors-internal-api/src/main/java/com/sun/appserv/connectors/internal/api/ConnectorDescriptorProxy.java
@@ -21,8 +21,8 @@
import org.glassfish.hk2.api.PerLookup;
-import javax.inject.Inject;
-import javax.inject.Provider;
+import jakarta.inject.Inject;
+import jakarta.inject.Provider;
import javax.naming.Context;
import javax.naming.NamingException;
diff --git a/appserver/connectors/connectors-internal-api/src/main/java/com/sun/appserv/connectors/internal/api/ConnectorsClassLoaderUtil.java b/appserver/connectors/connectors-internal-api/src/main/java/com/sun/appserv/connectors/internal/api/ConnectorsClassLoaderUtil.java
index db8cd22..9a778a7 100644
--- a/appserver/connectors/connectors-internal-api/src/main/java/com/sun/appserv/connectors/internal/api/ConnectorsClassLoaderUtil.java
+++ b/appserver/connectors/connectors-internal-api/src/main/java/com/sun/appserv/connectors/internal/api/ConnectorsClassLoaderUtil.java
@@ -24,7 +24,7 @@
import org.glassfish.api.event.EventTypes;
import org.jvnet.hk2.annotations.Service;
-import javax.inject.Singleton;
+import jakarta.inject.Singleton;
import java.io.*;
import java.net.MalformedURLException;
@@ -42,7 +42,7 @@
import com.sun.logging.LogDomains;
import java.util.Locale;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
/**
diff --git a/appserver/connectors/connectors-runtime/src/main/java/com/sun/enterprise/connectors/ActiveOutboundResourceAdapter.java b/appserver/connectors/connectors-runtime/src/main/java/com/sun/enterprise/connectors/ActiveOutboundResourceAdapter.java
index 1a738aa..092ae97 100755
--- a/appserver/connectors/connectors-runtime/src/main/java/com/sun/enterprise/connectors/ActiveOutboundResourceAdapter.java
+++ b/appserver/connectors/connectors-runtime/src/main/java/com/sun/enterprise/connectors/ActiveOutboundResourceAdapter.java
@@ -34,7 +34,7 @@
import org.jvnet.hk2.annotations.Service;
import org.jvnet.hk2.config.types.Property;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
import javax.naming.NamingException;
import javax.naming.Reference;
import jakarta.resource.ResourceException;
diff --git a/appserver/connectors/connectors-runtime/src/main/java/com/sun/enterprise/connectors/ActiveRAFactory.java b/appserver/connectors/connectors-runtime/src/main/java/com/sun/enterprise/connectors/ActiveRAFactory.java
index adedd89..1488a2f 100755
--- a/appserver/connectors/connectors-runtime/src/main/java/com/sun/enterprise/connectors/ActiveRAFactory.java
+++ b/appserver/connectors/connectors-runtime/src/main/java/com/sun/enterprise/connectors/ActiveRAFactory.java
@@ -21,7 +21,7 @@
import com.sun.enterprise.util.Utility;
import com.sun.logging.LogDomains;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
import jakarta.resource.spi.ResourceAdapter;
import java.util.logging.Level;
import java.util.logging.Logger;
@@ -31,7 +31,7 @@
import org.glassfish.hk2.api.ServiceLocator;
import org.jvnet.hk2.annotations.Service;
-import javax.inject.Singleton;
+import jakarta.inject.Singleton;
/**
* Factory creating Active Resource adapters.
diff --git a/appserver/connectors/connectors-runtime/src/main/java/com/sun/enterprise/connectors/ConnectorRuntime.java b/appserver/connectors/connectors-runtime/src/main/java/com/sun/enterprise/connectors/ConnectorRuntime.java
index da46d16..07096cc 100755
--- a/appserver/connectors/connectors-runtime/src/main/java/com/sun/enterprise/connectors/ConnectorRuntime.java
+++ b/appserver/connectors/connectors-runtime/src/main/java/com/sun/enterprise/connectors/ConnectorRuntime.java
@@ -65,10 +65,10 @@
import org.jvnet.hk2.config.types.Property;
import com.sun.enterprise.config.serverbeans.Module;
-import javax.inject.Inject;
-import javax.inject.Named;
-import javax.inject.Provider;
-import javax.inject.Singleton;
+import jakarta.inject.Inject;
+import jakarta.inject.Named;
+import jakarta.inject.Provider;
+import jakarta.inject.Singleton;
import javax.naming.NamingException;
import jakarta.resource.ResourceException;
import jakarta.resource.spi.ConnectionManager;
diff --git a/appserver/connectors/connectors-runtime/src/main/java/com/sun/enterprise/connectors/deployment/util/ConnectorArchivist.java b/appserver/connectors/connectors-runtime/src/main/java/com/sun/enterprise/connectors/deployment/util/ConnectorArchivist.java
index a9314bf..9bfcd9d 100644
--- a/appserver/connectors/connectors-runtime/src/main/java/com/sun/enterprise/connectors/deployment/util/ConnectorArchivist.java
+++ b/appserver/connectors/connectors-runtime/src/main/java/com/sun/enterprise/connectors/deployment/util/ConnectorArchivist.java
@@ -37,7 +37,7 @@
import java.util.List;
import java.util.ArrayList;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
/**
* This class is responsible for handling J2EE Connector archive files.
diff --git a/appserver/connectors/connectors-runtime/src/main/java/com/sun/enterprise/connectors/module/ConnectorDeployer.java b/appserver/connectors/connectors-runtime/src/main/java/com/sun/enterprise/connectors/module/ConnectorDeployer.java
index 967b330..b52f615 100644
--- a/appserver/connectors/connectors-runtime/src/main/java/com/sun/enterprise/connectors/module/ConnectorDeployer.java
+++ b/appserver/connectors/connectors-runtime/src/main/java/com/sun/enterprise/connectors/module/ConnectorDeployer.java
@@ -52,7 +52,7 @@
import org.jvnet.hk2.config.TransactionFailure;
import com.sun.enterprise.config.serverbeans.Module;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
import jakarta.validation.*;
import jakarta.validation.bootstrap.GenericBootstrap;
import java.beans.PropertyVetoException;
diff --git a/appserver/connectors/connectors-runtime/src/main/java/com/sun/enterprise/connectors/module/RarHandler.java b/appserver/connectors/connectors-runtime/src/main/java/com/sun/enterprise/connectors/module/RarHandler.java
index 58514b7..93e10f6 100644
--- a/appserver/connectors/connectors-runtime/src/main/java/com/sun/enterprise/connectors/module/RarHandler.java
+++ b/appserver/connectors/connectors-runtime/src/main/java/com/sun/enterprise/connectors/module/RarHandler.java
@@ -40,8 +40,8 @@
import java.util.logging.Level;
import java.util.logging.Logger;
-import javax.inject.Inject;
-import javax.inject.Named;
+import jakarta.inject.Inject;
+import jakarta.inject.Named;
/**
* Archive handler for resource-adapters
diff --git a/appserver/connectors/connectors-runtime/src/main/java/com/sun/enterprise/resource/deployer/AdminObjectResourceDeployer.java b/appserver/connectors/connectors-runtime/src/main/java/com/sun/enterprise/resource/deployer/AdminObjectResourceDeployer.java
index 5b8a560..cd68771 100644
--- a/appserver/connectors/connectors-runtime/src/main/java/com/sun/enterprise/resource/deployer/AdminObjectResourceDeployer.java
+++ b/appserver/connectors/connectors-runtime/src/main/java/com/sun/enterprise/resource/deployer/AdminObjectResourceDeployer.java
@@ -27,8 +27,8 @@
import org.jvnet.hk2.annotations.Service;
import org.jvnet.hk2.config.types.Property;
-import javax.inject.Inject;
-import javax.inject.Singleton;
+import jakarta.inject.Inject;
+import jakarta.inject.Singleton;
import java.util.List;
import java.util.Properties;
import java.util.logging.Level;
diff --git a/appserver/connectors/connectors-runtime/src/main/java/com/sun/enterprise/resource/deployer/AdministeredObjectDefinitionDeployer.java b/appserver/connectors/connectors-runtime/src/main/java/com/sun/enterprise/resource/deployer/AdministeredObjectDefinitionDeployer.java
index dd2222c..944e496 100644
--- a/appserver/connectors/connectors-runtime/src/main/java/com/sun/enterprise/resource/deployer/AdministeredObjectDefinitionDeployer.java
+++ b/appserver/connectors/connectors-runtime/src/main/java/com/sun/enterprise/resource/deployer/AdministeredObjectDefinitionDeployer.java
@@ -31,8 +31,8 @@
import org.jvnet.hk2.config.TransactionFailure;
import org.jvnet.hk2.config.types.Property;
-import javax.inject.Inject;
-import javax.inject.Provider;
+import jakarta.inject.Inject;
+import jakarta.inject.Provider;
import java.beans.PropertyVetoException;
import java.util.ArrayList;
import java.util.Collection;
diff --git a/appserver/connectors/connectors-runtime/src/main/java/com/sun/enterprise/resource/deployer/ConnectionFactoryDefinitionDeployer.java b/appserver/connectors/connectors-runtime/src/main/java/com/sun/enterprise/resource/deployer/ConnectionFactoryDefinitionDeployer.java
index 53ac1d7..eaac665 100644
--- a/appserver/connectors/connectors-runtime/src/main/java/com/sun/enterprise/resource/deployer/ConnectionFactoryDefinitionDeployer.java
+++ b/appserver/connectors/connectors-runtime/src/main/java/com/sun/enterprise/resource/deployer/ConnectionFactoryDefinitionDeployer.java
@@ -32,8 +32,8 @@
import org.jvnet.hk2.config.TransactionFailure;
import org.jvnet.hk2.config.types.Property;
-import javax.inject.Inject;
-import javax.inject.Provider;
+import jakarta.inject.Inject;
+import jakarta.inject.Provider;
import java.beans.PropertyVetoException;
import java.util.ArrayList;
import java.util.Collection;
diff --git a/appserver/connectors/connectors-runtime/src/main/java/com/sun/enterprise/resource/deployer/ConnectorConnectionPoolDeployer.java b/appserver/connectors/connectors-runtime/src/main/java/com/sun/enterprise/resource/deployer/ConnectorConnectionPoolDeployer.java
index 75ae813..52d1e29 100644
--- a/appserver/connectors/connectors-runtime/src/main/java/com/sun/enterprise/resource/deployer/ConnectorConnectionPoolDeployer.java
+++ b/appserver/connectors/connectors-runtime/src/main/java/com/sun/enterprise/resource/deployer/ConnectorConnectionPoolDeployer.java
@@ -37,8 +37,8 @@
import org.jvnet.hk2.annotations.Service;
import org.jvnet.hk2.config.types.Property;
-import javax.inject.Inject;
-import javax.inject.Singleton;
+import jakarta.inject.Inject;
+import jakarta.inject.Singleton;
import java.util.*;
import java.util.logging.Level;
import java.util.logging.Logger;
diff --git a/appserver/connectors/connectors-runtime/src/main/java/com/sun/enterprise/resource/deployer/ConnectorResourceDeployer.java b/appserver/connectors/connectors-runtime/src/main/java/com/sun/enterprise/resource/deployer/ConnectorResourceDeployer.java
index 01b4cf9..cefac77 100644
--- a/appserver/connectors/connectors-runtime/src/main/java/com/sun/enterprise/resource/deployer/ConnectorResourceDeployer.java
+++ b/appserver/connectors/connectors-runtime/src/main/java/com/sun/enterprise/resource/deployer/ConnectorResourceDeployer.java
@@ -31,8 +31,8 @@
import org.glassfish.resourcebase.resources.api.ResourceInfo;
import org.jvnet.hk2.annotations.Service;
-import javax.inject.Inject;
-import javax.inject.Singleton;
+import jakarta.inject.Inject;
+import jakarta.inject.Singleton;
import java.util.logging.Level;
import java.util.logging.Logger;
diff --git a/appserver/connectors/connectors-runtime/src/main/java/com/sun/enterprise/resource/deployer/ConnectorWorkSecurityMapDeployer.java b/appserver/connectors/connectors-runtime/src/main/java/com/sun/enterprise/resource/deployer/ConnectorWorkSecurityMapDeployer.java
index bc79d29..7a64340 100644
--- a/appserver/connectors/connectors-runtime/src/main/java/com/sun/enterprise/resource/deployer/ConnectorWorkSecurityMapDeployer.java
+++ b/appserver/connectors/connectors-runtime/src/main/java/com/sun/enterprise/resource/deployer/ConnectorWorkSecurityMapDeployer.java
@@ -21,7 +21,7 @@
import org.glassfish.resourcebase.resources.api.ResourceDeployerInfo;
import org.jvnet.hk2.annotations.Service;
-import javax.inject.Singleton;
+import jakarta.inject.Singleton;
@Service
@ResourceDeployerInfo(WorkSecurityMap.class)
diff --git a/appserver/connectors/connectors-runtime/src/main/java/com/sun/enterprise/resource/deployer/JMSConnectionFactoryDefinitionDeployer.java b/appserver/connectors/connectors-runtime/src/main/java/com/sun/enterprise/resource/deployer/JMSConnectionFactoryDefinitionDeployer.java
index 8d37635..3df19f6 100644
--- a/appserver/connectors/connectors-runtime/src/main/java/com/sun/enterprise/resource/deployer/JMSConnectionFactoryDefinitionDeployer.java
+++ b/appserver/connectors/connectors-runtime/src/main/java/com/sun/enterprise/resource/deployer/JMSConnectionFactoryDefinitionDeployer.java
@@ -34,8 +34,8 @@
import org.jvnet.hk2.config.TransactionFailure;
import org.jvnet.hk2.config.types.Property;
-import javax.inject.Inject;
-import javax.inject.Provider;
+import jakarta.inject.Inject;
+import jakarta.inject.Provider;
import java.beans.PropertyVetoException;
import java.util.ArrayList;
import java.util.Collection;
diff --git a/appserver/connectors/connectors-runtime/src/main/java/com/sun/enterprise/resource/deployer/JMSDestinationDefinitionDeployer.java b/appserver/connectors/connectors-runtime/src/main/java/com/sun/enterprise/resource/deployer/JMSDestinationDefinitionDeployer.java
index a2160ca..1443a1e 100644
--- a/appserver/connectors/connectors-runtime/src/main/java/com/sun/enterprise/resource/deployer/JMSDestinationDefinitionDeployer.java
+++ b/appserver/connectors/connectors-runtime/src/main/java/com/sun/enterprise/resource/deployer/JMSDestinationDefinitionDeployer.java
@@ -31,8 +31,8 @@
import org.jvnet.hk2.config.TransactionFailure;
import org.jvnet.hk2.config.types.Property;
-import javax.inject.Inject;
-import javax.inject.Provider;
+import jakarta.inject.Inject;
+import jakarta.inject.Provider;
import java.beans.PropertyVetoException;
import java.util.ArrayList;
import java.util.Collection;
diff --git a/appserver/connectors/connectors-runtime/src/main/java/com/sun/enterprise/resource/deployer/MailSessionDeployer.java b/appserver/connectors/connectors-runtime/src/main/java/com/sun/enterprise/resource/deployer/MailSessionDeployer.java
index d05cf8e..a566dcf 100644
--- a/appserver/connectors/connectors-runtime/src/main/java/com/sun/enterprise/resource/deployer/MailSessionDeployer.java
+++ b/appserver/connectors/connectors-runtime/src/main/java/com/sun/enterprise/resource/deployer/MailSessionDeployer.java
@@ -38,8 +38,8 @@
import org.jvnet.hk2.config.TransactionFailure;
import org.jvnet.hk2.config.types.Property;
-import javax.inject.Inject;
-import javax.inject.Provider;
+import jakarta.inject.Inject;
+import jakarta.inject.Provider;
import javax.naming.NamingException;
import java.beans.PropertyVetoException;
import java.util.ArrayList;
diff --git a/appserver/connectors/connectors-runtime/src/main/java/com/sun/enterprise/resource/deployer/ResourceAdapterConfigDeployer.java b/appserver/connectors/connectors-runtime/src/main/java/com/sun/enterprise/resource/deployer/ResourceAdapterConfigDeployer.java
index c5913e7..7030af9 100644
--- a/appserver/connectors/connectors-runtime/src/main/java/com/sun/enterprise/resource/deployer/ResourceAdapterConfigDeployer.java
+++ b/appserver/connectors/connectors-runtime/src/main/java/com/sun/enterprise/resource/deployer/ResourceAdapterConfigDeployer.java
@@ -23,9 +23,9 @@
import org.glassfish.resourcebase.resources.api.ResourceDeployerInfo;
import org.jvnet.hk2.annotations.Service;
-import javax.inject.Inject;
-import javax.inject.Provider;
-import javax.inject.Singleton;
+import jakarta.inject.Inject;
+import jakarta.inject.Provider;
+import jakarta.inject.Singleton;
import java.util.logging.Level;
import java.util.logging.Logger;
diff --git a/appserver/connectors/connectors-runtime/src/main/java/com/sun/enterprise/resource/pool/PoolLifeCycleRegistry.java b/appserver/connectors/connectors-runtime/src/main/java/com/sun/enterprise/resource/pool/PoolLifeCycleRegistry.java
index a1afd78..72f8661 100644
--- a/appserver/connectors/connectors-runtime/src/main/java/com/sun/enterprise/resource/pool/PoolLifeCycleRegistry.java
+++ b/appserver/connectors/connectors-runtime/src/main/java/com/sun/enterprise/resource/pool/PoolLifeCycleRegistry.java
@@ -20,7 +20,7 @@
import com.sun.enterprise.resource.listener.PoolLifeCycle;
import org.glassfish.resourcebase.resources.api.PoolInfo;
-import javax.inject.Singleton;
+import jakarta.inject.Singleton;
import java.util.ArrayList;
import java.util.List;
diff --git a/appserver/connectors/connectors-runtime/src/main/java/com/sun/enterprise/resource/pool/PoolManagerImpl.java b/appserver/connectors/connectors-runtime/src/main/java/com/sun/enterprise/resource/pool/PoolManagerImpl.java
index 720709e..4ab70a8 100644
--- a/appserver/connectors/connectors-runtime/src/main/java/com/sun/enterprise/resource/pool/PoolManagerImpl.java
+++ b/appserver/connectors/connectors-runtime/src/main/java/com/sun/enterprise/resource/pool/PoolManagerImpl.java
@@ -39,8 +39,8 @@
import org.glassfish.resourcebase.resources.api.PoolInfo;
import org.jvnet.hk2.annotations.Service;
-import javax.inject.Inject;
-import javax.inject.Provider;
+import jakarta.inject.Inject;
+import jakarta.inject.Provider;
import jakarta.resource.ResourceException;
import jakarta.resource.spi.ManagedConnection;
import jakarta.resource.spi.ManagedConnectionFactory;
diff --git a/appserver/connectors/connectors-runtime/src/main/java/com/sun/enterprise/resource/pool/monitor/ConnectionPoolProbeProviderUtil.java b/appserver/connectors/connectors-runtime/src/main/java/com/sun/enterprise/resource/pool/monitor/ConnectionPoolProbeProviderUtil.java
index 25e9be8..6ce3ea3 100644
--- a/appserver/connectors/connectors-runtime/src/main/java/com/sun/enterprise/resource/pool/monitor/ConnectionPoolProbeProviderUtil.java
+++ b/appserver/connectors/connectors-runtime/src/main/java/com/sun/enterprise/resource/pool/monitor/ConnectionPoolProbeProviderUtil.java
@@ -21,8 +21,8 @@
import org.jvnet.hk2.annotations.Service;
import org.glassfish.hk2.api.ServiceLocator;
-import javax.inject.Inject;
-import javax.inject.Provider;
+import jakarta.inject.Inject;
+import jakarta.inject.Provider;
import java.util.Collection;
/**
diff --git a/appserver/connectors/connectors-runtime/src/main/java/com/sun/enterprise/resource/pool/monitor/ConnectionPoolStatsProviderBootstrap.java b/appserver/connectors/connectors-runtime/src/main/java/com/sun/enterprise/resource/pool/monitor/ConnectionPoolStatsProviderBootstrap.java
index 5ff7bd0..9bbff3f 100644
--- a/appserver/connectors/connectors-runtime/src/main/java/com/sun/enterprise/resource/pool/monitor/ConnectionPoolStatsProviderBootstrap.java
+++ b/appserver/connectors/connectors-runtime/src/main/java/com/sun/enterprise/resource/pool/monitor/ConnectionPoolStatsProviderBootstrap.java
@@ -37,9 +37,9 @@
import org.jvnet.hk2.annotations.Service;
import org.glassfish.hk2.api.ServiceLocator;
-import javax.inject.Inject;
-import javax.inject.Provider;
-import javax.inject.Singleton;
+import jakarta.inject.Inject;
+import jakarta.inject.Provider;
+import jakarta.inject.Singleton;
import java.util.*;
import java.util.logging.Level;
import java.util.logging.Logger;
diff --git a/appserver/connectors/connectors-runtime/src/main/java/com/sun/enterprise/resource/pool/monitor/PoolMonitoringLevelListener.java b/appserver/connectors/connectors-runtime/src/main/java/com/sun/enterprise/resource/pool/monitor/PoolMonitoringLevelListener.java
index 6c1f932..7e1e77a 100644
--- a/appserver/connectors/connectors-runtime/src/main/java/com/sun/enterprise/resource/pool/monitor/PoolMonitoringLevelListener.java
+++ b/appserver/connectors/connectors-runtime/src/main/java/com/sun/enterprise/resource/pool/monitor/PoolMonitoringLevelListener.java
@@ -23,14 +23,14 @@
import org.jvnet.hk2.annotations.Service;
import org.glassfish.hk2.api.PostConstruct;
import org.glassfish.hk2.api.PreDestroy;
-import javax.inject.Singleton;
+import jakarta.inject.Singleton;
import org.jvnet.hk2.config.*;
import java.beans.PropertyChangeEvent;
import java.util.logging.Level;
import java.util.logging.Logger;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
@Service
@Singleton
diff --git a/appserver/connectors/connectors-runtime/src/main/java/com/sun/enterprise/resource/recovery/ConnectorsRecoveryResourceHandler.java b/appserver/connectors/connectors-runtime/src/main/java/com/sun/enterprise/resource/recovery/ConnectorsRecoveryResourceHandler.java
index a9de201..85b89f0 100644
--- a/appserver/connectors/connectors-runtime/src/main/java/com/sun/enterprise/resource/recovery/ConnectorsRecoveryResourceHandler.java
+++ b/appserver/connectors/connectors-runtime/src/main/java/com/sun/enterprise/resource/recovery/ConnectorsRecoveryResourceHandler.java
@@ -42,9 +42,9 @@
import org.jvnet.hk2.config.types.Property;
import com.sun.enterprise.config.serverbeans.Module;
-import javax.inject.Inject;
-import javax.inject.Named;
-import javax.inject.Provider;
+import jakarta.inject.Inject;
+import jakarta.inject.Named;
+import jakarta.inject.Provider;
import javax.naming.InitialContext;
import javax.naming.NamingException;
import jakarta.resource.ResourceException;
diff --git a/appserver/connectors/connectors-runtime/src/main/java/com/sun/enterprise/resource/recovery/ThirdPartyRecoveryResourceHandler.java b/appserver/connectors/connectors-runtime/src/main/java/com/sun/enterprise/resource/recovery/ThirdPartyRecoveryResourceHandler.java
index e6b06af..68ae3a4 100644
--- a/appserver/connectors/connectors-runtime/src/main/java/com/sun/enterprise/resource/recovery/ThirdPartyRecoveryResourceHandler.java
+++ b/appserver/connectors/connectors-runtime/src/main/java/com/sun/enterprise/resource/recovery/ThirdPartyRecoveryResourceHandler.java
@@ -16,7 +16,7 @@
package com.sun.enterprise.resource.recovery;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
import javax.transaction.xa.XAResource;
import java.util.Set;
import java.util.List;
diff --git a/appserver/connectors/work-management/src/main/java/com/sun/enterprise/connectors/work/WorkManagerFactoryImpl.java b/appserver/connectors/work-management/src/main/java/com/sun/enterprise/connectors/work/WorkManagerFactoryImpl.java
index 9c9b18a..efb07a8 100755
--- a/appserver/connectors/work-management/src/main/java/com/sun/enterprise/connectors/work/WorkManagerFactoryImpl.java
+++ b/appserver/connectors/work-management/src/main/java/com/sun/enterprise/connectors/work/WorkManagerFactoryImpl.java
@@ -23,10 +23,10 @@
import org.glassfish.logging.annotation.LogMessageInfo;
import org.jvnet.hk2.annotations.Service;
-import javax.inject.Singleton;
+import jakarta.inject.Singleton;
-import javax.inject.Inject;
-import javax.inject.Provider;
+import jakarta.inject.Inject;
+import jakarta.inject.Provider;
import jakarta.resource.spi.work.WorkManager;
import java.lang.reflect.Method;
import java.util.Collections;
diff --git a/appserver/connectors/work-management/src/main/java/com/sun/enterprise/connectors/work/context/WorkContextHandlerImpl.java b/appserver/connectors/work-management/src/main/java/com/sun/enterprise/connectors/work/context/WorkContextHandlerImpl.java
index 0d65b7e..6749ff8 100644
--- a/appserver/connectors/work-management/src/main/java/com/sun/enterprise/connectors/work/context/WorkContextHandlerImpl.java
+++ b/appserver/connectors/work-management/src/main/java/com/sun/enterprise/connectors/work/context/WorkContextHandlerImpl.java
@@ -33,7 +33,7 @@
import com.sun.enterprise.transaction.api.JavaEETransactionManager;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
import jakarta.resource.spi.work.*;
import javax.security.auth.Subject;
import javax.security.auth.callback.CallbackHandler;
diff --git a/appserver/core/api-exporter-fragment/pom.xml b/appserver/core/api-exporter-fragment/pom.xml
index 7204672..ecca458 100755
--- a/appserver/core/api-exporter-fragment/pom.xml
+++ b/appserver/core/api-exporter-fragment/pom.xml
@@ -133,7 +133,7 @@
jakarta.faces.view; \
jakarta.faces.view.facelets; \
jakarta.faces.webapp; \
-javax.inject; \
+jakarta.inject; \
javax.imageio; \
javax.imageio.event; \
javax.imageio.metadata; \
diff --git a/appserver/core/javaee-kernel/src/main/java/org/glassfish/kernel/javaee/MEJBService.java b/appserver/core/javaee-kernel/src/main/java/org/glassfish/kernel/javaee/MEJBService.java
index ae55d4f..1034273 100755
--- a/appserver/core/javaee-kernel/src/main/java/org/glassfish/kernel/javaee/MEJBService.java
+++ b/appserver/core/javaee-kernel/src/main/java/org/glassfish/kernel/javaee/MEJBService.java
@@ -16,8 +16,8 @@
package org.glassfish.kernel.javaee;
-import javax.inject.Inject;
-import javax.inject.Provider;
+import jakarta.inject.Inject;
+import jakarta.inject.Provider;
import org.glassfish.hk2.runlevel.RunLevel;
import org.jvnet.hk2.annotations.Service;
diff --git a/appserver/core/javaee-kernel/src/main/java/org/glassfish/kernel/javaee/WebContainerStarter.java b/appserver/core/javaee-kernel/src/main/java/org/glassfish/kernel/javaee/WebContainerStarter.java
index 74b24f8..5cbcc79 100644
--- a/appserver/core/javaee-kernel/src/main/java/org/glassfish/kernel/javaee/WebContainerStarter.java
+++ b/appserver/core/javaee-kernel/src/main/java/org/glassfish/kernel/javaee/WebContainerStarter.java
@@ -30,9 +30,9 @@
import java.util.ResourceBundle;
import java.util.logging.Level;
import java.util.logging.Logger;
-import javax.inject.Inject;
-import javax.inject.Named;
-import javax.inject.Provider;
+import jakarta.inject.Inject;
+import jakarta.inject.Named;
+import jakarta.inject.Provider;
import org.glassfish.api.StartupRunLevel;
import org.glassfish.api.admin.ServerEnvironment;
import org.glassfish.api.container.Sniffer;
diff --git a/appserver/deployment/dol/src/main/java/com/sun/enterprise/deployment/Application.java b/appserver/deployment/dol/src/main/java/com/sun/enterprise/deployment/Application.java
index a22938a..fb723ea 100644
--- a/appserver/deployment/dol/src/main/java/com/sun/enterprise/deployment/Application.java
+++ b/appserver/deployment/dol/src/main/java/com/sun/enterprise/deployment/Application.java
@@ -34,7 +34,7 @@
import java.util.Vector;
import java.util.logging.Level;
import java.util.logging.Logger;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
import jakarta.persistence.EntityManagerFactory;
import com.sun.enterprise.deployment.node.ApplicationNode;
diff --git a/appserver/deployment/dol/src/main/java/com/sun/enterprise/deployment/EarType.java b/appserver/deployment/dol/src/main/java/com/sun/enterprise/deployment/EarType.java
index 7c433ce..6091d1d 100644
--- a/appserver/deployment/dol/src/main/java/com/sun/enterprise/deployment/EarType.java
+++ b/appserver/deployment/dol/src/main/java/com/sun/enterprise/deployment/EarType.java
@@ -26,7 +26,7 @@
* @author sanjeeb.sahoo@oracle.com
*/
@Service(name = EarType.ARCHIVE_TYPE)
-@javax.inject.Singleton
+@jakarta.inject.Singleton
public class EarType extends ArchiveType {
/**
* same as what's returned by {@link javax.enterprise.deploy.shared.ModuleType#EAR#toString()}
diff --git a/appserver/deployment/dol/src/main/java/com/sun/enterprise/deployment/annotation/factory/SJSASFactory.java b/appserver/deployment/dol/src/main/java/com/sun/enterprise/deployment/annotation/factory/SJSASFactory.java
index 2d27c80..ddb5f71 100644
--- a/appserver/deployment/dol/src/main/java/com/sun/enterprise/deployment/annotation/factory/SJSASFactory.java
+++ b/appserver/deployment/dol/src/main/java/com/sun/enterprise/deployment/annotation/factory/SJSASFactory.java
@@ -29,8 +29,8 @@
import org.jvnet.hk2.annotations.Service;
import jakarta.annotation.PostConstruct;
-import javax.inject.Inject;
-import javax.inject.Singleton;
+import jakarta.inject.Inject;
+import jakarta.inject.Singleton;
import java.lang.annotation.Annotation;
import java.util.HashSet;
diff --git a/appserver/deployment/dol/src/main/java/com/sun/enterprise/deployment/annotation/handlers/AbstractHandler.java b/appserver/deployment/dol/src/main/java/com/sun/enterprise/deployment/annotation/handlers/AbstractHandler.java
index 8e19765..f2d8701 100644
--- a/appserver/deployment/dol/src/main/java/com/sun/enterprise/deployment/annotation/handlers/AbstractHandler.java
+++ b/appserver/deployment/dol/src/main/java/com/sun/enterprise/deployment/annotation/handlers/AbstractHandler.java
@@ -22,8 +22,8 @@
import org.glassfish.apf.impl.AnnotationUtils;
import org.glassfish.apf.impl.HandlerProcessingResultImpl;
import org.jvnet.hk2.annotations.Optional;
-import javax.inject.Inject;
-import javax.inject.Named;
+import jakarta.inject.Inject;
+import jakarta.inject.Named;
import java.lang.annotation.Annotation;
import java.lang.reflect.Method;
diff --git a/appserver/deployment/dol/src/main/java/com/sun/enterprise/deployment/annotation/handlers/ResourceHandler.java b/appserver/deployment/dol/src/main/java/com/sun/enterprise/deployment/annotation/handlers/ResourceHandler.java
index e03f0f8..31f8240 100644
--- a/appserver/deployment/dol/src/main/java/com/sun/enterprise/deployment/annotation/handlers/ResourceHandler.java
+++ b/appserver/deployment/dol/src/main/java/com/sun/enterprise/deployment/annotation/handlers/ResourceHandler.java
@@ -26,8 +26,8 @@
import org.glassfish.apf.HandlerProcessingResult;
import org.glassfish.hk2.api.ServiceLocator;
import org.jvnet.hk2.annotations.Service;
-import javax.inject.Inject;
-import javax.inject.Provider;
+import jakarta.inject.Inject;
+import jakarta.inject.Provider;
import static com.sun.enterprise.util.StringUtils.ok;
diff --git a/appserver/deployment/dol/src/main/java/com/sun/enterprise/deployment/annotation/impl/AppClientScanner.java b/appserver/deployment/dol/src/main/java/com/sun/enterprise/deployment/annotation/impl/AppClientScanner.java
index c9c37e5..4a1b449 100644
--- a/appserver/deployment/dol/src/main/java/com/sun/enterprise/deployment/annotation/impl/AppClientScanner.java
+++ b/appserver/deployment/dol/src/main/java/com/sun/enterprise/deployment/annotation/impl/AppClientScanner.java
@@ -32,8 +32,8 @@
import com.sun.enterprise.deployment.deploy.shared.MultiReadableArchive;
-import javax.inject.Inject;
-import javax.inject.Named;
+import jakarta.inject.Inject;
+import jakarta.inject.Named;
import java.io.File;
import java.io.IOException;
import java.net.URI;
diff --git a/appserver/deployment/dol/src/main/java/com/sun/enterprise/deployment/annotation/impl/ModuleScanner.java b/appserver/deployment/dol/src/main/java/com/sun/enterprise/deployment/annotation/impl/ModuleScanner.java
index 06bf931..e7bb7d7 100644
--- a/appserver/deployment/dol/src/main/java/com/sun/enterprise/deployment/annotation/impl/ModuleScanner.java
+++ b/appserver/deployment/dol/src/main/java/com/sun/enterprise/deployment/annotation/impl/ModuleScanner.java
@@ -28,7 +28,7 @@
import org.glassfish.apf.Scanner;
import org.glassfish.apf.impl.JavaEEScanner;
import org.glassfish.hk2.classmodel.reflect.*;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
import org.glassfish.deployment.common.DeploymentUtils;
import org.glassfish.api.deployment.archive.ReadableArchive;
diff --git a/appserver/deployment/dol/src/main/java/com/sun/enterprise/deployment/annotation/introspection/AppClientPersistenceDependencyAnnotationScanner.java b/appserver/deployment/dol/src/main/java/com/sun/enterprise/deployment/annotation/introspection/AppClientPersistenceDependencyAnnotationScanner.java
index 67fca57..309826c 100644
--- a/appserver/deployment/dol/src/main/java/com/sun/enterprise/deployment/annotation/introspection/AppClientPersistenceDependencyAnnotationScanner.java
+++ b/appserver/deployment/dol/src/main/java/com/sun/enterprise/deployment/annotation/introspection/AppClientPersistenceDependencyAnnotationScanner.java
@@ -18,7 +18,7 @@
import org.jvnet.hk2.annotations.Service;
-import javax.inject.Singleton;
+import jakarta.inject.Singleton;
/**
* Scans for annotations relevant to persistence units that indicate an app
diff --git a/appserver/deployment/dol/src/main/java/com/sun/enterprise/deployment/annotation/introspection/DefaultAnnotationScanner.java b/appserver/deployment/dol/src/main/java/com/sun/enterprise/deployment/annotation/introspection/DefaultAnnotationScanner.java
index 4cfaa5c..550ca27 100644
--- a/appserver/deployment/dol/src/main/java/com/sun/enterprise/deployment/annotation/introspection/DefaultAnnotationScanner.java
+++ b/appserver/deployment/dol/src/main/java/com/sun/enterprise/deployment/annotation/introspection/DefaultAnnotationScanner.java
@@ -17,11 +17,11 @@
package com.sun.enterprise.deployment.annotation.introspection;
import com.sun.enterprise.deployment.annotation.factory.SJSASFactory;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
import org.jvnet.hk2.annotations.Service;
import org.glassfish.hk2.api.PostConstruct;
-import javax.inject.Singleton;
+import jakarta.inject.Singleton;
import java.util.Set;
diff --git a/appserver/deployment/dol/src/main/java/com/sun/enterprise/deployment/annotation/introspection/EjbComponentAnnotationScanner.java b/appserver/deployment/dol/src/main/java/com/sun/enterprise/deployment/annotation/introspection/EjbComponentAnnotationScanner.java
index e8726e8..8d29ff7 100644
--- a/appserver/deployment/dol/src/main/java/com/sun/enterprise/deployment/annotation/introspection/EjbComponentAnnotationScanner.java
+++ b/appserver/deployment/dol/src/main/java/com/sun/enterprise/deployment/annotation/introspection/EjbComponentAnnotationScanner.java
@@ -18,7 +18,7 @@
import org.jvnet.hk2.annotations.Service;
-import javax.inject.Singleton;
+import jakarta.inject.Singleton;
import java.util.HashSet;
import java.util.Set;
diff --git a/appserver/deployment/dol/src/main/java/com/sun/enterprise/deployment/annotation/introspection/ResourceAdapterAnnotationScanner.java b/appserver/deployment/dol/src/main/java/com/sun/enterprise/deployment/annotation/introspection/ResourceAdapterAnnotationScanner.java
index 817c80c..05a87cd 100644
--- a/appserver/deployment/dol/src/main/java/com/sun/enterprise/deployment/annotation/introspection/ResourceAdapterAnnotationScanner.java
+++ b/appserver/deployment/dol/src/main/java/com/sun/enterprise/deployment/annotation/introspection/ResourceAdapterAnnotationScanner.java
@@ -18,7 +18,7 @@
import org.jvnet.hk2.annotations.Service;
-import javax.inject.Singleton;
+import jakarta.inject.Singleton;
import java.util.Set;
import java.util.HashSet;
diff --git a/appserver/deployment/dol/src/main/java/com/sun/enterprise/deployment/archivist/ACCPersistenceArchivist.java b/appserver/deployment/dol/src/main/java/com/sun/enterprise/deployment/archivist/ACCPersistenceArchivist.java
index 5fb2ae7..544a8c4 100644
--- a/appserver/deployment/dol/src/main/java/com/sun/enterprise/deployment/archivist/ACCPersistenceArchivist.java
+++ b/appserver/deployment/dol/src/main/java/com/sun/enterprise/deployment/archivist/ACCPersistenceArchivist.java
@@ -33,7 +33,7 @@
import org.glassfish.api.admin.ProcessEnvironment;
import org.glassfish.api.admin.ProcessEnvironment.ProcessType;
import org.glassfish.api.deployment.archive.ReadableArchive;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
import org.jvnet.hk2.annotations.Service;
import org.xml.sax.SAXException;
diff --git a/appserver/deployment/dol/src/main/java/com/sun/enterprise/deployment/archivist/ApplicationArchivist.java b/appserver/deployment/dol/src/main/java/com/sun/enterprise/deployment/archivist/ApplicationArchivist.java
index baef19b..756bb2b 100644
--- a/appserver/deployment/dol/src/main/java/com/sun/enterprise/deployment/archivist/ApplicationArchivist.java
+++ b/appserver/deployment/dol/src/main/java/com/sun/enterprise/deployment/archivist/ApplicationArchivist.java
@@ -45,8 +45,8 @@
import org.glassfish.hk2.api.PerLookup;
import org.xml.sax.SAXException;
-import javax.inject.Inject;
-import javax.inject.Provider;
+import jakarta.inject.Inject;
+import jakarta.inject.Provider;
import java.io.*;
import java.util.*;
import java.util.logging.Level;
diff --git a/appserver/deployment/dol/src/main/java/com/sun/enterprise/deployment/archivist/ApplicationFactory.java b/appserver/deployment/dol/src/main/java/com/sun/enterprise/deployment/archivist/ApplicationFactory.java
index 9ae6f98..3df3059 100644
--- a/appserver/deployment/dol/src/main/java/com/sun/enterprise/deployment/archivist/ApplicationFactory.java
+++ b/appserver/deployment/dol/src/main/java/com/sun/enterprise/deployment/archivist/ApplicationFactory.java
@@ -28,7 +28,7 @@
import com.sun.enterprise.config.serverbeans.DasConfig;
import com.sun.enterprise.util.LocalStringManagerImpl;
import org.glassfish.api.deployment.archive.ReadableArchive;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
import org.jvnet.hk2.annotations.Service;
import org.xml.sax.SAXException;
diff --git a/appserver/deployment/dol/src/main/java/com/sun/enterprise/deployment/archivist/Archivist.java b/appserver/deployment/dol/src/main/java/com/sun/enterprise/deployment/archivist/Archivist.java
index c9a25ee..f9df4e7 100644
--- a/appserver/deployment/dol/src/main/java/com/sun/enterprise/deployment/archivist/Archivist.java
+++ b/appserver/deployment/dol/src/main/java/com/sun/enterprise/deployment/archivist/Archivist.java
@@ -42,7 +42,7 @@
import org.glassfish.hk2.api.MultiException;
import org.glassfish.hk2.api.ServiceLocator;
import org.glassfish.hk2.classmodel.reflect.*;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
import org.jvnet.hk2.annotations.Contract;
import org.jvnet.hk2.annotations.Optional;
import org.xml.sax.SAXException;
diff --git a/appserver/deployment/dol/src/main/java/com/sun/enterprise/deployment/archivist/ArchivistFactory.java b/appserver/deployment/dol/src/main/java/com/sun/enterprise/deployment/archivist/ArchivistFactory.java
index ec57e86..c879d82 100644
--- a/appserver/deployment/dol/src/main/java/com/sun/enterprise/deployment/archivist/ArchivistFactory.java
+++ b/appserver/deployment/dol/src/main/java/com/sun/enterprise/deployment/archivist/ArchivistFactory.java
@@ -24,9 +24,9 @@
import org.glassfish.hk2.api.ServiceHandle;
import org.glassfish.hk2.api.ServiceLocator;
import org.jvnet.hk2.annotations.Service;
-import javax.inject.Singleton;
+import jakarta.inject.Singleton;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
import java.util.ArrayList;
import java.util.Collection;
diff --git a/appserver/deployment/dol/src/main/java/com/sun/enterprise/deployment/archivist/ArchivistFor.java b/appserver/deployment/dol/src/main/java/com/sun/enterprise/deployment/archivist/ArchivistFor.java
index 2b71011..74d85f1 100644
--- a/appserver/deployment/dol/src/main/java/com/sun/enterprise/deployment/archivist/ArchivistFor.java
+++ b/appserver/deployment/dol/src/main/java/com/sun/enterprise/deployment/archivist/ArchivistFor.java
@@ -20,7 +20,7 @@
import java.lang.annotation.Retention;
import java.lang.annotation.Target;
-import javax.inject.Qualifier;
+import jakarta.inject.Qualifier;
import org.glassfish.hk2.api.Metadata;
diff --git a/appserver/deployment/dol/src/main/java/com/sun/enterprise/deployment/archivist/DescriptorArchivist.java b/appserver/deployment/dol/src/main/java/com/sun/enterprise/deployment/archivist/DescriptorArchivist.java
index 3db6b1c..cade4c0 100644
--- a/appserver/deployment/dol/src/main/java/com/sun/enterprise/deployment/archivist/DescriptorArchivist.java
+++ b/appserver/deployment/dol/src/main/java/com/sun/enterprise/deployment/archivist/DescriptorArchivist.java
@@ -24,8 +24,8 @@
import org.glassfish.deployment.common.ModuleDescriptor;
import org.jvnet.hk2.annotations.Service;
-import javax.inject.Inject;
-import javax.inject.Provider;
+import jakarta.inject.Inject;
+import jakarta.inject.Provider;
import java.io.IOException;
import java.io.OutputStream;
import java.util.Collection;
diff --git a/appserver/deployment/dol/src/main/java/com/sun/enterprise/deployment/archivist/ExtensionsArchivistFor.java b/appserver/deployment/dol/src/main/java/com/sun/enterprise/deployment/archivist/ExtensionsArchivistFor.java
index c7b5715..0dcef78 100644
--- a/appserver/deployment/dol/src/main/java/com/sun/enterprise/deployment/archivist/ExtensionsArchivistFor.java
+++ b/appserver/deployment/dol/src/main/java/com/sun/enterprise/deployment/archivist/ExtensionsArchivistFor.java
@@ -20,7 +20,7 @@
import java.lang.annotation.Retention;
import java.lang.annotation.Target;
-import javax.inject.Qualifier;
+import jakarta.inject.Qualifier;
import org.glassfish.hk2.api.Metadata;
diff --git a/appserver/deployment/dol/src/main/java/com/sun/enterprise/deployment/archivist/ServerSidePersistenceArchivist.java b/appserver/deployment/dol/src/main/java/com/sun/enterprise/deployment/archivist/ServerSidePersistenceArchivist.java
index 6c63ee1..6ec0f58 100644
--- a/appserver/deployment/dol/src/main/java/com/sun/enterprise/deployment/archivist/ServerSidePersistenceArchivist.java
+++ b/appserver/deployment/dol/src/main/java/com/sun/enterprise/deployment/archivist/ServerSidePersistenceArchivist.java
@@ -21,7 +21,7 @@
import org.glassfish.api.admin.*;
import org.jvnet.hk2.annotations.Service;
import com.sun.enterprise.deployment.util.DOLUtils;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
/**
diff --git a/appserver/deployment/dol/src/main/java/com/sun/enterprise/deployment/io/ConfigurationDeploymentDescriptorFileFor.java b/appserver/deployment/dol/src/main/java/com/sun/enterprise/deployment/io/ConfigurationDeploymentDescriptorFileFor.java
index 212e016..baf28c3 100644
--- a/appserver/deployment/dol/src/main/java/com/sun/enterprise/deployment/io/ConfigurationDeploymentDescriptorFileFor.java
+++ b/appserver/deployment/dol/src/main/java/com/sun/enterprise/deployment/io/ConfigurationDeploymentDescriptorFileFor.java
@@ -22,7 +22,7 @@
import java.lang.annotation.Retention;
import java.lang.annotation.Target;
-import javax.inject.Qualifier;
+import jakarta.inject.Qualifier;
import static java.lang.annotation.RetentionPolicy.RUNTIME;
diff --git a/appserver/deployment/dol/src/main/java/com/sun/enterprise/deployment/util/ResourceValidator.java b/appserver/deployment/dol/src/main/java/com/sun/enterprise/deployment/util/ResourceValidator.java
index 71454bb..2b2198a 100644
--- a/appserver/deployment/dol/src/main/java/com/sun/enterprise/deployment/util/ResourceValidator.java
+++ b/appserver/deployment/dol/src/main/java/com/sun/enterprise/deployment/util/ResourceValidator.java
@@ -33,8 +33,8 @@
import org.jvnet.hk2.annotations.Service;
import org.glassfish.resourcebase.resources.api.ResourceConstants;
-import javax.inject.Inject;
-import javax.inject.Named;
+import jakarta.inject.Inject;
+import jakarta.inject.Named;
import javax.naming.InitialContext;
import javax.naming.NamingException;
import java.net.MalformedURLException;
diff --git a/appserver/deployment/javaee-core/src/main/java/org/glassfish/javaee/core/deployment/DolProvider.java b/appserver/deployment/javaee-core/src/main/java/org/glassfish/javaee/core/deployment/DolProvider.java
index bbfa2d5..5828789 100644
--- a/appserver/deployment/javaee-core/src/main/java/org/glassfish/javaee/core/deployment/DolProvider.java
+++ b/appserver/deployment/javaee-core/src/main/java/org/glassfish/javaee/core/deployment/DolProvider.java
@@ -56,8 +56,8 @@
import org.xml.sax.SAXException;
import javax.enterprise.deploy.shared.ModuleType;
-import javax.inject.Inject;
-import javax.inject.Provider;
+import jakarta.inject.Inject;
+import jakarta.inject.Provider;
import java.io.File;
import java.io.IOException;
import java.net.URL;
diff --git a/appserver/deployment/javaee-core/src/main/java/org/glassfish/javaee/core/deployment/GetContextRootCommand.java b/appserver/deployment/javaee-core/src/main/java/org/glassfish/javaee/core/deployment/GetContextRootCommand.java
index 54e1f95..0cd7e90 100644
--- a/appserver/deployment/javaee-core/src/main/java/org/glassfish/javaee/core/deployment/GetContextRootCommand.java
+++ b/appserver/deployment/javaee-core/src/main/java/org/glassfish/javaee/core/deployment/GetContextRootCommand.java
@@ -26,7 +26,7 @@
import com.sun.enterprise.deployment.WebBundleDescriptor;
import org.glassfish.api.ActionReport;
import org.glassfish.api.admin.*;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
import org.jvnet.hk2.annotations.Service;
import org.glassfish.hk2.api.PerLookup;
diff --git a/appserver/deployment/javaee-core/src/main/java/org/glassfish/javaee/core/deployment/JavaEEDeployer.java b/appserver/deployment/javaee-core/src/main/java/org/glassfish/javaee/core/deployment/JavaEEDeployer.java
index 86dd39e..d7259af 100644
--- a/appserver/deployment/javaee-core/src/main/java/org/glassfish/javaee/core/deployment/JavaEEDeployer.java
+++ b/appserver/deployment/javaee-core/src/main/java/org/glassfish/javaee/core/deployment/JavaEEDeployer.java
@@ -42,9 +42,9 @@
import java.util.List;
import java.net.URL;
-import javax.inject.Inject;
-import javax.inject.Named;
-import javax.inject.Provider;
+import jakarta.inject.Inject;
+import jakarta.inject.Named;
+import jakarta.inject.Provider;
/**
* Convenient superclass for JavaEE Deployer implementations.
diff --git a/appserver/deployment/javaee-core/src/main/java/org/glassfish/javaee/core/deployment/ListSubComponentsCommand.java b/appserver/deployment/javaee-core/src/main/java/org/glassfish/javaee/core/deployment/ListSubComponentsCommand.java
index b843450..aadc031 100644
--- a/appserver/deployment/javaee-core/src/main/java/org/glassfish/javaee/core/deployment/ListSubComponentsCommand.java
+++ b/appserver/deployment/javaee-core/src/main/java/org/glassfish/javaee/core/deployment/ListSubComponentsCommand.java
@@ -23,7 +23,7 @@
import java.util.LinkedHashMap;
import java.util.List;
import java.util.Map;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
import com.sun.enterprise.config.serverbeans.Application;
import com.sun.enterprise.config.serverbeans.Applications;
diff --git a/appserver/deployment/javaee-full/src/main/java/org/glassfish/javaee/full/deployment/EarDeployer.java b/appserver/deployment/javaee-full/src/main/java/org/glassfish/javaee/full/deployment/EarDeployer.java
index f90209f..e213d91 100644
--- a/appserver/deployment/javaee-full/src/main/java/org/glassfish/javaee/full/deployment/EarDeployer.java
+++ b/appserver/deployment/javaee-full/src/main/java/org/glassfish/javaee/full/deployment/EarDeployer.java
@@ -31,7 +31,7 @@
import org.glassfish.internal.deployment.SnifferManager;
import org.glassfish.hk2.classmodel.reflect.*;
import org.jvnet.hk2.annotations.Service;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
import org.glassfish.hk2.api.PerLookup;
import com.sun.enterprise.deployment.*;
diff --git a/appserver/deployment/javaee-full/src/main/java/org/glassfish/javaee/full/deployment/EarDetector.java b/appserver/deployment/javaee-full/src/main/java/org/glassfish/javaee/full/deployment/EarDetector.java
index 3a2e5d2..a585bd9 100644
--- a/appserver/deployment/javaee-full/src/main/java/org/glassfish/javaee/full/deployment/EarDetector.java
+++ b/appserver/deployment/javaee-full/src/main/java/org/glassfish/javaee/full/deployment/EarDetector.java
@@ -19,8 +19,8 @@
import java.io.IOException;
import java.util.logging.Logger;
-import javax.inject.Inject;
-import javax.inject.Singleton;
+import jakarta.inject.Inject;
+import jakarta.inject.Singleton;
import org.glassfish.api.deployment.archive.ArchiveDetector;
import org.glassfish.api.deployment.archive.ArchiveHandler;
diff --git a/appserver/deployment/javaee-full/src/main/java/org/glassfish/javaee/full/deployment/EarHandler.java b/appserver/deployment/javaee-full/src/main/java/org/glassfish/javaee/full/deployment/EarHandler.java
index 171d7a9..c54a717 100644
--- a/appserver/deployment/javaee-full/src/main/java/org/glassfish/javaee/full/deployment/EarHandler.java
+++ b/appserver/deployment/javaee-full/src/main/java/org/glassfish/javaee/full/deployment/EarHandler.java
@@ -69,8 +69,8 @@
import java.security.PrivilegedAction;
import javax.xml.stream.XMLStreamException;
import javax.xml.stream.XMLStreamReader;
-import javax.inject.Inject;
-import javax.inject.Named;
+import jakarta.inject.Inject;
+import jakarta.inject.Named;
import static javax.xml.stream.XMLStreamConstants.*;
@Service(name=EarDetector.ARCHIVE_TYPE)
diff --git a/appserver/deployment/javaee-full/src/main/java/org/glassfish/javaee/full/deployment/EarSniffer.java b/appserver/deployment/javaee-full/src/main/java/org/glassfish/javaee/full/deployment/EarSniffer.java
index 0978807..73e58f1 100644
--- a/appserver/deployment/javaee-full/src/main/java/org/glassfish/javaee/full/deployment/EarSniffer.java
+++ b/appserver/deployment/javaee-full/src/main/java/org/glassfish/javaee/full/deployment/EarSniffer.java
@@ -24,7 +24,7 @@
import org.glassfish.internal.deployment.GenericSniffer;
import org.glassfish.deployment.common.DeploymentUtils;
import com.sun.enterprise.deployment.EarType;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
import java.util.List;
import java.util.ArrayList;
diff --git a/appserver/ejb/ejb-connector/src/main/java/org/glassfish/ejb/deployment/archive/EjbJarDetector.java b/appserver/ejb/ejb-connector/src/main/java/org/glassfish/ejb/deployment/archive/EjbJarDetector.java
index 0ac9db4..af5a0b4 100644
--- a/appserver/ejb/ejb-connector/src/main/java/org/glassfish/ejb/deployment/archive/EjbJarDetector.java
+++ b/appserver/ejb/ejb-connector/src/main/java/org/glassfish/ejb/deployment/archive/EjbJarDetector.java
@@ -24,10 +24,10 @@
import org.glassfish.deployment.common.GenericAnnotationDetector;
import org.glassfish.hk2.api.ServiceLocator;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
import org.jvnet.hk2.annotations.Service;
-import javax.inject.Singleton;
+import jakarta.inject.Singleton;
import java.io.IOException;
import java.util.logging.Logger;
diff --git a/appserver/ejb/ejb-connector/src/main/java/org/glassfish/ejb/deployment/archive/EjbSniffer.java b/appserver/ejb/ejb-connector/src/main/java/org/glassfish/ejb/deployment/archive/EjbSniffer.java
index f80d2a0..4e5c294 100644
--- a/appserver/ejb/ejb-connector/src/main/java/org/glassfish/ejb/deployment/archive/EjbSniffer.java
+++ b/appserver/ejb/ejb-connector/src/main/java/org/glassfish/ejb/deployment/archive/EjbSniffer.java
@@ -23,9 +23,9 @@
import org.jvnet.hk2.annotations.Service;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
import javax.enterprise.deploy.shared.ModuleType;
-import javax.inject.Singleton;
+import jakarta.inject.Singleton;
import java.io.IOException;
import java.util.List;
diff --git a/appserver/ejb/ejb-connector/src/main/java/org/glassfish/ejb/deployment/archive/EjbType.java b/appserver/ejb/ejb-connector/src/main/java/org/glassfish/ejb/deployment/archive/EjbType.java
index b45d7b8..c636e4d 100644
--- a/appserver/ejb/ejb-connector/src/main/java/org/glassfish/ejb/deployment/archive/EjbType.java
+++ b/appserver/ejb/ejb-connector/src/main/java/org/glassfish/ejb/deployment/archive/EjbType.java
@@ -29,7 +29,7 @@
* @author sanjeeb.sahoo@oracle.com
*/
@Service(name = EjbType.ARCHIVE_TYPE)
-@javax.inject.Singleton
+@jakarta.inject.Singleton
public class EjbType extends ArchiveType {
/**
* same as what's returned by {@link javax.enterprise.deploy.shared.ModuleType#EJB#toString()}
diff --git a/appserver/ejb/ejb-container/src/main/java/com/sun/ejb/EjbNamingReferenceManagerImpl.java b/appserver/ejb/ejb-container/src/main/java/com/sun/ejb/EjbNamingReferenceManagerImpl.java
index 1976c20..6296f71 100644
--- a/appserver/ejb/ejb-container/src/main/java/com/sun/ejb/EjbNamingReferenceManagerImpl.java
+++ b/appserver/ejb/ejb-container/src/main/java/com/sun/ejb/EjbNamingReferenceManagerImpl.java
@@ -24,10 +24,10 @@
import org.glassfish.api.invocation.ComponentInvocation;
import org.glassfish.api.invocation.InvocationManager;
import org.glassfish.enterprise.iiop.api.GlassFishORBHelper;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
import org.jvnet.hk2.annotations.Service;
-import javax.inject.Provider;
+import jakarta.inject.Provider;
import javax.naming.Context;
import com.sun.enterprise.util.Utility;
diff --git a/appserver/ejb/ejb-container/src/main/java/com/sun/ejb/base/container/util/CacheProperties.java b/appserver/ejb/ejb-container/src/main/java/com/sun/ejb/base/container/util/CacheProperties.java
index a66957b..bd0f56e 100644
--- a/appserver/ejb/ejb-container/src/main/java/com/sun/ejb/base/container/util/CacheProperties.java
+++ b/appserver/ejb/ejb-container/src/main/java/com/sun/ejb/base/container/util/CacheProperties.java
@@ -19,8 +19,8 @@
import java.util.concurrent.TimeUnit;
import java.util.logging.Logger;
-import javax.inject.Inject;
-import javax.inject.Named;
+import jakarta.inject.Inject;
+import jakarta.inject.Named;
import com.sun.logging.LogDomains;
import org.glassfish.api.admin.ServerEnvironment;
diff --git a/appserver/ejb/ejb-container/src/main/java/com/sun/ejb/containers/BaseContainerFactory.java b/appserver/ejb/ejb-container/src/main/java/com/sun/ejb/containers/BaseContainerFactory.java
index e637d9a..8376aa6 100644
--- a/appserver/ejb/ejb-container/src/main/java/com/sun/ejb/containers/BaseContainerFactory.java
+++ b/appserver/ejb/ejb-container/src/main/java/com/sun/ejb/containers/BaseContainerFactory.java
@@ -18,7 +18,7 @@
import com.sun.enterprise.util.LocalStringManagerImpl;
import com.sun.enterprise.security.SecurityManager;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
import org.glassfish.ejb.deployment.descriptor.EjbDescriptor;
import org.glassfish.ejb.security.application.EJBSecurityManager;
import org.glassfish.ejb.security.factory.EJBSecurityManagerFactory;
diff --git a/appserver/ejb/ejb-container/src/main/java/com/sun/ejb/containers/EJBTimerServiceConfigListener.java b/appserver/ejb/ejb-container/src/main/java/com/sun/ejb/containers/EJBTimerServiceConfigListener.java
index 6e85dfd..d0cd08d 100644
--- a/appserver/ejb/ejb-container/src/main/java/com/sun/ejb/containers/EJBTimerServiceConfigListener.java
+++ b/appserver/ejb/ejb-container/src/main/java/com/sun/ejb/containers/EJBTimerServiceConfigListener.java
@@ -27,7 +27,7 @@
import org.glassfish.ejb.config.EjbTimerService;
import org.jvnet.hk2.annotations.Service;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
import org.jvnet.hk2.config.ConfigListener;
import org.jvnet.hk2.config.UnprocessedChangeEvent;
import org.jvnet.hk2.config.UnprocessedChangeEvents;
diff --git a/appserver/ejb/ejb-container/src/main/java/com/sun/ejb/containers/EjbContainerUtilImpl.java b/appserver/ejb/ejb-container/src/main/java/com/sun/ejb/containers/EjbContainerUtilImpl.java
index 4354092..5c76095 100644
--- a/appserver/ejb/ejb-container/src/main/java/com/sun/ejb/containers/EjbContainerUtilImpl.java
+++ b/appserver/ejb/ejb-container/src/main/java/com/sun/ejb/containers/EjbContainerUtilImpl.java
@@ -50,9 +50,9 @@
import org.glassfish.hk2.api.PreDestroy;
import org.glassfish.hk2.api.ServiceLocator;
-import javax.inject.Inject;
-import javax.inject.Named;
-import javax.inject.Provider;
+import jakarta.inject.Inject;
+import jakarta.inject.Named;
+import jakarta.inject.Provider;
import jakarta.transaction.RollbackException;
import jakarta.transaction.SystemException;
import jakarta.transaction.Transaction;
diff --git a/appserver/ejb/ejb-container/src/main/java/com/sun/ejb/containers/InternalInterceptorBindingNamingProxy.java b/appserver/ejb/ejb-container/src/main/java/com/sun/ejb/containers/InternalInterceptorBindingNamingProxy.java
index b323913..9599df5 100644
--- a/appserver/ejb/ejb-container/src/main/java/com/sun/ejb/containers/InternalInterceptorBindingNamingProxy.java
+++ b/appserver/ejb/ejb-container/src/main/java/com/sun/ejb/containers/InternalInterceptorBindingNamingProxy.java
@@ -20,7 +20,7 @@
import org.glassfish.api.naming.NamedNamingObjectProxy;
import org.glassfish.hk2.api.ServiceLocator;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
import org.jvnet.hk2.annotations.Service;
import javax.naming.NamingException;
diff --git a/appserver/ejb/ejb-container/src/main/java/com/sun/ejb/containers/SingletonContainerFactory.java b/appserver/ejb/ejb-container/src/main/java/com/sun/ejb/containers/SingletonContainerFactory.java
index 396e78f..060d5f9 100644
--- a/appserver/ejb/ejb-container/src/main/java/com/sun/ejb/containers/SingletonContainerFactory.java
+++ b/appserver/ejb/ejb-container/src/main/java/com/sun/ejb/containers/SingletonContainerFactory.java
@@ -19,7 +19,7 @@
import com.sun.ejb.Container;
import com.sun.ejb.ContainerFactory;
import com.sun.enterprise.security.SecurityManager;
-import javax.inject.Singleton;
+import jakarta.inject.Singleton;
import org.glassfish.api.deployment.DeploymentContext;
import org.glassfish.ejb.deployment.descriptor.EjbDescriptor;
import org.glassfish.ejb.deployment.descriptor.EjbSessionDescriptor;
diff --git a/appserver/ejb/ejb-container/src/main/java/com/sun/ejb/containers/StatefulContainerFactory.java b/appserver/ejb/ejb-container/src/main/java/com/sun/ejb/containers/StatefulContainerFactory.java
index 9d9d6c5..8d7acd6 100644
--- a/appserver/ejb/ejb-container/src/main/java/com/sun/ejb/containers/StatefulContainerFactory.java
+++ b/appserver/ejb/ejb-container/src/main/java/com/sun/ejb/containers/StatefulContainerFactory.java
@@ -23,8 +23,8 @@
import java.util.logging.Level;
import java.util.logging.Logger;
-import javax.inject.Inject;
-import javax.inject.Named;
+import jakarta.inject.Inject;
+import jakarta.inject.Named;
import com.sun.appserv.util.cache.CacheListener;
import com.sun.ejb.Container;
diff --git a/appserver/ejb/ejb-container/src/main/java/com/sun/ejb/containers/StatelessContainerFactory.java b/appserver/ejb/ejb-container/src/main/java/com/sun/ejb/containers/StatelessContainerFactory.java
index d6f9373..ee48e77 100644
--- a/appserver/ejb/ejb-container/src/main/java/com/sun/ejb/containers/StatelessContainerFactory.java
+++ b/appserver/ejb/ejb-container/src/main/java/com/sun/ejb/containers/StatelessContainerFactory.java
@@ -19,7 +19,7 @@
import com.sun.ejb.Container;
import com.sun.ejb.ContainerFactory;
import com.sun.enterprise.security.SecurityManager;
-import javax.inject.Singleton;
+import jakarta.inject.Singleton;
import org.glassfish.api.deployment.DeploymentContext;
import org.glassfish.ejb.deployment.descriptor.EjbDescriptor;
import org.jvnet.hk2.annotations.Service;
diff --git a/appserver/ejb/ejb-container/src/main/java/org/glassfish/ejb/admin/cli/ListTimers.java b/appserver/ejb/ejb-container/src/main/java/org/glassfish/ejb/admin/cli/ListTimers.java
index d7ed2db..7e1e193 100644
--- a/appserver/ejb/ejb-container/src/main/java/org/glassfish/ejb/admin/cli/ListTimers.java
+++ b/appserver/ejb/ejb-container/src/main/java/org/glassfish/ejb/admin/cli/ListTimers.java
@@ -37,7 +37,7 @@
import org.glassfish.config.support.CommandTarget;
import org.glassfish.config.support.TargetType;
import org.glassfish.internal.api.Target;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
import org.jvnet.hk2.annotations.Service;
import org.glassfish.hk2.api.PerLookup;
diff --git a/appserver/ejb/ejb-container/src/main/java/org/glassfish/ejb/admin/cli/MigrateTimers.java b/appserver/ejb/ejb-container/src/main/java/org/glassfish/ejb/admin/cli/MigrateTimers.java
index 9c519d2..6a310ce 100644
--- a/appserver/ejb/ejb-container/src/main/java/org/glassfish/ejb/admin/cli/MigrateTimers.java
+++ b/appserver/ejb/ejb-container/src/main/java/org/glassfish/ejb/admin/cli/MigrateTimers.java
@@ -44,7 +44,7 @@
import org.glassfish.config.support.CommandTarget;
import org.glassfish.config.support.TargetType;
import org.glassfish.internal.api.Target;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
import org.jvnet.hk2.annotations.Service;
import org.glassfish.hk2.api.PerLookup;
diff --git a/appserver/ejb/ejb-container/src/main/java/org/glassfish/ejb/deployment/EjbJarHandler.java b/appserver/ejb/ejb-container/src/main/java/org/glassfish/ejb/deployment/EjbJarHandler.java
index e1dc739..9d4bdf1 100644
--- a/appserver/ejb/ejb-container/src/main/java/org/glassfish/ejb/deployment/EjbJarHandler.java
+++ b/appserver/ejb/ejb-container/src/main/java/org/glassfish/ejb/deployment/EjbJarHandler.java
@@ -30,8 +30,8 @@
import org.glassfish.ejb.deployment.archive.EjbJarDetector;
import org.glassfish.ejb.LogFacade;
import org.glassfish.loader.util.ASClassLoaderUtil;
-import javax.inject.Inject;
-import javax.inject.Named;
+import jakarta.inject.Inject;
+import jakarta.inject.Named;
import org.jvnet.hk2.annotations.Service;
import javax.xml.stream.XMLStreamException;
diff --git a/appserver/ejb/ejb-container/src/main/java/org/glassfish/ejb/deployment/archivist/EjbArchivist.java b/appserver/ejb/ejb-container/src/main/java/org/glassfish/ejb/deployment/archivist/EjbArchivist.java
index 14cf39c..2bf7810 100644
--- a/appserver/ejb/ejb-container/src/main/java/org/glassfish/ejb/deployment/archivist/EjbArchivist.java
+++ b/appserver/ejb/ejb-container/src/main/java/org/glassfish/ejb/deployment/archivist/EjbArchivist.java
@@ -19,7 +19,7 @@
import java.io.IOException;
import java.util.List;
import java.util.Set;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
import com.sun.ejb.containers.EjbContainerUtil;
import com.sun.enterprise.deployment.Application;
diff --git a/appserver/ejb/ejb-container/src/main/java/org/glassfish/ejb/deployment/archivist/EjbInWarArchivist.java b/appserver/ejb/ejb-container/src/main/java/org/glassfish/ejb/deployment/archivist/EjbInWarArchivist.java
index ac7ab05..b90c7b1 100644
--- a/appserver/ejb/ejb-container/src/main/java/org/glassfish/ejb/deployment/archivist/EjbInWarArchivist.java
+++ b/appserver/ejb/ejb-container/src/main/java/org/glassfish/ejb/deployment/archivist/EjbInWarArchivist.java
@@ -16,8 +16,8 @@
package org.glassfish.ejb.deployment.archivist;
-import javax.inject.Inject;
-import javax.inject.Provider;
+import jakarta.inject.Inject;
+import jakarta.inject.Provider;
import java.util.List;
import java.util.Collection;
diff --git a/appserver/ejb/ejb-container/src/main/java/org/glassfish/ejb/deployment/descriptor/EjbDescriptor.java b/appserver/ejb/ejb-container/src/main/java/org/glassfish/ejb/deployment/descriptor/EjbDescriptor.java
index d1cbd0d..36b502f 100644
--- a/appserver/ejb/ejb-container/src/main/java/org/glassfish/ejb/deployment/descriptor/EjbDescriptor.java
+++ b/appserver/ejb/ejb-container/src/main/java/org/glassfish/ejb/deployment/descriptor/EjbDescriptor.java
@@ -75,7 +75,7 @@
import org.glassfish.internal.api.Globals;
import com.sun.enterprise.container.common.spi.JCDIService;
import org.glassfish.hk2.api.ServiceLocator;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
/**
* This abstract class encapsulates the meta-information describing
diff --git a/appserver/ejb/ejb-container/src/main/java/org/glassfish/ejb/security/application/EjbSecurityComponentInvocationHandler.java b/appserver/ejb/ejb-container/src/main/java/org/glassfish/ejb/security/application/EjbSecurityComponentInvocationHandler.java
index 0556cbe..0094481 100644
--- a/appserver/ejb/ejb-container/src/main/java/org/glassfish/ejb/security/application/EjbSecurityComponentInvocationHandler.java
+++ b/appserver/ejb/ejb-container/src/main/java/org/glassfish/ejb/security/application/EjbSecurityComponentInvocationHandler.java
@@ -26,10 +26,10 @@
import org.glassfish.api.invocation.RegisteredComponentInvocationHandler;
import org.glassfish.api.invocation.InvocationException;
import org.glassfish.api.invocation.InvocationManager;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
import org.jvnet.hk2.annotations.Service;
-import javax.inject.Singleton;
+import jakarta.inject.Singleton;
@Service(name="ejbSecurityCIH")
@Singleton
diff --git a/appserver/ejb/ejb-container/src/main/java/org/glassfish/ejb/security/factory/EJBSecurityManagerFactory.java b/appserver/ejb/ejb-container/src/main/java/org/glassfish/ejb/security/factory/EJBSecurityManagerFactory.java
index cf7344f..c031907 100644
--- a/appserver/ejb/ejb-container/src/main/java/org/glassfish/ejb/security/factory/EJBSecurityManagerFactory.java
+++ b/appserver/ejb/ejb-container/src/main/java/org/glassfish/ejb/security/factory/EJBSecurityManagerFactory.java
@@ -28,7 +28,7 @@
import java.util.logging.Level;
import java.util.logging.Logger;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
import org.glassfish.api.invocation.InvocationManager;
import org.glassfish.ejb.deployment.descriptor.EjbDescriptor;
@@ -36,7 +36,7 @@
import org.glassfish.ejb.security.application.EjbSecurityProbeProvider;
import org.jvnet.hk2.annotations.Service;
-import javax.inject.Singleton;
+import jakarta.inject.Singleton;
import com.sun.enterprise.security.ee.audit.AppServerAuditManager;
import com.sun.enterprise.security.factory.SecurityManagerFactory;
diff --git a/appserver/ejb/ejb-container/src/main/java/org/glassfish/ejb/startup/EjbContainerStarter.java b/appserver/ejb/ejb-container/src/main/java/org/glassfish/ejb/startup/EjbContainerStarter.java
index c3346c7..faf0e81 100644
--- a/appserver/ejb/ejb-container/src/main/java/org/glassfish/ejb/startup/EjbContainerStarter.java
+++ b/appserver/ejb/ejb-container/src/main/java/org/glassfish/ejb/startup/EjbContainerStarter.java
@@ -18,7 +18,7 @@
import com.sun.ejb.containers.EjbContainerUtil;
import org.glassfish.api.container.Container;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
import org.jvnet.hk2.annotations.Service;
import org.glassfish.hk2.api.PostConstruct;
import org.glassfish.hk2.api.PreDestroy;
diff --git a/appserver/ejb/ejb-container/src/main/java/org/glassfish/ejb/startup/EjbDeployer.java b/appserver/ejb/ejb-container/src/main/java/org/glassfish/ejb/startup/EjbDeployer.java
index 4c09bfa..2f32c2b 100644
--- a/appserver/ejb/ejb-container/src/main/java/org/glassfish/ejb/startup/EjbDeployer.java
+++ b/appserver/ejb/ejb-container/src/main/java/org/glassfish/ejb/startup/EjbDeployer.java
@@ -23,8 +23,8 @@
import java.util.concurrent.atomic.AtomicLong;
import java.util.logging.Level;
import java.util.logging.Logger;
-import javax.inject.Inject;
-import javax.inject.Provider;
+import jakarta.inject.Inject;
+import jakarta.inject.Provider;
import com.sun.ejb.codegen.StaticRmiStubGenerator;
import com.sun.ejb.containers.EJBTimerService;
diff --git a/appserver/ejb/ejb-container/src/main/java/org/glassfish/ejb/upgrade/EJBTimerServiceUpgrade.java b/appserver/ejb/ejb-container/src/main/java/org/glassfish/ejb/upgrade/EJBTimerServiceUpgrade.java
index 0f29001..4fc1ffa 100644
--- a/appserver/ejb/ejb-container/src/main/java/org/glassfish/ejb/upgrade/EJBTimerServiceUpgrade.java
+++ b/appserver/ejb/ejb-container/src/main/java/org/glassfish/ejb/upgrade/EJBTimerServiceUpgrade.java
@@ -26,7 +26,7 @@
import org.glassfish.ejb.config.EjbContainer;
import org.glassfish.ejb.config.EjbTimerService;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
import org.jvnet.hk2.annotations.Service;
import org.glassfish.hk2.api.PostConstruct;
import org.jvnet.hk2.config.ConfigSupport;
diff --git a/appserver/ejb/ejb-full-container/src/main/java/org/glassfish/ejb/mdb/MessageBeanContainerFactory.java b/appserver/ejb/ejb-full-container/src/main/java/org/glassfish/ejb/mdb/MessageBeanContainerFactory.java
index 0df6535..7b6b983 100644
--- a/appserver/ejb/ejb-full-container/src/main/java/org/glassfish/ejb/mdb/MessageBeanContainerFactory.java
+++ b/appserver/ejb/ejb-full-container/src/main/java/org/glassfish/ejb/mdb/MessageBeanContainerFactory.java
@@ -17,7 +17,7 @@
package org.glassfish.ejb.mdb;
import com.sun.ejb.containers.BaseContainerFactory;
-import javax.inject.Singleton;
+import jakarta.inject.Singleton;
import org.glassfish.api.deployment.DeploymentContext;
import com.sun.enterprise.security.SecurityManager;
import org.jvnet.hk2.annotations.Service;
diff --git a/appserver/ejb/ejb-full-container/src/main/java/org/glassfish/ejb/persistent/timer/DistributedEJBTimerService.java b/appserver/ejb/ejb-full-container/src/main/java/org/glassfish/ejb/persistent/timer/DistributedEJBTimerService.java
index edee1c4..430ceef 100644
--- a/appserver/ejb/ejb-full-container/src/main/java/org/glassfish/ejb/persistent/timer/DistributedEJBTimerService.java
+++ b/appserver/ejb/ejb-full-container/src/main/java/org/glassfish/ejb/persistent/timer/DistributedEJBTimerService.java
@@ -31,7 +31,7 @@
import com.sun.enterprise.ee.cms.core.Signal;
import org.jvnet.hk2.annotations.Service;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
import org.glassfish.hk2.api.PostConstruct;
import java.util.logging.Logger;
diff --git a/appserver/extras/embedded/shell/glassfish-embedded-static-shell/pom.xml b/appserver/extras/embedded/shell/glassfish-embedded-static-shell/pom.xml
index 26716c7..2d6c038 100755
--- a/appserver/extras/embedded/shell/glassfish-embedded-static-shell/pom.xml
+++ b/appserver/extras/embedded/shell/glassfish-embedded-static-shell/pom.xml
@@ -561,8 +561,8 @@
<optional>true</optional>
</dependency>
<dependency>
- <groupId>org.glassfish.hk2.external</groupId>
- <artifactId>jakarta.inject</artifactId>
+ <groupId>jakarta.inject</groupId>
+ <artifactId>jakarta.inject-api</artifactId>
<optional>true</optional>
</dependency>
<dependency>
diff --git a/appserver/extras/javaee/manifest-jar/pom.xml b/appserver/extras/javaee/manifest-jar/pom.xml
index f1746aa..da38555 100644
--- a/appserver/extras/javaee/manifest-jar/pom.xml
+++ b/appserver/extras/javaee/manifest-jar/pom.xml
@@ -34,7 +34,7 @@
<configuration>
<archive>
<manifestEntries>
- <Class-Path>../modules/jakarta.servlet-api.jar ../modules/jakarta.annotation-api.jar ../modules/jakarta.ejb-api.jar ../modules/jakarta.transaction-api.jar ../modules/jakarta.enterprise.deploy-api.jar ../modules/jakarta.management.j2ee-api.jar ../modules/jakarta.resource-api.jar ../modules/jakarta.security.auth.message-api.jar ../modules/jakarta.authorization-api.jar ../modules/webservices-osgi.jar ../modules/jaxb-osgi.jar ../modules/jakarta.xml.bind-api.jar ../modules/webservices-api-osgi.jar ../modules/jakarta.mail.jar ../modules/jakarta.activation.jar ../modules/jakarta.faces.jar ../modules/jakarta.servlet.jsp-api.jar ../modules/jakarta.el.jar ../modules/jakarta.servlet.jsp.jstl-api.jar ../modules/jakarta.persistence.jar ../modules/jakarta.jms-api.jar ../modules/hibernate-validator.jar ../modules/validation.jar ../modules/cdi-api.jar ../../mq/lib/jaxm-api.jar ../modules/jakarta.ws.rs-api.jar ../modules/jakarta.json.jar ../modules/jakarta.json.bind-api.jar ../modules/jakarta.websocket-api.jar ../modules/jakarta.enterprise.concurrent-api.jar ../modules/jakarta.batch-api.jar ../modules/jakarta.inject.jar</Class-Path>
+ <Class-Path>../modules/jakarta.servlet-api.jar ../modules/jakarta.annotation-api.jar ../modules/jakarta.ejb-api.jar ../modules/jakarta.transaction-api.jar ../modules/jakarta.enterprise.deploy-api.jar ../modules/jakarta.management.j2ee-api.jar ../modules/jakarta.resource-api.jar ../modules/jakarta.security.auth.message-api.jar ../modules/jakarta.authorization-api.jar ../modules/webservices-osgi.jar ../modules/jaxb-osgi.jar ../modules/jakarta.xml.bind-api.jar ../modules/webservices-api-osgi.jar ../modules/jakarta.mail.jar ../modules/jakarta.activation.jar ../modules/jakarta.faces.jar ../modules/jakarta.servlet.jsp-api.jar ../modules/jakarta.el.jar ../modules/jakarta.servlet.jsp.jstl-api.jar ../modules/jakarta.persistence.jar ../modules/jakarta.jms-api.jar ../modules/hibernate-validator.jar ../modules/validation.jar ../modules/cdi-api.jar ../../mq/lib/jaxm-api.jar ../modules/jakarta.ws.rs-api.jar ../modules/jakarta.json.jar ../modules/jakarta.json.bind-api.jar ../modules/jakarta.websocket-api.jar ../modules/jakarta.enterprise.concurrent-api.jar ../modules/jakarta.batch-api.jar ../modules/jakarta.inject-api.jar</Class-Path>
<GlassFish-ServerExcluded>true</GlassFish-ServerExcluded>
</manifestEntries>
</archive>
diff --git a/appserver/grizzly/grizzly-container/src/main/java/org/glassfish/extras/grizzly/GrizzlyDeployer.java b/appserver/grizzly/grizzly-container/src/main/java/org/glassfish/extras/grizzly/GrizzlyDeployer.java
index e520bd1..6a9f97d 100644
--- a/appserver/grizzly/grizzly-container/src/main/java/org/glassfish/extras/grizzly/GrizzlyDeployer.java
+++ b/appserver/grizzly/grizzly-container/src/main/java/org/glassfish/extras/grizzly/GrizzlyDeployer.java
@@ -27,7 +27,7 @@
import java.util.LinkedList;
import java.util.logging.Level;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
import com.sun.logging.LogDomains;
import java.util.ArrayList;
diff --git a/appserver/ha/ha-shoal-cache-bootstrap/src/main/java/org/glassfish/ha/store/adapter/cache/ReplicationStoreProxy2.java b/appserver/ha/ha-shoal-cache-bootstrap/src/main/java/org/glassfish/ha/store/adapter/cache/ReplicationStoreProxy2.java
index 6049e1c..bdd12d8 100644
--- a/appserver/ha/ha-shoal-cache-bootstrap/src/main/java/org/glassfish/ha/store/adapter/cache/ReplicationStoreProxy2.java
+++ b/appserver/ha/ha-shoal-cache-bootstrap/src/main/java/org/glassfish/ha/store/adapter/cache/ReplicationStoreProxy2.java
@@ -18,7 +18,7 @@
import java.io.Serializable;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
import org.glassfish.api.StartupRunLevel;
import org.glassfish.api.event.Events;
diff --git a/appserver/ha/ha-shoal-cache-bootstrap/src/main/java/org/glassfish/ha/store/adapter/cache/ShoalBackingStoreProxy.java b/appserver/ha/ha-shoal-cache-bootstrap/src/main/java/org/glassfish/ha/store/adapter/cache/ShoalBackingStoreProxy.java
index e3179a7..ba2007b 100644
--- a/appserver/ha/ha-shoal-cache-bootstrap/src/main/java/org/glassfish/ha/store/adapter/cache/ShoalBackingStoreProxy.java
+++ b/appserver/ha/ha-shoal-cache-bootstrap/src/main/java/org/glassfish/ha/store/adapter/cache/ShoalBackingStoreProxy.java
@@ -20,7 +20,7 @@
import java.util.logging.Level;
import java.util.logging.Logger;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
import org.glassfish.api.StartupRunLevel;
import org.glassfish.api.event.EventListener;
diff --git a/appserver/jdbc/admin/src/main/java/org/glassfish/jdbc/admin/cli/CreateJdbcConnectionPool.java b/appserver/jdbc/admin/src/main/java/org/glassfish/jdbc/admin/cli/CreateJdbcConnectionPool.java
index f00fe1e..9e1356d 100644
--- a/appserver/jdbc/admin/src/main/java/org/glassfish/jdbc/admin/cli/CreateJdbcConnectionPool.java
+++ b/appserver/jdbc/admin/src/main/java/org/glassfish/jdbc/admin/cli/CreateJdbcConnectionPool.java
@@ -29,7 +29,7 @@
import org.glassfish.resourcebase.resources.api.ResourceStatus;
import org.jvnet.hk2.annotations.Service;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
import java.util.HashMap;
import java.util.Properties;
diff --git a/appserver/jdbc/admin/src/main/java/org/glassfish/jdbc/admin/cli/CreateJdbcResource.java b/appserver/jdbc/admin/src/main/java/org/glassfish/jdbc/admin/cli/CreateJdbcResource.java
index 3bd85f1..45c7ac3 100644
--- a/appserver/jdbc/admin/src/main/java/org/glassfish/jdbc/admin/cli/CreateJdbcResource.java
+++ b/appserver/jdbc/admin/src/main/java/org/glassfish/jdbc/admin/cli/CreateJdbcResource.java
@@ -32,7 +32,7 @@
import org.glassfish.resourcebase.resources.api.ResourceStatus;
import org.jvnet.hk2.annotations.Service;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
import java.util.HashMap;
import java.util.Properties;
diff --git a/appserver/jdbc/admin/src/main/java/org/glassfish/jdbc/admin/cli/DeleteJdbcConnectionPool.java b/appserver/jdbc/admin/src/main/java/org/glassfish/jdbc/admin/cli/DeleteJdbcConnectionPool.java
index bb5a1c8..8cc28ea 100644
--- a/appserver/jdbc/admin/src/main/java/org/glassfish/jdbc/admin/cli/DeleteJdbcConnectionPool.java
+++ b/appserver/jdbc/admin/src/main/java/org/glassfish/jdbc/admin/cli/DeleteJdbcConnectionPool.java
@@ -33,7 +33,7 @@
import org.glassfish.resourcebase.resources.api.ResourceStatus;
import org.jvnet.hk2.annotations.Service;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
import java.util.logging.Level;
import java.util.logging.Logger;
diff --git a/appserver/jdbc/admin/src/main/java/org/glassfish/jdbc/admin/cli/DeleteJdbcResource.java b/appserver/jdbc/admin/src/main/java/org/glassfish/jdbc/admin/cli/DeleteJdbcResource.java
index e3df1a5..82de180 100644
--- a/appserver/jdbc/admin/src/main/java/org/glassfish/jdbc/admin/cli/DeleteJdbcResource.java
+++ b/appserver/jdbc/admin/src/main/java/org/glassfish/jdbc/admin/cli/DeleteJdbcResource.java
@@ -30,7 +30,7 @@
import org.glassfish.resourcebase.resources.api.ResourceStatus;
import org.jvnet.hk2.annotations.Service;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
/**
* Delete JDBC Resource command
diff --git a/appserver/jdbc/admin/src/main/java/org/glassfish/jdbc/admin/cli/JDBCResourceManager.java b/appserver/jdbc/admin/src/main/java/org/glassfish/jdbc/admin/cli/JDBCResourceManager.java
index 21caf3e..af9c36c 100644
--- a/appserver/jdbc/admin/src/main/java/org/glassfish/jdbc/admin/cli/JDBCResourceManager.java
+++ b/appserver/jdbc/admin/src/main/java/org/glassfish/jdbc/admin/cli/JDBCResourceManager.java
@@ -37,7 +37,7 @@
import org.jvnet.hk2.config.TransactionFailure;
import org.jvnet.hk2.config.types.Property;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
import jakarta.resource.ResourceException;
import java.beans.PropertyVetoException;
import java.util.HashMap;
diff --git a/appserver/jdbc/admin/src/main/java/org/glassfish/jdbc/admin/cli/ListJdbcConnectionPools.java b/appserver/jdbc/admin/src/main/java/org/glassfish/jdbc/admin/cli/ListJdbcConnectionPools.java
index 46d0bff..8309c56 100644
--- a/appserver/jdbc/admin/src/main/java/org/glassfish/jdbc/admin/cli/ListJdbcConnectionPools.java
+++ b/appserver/jdbc/admin/src/main/java/org/glassfish/jdbc/admin/cli/ListJdbcConnectionPools.java
@@ -38,7 +38,7 @@
import org.glassfish.api.admin.RestEndpoint;
import org.glassfish.api.admin.RestEndpoints;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
/**
* List JDBC Connection Pools command
diff --git a/appserver/jdbc/admin/src/main/java/org/glassfish/jdbc/admin/cli/ListJdbcResources.java b/appserver/jdbc/admin/src/main/java/org/glassfish/jdbc/admin/cli/ListJdbcResources.java
index 8027388..2531e90 100644
--- a/appserver/jdbc/admin/src/main/java/org/glassfish/jdbc/admin/cli/ListJdbcResources.java
+++ b/appserver/jdbc/admin/src/main/java/org/glassfish/jdbc/admin/cli/ListJdbcResources.java
@@ -32,7 +32,7 @@
import org.glassfish.resourcebase.resources.util.BindableResourcesHelper;
import org.jvnet.hk2.annotations.Service;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
import java.util.*;
/**
diff --git a/appserver/jdbc/admin/src/main/java/org/glassfish/jdbc/admin/cli/internal/GetDatabaseVendorNames.java b/appserver/jdbc/admin/src/main/java/org/glassfish/jdbc/admin/cli/internal/GetDatabaseVendorNames.java
index 929637d..131cd8f 100644
--- a/appserver/jdbc/admin/src/main/java/org/glassfish/jdbc/admin/cli/internal/GetDatabaseVendorNames.java
+++ b/appserver/jdbc/admin/src/main/java/org/glassfish/jdbc/admin/cli/internal/GetDatabaseVendorNames.java
@@ -32,7 +32,7 @@
import org.glassfish.api.admin.RestEndpoint;
import org.glassfish.api.admin.RestEndpoints;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
/**
* @author Jagadish Ramu
diff --git a/appserver/jdbc/admin/src/main/java/org/glassfish/jdbc/admin/cli/internal/GetJdbcDriverClassNames.java b/appserver/jdbc/admin/src/main/java/org/glassfish/jdbc/admin/cli/internal/GetJdbcDriverClassNames.java
index b200c01..f54a758 100644
--- a/appserver/jdbc/admin/src/main/java/org/glassfish/jdbc/admin/cli/internal/GetJdbcDriverClassNames.java
+++ b/appserver/jdbc/admin/src/main/java/org/glassfish/jdbc/admin/cli/internal/GetJdbcDriverClassNames.java
@@ -31,7 +31,7 @@
import org.glassfish.api.admin.RestEndpoint;
import org.glassfish.api.admin.RestEndpoints;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
/**
* @author Jagadish Ramu
diff --git a/appserver/jdbc/admin/src/main/java/org/glassfish/jdbc/admin/cli/internal/GetValidationClassNames.java b/appserver/jdbc/admin/src/main/java/org/glassfish/jdbc/admin/cli/internal/GetValidationClassNames.java
index 4f3dc39..f7f7846 100644
--- a/appserver/jdbc/admin/src/main/java/org/glassfish/jdbc/admin/cli/internal/GetValidationClassNames.java
+++ b/appserver/jdbc/admin/src/main/java/org/glassfish/jdbc/admin/cli/internal/GetValidationClassNames.java
@@ -34,7 +34,7 @@
import org.glassfish.api.admin.RestEndpoint;
import org.glassfish.api.admin.RestEndpoints;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
/**
* @author Jagadish Ramu
diff --git a/appserver/jdbc/admin/src/main/java/org/glassfish/jdbc/admin/cli/internal/GetValidationTableNames.java b/appserver/jdbc/admin/src/main/java/org/glassfish/jdbc/admin/cli/internal/GetValidationTableNames.java
index 3cf855e..3ad0a0a 100644
--- a/appserver/jdbc/admin/src/main/java/org/glassfish/jdbc/admin/cli/internal/GetValidationTableNames.java
+++ b/appserver/jdbc/admin/src/main/java/org/glassfish/jdbc/admin/cli/internal/GetValidationTableNames.java
@@ -25,7 +25,7 @@
import org.glassfish.resourcebase.resources.api.PoolInfo;
import org.jvnet.hk2.annotations.Service;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
import java.util.ArrayList;
import java.util.Properties;
import java.util.Set;
diff --git a/appserver/jdbc/jdbc-runtime/src/main/java/org/glassfish/jdbc/deployer/DataSourceDefinitionDeployer.java b/appserver/jdbc/jdbc-runtime/src/main/java/org/glassfish/jdbc/deployer/DataSourceDefinitionDeployer.java
index 37e78e3..a71ec75 100644
--- a/appserver/jdbc/jdbc-runtime/src/main/java/org/glassfish/jdbc/deployer/DataSourceDefinitionDeployer.java
+++ b/appserver/jdbc/jdbc-runtime/src/main/java/org/glassfish/jdbc/deployer/DataSourceDefinitionDeployer.java
@@ -41,8 +41,8 @@
import org.jvnet.hk2.config.TransactionFailure;
import org.jvnet.hk2.config.types.Property;
-import javax.inject.Inject;
-import javax.inject.Provider;
+import jakarta.inject.Inject;
+import jakarta.inject.Provider;
import javax.naming.NamingException;
import java.beans.PropertyVetoException;
import java.util.*;
diff --git a/appserver/jdbc/jdbc-runtime/src/main/java/org/glassfish/jdbc/deployer/JdbcConnectionPoolDeployer.java b/appserver/jdbc/jdbc-runtime/src/main/java/org/glassfish/jdbc/deployer/JdbcConnectionPoolDeployer.java
index b62c715..7784f2c 100644
--- a/appserver/jdbc/jdbc-runtime/src/main/java/org/glassfish/jdbc/deployer/JdbcConnectionPoolDeployer.java
+++ b/appserver/jdbc/jdbc-runtime/src/main/java/org/glassfish/jdbc/deployer/JdbcConnectionPoolDeployer.java
@@ -41,8 +41,8 @@
import org.jvnet.hk2.annotations.Service;
import org.jvnet.hk2.config.types.Property;
-import javax.inject.Inject;
-import javax.inject.Singleton;
+import jakarta.inject.Inject;
+import jakarta.inject.Singleton;
import java.util.*;
import java.util.concurrent.Callable;
import java.util.concurrent.ExecutorService;
diff --git a/appserver/jdbc/jdbc-runtime/src/main/java/org/glassfish/jdbc/deployer/JdbcResourceDeployer.java b/appserver/jdbc/jdbc-runtime/src/main/java/org/glassfish/jdbc/deployer/JdbcResourceDeployer.java
index d4b66d7..7d428b9 100644
--- a/appserver/jdbc/jdbc-runtime/src/main/java/org/glassfish/jdbc/deployer/JdbcResourceDeployer.java
+++ b/appserver/jdbc/jdbc-runtime/src/main/java/org/glassfish/jdbc/deployer/JdbcResourceDeployer.java
@@ -30,8 +30,8 @@
import org.glassfish.resourcebase.resources.api.*;
import org.jvnet.hk2.annotations.Service;
-import javax.inject.Inject;
-import javax.inject.Singleton;
+import jakarta.inject.Inject;
+import jakarta.inject.Singleton;
import java.util.Collection;
import java.util.logging.Level;
import java.util.logging.Logger;
diff --git a/appserver/jdbc/jdbc-runtime/src/main/java/org/glassfish/jdbc/recovery/JdbcRecoveryResourceHandler.java b/appserver/jdbc/jdbc-runtime/src/main/java/org/glassfish/jdbc/recovery/JdbcRecoveryResourceHandler.java
index 59f9b0e..c3b7e9a 100644
--- a/appserver/jdbc/jdbc-runtime/src/main/java/org/glassfish/jdbc/recovery/JdbcRecoveryResourceHandler.java
+++ b/appserver/jdbc/jdbc-runtime/src/main/java/org/glassfish/jdbc/recovery/JdbcRecoveryResourceHandler.java
@@ -36,8 +36,8 @@
import org.jvnet.hk2.config.types.Property;
import com.sun.enterprise.config.serverbeans.Module;
-import javax.inject.Inject;
-import javax.inject.Provider;
+import jakarta.inject.Inject;
+import jakarta.inject.Provider;
import javax.naming.InitialContext;
import javax.naming.NamingException;
import jakarta.resource.ResourceException;
diff --git a/appserver/jdbc/jdbc-runtime/src/main/java/org/glassfish/jdbcruntime/JdbcPoolMonitoringExtension.java b/appserver/jdbc/jdbc-runtime/src/main/java/org/glassfish/jdbcruntime/JdbcPoolMonitoringExtension.java
index f232567..0b284f9 100644
--- a/appserver/jdbc/jdbc-runtime/src/main/java/org/glassfish/jdbcruntime/JdbcPoolMonitoringExtension.java
+++ b/appserver/jdbc/jdbc-runtime/src/main/java/org/glassfish/jdbcruntime/JdbcPoolMonitoringExtension.java
@@ -36,8 +36,8 @@
import org.glassfish.resourcebase.resources.api.PoolInfo;
import org.jvnet.hk2.annotations.Service;
-import javax.inject.Inject;
-import javax.inject.Provider;
+import jakarta.inject.Inject;
+import jakarta.inject.Provider;
import java.util.ArrayList;
import java.util.Iterator;
import java.util.List;
diff --git a/appserver/jdbc/jdbc-runtime/src/main/java/org/glassfish/jdbcruntime/JdbcRuntimeExtension.java b/appserver/jdbc/jdbc-runtime/src/main/java/org/glassfish/jdbcruntime/JdbcRuntimeExtension.java
index 82b27c6..9ee1a94 100644
--- a/appserver/jdbc/jdbc-runtime/src/main/java/org/glassfish/jdbcruntime/JdbcRuntimeExtension.java
+++ b/appserver/jdbc/jdbc-runtime/src/main/java/org/glassfish/jdbcruntime/JdbcRuntimeExtension.java
@@ -38,8 +38,8 @@
import org.jvnet.hk2.annotations.Service;
import org.jvnet.hk2.config.ConfigBeanProxy;
-import javax.inject.Inject;
-import javax.inject.Provider;
+import jakarta.inject.Inject;
+import jakarta.inject.Provider;
import java.util.ArrayList;
import java.util.Collection;
import java.util.List;
diff --git a/appserver/jdbc/jdbc-runtime/src/main/java/org/glassfish/jdbcruntime/service/JdbcAdminServiceImpl.java b/appserver/jdbc/jdbc-runtime/src/main/java/org/glassfish/jdbcruntime/service/JdbcAdminServiceImpl.java
index 7d0d968..208a586 100644
--- a/appserver/jdbc/jdbc-runtime/src/main/java/org/glassfish/jdbcruntime/service/JdbcAdminServiceImpl.java
+++ b/appserver/jdbc/jdbc-runtime/src/main/java/org/glassfish/jdbcruntime/service/JdbcAdminServiceImpl.java
@@ -28,7 +28,7 @@
import org.glassfish.resourcebase.resources.api.PoolInfo;
import org.jvnet.hk2.annotations.Service;
-import javax.inject.Singleton;
+import jakarta.inject.Singleton;
import javax.naming.NamingException;
import jakarta.resource.ResourceException;
import jakarta.resource.spi.ManagedConnection;
diff --git a/appserver/jms/admin/src/main/java/org/glassfish/jms/admin/cli/ChangeMasterBrokerCommand.java b/appserver/jms/admin/src/main/java/org/glassfish/jms/admin/cli/ChangeMasterBrokerCommand.java
index 0c77274..f984e78 100755
--- a/appserver/jms/admin/src/main/java/org/glassfish/jms/admin/cli/ChangeMasterBrokerCommand.java
+++ b/appserver/jms/admin/src/main/java/org/glassfish/jms/admin/cli/ChangeMasterBrokerCommand.java
@@ -45,7 +45,7 @@
import org.jvnet.hk2.config.SingleConfigCode;
import org.jvnet.hk2.config.TransactionFailure;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
import javax.management.MBeanServerConnection;
import javax.management.ObjectName;
import javax.management.openmbean.CompositeData;
diff --git a/appserver/jms/admin/src/main/java/org/glassfish/jms/admin/cli/ConfigureJMSCluster.java b/appserver/jms/admin/src/main/java/org/glassfish/jms/admin/cli/ConfigureJMSCluster.java
index 3cd546a..ae5f83a 100755
--- a/appserver/jms/admin/src/main/java/org/glassfish/jms/admin/cli/ConfigureJMSCluster.java
+++ b/appserver/jms/admin/src/main/java/org/glassfish/jms/admin/cli/ConfigureJMSCluster.java
@@ -36,7 +36,7 @@
import java.util.Map;
import java.beans.PropertyVetoException;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
import org.jvnet.hk2.annotations.Service;
diff --git a/appserver/jms/admin/src/main/java/org/glassfish/jms/admin/cli/CreateJMSDestination.java b/appserver/jms/admin/src/main/java/org/glassfish/jms/admin/cli/CreateJMSDestination.java
index 3510b17..1bf4248 100644
--- a/appserver/jms/admin/src/main/java/org/glassfish/jms/admin/cli/CreateJMSDestination.java
+++ b/appserver/jms/admin/src/main/java/org/glassfish/jms/admin/cli/CreateJMSDestination.java
@@ -32,8 +32,8 @@
import com.sun.enterprise.util.SystemPropertyConstants;
import com.sun.enterprise.config.serverbeans.*;
-import javax.inject.Inject;
-import javax.inject.Named;
+import jakarta.inject.Inject;
+import jakarta.inject.Named;
import javax.management.MBeanServerConnection;
import javax.management.ObjectName;
import javax.management.AttributeList;
diff --git a/appserver/jms/admin/src/main/java/org/glassfish/jms/admin/cli/CreateJMSHost.java b/appserver/jms/admin/src/main/java/org/glassfish/jms/admin/cli/CreateJMSHost.java
index 7d3f5d4..bf0529f 100644
--- a/appserver/jms/admin/src/main/java/org/glassfish/jms/admin/cli/CreateJMSHost.java
+++ b/appserver/jms/admin/src/main/java/org/glassfish/jms/admin/cli/CreateJMSHost.java
@@ -44,8 +44,8 @@
import org.jvnet.hk2.config.types.Property;
import java.util.Map;
-import javax.inject.Inject;
-import javax.inject.Named;
+import jakarta.inject.Inject;
+import jakarta.inject.Named;
/**
* Create Admin Object Command
diff --git a/appserver/jms/admin/src/main/java/org/glassfish/jms/admin/cli/CreateJMSResource.java b/appserver/jms/admin/src/main/java/org/glassfish/jms/admin/cli/CreateJMSResource.java
index 6e5038b..e005b4a 100644
--- a/appserver/jms/admin/src/main/java/org/glassfish/jms/admin/cli/CreateJMSResource.java
+++ b/appserver/jms/admin/src/main/java/org/glassfish/jms/admin/cli/CreateJMSResource.java
@@ -32,7 +32,7 @@
import org.glassfish.hk2.api.PerLookup;
import org.jvnet.hk2.annotations.Service;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
import java.nio.charset.Charset;
import java.nio.charset.CharsetEncoder;
import java.util.Enumeration;
diff --git a/appserver/jms/admin/src/main/java/org/glassfish/jms/admin/cli/DeleteJMSDestination.java b/appserver/jms/admin/src/main/java/org/glassfish/jms/admin/cli/DeleteJMSDestination.java
index 53f145c..f50cf62 100644
--- a/appserver/jms/admin/src/main/java/org/glassfish/jms/admin/cli/DeleteJMSDestination.java
+++ b/appserver/jms/admin/src/main/java/org/glassfish/jms/admin/cli/DeleteJMSDestination.java
@@ -32,8 +32,8 @@
import com.sun.enterprise.connectors.jms.system.ActiveJmsResourceAdapter;
import com.sun.enterprise.config.serverbeans.*;
-import javax.inject.Inject;
-import javax.inject.Named;
+import jakarta.inject.Inject;
+import jakarta.inject.Named;
import javax.management.MBeanServerConnection;
import javax.management.ObjectName;
diff --git a/appserver/jms/admin/src/main/java/org/glassfish/jms/admin/cli/DeleteJMSHost.java b/appserver/jms/admin/src/main/java/org/glassfish/jms/admin/cli/DeleteJMSHost.java
index 1416898..598cb9c 100644
--- a/appserver/jms/admin/src/main/java/org/glassfish/jms/admin/cli/DeleteJMSHost.java
+++ b/appserver/jms/admin/src/main/java/org/glassfish/jms/admin/cli/DeleteJMSHost.java
@@ -29,7 +29,7 @@
import java.beans.PropertyVetoException;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
import org.glassfish.api.admin.*;
import org.jvnet.hk2.annotations.Service;
diff --git a/appserver/jms/admin/src/main/java/org/glassfish/jms/admin/cli/DeleteJMSResource.java b/appserver/jms/admin/src/main/java/org/glassfish/jms/admin/cli/DeleteJMSResource.java
index 6566e31..a7750ed 100644
--- a/appserver/jms/admin/src/main/java/org/glassfish/jms/admin/cli/DeleteJMSResource.java
+++ b/appserver/jms/admin/src/main/java/org/glassfish/jms/admin/cli/DeleteJMSResource.java
@@ -26,7 +26,7 @@
import java.util.List;
import java.util.Properties;
import java.util.Map;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
import org.glassfish.api.ActionReport;
import org.glassfish.api.I18n;
import org.glassfish.api.Param;
diff --git a/appserver/jms/admin/src/main/java/org/glassfish/jms/admin/cli/FlushJMSDestination.java b/appserver/jms/admin/src/main/java/org/glassfish/jms/admin/cli/FlushJMSDestination.java
index ab8e168..7ea72e3 100644
--- a/appserver/jms/admin/src/main/java/org/glassfish/jms/admin/cli/FlushJMSDestination.java
+++ b/appserver/jms/admin/src/main/java/org/glassfish/jms/admin/cli/FlushJMSDestination.java
@@ -31,8 +31,8 @@
import com.sun.enterprise.config.serverbeans.*;
import com.sun.enterprise.connectors.jms.util.JmsRaUtil;
-import javax.inject.Inject;
-import javax.inject.Named;
+import jakarta.inject.Inject;
+import jakarta.inject.Named;
import javax.management.MBeanServerConnection;
import javax.management.ObjectName;
import javax.management.MalformedObjectNameException;
diff --git a/appserver/jms/admin/src/main/java/org/glassfish/jms/admin/cli/GetJmsPhysicalDestinationCommand.java b/appserver/jms/admin/src/main/java/org/glassfish/jms/admin/cli/GetJmsPhysicalDestinationCommand.java
index 624801b..7075fce 100644
--- a/appserver/jms/admin/src/main/java/org/glassfish/jms/admin/cli/GetJmsPhysicalDestinationCommand.java
+++ b/appserver/jms/admin/src/main/java/org/glassfish/jms/admin/cli/GetJmsPhysicalDestinationCommand.java
@@ -27,8 +27,8 @@
import java.util.Properties;
import java.util.logging.Level;
-import javax.inject.Inject;
-import javax.inject.Named;
+import jakarta.inject.Inject;
+import jakarta.inject.Named;
import javax.management.MBeanAttributeInfo;
import javax.management.MBeanServerConnection;
import javax.management.ObjectName;
diff --git a/appserver/jms/admin/src/main/java/org/glassfish/jms/admin/cli/JMSPing.java b/appserver/jms/admin/src/main/java/org/glassfish/jms/admin/cli/JMSPing.java
index da27733..07dbdd7 100644
--- a/appserver/jms/admin/src/main/java/org/glassfish/jms/admin/cli/JMSPing.java
+++ b/appserver/jms/admin/src/main/java/org/glassfish/jms/admin/cli/JMSPing.java
@@ -37,8 +37,8 @@
import org.glassfish.resourcebase.resources.api.PoolInfo;
import org.jvnet.hk2.annotations.Service;
-import javax.inject.Inject;
-import javax.inject.Named;
+import jakarta.inject.Inject;
+import jakarta.inject.Named;
import jakarta.resource.ResourceException;
import java.util.Properties;
diff --git a/appserver/jms/admin/src/main/java/org/glassfish/jms/admin/cli/ListJMSDestinations.java b/appserver/jms/admin/src/main/java/org/glassfish/jms/admin/cli/ListJMSDestinations.java
index d1fd95a..e291314 100644
--- a/appserver/jms/admin/src/main/java/org/glassfish/jms/admin/cli/ListJMSDestinations.java
+++ b/appserver/jms/admin/src/main/java/org/glassfish/jms/admin/cli/ListJMSDestinations.java
@@ -37,8 +37,8 @@
import org.glassfish.api.admin.RuntimeType;
import org.glassfish.api.admin.ServerEnvironment;
-import javax.inject.Inject;
-import javax.inject.Named;
+import jakarta.inject.Inject;
+import jakarta.inject.Named;
import javax.management.MBeanServerConnection;
import javax.management.ObjectName;
diff --git a/appserver/jms/admin/src/main/java/org/glassfish/jms/admin/cli/ListJMSHosts.java b/appserver/jms/admin/src/main/java/org/glassfish/jms/admin/cli/ListJMSHosts.java
index 68e3620..d958ed8 100644
--- a/appserver/jms/admin/src/main/java/org/glassfish/jms/admin/cli/ListJMSHosts.java
+++ b/appserver/jms/admin/src/main/java/org/glassfish/jms/admin/cli/ListJMSHosts.java
@@ -36,7 +36,7 @@
import org.glassfish.api.admin.RuntimeType;
import java.util.ArrayList;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
import org.glassfish.api.admin.*;
diff --git a/appserver/jms/admin/src/main/java/org/glassfish/jms/admin/cli/ListJMSResources.java b/appserver/jms/admin/src/main/java/org/glassfish/jms/admin/cli/ListJMSResources.java
index 0e12a6f..a21f7cd 100644
--- a/appserver/jms/admin/src/main/java/org/glassfish/jms/admin/cli/ListJMSResources.java
+++ b/appserver/jms/admin/src/main/java/org/glassfish/jms/admin/cli/ListJMSResources.java
@@ -26,7 +26,7 @@
import java.util.List;
import java.util.Map;
import java.util.Properties;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
import org.glassfish.api.ActionReport;
import org.glassfish.api.I18n;
import org.glassfish.api.Param;
diff --git a/appserver/jms/admin/src/main/java/org/glassfish/jms/admin/cli/UpdateJmsPhysicalDestinationCommand.java b/appserver/jms/admin/src/main/java/org/glassfish/jms/admin/cli/UpdateJmsPhysicalDestinationCommand.java
index 8a38de0..7fdb159 100644
--- a/appserver/jms/admin/src/main/java/org/glassfish/jms/admin/cli/UpdateJmsPhysicalDestinationCommand.java
+++ b/appserver/jms/admin/src/main/java/org/glassfish/jms/admin/cli/UpdateJmsPhysicalDestinationCommand.java
@@ -25,8 +25,8 @@
import java.util.Properties;
import java.util.logging.Level;
-import javax.inject.Inject;
-import javax.inject.Named;
+import jakarta.inject.Inject;
+import jakarta.inject.Named;
import javax.management.AttributeList;
import javax.management.MBeanServerConnection;
import javax.management.ObjectName;
diff --git a/appserver/jms/gf-jms-injection/src/main/java/org/glassfish/jms/injection/InjectableJMSContext.java b/appserver/jms/gf-jms-injection/src/main/java/org/glassfish/jms/injection/InjectableJMSContext.java
index c38f569..bc13344 100644
--- a/appserver/jms/gf-jms-injection/src/main/java/org/glassfish/jms/injection/InjectableJMSContext.java
+++ b/appserver/jms/gf-jms-injection/src/main/java/org/glassfish/jms/injection/InjectableJMSContext.java
@@ -23,7 +23,7 @@
import jakarta.annotation.PreDestroy;
import jakarta.enterprise.inject.Instance;
import jakarta.enterprise.inject.spi.InjectionPoint;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
import jakarta.jms.ConnectionFactory;
import jakarta.jms.JMSConnectionFactory;
import jakarta.jms.JMSContext;
diff --git a/appserver/jms/jms-core/src/main/java/com/sun/enterprise/connectors/jms/system/ActiveJmsResourceAdapter.java b/appserver/jms/jms-core/src/main/java/com/sun/enterprise/connectors/jms/system/ActiveJmsResourceAdapter.java
index 9b403b9..6bc4345 100755
--- a/appserver/jms/jms-core/src/main/java/com/sun/enterprise/connectors/jms/system/ActiveJmsResourceAdapter.java
+++ b/appserver/jms/jms-core/src/main/java/com/sun/enterprise/connectors/jms/system/ActiveJmsResourceAdapter.java
@@ -33,9 +33,9 @@
import java.util.StringTokenizer;
import java.util.logging.Level;
import java.util.logging.Logger;
-import javax.inject.Inject;
-import javax.inject.Named;
-import javax.inject.Provider;
+import jakarta.inject.Inject;
+import jakarta.inject.Named;
+import jakarta.inject.Provider;
import jakarta.resource.spi.ActivationSpec;
import jakarta.resource.spi.BootstrapContext;
import jakarta.resource.spi.ManagedConnectionFactory;
@@ -105,7 +105,7 @@
import org.glassfish.hk2.api.PostConstruct;
import org.glassfish.hk2.api.ServiceLocator;
-import javax.inject.Singleton;
+import jakarta.inject.Singleton;
import org.glassfish.api.logging.LogHelper;
import org.jvnet.hk2.config.types.Property;
diff --git a/appserver/jms/jms-core/src/main/java/com/sun/enterprise/connectors/jms/system/JMSConfigListener.java b/appserver/jms/jms-core/src/main/java/com/sun/enterprise/connectors/jms/system/JMSConfigListener.java
index d4bdc7c..f4e1705 100755
--- a/appserver/jms/jms-core/src/main/java/com/sun/enterprise/connectors/jms/system/JMSConfigListener.java
+++ b/appserver/jms/jms-core/src/main/java/com/sun/enterprise/connectors/jms/system/JMSConfigListener.java
@@ -20,8 +20,8 @@
import java.util.logging.*;
import java.beans.PropertyChangeEvent;
-import javax.inject.Inject;
-import javax.inject.Named;
+import jakarta.inject.Inject;
+import jakarta.inject.Named;
import com.sun.enterprise.connectors.jms.config.JmsHost;
import com.sun.enterprise.connectors.jms.config.JmsService;
diff --git a/appserver/jms/jms-core/src/main/java/com/sun/enterprise/connectors/jms/system/JmsProviderLifecycle.java b/appserver/jms/jms-core/src/main/java/com/sun/enterprise/connectors/jms/system/JmsProviderLifecycle.java
index 217c86e..277e6ce 100644
--- a/appserver/jms/jms-core/src/main/java/com/sun/enterprise/connectors/jms/system/JmsProviderLifecycle.java
+++ b/appserver/jms/jms-core/src/main/java/com/sun/enterprise/connectors/jms/system/JmsProviderLifecycle.java
@@ -38,9 +38,9 @@
import java.util.List;
-import javax.inject.Inject;
-import javax.inject.Named;
-import javax.inject.Provider;
+import jakarta.inject.Inject;
+import jakarta.inject.Named;
+import jakarta.inject.Provider;
import org.glassfish.api.admin.ServerEnvironment;
//import com.sun.enterprise.config.serverbeans.MonitoringService;
diff --git a/appserver/jms/jms-core/src/main/java/com/sun/enterprise/connectors/jms/system/LegacyJmsRecoveryResourceHandler.java b/appserver/jms/jms-core/src/main/java/com/sun/enterprise/connectors/jms/system/LegacyJmsRecoveryResourceHandler.java
index 20aadd6..dcabafb 100644
--- a/appserver/jms/jms-core/src/main/java/com/sun/enterprise/connectors/jms/system/LegacyJmsRecoveryResourceHandler.java
+++ b/appserver/jms/jms-core/src/main/java/com/sun/enterprise/connectors/jms/system/LegacyJmsRecoveryResourceHandler.java
@@ -22,8 +22,8 @@
import com.sun.enterprise.transaction.spi.RecoveryResourceHandler;
import com.sun.enterprise.util.LocalStringManagerImpl;
-import javax.inject.Inject;
-import javax.inject.Named;
+import jakarta.inject.Inject;
+import jakarta.inject.Named;
import javax.naming.NamingException;
import javax.naming.InitialContext;
import javax.transaction.xa.XAResource;
diff --git a/appserver/load-balancer/admin/src/main/java/org/glassfish/loadbalancer/admin/cli/ApplyHttpLbChanges.java b/appserver/load-balancer/admin/src/main/java/org/glassfish/loadbalancer/admin/cli/ApplyHttpLbChanges.java
index 505ec78..d6a6a76 100644
--- a/appserver/load-balancer/admin/src/main/java/org/glassfish/loadbalancer/admin/cli/ApplyHttpLbChanges.java
+++ b/appserver/load-balancer/admin/src/main/java/org/glassfish/loadbalancer/admin/cli/ApplyHttpLbChanges.java
@@ -42,7 +42,7 @@
import org.glassfish.loadbalancer.admin.cli.helper.LbConfigHelper;
import org.jvnet.hk2.config.types.Property;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
/**
* Class to publish the loadbalancer.xml to the physical loadbalancer.
diff --git a/appserver/load-balancer/admin/src/main/java/org/glassfish/loadbalancer/admin/cli/CreateHTTPHealthCheckerCommand.java b/appserver/load-balancer/admin/src/main/java/org/glassfish/loadbalancer/admin/cli/CreateHTTPHealthCheckerCommand.java
index 8aeb254..e75414e 100644
--- a/appserver/load-balancer/admin/src/main/java/org/glassfish/loadbalancer/admin/cli/CreateHTTPHealthCheckerCommand.java
+++ b/appserver/load-balancer/admin/src/main/java/org/glassfish/loadbalancer/admin/cli/CreateHTTPHealthCheckerCommand.java
@@ -48,7 +48,7 @@
import org.glassfish.config.support.TargetType;
import org.glassfish.config.support.CommandTarget;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
/**
* This is a remote command that creates health-checker config for cluster or
diff --git a/appserver/load-balancer/admin/src/main/java/org/glassfish/loadbalancer/admin/cli/CreateHTTPLBRefCommand.java b/appserver/load-balancer/admin/src/main/java/org/glassfish/loadbalancer/admin/cli/CreateHTTPLBRefCommand.java
index 414f1b6..b785be3 100644
--- a/appserver/load-balancer/admin/src/main/java/org/glassfish/loadbalancer/admin/cli/CreateHTTPLBRefCommand.java
+++ b/appserver/load-balancer/admin/src/main/java/org/glassfish/loadbalancer/admin/cli/CreateHTTPLBRefCommand.java
@@ -49,7 +49,7 @@
import org.glassfish.config.support.TargetType;
import org.glassfish.config.support.CommandTarget;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
/**
*
diff --git a/appserver/load-balancer/admin/src/main/java/org/glassfish/loadbalancer/admin/cli/CreateHTTPLoadBalancerCommand.java b/appserver/load-balancer/admin/src/main/java/org/glassfish/loadbalancer/admin/cli/CreateHTTPLoadBalancerCommand.java
index 3e8259b..355681a 100644
--- a/appserver/load-balancer/admin/src/main/java/org/glassfish/loadbalancer/admin/cli/CreateHTTPLoadBalancerCommand.java
+++ b/appserver/load-balancer/admin/src/main/java/org/glassfish/loadbalancer/admin/cli/CreateHTTPLoadBalancerCommand.java
@@ -48,7 +48,7 @@
import org.glassfish.api.admin.CommandRunner.CommandInvocation;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
/**
* This method supports the create-http-lb CLI command. It creates a lb-config, cluster-ref, health-checker by using
diff --git a/appserver/load-balancer/admin/src/main/java/org/glassfish/loadbalancer/admin/cli/DeleteHTTPHealthCheckerCommand.java b/appserver/load-balancer/admin/src/main/java/org/glassfish/loadbalancer/admin/cli/DeleteHTTPHealthCheckerCommand.java
index 7c79626..358f462 100644
--- a/appserver/load-balancer/admin/src/main/java/org/glassfish/loadbalancer/admin/cli/DeleteHTTPHealthCheckerCommand.java
+++ b/appserver/load-balancer/admin/src/main/java/org/glassfish/loadbalancer/admin/cli/DeleteHTTPHealthCheckerCommand.java
@@ -47,7 +47,7 @@
import org.glassfish.config.support.TargetType;
import org.glassfish.config.support.CommandTarget;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
/**
* This is a remote command that deletes health-checker config for cluster or
diff --git a/appserver/load-balancer/admin/src/main/java/org/glassfish/loadbalancer/admin/cli/DeleteHTTPLBRefCommand.java b/appserver/load-balancer/admin/src/main/java/org/glassfish/loadbalancer/admin/cli/DeleteHTTPLBRefCommand.java
index 0af3f91..4302e7b 100644
--- a/appserver/load-balancer/admin/src/main/java/org/glassfish/loadbalancer/admin/cli/DeleteHTTPLBRefCommand.java
+++ b/appserver/load-balancer/admin/src/main/java/org/glassfish/loadbalancer/admin/cli/DeleteHTTPLBRefCommand.java
@@ -48,7 +48,7 @@
import org.glassfish.config.support.TargetType;
import org.glassfish.config.support.CommandTarget;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
/**
*
diff --git a/appserver/load-balancer/admin/src/main/java/org/glassfish/loadbalancer/admin/cli/DisableHTTPLBApplicationCommand.java b/appserver/load-balancer/admin/src/main/java/org/glassfish/loadbalancer/admin/cli/DisableHTTPLBApplicationCommand.java
index 6045f2e..13024aa 100644
--- a/appserver/load-balancer/admin/src/main/java/org/glassfish/loadbalancer/admin/cli/DisableHTTPLBApplicationCommand.java
+++ b/appserver/load-balancer/admin/src/main/java/org/glassfish/loadbalancer/admin/cli/DisableHTTPLBApplicationCommand.java
@@ -33,7 +33,7 @@
import org.glassfish.config.support.CommandTarget;
import org.glassfish.hk2.api.PerLookup;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
/**
* This is a remote command that disables lb-enabled attribute of an application
diff --git a/appserver/load-balancer/admin/src/main/java/org/glassfish/loadbalancer/admin/cli/DisableHTTPLBServerCommand.java b/appserver/load-balancer/admin/src/main/java/org/glassfish/loadbalancer/admin/cli/DisableHTTPLBServerCommand.java
index 2c3f85d..78367b6 100644
--- a/appserver/load-balancer/admin/src/main/java/org/glassfish/loadbalancer/admin/cli/DisableHTTPLBServerCommand.java
+++ b/appserver/load-balancer/admin/src/main/java/org/glassfish/loadbalancer/admin/cli/DisableHTTPLBServerCommand.java
@@ -38,7 +38,7 @@
import org.glassfish.config.support.TargetType;
import org.glassfish.config.support.CommandTarget;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
/**
* This is a remote command that enables lb-enabled attribute of
diff --git a/appserver/load-balancer/admin/src/main/java/org/glassfish/loadbalancer/admin/cli/EnableHTTPLBApplicationCommand.java b/appserver/load-balancer/admin/src/main/java/org/glassfish/loadbalancer/admin/cli/EnableHTTPLBApplicationCommand.java
index 7237484..5019e7d 100644
--- a/appserver/load-balancer/admin/src/main/java/org/glassfish/loadbalancer/admin/cli/EnableHTTPLBApplicationCommand.java
+++ b/appserver/load-balancer/admin/src/main/java/org/glassfish/loadbalancer/admin/cli/EnableHTTPLBApplicationCommand.java
@@ -33,7 +33,7 @@
import org.glassfish.config.support.CommandTarget;
import org.glassfish.hk2.api.PerLookup;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
/**
* This is a remote command that enables lb-enabled attribute of an application
diff --git a/appserver/load-balancer/admin/src/main/java/org/glassfish/loadbalancer/admin/cli/EnableHTTPLBServerCommand.java b/appserver/load-balancer/admin/src/main/java/org/glassfish/loadbalancer/admin/cli/EnableHTTPLBServerCommand.java
index aedf9b8..22b5766 100644
--- a/appserver/load-balancer/admin/src/main/java/org/glassfish/loadbalancer/admin/cli/EnableHTTPLBServerCommand.java
+++ b/appserver/load-balancer/admin/src/main/java/org/glassfish/loadbalancer/admin/cli/EnableHTTPLBServerCommand.java
@@ -40,7 +40,7 @@
import org.glassfish.hk2.api.PerLookup;
import org.glassfish.internal.api.Target;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
/**
* This is a remote command that enables lb-enabled attribute of
diff --git a/appserver/load-balancer/admin/src/main/java/org/glassfish/loadbalancer/admin/cli/ExportHttpLbConfig.java b/appserver/load-balancer/admin/src/main/java/org/glassfish/loadbalancer/admin/cli/ExportHttpLbConfig.java
index 3d8e53d..164f07d 100644
--- a/appserver/load-balancer/admin/src/main/java/org/glassfish/loadbalancer/admin/cli/ExportHttpLbConfig.java
+++ b/appserver/load-balancer/admin/src/main/java/org/glassfish/loadbalancer/admin/cli/ExportHttpLbConfig.java
@@ -51,7 +51,7 @@
import org.glassfish.loadbalancer.admin.cli.helper.LbConfigHelper;
import org.glassfish.loadbalancer.config.LbConfig;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
/**
* Export load-balancer xml
diff --git a/appserver/load-balancer/admin/src/main/java/org/glassfish/loadbalancer/admin/cli/LBCommandsBase.java b/appserver/load-balancer/admin/src/main/java/org/glassfish/loadbalancer/admin/cli/LBCommandsBase.java
index cef1e72..98b23a7 100644
--- a/appserver/load-balancer/admin/src/main/java/org/glassfish/loadbalancer/admin/cli/LBCommandsBase.java
+++ b/appserver/load-balancer/admin/src/main/java/org/glassfish/loadbalancer/admin/cli/LBCommandsBase.java
@@ -32,7 +32,7 @@
import org.glassfish.api.admin.*;
import org.glassfish.api.ActionReport.ExitCode;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
/**
* Base class for all the LB commands
diff --git a/appserver/load-balancer/admin/src/main/java/org/glassfish/loadbalancer/admin/cli/ListLBConfigsCommand.java b/appserver/load-balancer/admin/src/main/java/org/glassfish/loadbalancer/admin/cli/ListLBConfigsCommand.java
index 522218a..36f50b6 100644
--- a/appserver/load-balancer/admin/src/main/java/org/glassfish/loadbalancer/admin/cli/ListLBConfigsCommand.java
+++ b/appserver/load-balancer/admin/src/main/java/org/glassfish/loadbalancer/admin/cli/ListLBConfigsCommand.java
@@ -38,7 +38,7 @@
import org.glassfish.api.admin.*;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
/**
* This is a remote commands to list lb configs (ported from v2)
diff --git a/appserver/load-balancer/admin/src/main/java/org/glassfish/loadbalancer/upgrade/LoadBalancerConfigUpgrade.java b/appserver/load-balancer/admin/src/main/java/org/glassfish/loadbalancer/upgrade/LoadBalancerConfigUpgrade.java
index e321abc..7ddedb5 100644
--- a/appserver/load-balancer/admin/src/main/java/org/glassfish/loadbalancer/upgrade/LoadBalancerConfigUpgrade.java
+++ b/appserver/load-balancer/admin/src/main/java/org/glassfish/loadbalancer/upgrade/LoadBalancerConfigUpgrade.java
@@ -34,7 +34,7 @@
import org.jvnet.hk2.config.ConfigSupport;
import org.jvnet.hk2.config.SingleConfigCode;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
/**
*
diff --git a/appserver/load-balancer/gf-load-balancer-connector/src/main/java/org/glassfish/loadbalancer/config/LbConfig.java b/appserver/load-balancer/gf-load-balancer-connector/src/main/java/org/glassfish/loadbalancer/config/LbConfig.java
index ea449bd..c987943 100644
--- a/appserver/load-balancer/gf-load-balancer-connector/src/main/java/org/glassfish/loadbalancer/config/LbConfig.java
+++ b/appserver/load-balancer/gf-load-balancer-connector/src/main/java/org/glassfish/loadbalancer/config/LbConfig.java
@@ -49,7 +49,7 @@
import org.glassfish.api.admin.AdminCommandContext;
import org.glassfish.api.admin.config.PropertiesDesc;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
import jakarta.validation.constraints.NotNull;
import jakarta.validation.constraints.Min;
import jakarta.validation.constraints.Pattern;
diff --git a/appserver/load-balancer/gf-load-balancer-connector/src/main/java/org/glassfish/loadbalancer/config/LoadBalancer.java b/appserver/load-balancer/gf-load-balancer-connector/src/main/java/org/glassfish/loadbalancer/config/LoadBalancer.java
index 515240e..54d2dcd 100644
--- a/appserver/load-balancer/gf-load-balancer-connector/src/main/java/org/glassfish/loadbalancer/config/LoadBalancer.java
+++ b/appserver/load-balancer/gf-load-balancer-connector/src/main/java/org/glassfish/loadbalancer/config/LoadBalancer.java
@@ -38,7 +38,7 @@
import org.jvnet.hk2.config.types.Property;
import org.jvnet.hk2.config.types.PropertyBag;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
import jakarta.validation.constraints.NotNull;
import java.beans.PropertyVetoException;
import java.util.List;
diff --git a/appserver/orb/orb-connector/src/main/java/org/glassfish/enterprise/iiop/api/GlassFishORBHelper.java b/appserver/orb/orb-connector/src/main/java/org/glassfish/enterprise/iiop/api/GlassFishORBHelper.java
index 8357d0d..edbdfef 100644
--- a/appserver/orb/orb-connector/src/main/java/org/glassfish/enterprise/iiop/api/GlassFishORBHelper.java
+++ b/appserver/orb/orb-connector/src/main/java/org/glassfish/enterprise/iiop/api/GlassFishORBHelper.java
@@ -16,8 +16,8 @@
package org.glassfish.enterprise.iiop.api;
-import javax.inject.Inject;
-import javax.inject.Provider;
+import jakarta.inject.Inject;
+import jakarta.inject.Provider;
import org.jvnet.hk2.annotations.Service;
import org.glassfish.hk2.api.ServiceLocator;
diff --git a/appserver/orb/orb-connector/src/main/java/org/glassfish/enterprise/iiop/api/HandleDelegateNamingProxy.java b/appserver/orb/orb-connector/src/main/java/org/glassfish/enterprise/iiop/api/HandleDelegateNamingProxy.java
index 294ddd8..3725d3d 100644
--- a/appserver/orb/orb-connector/src/main/java/org/glassfish/enterprise/iiop/api/HandleDelegateNamingProxy.java
+++ b/appserver/orb/orb-connector/src/main/java/org/glassfish/enterprise/iiop/api/HandleDelegateNamingProxy.java
@@ -20,11 +20,11 @@
import org.glassfish.api.naming.NamedNamingObjectProxy;
import org.jvnet.hk2.annotations.Service;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
import jakarta.ejb.spi.HandleDelegate;
-import javax.inject.Provider;
+import jakarta.inject.Provider;
import javax.naming.NamingException;
/**
diff --git a/appserver/orb/orb-connector/src/main/java/org/glassfish/enterprise/iiop/api/ORBLazyServiceInitializer.java b/appserver/orb/orb-connector/src/main/java/org/glassfish/enterprise/iiop/api/ORBLazyServiceInitializer.java
index e655c9f..30e5598 100644
--- a/appserver/orb/orb-connector/src/main/java/org/glassfish/enterprise/iiop/api/ORBLazyServiceInitializer.java
+++ b/appserver/orb/orb-connector/src/main/java/org/glassfish/enterprise/iiop/api/ORBLazyServiceInitializer.java
@@ -19,8 +19,8 @@
import org.glassfish.internal.grizzly.LazyServiceInitializer;
import org.jvnet.hk2.annotations.Service;
-import javax.inject.Inject;
-import javax.inject.Named;
+import jakarta.inject.Inject;
+import jakarta.inject.Named;
import org.glassfish.hk2.api.PostConstruct;
diff --git a/appserver/orb/orb-connector/src/main/java/org/glassfish/enterprise/iiop/api/ORBNamingProxy.java b/appserver/orb/orb-connector/src/main/java/org/glassfish/enterprise/iiop/api/ORBNamingProxy.java
index 3511996..2b0cd22 100644
--- a/appserver/orb/orb-connector/src/main/java/org/glassfish/enterprise/iiop/api/ORBNamingProxy.java
+++ b/appserver/orb/orb-connector/src/main/java/org/glassfish/enterprise/iiop/api/ORBNamingProxy.java
@@ -20,7 +20,7 @@
import org.glassfish.api.naming.NamedNamingObjectProxy;
import org.jvnet.hk2.annotations.Service;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
import org.omg.CORBA.ORB;
diff --git a/appserver/orb/orb-connector/src/main/java/org/glassfish/enterprise/iiop/util/IIOPUtils.java b/appserver/orb/orb-connector/src/main/java/org/glassfish/enterprise/iiop/util/IIOPUtils.java
index d384672..7654798 100644
--- a/appserver/orb/orb-connector/src/main/java/org/glassfish/enterprise/iiop/util/IIOPUtils.java
+++ b/appserver/orb/orb-connector/src/main/java/org/glassfish/enterprise/iiop/util/IIOPUtils.java
@@ -35,7 +35,7 @@
import org.glassfish.enterprise.iiop.api.GlassFishORBLifeCycleListener;
import org.glassfish.enterprise.iiop.api.IIOPInterceptorFactory;
import org.glassfish.internal.api.ClassLoaderHierarchy;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
import org.jvnet.hk2.annotations.Service;
import org.glassfish.hk2.api.PostConstruct;
import org.glassfish.hk2.api.ServiceLocator;
diff --git a/appserver/orb/orb-connector/src/main/java/org/glassfish/orb/admin/cli/CreateIiopListener.java b/appserver/orb/orb-connector/src/main/java/org/glassfish/orb/admin/cli/CreateIiopListener.java
index b05658f..67e6dd8 100644
--- a/appserver/orb/orb-connector/src/main/java/org/glassfish/orb/admin/cli/CreateIiopListener.java
+++ b/appserver/orb/orb-connector/src/main/java/org/glassfish/orb/admin/cli/CreateIiopListener.java
@@ -27,7 +27,7 @@
import org.jvnet.hk2.annotations.Service;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
import org.glassfish.hk2.api.PerLookup;
import org.jvnet.hk2.config.ConfigSupport;
import org.jvnet.hk2.config.SingleConfigCode;
diff --git a/appserver/orb/orb-connector/src/main/java/org/glassfish/orb/admin/cli/DeleteIiopListener.java b/appserver/orb/orb-connector/src/main/java/org/glassfish/orb/admin/cli/DeleteIiopListener.java
index 59b057b..129c990 100644
--- a/appserver/orb/orb-connector/src/main/java/org/glassfish/orb/admin/cli/DeleteIiopListener.java
+++ b/appserver/orb/orb-connector/src/main/java/org/glassfish/orb/admin/cli/DeleteIiopListener.java
@@ -32,7 +32,7 @@
import org.jvnet.hk2.annotations.Service;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
import org.glassfish.hk2.api.PerLookup;
import org.jvnet.hk2.config.ConfigSupport;
import org.jvnet.hk2.config.SingleConfigCode;
diff --git a/appserver/orb/orb-connector/src/main/java/org/glassfish/orb/admin/cli/ListIiopListeners.java b/appserver/orb/orb-connector/src/main/java/org/glassfish/orb/admin/cli/ListIiopListeners.java
index 6efe88f..4f913cd 100644
--- a/appserver/orb/orb-connector/src/main/java/org/glassfish/orb/admin/cli/ListIiopListeners.java
+++ b/appserver/orb/orb-connector/src/main/java/org/glassfish/orb/admin/cli/ListIiopListeners.java
@@ -27,7 +27,7 @@
import org.jvnet.hk2.annotations.Service;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
import org.glassfish.hk2.api.PerLookup;
import org.glassfish.orb.admin.config.IiopListener;
diff --git a/appserver/orb/orb-enabler/src/main/java/org/glassfish/enterprise/api/enabler/ORBConnectorStartup.java b/appserver/orb/orb-enabler/src/main/java/org/glassfish/enterprise/api/enabler/ORBConnectorStartup.java
index 03815d1..bd92f92 100644
--- a/appserver/orb/orb-enabler/src/main/java/org/glassfish/enterprise/api/enabler/ORBConnectorStartup.java
+++ b/appserver/orb/orb-enabler/src/main/java/org/glassfish/enterprise/api/enabler/ORBConnectorStartup.java
@@ -18,8 +18,8 @@
import java.util.List;
-import javax.inject.Inject;
-import javax.inject.Named;
+import jakarta.inject.Inject;
+import jakarta.inject.Named;
import org.glassfish.api.StartupRunLevel;
import org.glassfish.api.admin.ServerEnvironment;
diff --git a/appserver/orb/orb-iiop/src/main/java/org/glassfish/enterprise/iiop/impl/GlassFishORBFactoryImpl.java b/appserver/orb/orb-iiop/src/main/java/org/glassfish/enterprise/iiop/impl/GlassFishORBFactoryImpl.java
index 8686616..f2c6118 100644
--- a/appserver/orb/orb-iiop/src/main/java/org/glassfish/enterprise/iiop/impl/GlassFishORBFactoryImpl.java
+++ b/appserver/orb/orb-iiop/src/main/java/org/glassfish/enterprise/iiop/impl/GlassFishORBFactoryImpl.java
@@ -19,7 +19,7 @@
import com.sun.enterprise.ee.cms.core.GroupManagementService;
import org.glassfish.enterprise.iiop.api.GlassFishORBFactory;
import org.glassfish.enterprise.iiop.util.IIOPUtils;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
import org.jvnet.hk2.annotations.Service;
import org.glassfish.hk2.api.PostConstruct;
import org.glassfish.hk2.api.ServiceLocator;
diff --git a/appserver/orb/orb-iiop/src/main/java/org/glassfish/enterprise/iiop/impl/NamingClusterInfoImpl.java b/appserver/orb/orb-iiop/src/main/java/org/glassfish/enterprise/iiop/impl/NamingClusterInfoImpl.java
index e5d1d0d..f11f01f 100644
--- a/appserver/orb/orb-iiop/src/main/java/org/glassfish/enterprise/iiop/impl/NamingClusterInfoImpl.java
+++ b/appserver/orb/orb-iiop/src/main/java/org/glassfish/enterprise/iiop/impl/NamingClusterInfoImpl.java
@@ -37,7 +37,7 @@
import java.util.logging.Level;
import java.util.logging.Logger;
-import javax.inject.Singleton;
+import jakarta.inject.Singleton;
/**
* This class is responsible for setting up naming load-balancing including RoundRobinPolicy.
diff --git a/appserver/orb/orb-iiop/src/main/java/org/glassfish/enterprise/iiop/impl/POAProtocolMgr.java b/appserver/orb/orb-iiop/src/main/java/org/glassfish/enterprise/iiop/impl/POAProtocolMgr.java
index 0772e11..77832b1 100644
--- a/appserver/orb/orb-iiop/src/main/java/org/glassfish/enterprise/iiop/impl/POAProtocolMgr.java
+++ b/appserver/orb/orb-iiop/src/main/java/org/glassfish/enterprise/iiop/impl/POAProtocolMgr.java
@@ -55,12 +55,12 @@
import java.util.List;
import java.util.logging.Level;
import java.util.logging.Logger;
-import javax.inject.Provider;
+import jakarta.inject.Provider;
import javax.rmi.CORBA.Tie;
import org.jvnet.hk2.annotations.Service;
import org.glassfish.hk2.api.ServiceLocator;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
import org.omg.CORBA.CompletionStatus;
import org.omg.CORBA.INVALID_TRANSACTION;
import org.omg.CORBA.LocalObject;
diff --git a/appserver/persistence/cmp/support-ejb/src/main/java/com/sun/jdo/spi/persistence/support/ejb/codegen/CMPDeployerImpl.java b/appserver/persistence/cmp/support-ejb/src/main/java/com/sun/jdo/spi/persistence/support/ejb/codegen/CMPDeployerImpl.java
index 65aa956..c212bf5 100644
--- a/appserver/persistence/cmp/support-ejb/src/main/java/com/sun/jdo/spi/persistence/support/ejb/codegen/CMPDeployerImpl.java
+++ b/appserver/persistence/cmp/support-ejb/src/main/java/com/sun/jdo/spi/persistence/support/ejb/codegen/CMPDeployerImpl.java
@@ -21,8 +21,8 @@
import java.util.Iterator;
import java.util.List;
import java.util.ResourceBundle;
-import javax.inject.Inject;
-import javax.inject.Named;
+import jakarta.inject.Inject;
+import jakarta.inject.Named;
import javax.tools.Diagnostic;
import javax.tools.DiagnosticCollector;
import javax.tools.JavaCompiler;
diff --git a/appserver/persistence/cmp/support-sqlstore/src/main/java/com/sun/jdo/spi/persistence/support/sqlstore/utility/PersistenceManagerFactoryResourceMigrator.java b/appserver/persistence/cmp/support-sqlstore/src/main/java/com/sun/jdo/spi/persistence/support/sqlstore/utility/PersistenceManagerFactoryResourceMigrator.java
index a056a7c..5fa2cf5 100644
--- a/appserver/persistence/cmp/support-sqlstore/src/main/java/com/sun/jdo/spi/persistence/support/sqlstore/utility/PersistenceManagerFactoryResourceMigrator.java
+++ b/appserver/persistence/cmp/support-sqlstore/src/main/java/com/sun/jdo/spi/persistence/support/sqlstore/utility/PersistenceManagerFactoryResourceMigrator.java
@@ -21,7 +21,7 @@
import org.glassfish.connectors.config.PersistenceManagerFactoryResource;
import org.glassfish.jdbc.config.JdbcResource;
import org.jvnet.hk2.annotations.Service;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
import org.glassfish.hk2.api.PostConstruct;
import org.jvnet.hk2.config.ConfigSupport;
import org.jvnet.hk2.config.SingleConfigCode;
diff --git a/appserver/persistence/entitybean-container/src/main/java/org/glassfish/persistence/ejb/entitybean/container/EntityContainerFactory.java b/appserver/persistence/entitybean-container/src/main/java/org/glassfish/persistence/ejb/entitybean/container/EntityContainerFactory.java
index 4c6215c..23fcfe2 100644
--- a/appserver/persistence/entitybean-container/src/main/java/org/glassfish/persistence/ejb/entitybean/container/EntityContainerFactory.java
+++ b/appserver/persistence/entitybean-container/src/main/java/org/glassfish/persistence/ejb/entitybean/container/EntityContainerFactory.java
@@ -20,8 +20,8 @@
import java.util.logging.Level;
import java.util.logging.Logger;
-import javax.inject.Inject;
-import javax.inject.Named;
+import jakarta.inject.Inject;
+import jakarta.inject.Named;
import com.sun.ejb.Container;
import com.sun.ejb.ContainerFactory;
diff --git a/appserver/persistence/entitybean-container/src/main/java/org/glassfish/persistence/ejb/entitybean/container/distributed/ReadOnlyBeanMessageCallBack.java b/appserver/persistence/entitybean-container/src/main/java/org/glassfish/persistence/ejb/entitybean/container/distributed/ReadOnlyBeanMessageCallBack.java
index 41fee4b..d899e8a 100755
--- a/appserver/persistence/entitybean-container/src/main/java/org/glassfish/persistence/ejb/entitybean/container/distributed/ReadOnlyBeanMessageCallBack.java
+++ b/appserver/persistence/entitybean-container/src/main/java/org/glassfish/persistence/ejb/entitybean/container/distributed/ReadOnlyBeanMessageCallBack.java
@@ -26,7 +26,7 @@
import com.sun.enterprise.ee.cms.core.Signal;
import org.jvnet.hk2.annotations.Service;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
import java.util.logging.Logger;
import java.util.logging.Level;
diff --git a/appserver/persistence/gf-jpa-connector/src/main/java/org/glassfish/persistence/jpaconnector/JPACompositeSniffer.java b/appserver/persistence/gf-jpa-connector/src/main/java/org/glassfish/persistence/jpaconnector/JPACompositeSniffer.java
index a328dfd..825daf5 100644
--- a/appserver/persistence/gf-jpa-connector/src/main/java/org/glassfish/persistence/jpaconnector/JPACompositeSniffer.java
+++ b/appserver/persistence/gf-jpa-connector/src/main/java/org/glassfish/persistence/jpaconnector/JPACompositeSniffer.java
@@ -29,8 +29,8 @@
import org.glassfish.javaee.core.deployment.ApplicationHolder;
import org.jvnet.hk2.annotations.Service;
-import javax.inject.Singleton;
-import javax.inject.Inject;
+import jakarta.inject.Singleton;
+import jakarta.inject.Inject;
import javax.enterprise.deploy.shared.ModuleType;
import java.util.Enumeration;
diff --git a/appserver/persistence/gf-jpa-connector/src/main/java/org/glassfish/persistence/jpaconnector/JPASniffer.java b/appserver/persistence/gf-jpa-connector/src/main/java/org/glassfish/persistence/jpaconnector/JPASniffer.java
index be33f27..81dd2cd 100644
--- a/appserver/persistence/gf-jpa-connector/src/main/java/org/glassfish/persistence/jpaconnector/JPASniffer.java
+++ b/appserver/persistence/gf-jpa-connector/src/main/java/org/glassfish/persistence/jpaconnector/JPASniffer.java
@@ -23,7 +23,7 @@
import org.glassfish.api.deployment.archive.ArchiveType;
import org.jvnet.hk2.annotations.Service;
-import javax.inject.Singleton;
+import jakarta.inject.Singleton;
import javax.enterprise.deploy.shared.ModuleType;
import java.util.Enumeration;
diff --git a/appserver/persistence/jpa-container/src/main/java/org/glassfish/persistence/jpa/JPADeployer.java b/appserver/persistence/jpa-container/src/main/java/org/glassfish/persistence/jpa/JPADeployer.java
index 294a5e7..e71ae2c 100644
--- a/appserver/persistence/jpa-container/src/main/java/org/glassfish/persistence/jpa/JPADeployer.java
+++ b/appserver/persistence/jpa-container/src/main/java/org/glassfish/persistence/jpa/JPADeployer.java
@@ -36,7 +36,7 @@
import org.glassfish.deployment.common.SimpleDeployer;
import org.glassfish.deployment.common.DeploymentException;
import org.glassfish.persistence.common.Java2DBProcessorHelper;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
import org.jvnet.hk2.annotations.Service;
import org.glassfish.hk2.api.PostConstruct;
diff --git a/appserver/pom.xml b/appserver/pom.xml
index d6aa553..2694f34 100644
--- a/appserver/pom.xml
+++ b/appserver/pom.xml
@@ -52,7 +52,6 @@
<jakarta.transaction-api.version>2.0.0-RC1</jakarta.transaction-api.version>
<jakarta.faces-api.version>3.0.0-RC1</jakarta.faces-api.version>
<cdi-api.version>3.0.0-M2</cdi-api.version>
- <javax.inject.version>2.0.0-RC3</javax.inject.version>
<jakarta.resource-api.version>2.0.0-RC1</jakarta.resource-api.version>
<javax.enterprise.deploy-api.version>1.7.1</javax.enterprise.deploy-api.version>
<jakarta.authorization-api.version>2.0.0-RC1</jakarta.authorization-api.version>
@@ -163,7 +162,7 @@
<version>1.6</version>
<configuration>
<dir>${stage.dir}/${install.dir.name}/glassfish/modules</dir>
- <excludes>jakarta.inject.jar,jakarta.servlet.jsp.jstl.jar,jakarta.servlet.jsp.jar,jakarta.enterprise.concurrent.jar, jakarta.persistence.jar</excludes>
+ <excludes>jakarta.inject-api.jar,jakarta.servlet.jsp.jstl.jar,jakarta.servlet.jsp.jar,jakarta.enterprise.concurrent.jar, jakarta.persistence.jar</excludes>
<specs>
<spec>
<artifact>
@@ -498,8 +497,8 @@
<version>${cdi-api.version}</version>
<exclusions>
<exclusion>
- <groupId>javax.inject</groupId>
- <artifactId>javax.inject</artifactId>
+ <groupId>jakarta.inject</groupId>
+ <artifactId>jakarta.inject</artifactId>
</exclusion>
</exclusions>
</dependency>
diff --git a/appserver/resources/mail/mail-connector/src/main/java/org/glassfish/resources/mail/admin/cli/CreateMailResource.java b/appserver/resources/mail/mail-connector/src/main/java/org/glassfish/resources/mail/admin/cli/CreateMailResource.java
index 57a4a66..fbf616d 100644
--- a/appserver/resources/mail/mail-connector/src/main/java/org/glassfish/resources/mail/admin/cli/CreateMailResource.java
+++ b/appserver/resources/mail/mail-connector/src/main/java/org/glassfish/resources/mail/admin/cli/CreateMailResource.java
@@ -31,7 +31,7 @@
import org.glassfish.resourcebase.resources.api.ResourceStatus;
import org.jvnet.hk2.annotations.Service;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
import java.util.HashMap;
import java.util.Properties;
import java.util.logging.Level;
diff --git a/appserver/resources/mail/mail-connector/src/main/java/org/glassfish/resources/mail/admin/cli/DeleteMailResource.java b/appserver/resources/mail/mail-connector/src/main/java/org/glassfish/resources/mail/admin/cli/DeleteMailResource.java
index 079ec18..4d39ca8 100644
--- a/appserver/resources/mail/mail-connector/src/main/java/org/glassfish/resources/mail/admin/cli/DeleteMailResource.java
+++ b/appserver/resources/mail/mail-connector/src/main/java/org/glassfish/resources/mail/admin/cli/DeleteMailResource.java
@@ -34,7 +34,7 @@
import org.jvnet.hk2.config.SingleConfigCode;
import org.jvnet.hk2.config.TransactionFailure;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
import java.beans.PropertyVetoException;
/**
diff --git a/appserver/resources/mail/mail-connector/src/main/java/org/glassfish/resources/mail/admin/cli/ListMailResources.java b/appserver/resources/mail/mail-connector/src/main/java/org/glassfish/resources/mail/admin/cli/ListMailResources.java
index c0ad73c..6c1f1a9 100644
--- a/appserver/resources/mail/mail-connector/src/main/java/org/glassfish/resources/mail/admin/cli/ListMailResources.java
+++ b/appserver/resources/mail/mail-connector/src/main/java/org/glassfish/resources/mail/admin/cli/ListMailResources.java
@@ -31,7 +31,7 @@
import org.glassfish.resourcebase.resources.util.BindableResourcesHelper;
import org.jvnet.hk2.annotations.Service;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
import java.util.ArrayList;
import java.util.Collection;
import java.util.List;
diff --git a/appserver/resources/mail/mail-connector/src/main/java/org/glassfish/resources/mail/admin/cli/MailResourceManager.java b/appserver/resources/mail/mail-connector/src/main/java/org/glassfish/resources/mail/admin/cli/MailResourceManager.java
index c91d8b7..14c3bad 100644
--- a/appserver/resources/mail/mail-connector/src/main/java/org/glassfish/resources/mail/admin/cli/MailResourceManager.java
+++ b/appserver/resources/mail/mail-connector/src/main/java/org/glassfish/resources/mail/admin/cli/MailResourceManager.java
@@ -31,7 +31,7 @@
import org.jvnet.hk2.config.TransactionFailure;
import org.jvnet.hk2.config.types.Property;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
import jakarta.resource.ResourceException;
import java.beans.PropertyVetoException;
import java.util.HashMap;
diff --git a/appserver/resources/mail/mail-runtime/src/main/java/org/glassfish/resources/mail/deployer/MailResourceDeployer.java b/appserver/resources/mail/mail-runtime/src/main/java/org/glassfish/resources/mail/deployer/MailResourceDeployer.java
index 228e5a5..c05c128 100644
--- a/appserver/resources/mail/mail-runtime/src/main/java/org/glassfish/resources/mail/deployer/MailResourceDeployer.java
+++ b/appserver/resources/mail/mail-runtime/src/main/java/org/glassfish/resources/mail/deployer/MailResourceDeployer.java
@@ -37,8 +37,8 @@
import org.jvnet.hk2.annotations.Service;
import org.jvnet.hk2.config.types.Property;
-import javax.inject.Inject;
-import javax.inject.Singleton;
+import jakarta.inject.Inject;
+import jakarta.inject.Singleton;
import javax.naming.NamingException;
import java.util.Collection;
import java.util.List;
diff --git a/appserver/resources/resources-connector/src/main/java/org/glassfish/resources/admin/cli/AddResources.java b/appserver/resources/resources-connector/src/main/java/org/glassfish/resources/admin/cli/AddResources.java
index 20b3c11..7f743ca 100644
--- a/appserver/resources/resources-connector/src/main/java/org/glassfish/resources/admin/cli/AddResources.java
+++ b/appserver/resources/resources-connector/src/main/java/org/glassfish/resources/admin/cli/AddResources.java
@@ -30,7 +30,7 @@
import org.glassfish.resourcebase.resources.api.ResourceStatus;
import org.jvnet.hk2.annotations.Service;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
import java.io.File;
import java.util.ArrayList;
import java.util.Iterator;
diff --git a/appserver/resources/resources-connector/src/main/java/org/glassfish/resources/admin/cli/CreateCustomResource.java b/appserver/resources/resources-connector/src/main/java/org/glassfish/resources/admin/cli/CreateCustomResource.java
index f225063..5aa1ad8 100644
--- a/appserver/resources/resources-connector/src/main/java/org/glassfish/resources/admin/cli/CreateCustomResource.java
+++ b/appserver/resources/resources-connector/src/main/java/org/glassfish/resources/admin/cli/CreateCustomResource.java
@@ -31,7 +31,7 @@
import org.glassfish.resourcebase.resources.api.ResourceStatus;
import org.jvnet.hk2.annotations.Service;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
import java.util.HashMap;
import java.util.Properties;
import java.util.logging.Level;
diff --git a/appserver/resources/resources-connector/src/main/java/org/glassfish/resources/admin/cli/CreateJndiResource.java b/appserver/resources/resources-connector/src/main/java/org/glassfish/resources/admin/cli/CreateJndiResource.java
index ce8e19b..571878b 100644
--- a/appserver/resources/resources-connector/src/main/java/org/glassfish/resources/admin/cli/CreateJndiResource.java
+++ b/appserver/resources/resources-connector/src/main/java/org/glassfish/resources/admin/cli/CreateJndiResource.java
@@ -31,7 +31,7 @@
import org.glassfish.resourcebase.resources.api.ResourceStatus;
import org.jvnet.hk2.annotations.Service;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
import java.util.HashMap;
import java.util.Properties;
import java.util.logging.Level;
diff --git a/appserver/resources/resources-connector/src/main/java/org/glassfish/resources/admin/cli/CustomResourceManager.java b/appserver/resources/resources-connector/src/main/java/org/glassfish/resources/admin/cli/CustomResourceManager.java
index 949b0a4..edf0945 100644
--- a/appserver/resources/resources-connector/src/main/java/org/glassfish/resources/admin/cli/CustomResourceManager.java
+++ b/appserver/resources/resources-connector/src/main/java/org/glassfish/resources/admin/cli/CustomResourceManager.java
@@ -32,7 +32,7 @@
import org.jvnet.hk2.config.TransactionFailure;
import org.jvnet.hk2.config.types.Property;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
import jakarta.resource.ResourceException;
import java.beans.PropertyVetoException;
import java.util.HashMap;
diff --git a/appserver/resources/resources-connector/src/main/java/org/glassfish/resources/admin/cli/DeleteCustomResource.java b/appserver/resources/resources-connector/src/main/java/org/glassfish/resources/admin/cli/DeleteCustomResource.java
index fc50a8c..9633c8e 100644
--- a/appserver/resources/resources-connector/src/main/java/org/glassfish/resources/admin/cli/DeleteCustomResource.java
+++ b/appserver/resources/resources-connector/src/main/java/org/glassfish/resources/admin/cli/DeleteCustomResource.java
@@ -33,7 +33,7 @@
import org.jvnet.hk2.config.SingleConfigCode;
import org.jvnet.hk2.config.TransactionFailure;
import org.glassfish.resourcebase.resources.admin.cli.ResourceUtil;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
import java.beans.PropertyVetoException;
/**
diff --git a/appserver/resources/resources-connector/src/main/java/org/glassfish/resources/admin/cli/DeleteJndiResource.java b/appserver/resources/resources-connector/src/main/java/org/glassfish/resources/admin/cli/DeleteJndiResource.java
index 4c5ea2a..36c335e 100644
--- a/appserver/resources/resources-connector/src/main/java/org/glassfish/resources/admin/cli/DeleteJndiResource.java
+++ b/appserver/resources/resources-connector/src/main/java/org/glassfish/resources/admin/cli/DeleteJndiResource.java
@@ -34,7 +34,7 @@
import org.jvnet.hk2.config.TransactionFailure;
import org.glassfish.resourcebase.resources.admin.cli.ResourceUtil;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
import java.beans.PropertyVetoException;
/**
diff --git a/appserver/resources/resources-connector/src/main/java/org/glassfish/resources/admin/cli/JndiResourceManager.java b/appserver/resources/resources-connector/src/main/java/org/glassfish/resources/admin/cli/JndiResourceManager.java
index 24552a9..1e6757b 100644
--- a/appserver/resources/resources-connector/src/main/java/org/glassfish/resources/admin/cli/JndiResourceManager.java
+++ b/appserver/resources/resources-connector/src/main/java/org/glassfish/resources/admin/cli/JndiResourceManager.java
@@ -33,7 +33,7 @@
import org.jvnet.hk2.config.TransactionFailure;
import org.jvnet.hk2.config.types.Property;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
import jakarta.resource.ResourceException;
import java.beans.PropertyVetoException;
import java.util.HashMap;
diff --git a/appserver/resources/resources-connector/src/main/java/org/glassfish/resources/admin/cli/ListCustomResources.java b/appserver/resources/resources-connector/src/main/java/org/glassfish/resources/admin/cli/ListCustomResources.java
index 617b2b9..cf420b9 100644
--- a/appserver/resources/resources-connector/src/main/java/org/glassfish/resources/admin/cli/ListCustomResources.java
+++ b/appserver/resources/resources-connector/src/main/java/org/glassfish/resources/admin/cli/ListCustomResources.java
@@ -31,7 +31,7 @@
import org.glassfish.resourcebase.resources.util.BindableResourcesHelper;
import org.jvnet.hk2.annotations.Service;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
import java.util.ArrayList;
import java.util.Collection;
import java.util.List;
diff --git a/appserver/resources/resources-connector/src/main/java/org/glassfish/resources/admin/cli/ListJndiResources.java b/appserver/resources/resources-connector/src/main/java/org/glassfish/resources/admin/cli/ListJndiResources.java
index 8055bb0..ea1deca 100644
--- a/appserver/resources/resources-connector/src/main/java/org/glassfish/resources/admin/cli/ListJndiResources.java
+++ b/appserver/resources/resources-connector/src/main/java/org/glassfish/resources/admin/cli/ListJndiResources.java
@@ -31,7 +31,7 @@
import org.glassfish.resourcebase.resources.util.BindableResourcesHelper;
import org.jvnet.hk2.annotations.Service;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
import java.util.ArrayList;
import java.util.Collection;
import java.util.List;
diff --git a/appserver/resources/resources-connector/src/main/java/org/glassfish/resources/admin/cli/ResourceFactory.java b/appserver/resources/resources-connector/src/main/java/org/glassfish/resources/admin/cli/ResourceFactory.java
index b64740a..bd5a53a 100644
--- a/appserver/resources/resources-connector/src/main/java/org/glassfish/resources/admin/cli/ResourceFactory.java
+++ b/appserver/resources/resources-connector/src/main/java/org/glassfish/resources/admin/cli/ResourceFactory.java
@@ -23,8 +23,8 @@
import org.jvnet.hk2.annotations.Service;
import org.glassfish.hk2.api.PerLookup;
-import javax.inject.Inject;
-import javax.inject.Provider;
+import jakarta.inject.Inject;
+import jakarta.inject.Provider;
/**
*
diff --git a/appserver/resources/resources-connector/src/main/java/org/glassfish/resources/connector/ResourcesCompositeSniffer.java b/appserver/resources/resources-connector/src/main/java/org/glassfish/resources/connector/ResourcesCompositeSniffer.java
index 97d922c..c0ba42b 100644
--- a/appserver/resources/resources-connector/src/main/java/org/glassfish/resources/connector/ResourcesCompositeSniffer.java
+++ b/appserver/resources/resources-connector/src/main/java/org/glassfish/resources/connector/ResourcesCompositeSniffer.java
@@ -25,7 +25,7 @@
import org.jvnet.hk2.annotations.Service;
import javax.enterprise.deploy.shared.ModuleType;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
import java.util.ArrayList;
import java.util.List;
diff --git a/appserver/resources/resources-connector/src/main/java/org/glassfish/resources/connector/ResourcesSniffer.java b/appserver/resources/resources-connector/src/main/java/org/glassfish/resources/connector/ResourcesSniffer.java
index 2662f5a..38254ed 100644
--- a/appserver/resources/resources-connector/src/main/java/org/glassfish/resources/connector/ResourcesSniffer.java
+++ b/appserver/resources/resources-connector/src/main/java/org/glassfish/resources/connector/ResourcesSniffer.java
@@ -25,7 +25,7 @@
import org.jvnet.hk2.annotations.Service;
import javax.enterprise.deploy.shared.ModuleType;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
import java.util.ArrayList;
import java.util.List;
diff --git a/appserver/resources/resources-connector/src/main/java/org/glassfish/resources/listener/ApplicationScopedResourcesManager.java b/appserver/resources/resources-connector/src/main/java/org/glassfish/resources/listener/ApplicationScopedResourcesManager.java
index be0e36b..f962c73 100644
--- a/appserver/resources/resources-connector/src/main/java/org/glassfish/resources/listener/ApplicationScopedResourcesManager.java
+++ b/appserver/resources/resources-connector/src/main/java/org/glassfish/resources/listener/ApplicationScopedResourcesManager.java
@@ -33,9 +33,9 @@
import org.jvnet.hk2.annotations.Service;
import org.jvnet.hk2.config.*;
-import javax.inject.Inject;
-import javax.inject.Provider;
-import javax.inject.Singleton;
+import jakarta.inject.Inject;
+import jakarta.inject.Provider;
+import jakarta.inject.Singleton;
import java.beans.PropertyChangeEvent;
import java.util.Collection;
import java.util.List;
diff --git a/appserver/resources/resources-runtime/src/main/java/org/glassfish/resources/deployer/CustomResourceDeployer.java b/appserver/resources/resources-runtime/src/main/java/org/glassfish/resources/deployer/CustomResourceDeployer.java
index 2be88eb..77dd42b 100644
--- a/appserver/resources/resources-runtime/src/main/java/org/glassfish/resources/deployer/CustomResourceDeployer.java
+++ b/appserver/resources/resources-runtime/src/main/java/org/glassfish/resources/deployer/CustomResourceDeployer.java
@@ -33,8 +33,8 @@
import org.glassfish.resourcebase.resources.util.ResourceUtil;
import org.glassfish.resourcebase.resources.util.BindableResourcesHelper;
import org.glassfish.resourcebase.resources.naming.ResourceNamingService;
-import javax.inject.Inject;
-import javax.inject.Singleton;
+import jakarta.inject.Inject;
+import jakarta.inject.Singleton;
import javax.naming.NamingException;
import javax.naming.Reference;
import javax.naming.StringRefAddr;
diff --git a/appserver/resources/resources-runtime/src/main/java/org/glassfish/resources/deployer/ExternalJndiResourceDeployer.java b/appserver/resources/resources-runtime/src/main/java/org/glassfish/resources/deployer/ExternalJndiResourceDeployer.java
index 6d584ef..8c5f886 100644
--- a/appserver/resources/resources-runtime/src/main/java/org/glassfish/resources/deployer/ExternalJndiResourceDeployer.java
+++ b/appserver/resources/resources-runtime/src/main/java/org/glassfish/resources/deployer/ExternalJndiResourceDeployer.java
@@ -35,10 +35,10 @@
import org.glassfish.resourcebase.resources.api.ResourceDeployerInfo;
import org.glassfish.resourcebase.resources.api.ResourceConflictException;
import org.jvnet.hk2.annotations.Service;
-import javax.inject.Singleton;
+import jakarta.inject.Singleton;
import org.jvnet.hk2.config.types.Property;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
import javax.naming.Context;
import javax.naming.NamingException;
import javax.naming.Reference;
diff --git a/appserver/resources/resources-runtime/src/main/java/org/glassfish/resources/module/ResourcesApplication.java b/appserver/resources/resources-runtime/src/main/java/org/glassfish/resources/module/ResourcesApplication.java
index 9fa10f6..ca8b69e 100644
--- a/appserver/resources/resources-runtime/src/main/java/org/glassfish/resources/module/ResourcesApplication.java
+++ b/appserver/resources/resources-runtime/src/main/java/org/glassfish/resources/module/ResourcesApplication.java
@@ -28,7 +28,7 @@
import java.util.logging.Logger;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
@Service
@PerLookup
diff --git a/appserver/resources/resources-runtime/src/main/java/org/glassfish/resources/module/ResourcesDeployer.java b/appserver/resources/resources-runtime/src/main/java/org/glassfish/resources/module/ResourcesDeployer.java
index b0eab67..3ea2b69 100644
--- a/appserver/resources/resources-runtime/src/main/java/org/glassfish/resources/module/ResourcesDeployer.java
+++ b/appserver/resources/resources-runtime/src/main/java/org/glassfish/resources/module/ResourcesDeployer.java
@@ -54,8 +54,8 @@
import org.glassfish.api.event.EventListener;
-import javax.inject.Inject;
-import javax.inject.Provider;
+import jakarta.inject.Inject;
+import jakarta.inject.Provider;
import jakarta.resource.ResourceException;
import java.io.File;
import java.io.IOException;
diff --git a/appserver/security/appclient.security/src/main/java/com/sun/enterprise/security/appclient/AppClientSecurityInfoImpl.java b/appserver/security/appclient.security/src/main/java/com/sun/enterprise/security/appclient/AppClientSecurityInfoImpl.java
index 976a070..05f40ff 100644
--- a/appserver/security/appclient.security/src/main/java/com/sun/enterprise/security/appclient/AppClientSecurityInfoImpl.java
+++ b/appserver/security/appclient.security/src/main/java/com/sun/enterprise/security/appclient/AppClientSecurityInfoImpl.java
@@ -32,7 +32,7 @@
import java.util.List;
import java.util.logging.Level;
import java.util.logging.Logger;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
import javax.security.auth.Subject;
import javax.security.auth.callback.CallbackHandler;
import jakarta.security.auth.message.config.AuthConfigFactory;
diff --git a/appserver/security/appclient.security/src/main/java/com/sun/enterprise/security/appclient/AppclientIIOPInterceptorFactory.java b/appserver/security/appclient.security/src/main/java/com/sun/enterprise/security/appclient/AppclientIIOPInterceptorFactory.java
index 19f8cc6..a04712a 100644
--- a/appserver/security/appclient.security/src/main/java/com/sun/enterprise/security/appclient/AppclientIIOPInterceptorFactory.java
+++ b/appserver/security/appclient.security/src/main/java/com/sun/enterprise/security/appclient/AppclientIIOPInterceptorFactory.java
@@ -28,14 +28,14 @@
import org.jvnet.hk2.annotations.Service;
-import javax.inject.Singleton;
+import jakarta.inject.Singleton;
import org.omg.IOP.Codec;
import org.omg.PortableInterceptor.ClientRequestInterceptor;
import org.omg.PortableInterceptor.ORBInitInfo;
import org.omg.PortableInterceptor.ServerRequestInterceptor;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
/**
*
diff --git a/appserver/security/core-ee/src/main/java/com/sun/enterprise/security/acl/RoleMapperFactory.java b/appserver/security/core-ee/src/main/java/com/sun/enterprise/security/acl/RoleMapperFactory.java
index d8e9f60..661f1f5 100644
--- a/appserver/security/core-ee/src/main/java/com/sun/enterprise/security/acl/RoleMapperFactory.java
+++ b/appserver/security/core-ee/src/main/java/com/sun/enterprise/security/acl/RoleMapperFactory.java
@@ -24,7 +24,7 @@
import org.jvnet.hk2.annotations.Service;
-import javax.inject.Singleton;
+import jakarta.inject.Singleton;
/**
*
diff --git a/appserver/security/core-ee/src/main/java/com/sun/enterprise/security/ee/JavaEESecurityLifecycle.java b/appserver/security/core-ee/src/main/java/com/sun/enterprise/security/ee/JavaEESecurityLifecycle.java
index 18b75de..b3c648f 100644
--- a/appserver/security/core-ee/src/main/java/com/sun/enterprise/security/ee/JavaEESecurityLifecycle.java
+++ b/appserver/security/core-ee/src/main/java/com/sun/enterprise/security/ee/JavaEESecurityLifecycle.java
@@ -26,7 +26,7 @@
import org.jvnet.hk2.annotations.Service;
import org.glassfish.hk2.api.PostConstruct;
-import javax.inject.Singleton;
+import jakarta.inject.Singleton;
/**
*
diff --git a/appserver/security/core-ee/src/main/java/com/sun/enterprise/security/ee/SecurityContainer.java b/appserver/security/core-ee/src/main/java/com/sun/enterprise/security/ee/SecurityContainer.java
index fc4c39a..c500b9a 100644
--- a/appserver/security/core-ee/src/main/java/com/sun/enterprise/security/ee/SecurityContainer.java
+++ b/appserver/security/core-ee/src/main/java/com/sun/enterprise/security/ee/SecurityContainer.java
@@ -27,8 +27,8 @@
import org.glassfish.hk2.api.PostConstruct;
import org.glassfish.hk2.api.ServiceLocator;
-import javax.inject.Inject;
-import javax.inject.Provider;
+import jakarta.inject.Inject;
+import jakarta.inject.Provider;
/**
* Security container service
diff --git a/appserver/security/core-ee/src/main/java/com/sun/enterprise/security/ee/SecurityDeployer.java b/appserver/security/core-ee/src/main/java/com/sun/enterprise/security/ee/SecurityDeployer.java
index c03cd88..ed04ddf 100644
--- a/appserver/security/core-ee/src/main/java/com/sun/enterprise/security/ee/SecurityDeployer.java
+++ b/appserver/security/core-ee/src/main/java/com/sun/enterprise/security/ee/SecurityDeployer.java
@@ -51,9 +51,9 @@
import org.glassfish.internal.data.ModuleInfo;
import com.sun.enterprise.deployment.web.LoginConfiguration;
-import javax.inject.Inject;
-import javax.inject.Named;
-import javax.inject.Provider;
+import jakarta.inject.Inject;
+import jakarta.inject.Named;
+import jakarta.inject.Provider;
/**
* Security Deployer which generate and clean the security policies
diff --git a/appserver/security/core-ee/src/main/java/com/sun/enterprise/security/ee/SecuritySniffer.java b/appserver/security/core-ee/src/main/java/com/sun/enterprise/security/ee/SecuritySniffer.java
index 4149d65..9c76f0c 100644
--- a/appserver/security/core-ee/src/main/java/com/sun/enterprise/security/ee/SecuritySniffer.java
+++ b/appserver/security/core-ee/src/main/java/com/sun/enterprise/security/ee/SecuritySniffer.java
@@ -33,7 +33,7 @@
import com.sun.enterprise.module.HK2Module;
import java.lang.annotation.Annotation;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
/**
* SecuritySniffer for security related activities
diff --git a/appserver/security/core-ee/src/main/java/com/sun/enterprise/security/ee/audit/AppServerAuditManager.java b/appserver/security/core-ee/src/main/java/com/sun/enterprise/security/ee/audit/AppServerAuditManager.java
index 478ffad..431765c 100644
--- a/appserver/security/core-ee/src/main/java/com/sun/enterprise/security/ee/audit/AppServerAuditManager.java
+++ b/appserver/security/core-ee/src/main/java/com/sun/enterprise/security/ee/audit/AppServerAuditManager.java
@@ -34,7 +34,7 @@
import java.util.logging.Level;
import org.jvnet.hk2.annotations.Service;
-import javax.inject.Singleton;
+import jakarta.inject.Singleton;
import jakarta.servlet.http.HttpServletRequest;
import org.glassfish.hk2.api.Rank;
diff --git a/appserver/security/core-ee/src/main/java/com/sun/enterprise/security/jmac/MessageSecurityConfigEventListenerImpl.java b/appserver/security/core-ee/src/main/java/com/sun/enterprise/security/jmac/MessageSecurityConfigEventListenerImpl.java
index 191a64c..39a38ff 100644
--- a/appserver/security/core-ee/src/main/java/com/sun/enterprise/security/jmac/MessageSecurityConfigEventListenerImpl.java
+++ b/appserver/security/core-ee/src/main/java/com/sun/enterprise/security/jmac/MessageSecurityConfigEventListenerImpl.java
@@ -20,8 +20,8 @@
import java.util.logging.Level;
import java.util.logging.Logger;
-import javax.inject.Inject;
-import javax.inject.Named;
+import jakarta.inject.Inject;
+import jakarta.inject.Named;
import org.glassfish.api.StartupRunLevel;
import org.glassfish.api.admin.ServerEnvironment;
diff --git a/appserver/security/core-ee/src/main/java/com/sun/enterprise/security/perms/XMLPermissionsHandler.java b/appserver/security/core-ee/src/main/java/com/sun/enterprise/security/perms/XMLPermissionsHandler.java
index bb2f592..4e4f74b 100644
--- a/appserver/security/core-ee/src/main/java/com/sun/enterprise/security/perms/XMLPermissionsHandler.java
+++ b/appserver/security/core-ee/src/main/java/com/sun/enterprise/security/perms/XMLPermissionsHandler.java
@@ -26,7 +26,7 @@
import java.util.logging.Level;
import java.util.logging.Logger;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
import javax.xml.stream.XMLStreamException;
import org.xml.sax.SAXException;
diff --git a/appserver/security/core-ee/src/main/java/com/sun/enterprise/security/web/integration/WebSecurityManagerFactory.java b/appserver/security/core-ee/src/main/java/com/sun/enterprise/security/web/integration/WebSecurityManagerFactory.java
index fd00002..7755acb 100644
--- a/appserver/security/core-ee/src/main/java/com/sun/enterprise/security/web/integration/WebSecurityManagerFactory.java
+++ b/appserver/security/core-ee/src/main/java/com/sun/enterprise/security/web/integration/WebSecurityManagerFactory.java
@@ -33,7 +33,7 @@
import jakarta.security.jacc.PolicyContextHandler;
import org.jvnet.hk2.annotations.Service;
-import javax.inject.Singleton;
+import jakarta.inject.Singleton;
/** @author JeanFrancois Arcand
* @author Harpreet Singh
diff --git a/appserver/security/ejb.security/src/main/java/com/sun/enterprise/iiop/security/GSSUtilsService.java b/appserver/security/ejb.security/src/main/java/com/sun/enterprise/iiop/security/GSSUtilsService.java
index 99ee53f..f1681ff 100644
--- a/appserver/security/ejb.security/src/main/java/com/sun/enterprise/iiop/security/GSSUtilsService.java
+++ b/appserver/security/ejb.security/src/main/java/com/sun/enterprise/iiop/security/GSSUtilsService.java
@@ -20,7 +20,7 @@
import java.io.IOException;
import org.jvnet.hk2.annotations.Service;
-import javax.inject.Singleton;
+import jakarta.inject.Singleton;
import sun.security.util.ObjectIdentifier;
/**
diff --git a/appserver/security/ejb.security/src/main/java/com/sun/enterprise/iiop/security/IIOPSSLUtilImpl.java b/appserver/security/ejb.security/src/main/java/com/sun/enterprise/iiop/security/IIOPSSLUtilImpl.java
index 4ed36fc..f49f17e 100644
--- a/appserver/security/ejb.security/src/main/java/com/sun/enterprise/iiop/security/IIOPSSLUtilImpl.java
+++ b/appserver/security/ejb.security/src/main/java/com/sun/enterprise/iiop/security/IIOPSSLUtilImpl.java
@@ -25,7 +25,7 @@
import java.util.List;
import java.util.logging.Level;
import java.util.logging.Logger;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
import javax.net.ssl.KeyManager;
import javax.net.ssl.TrustManager;
import javax.net.ssl.X509KeyManager;
@@ -34,7 +34,7 @@
import org.glassfish.internal.api.SharedSecureRandom;
import org.jvnet.hk2.annotations.Service;
-import javax.inject.Singleton;
+import jakarta.inject.Singleton;
import org.omg.IOP.TaggedComponent;
import org.omg.PortableInterceptor.IORInfo;
/**
diff --git a/appserver/security/ejb.security/src/main/java/com/sun/enterprise/iiop/security/Lookups.java b/appserver/security/ejb.security/src/main/java/com/sun/enterprise/iiop/security/Lookups.java
index d84ab19..fad7f5a 100644
--- a/appserver/security/ejb.security/src/main/java/com/sun/enterprise/iiop/security/Lookups.java
+++ b/appserver/security/ejb.security/src/main/java/com/sun/enterprise/iiop/security/Lookups.java
@@ -22,8 +22,8 @@
import org.glassfish.hk2.api.ServiceLocator;
import org.glassfish.internal.api.Globals;
-import javax.inject.Inject;
-import javax.inject.Provider;
+import jakarta.inject.Inject;
+import jakarta.inject.Provider;
/**
* This class is a local utility class to provide for hk2 lookups during runtime.
diff --git a/appserver/security/ejb.security/src/main/java/com/sun/enterprise/iiop/security/SecurityContextUtil.java b/appserver/security/ejb.security/src/main/java/com/sun/enterprise/iiop/security/SecurityContextUtil.java
index 8cfcd53..a695b42 100644
--- a/appserver/security/ejb.security/src/main/java/com/sun/enterprise/iiop/security/SecurityContextUtil.java
+++ b/appserver/security/ejb.security/src/main/java/com/sun/enterprise/iiop/security/SecurityContextUtil.java
@@ -33,14 +33,14 @@
import java.security.PrivilegedAction;
import java.util.logging.Level;
import java.util.Set;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
import javax.security.auth.Subject;
import org.glassfish.enterprise.iiop.api.GlassFishORBHelper;
import org.glassfish.enterprise.iiop.api.ProtocolManager;
import org.jvnet.hk2.annotations.Service;
import org.glassfish.hk2.api.PostConstruct;
-import javax.inject.Singleton;
+import jakarta.inject.Singleton;
/**
diff --git a/appserver/security/ejb.security/src/main/java/com/sun/enterprise/iiop/security/SecurityIIOPInterceptorFactory.java b/appserver/security/ejb.security/src/main/java/com/sun/enterprise/iiop/security/SecurityIIOPInterceptorFactory.java
index 918c357..50ed564 100644
--- a/appserver/security/ejb.security/src/main/java/com/sun/enterprise/iiop/security/SecurityIIOPInterceptorFactory.java
+++ b/appserver/security/ejb.security/src/main/java/com/sun/enterprise/iiop/security/SecurityIIOPInterceptorFactory.java
@@ -23,7 +23,7 @@
import org.glassfish.enterprise.iiop.api.IIOPInterceptorFactory;
import org.jvnet.hk2.annotations.Service;
-import javax.inject.Singleton;
+import jakarta.inject.Singleton;
import org.omg.CORBA.ORB;
import org.omg.IOP.Codec;
import org.omg.PortableInterceptor.ClientRequestInterceptor;
@@ -32,7 +32,7 @@
import org.omg.PortableInterceptor.ORBInitInfoPackage.DuplicateName;
import org.omg.PortableInterceptor.ServerRequestInterceptor;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
/**
*
diff --git a/appserver/security/ejb.security/src/main/java/com/sun/enterprise/iiop/security/SecurityMechanismSelector.java b/appserver/security/ejb.security/src/main/java/com/sun/enterprise/iiop/security/SecurityMechanismSelector.java
index 22af93d..6b8564f 100644
--- a/appserver/security/ejb.security/src/main/java/com/sun/enterprise/iiop/security/SecurityMechanismSelector.java
+++ b/appserver/security/ejb.security/src/main/java/com/sun/enterprise/iiop/security/SecurityMechanismSelector.java
@@ -77,9 +77,9 @@
import org.jvnet.hk2.annotations.Service;
import org.glassfish.api.invocation.InvocationManager ;
import org.glassfish.hk2.api.PostConstruct;
-import javax.inject.Singleton;
+import jakarta.inject.Singleton;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
/**
* This class is responsible for making various decisions for selecting
diff --git a/appserver/security/webintegration/src/main/java/com/sun/web/security/CNonceCacheFactoryImpl.java b/appserver/security/webintegration/src/main/java/com/sun/web/security/CNonceCacheFactoryImpl.java
index 28d2b48..b6bf10e 100644
--- a/appserver/security/webintegration/src/main/java/com/sun/web/security/CNonceCacheFactoryImpl.java
+++ b/appserver/security/webintegration/src/main/java/com/sun/web/security/CNonceCacheFactoryImpl.java
@@ -26,11 +26,11 @@
import org.jvnet.hk2.annotations.Service;
import org.glassfish.hk2.api.PostConstruct;
-import javax.inject.Singleton;
+import jakarta.inject.Singleton;
-import javax.inject.Inject;
-import javax.inject.Named;
-import javax.inject.Provider;
+import jakarta.inject.Inject;
+import jakarta.inject.Named;
+import jakarta.inject.Provider;
/**
*
diff --git a/appserver/security/webintegration/src/main/java/com/sun/web/security/RealmAdapter.java b/appserver/security/webintegration/src/main/java/com/sun/web/security/RealmAdapter.java
index bea0e7d..9c65ab2 100644
--- a/appserver/security/webintegration/src/main/java/com/sun/web/security/RealmAdapter.java
+++ b/appserver/security/webintegration/src/main/java/com/sun/web/security/RealmAdapter.java
@@ -35,8 +35,8 @@
import java.util.concurrent.locks.ReadWriteLock;
import java.util.concurrent.locks.ReentrantReadWriteLock;
-import javax.inject.Named;
-import javax.inject.Provider;
+import jakarta.inject.Named;
+import jakarta.inject.Provider;
import javax.security.auth.Subject;
import jakarta.security.auth.message.AuthException;
import jakarta.security.auth.message.AuthStatus;
@@ -101,7 +101,7 @@
import com.sun.enterprise.security.authorize.PolicyContextHandlerImpl;
import com.sun.enterprise.util.net.NetUtils;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
import jakarta.security.jacc.PolicyContext;
import jakarta.servlet.ServletContext;
import jakarta.servlet.ServletException;
diff --git a/appserver/security/webintegration/src/main/java/com/sun/web/security/WebSecurityComponentInvocationHandler.java b/appserver/security/webintegration/src/main/java/com/sun/web/security/WebSecurityComponentInvocationHandler.java
index 9514f7f..c9ed689 100644
--- a/appserver/security/webintegration/src/main/java/com/sun/web/security/WebSecurityComponentInvocationHandler.java
+++ b/appserver/security/webintegration/src/main/java/com/sun/web/security/WebSecurityComponentInvocationHandler.java
@@ -29,9 +29,9 @@
import org.glassfish.api.invocation.InvocationManager;
import org.jvnet.hk2.annotations.Service;
-import javax.inject.Singleton;
+import jakarta.inject.Singleton;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
@Service(name="webSecurityCIH")
@Singleton
diff --git a/appserver/security/webservices.security/src/main/java/com/sun/enterprise/security/webservices/GFServerPipeCreator.java b/appserver/security/webservices.security/src/main/java/com/sun/enterprise/security/webservices/GFServerPipeCreator.java
index a70ebb1..6ccbecb 100644
--- a/appserver/security/webservices.security/src/main/java/com/sun/enterprise/security/webservices/GFServerPipeCreator.java
+++ b/appserver/security/webservices.security/src/main/java/com/sun/enterprise/security/webservices/GFServerPipeCreator.java
@@ -34,7 +34,7 @@
import com.sun.xml.wss.provider.wsit.PipeConstants;
import org.jvnet.hk2.annotations.Service;
-import javax.inject.Singleton;
+import jakarta.inject.Singleton;
/**
diff --git a/appserver/security/webservices.security/src/main/java/com/sun/enterprise/security/webservices/SecurityServiceImpl.java b/appserver/security/webservices.security/src/main/java/com/sun/enterprise/security/webservices/SecurityServiceImpl.java
index 90a712f..f4ec326 100644
--- a/appserver/security/webservices.security/src/main/java/com/sun/enterprise/security/webservices/SecurityServiceImpl.java
+++ b/appserver/security/webservices.security/src/main/java/com/sun/enterprise/security/webservices/SecurityServiceImpl.java
@@ -32,7 +32,7 @@
import org.glassfish.webservices.WebServiceContextImpl;
import org.jvnet.hk2.annotations.Service;
-import javax.inject.Singleton;
+import jakarta.inject.Singleton;
import com.sun.enterprise.security.SecurityContext;
import java.security.Principal;
@@ -48,7 +48,7 @@
import java.lang.ref.WeakReference;
import java.util.ArrayList;
import java.util.List;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
import jakarta.security.jacc.PolicyContext;
import jakarta.xml.soap.SOAPMessage;
diff --git a/appserver/security/webservices.security/src/main/java/com/sun/enterprise/security/webservices/WebServicesDelegateImpl.java b/appserver/security/webservices.security/src/main/java/com/sun/enterprise/security/webservices/WebServicesDelegateImpl.java
index 204dd1d..530e35c 100644
--- a/appserver/security/webservices.security/src/main/java/com/sun/enterprise/security/webservices/WebServicesDelegateImpl.java
+++ b/appserver/security/webservices.security/src/main/java/com/sun/enterprise/security/webservices/WebServicesDelegateImpl.java
@@ -45,7 +45,7 @@
import org.glassfish.api.invocation.ComponentInvocation;
import org.jvnet.hk2.annotations.Service;
-import javax.inject.Singleton;
+import jakarta.inject.Singleton;
/**
*
diff --git a/appserver/tests/appserv-tests/devtests/batch/bmt-chunk-job/ejb/com/oracle/javaee7/samples/batch/chunk/SimpleItemProcessor.java b/appserver/tests/appserv-tests/devtests/batch/bmt-chunk-job/ejb/com/oracle/javaee7/samples/batch/chunk/SimpleItemProcessor.java
index ac427a9..c2f989a 100644
--- a/appserver/tests/appserv-tests/devtests/batch/bmt-chunk-job/ejb/com/oracle/javaee7/samples/batch/chunk/SimpleItemProcessor.java
+++ b/appserver/tests/appserv-tests/devtests/batch/bmt-chunk-job/ejb/com/oracle/javaee7/samples/batch/chunk/SimpleItemProcessor.java
@@ -14,10 +14,10 @@
*/
package com.oracle.javaee7.samples.batch.chunk;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
-@javax.inject.Named("SimpleItemProcessor")
+@jakarta.inject.Named("SimpleItemProcessor")
public class SimpleItemProcessor
implements javax.batch.api.chunk.ItemProcessor {
diff --git a/appserver/tests/appserv-tests/devtests/batch/bmt-chunk-job/ejb/com/oracle/javaee7/samples/batch/chunk/SimpleItemReader.java b/appserver/tests/appserv-tests/devtests/batch/bmt-chunk-job/ejb/com/oracle/javaee7/samples/batch/chunk/SimpleItemReader.java
index 74f446d..d78d1c5 100644
--- a/appserver/tests/appserv-tests/devtests/batch/bmt-chunk-job/ejb/com/oracle/javaee7/samples/batch/chunk/SimpleItemReader.java
+++ b/appserver/tests/appserv-tests/devtests/batch/bmt-chunk-job/ejb/com/oracle/javaee7/samples/batch/chunk/SimpleItemReader.java
@@ -16,7 +16,7 @@
import java.io.Serializable;
-@javax.inject.Named("SimpleItemReader")
+@jakarta.inject.Named("SimpleItemReader")
public class SimpleItemReader
implements javax.batch.api.chunk.ItemReader {
diff --git a/appserver/tests/appserv-tests/devtests/batch/bmt-chunk-job/ejb/com/oracle/javaee7/samples/batch/chunk/SimpleItemWriter.java b/appserver/tests/appserv-tests/devtests/batch/bmt-chunk-job/ejb/com/oracle/javaee7/samples/batch/chunk/SimpleItemWriter.java
index 96394df..b5bdfa3 100644
--- a/appserver/tests/appserv-tests/devtests/batch/bmt-chunk-job/ejb/com/oracle/javaee7/samples/batch/chunk/SimpleItemWriter.java
+++ b/appserver/tests/appserv-tests/devtests/batch/bmt-chunk-job/ejb/com/oracle/javaee7/samples/batch/chunk/SimpleItemWriter.java
@@ -16,7 +16,7 @@
import java.io.Serializable;
import java.util.List;
-@javax.inject.Named("SimpleItemWriter")
+@jakarta.inject.Named("SimpleItemWriter")
public class SimpleItemWriter
implements javax.batch.api.chunk.ItemWriter {
diff --git a/appserver/tests/appserv-tests/devtests/batch/cmt-chunk-job/ejb/com/oracle/javaee7/samples/batch/cmt/chunk/JobSubmitterBean.java b/appserver/tests/appserv-tests/devtests/batch/cmt-chunk-job/ejb/com/oracle/javaee7/samples/batch/cmt/chunk/JobSubmitterBean.java
index a9b67d9..1b3f215 100644
--- a/appserver/tests/appserv-tests/devtests/batch/cmt-chunk-job/ejb/com/oracle/javaee7/samples/batch/cmt/chunk/JobSubmitterBean.java
+++ b/appserver/tests/appserv-tests/devtests/batch/cmt-chunk-job/ejb/com/oracle/javaee7/samples/batch/cmt/chunk/JobSubmitterBean.java
@@ -21,7 +21,7 @@
import java.util.Map;
import java.util.HashMap;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
import jakarta.annotation.PostConstruct;
import javax.batch.operations.JobOperator;
diff --git a/appserver/tests/appserv-tests/devtests/batch/cmt-chunk-job/ejb/com/oracle/javaee7/samples/batch/cmt/chunk/SimpleItemProcessor.java b/appserver/tests/appserv-tests/devtests/batch/cmt-chunk-job/ejb/com/oracle/javaee7/samples/batch/cmt/chunk/SimpleItemProcessor.java
index 4ec8c54..3793407 100644
--- a/appserver/tests/appserv-tests/devtests/batch/cmt-chunk-job/ejb/com/oracle/javaee7/samples/batch/cmt/chunk/SimpleItemProcessor.java
+++ b/appserver/tests/appserv-tests/devtests/batch/cmt-chunk-job/ejb/com/oracle/javaee7/samples/batch/cmt/chunk/SimpleItemProcessor.java
@@ -14,10 +14,10 @@
*/
package com.oracle.javaee7.samples.batch.cmt.chunk;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
-@javax.inject.Named("SimpleItemProcessor")
+@jakarta.inject.Named("SimpleItemProcessor")
public class SimpleItemProcessor
implements javax.batch.api.chunk.ItemProcessor {
diff --git a/appserver/tests/appserv-tests/devtests/batch/cmt-chunk-job/ejb/com/oracle/javaee7/samples/batch/cmt/chunk/SimpleItemReader.java b/appserver/tests/appserv-tests/devtests/batch/cmt-chunk-job/ejb/com/oracle/javaee7/samples/batch/cmt/chunk/SimpleItemReader.java
index 8354666..dc00205 100644
--- a/appserver/tests/appserv-tests/devtests/batch/cmt-chunk-job/ejb/com/oracle/javaee7/samples/batch/cmt/chunk/SimpleItemReader.java
+++ b/appserver/tests/appserv-tests/devtests/batch/cmt-chunk-job/ejb/com/oracle/javaee7/samples/batch/cmt/chunk/SimpleItemReader.java
@@ -16,7 +16,7 @@
import java.io.Serializable;
-@javax.inject.Named("SimpleItemReader")
+@jakarta.inject.Named("SimpleItemReader")
public class SimpleItemReader
implements javax.batch.api.chunk.ItemReader {
diff --git a/appserver/tests/appserv-tests/devtests/batch/cmt-chunk-job/ejb/com/oracle/javaee7/samples/batch/cmt/chunk/SimpleItemWriter.java b/appserver/tests/appserv-tests/devtests/batch/cmt-chunk-job/ejb/com/oracle/javaee7/samples/batch/cmt/chunk/SimpleItemWriter.java
index 32abffb..46d6093 100644
--- a/appserver/tests/appserv-tests/devtests/batch/cmt-chunk-job/ejb/com/oracle/javaee7/samples/batch/cmt/chunk/SimpleItemWriter.java
+++ b/appserver/tests/appserv-tests/devtests/batch/cmt-chunk-job/ejb/com/oracle/javaee7/samples/batch/cmt/chunk/SimpleItemWriter.java
@@ -16,7 +16,7 @@
import java.io.Serializable;
import java.util.List;
-@javax.inject.Named("SimpleItemWriter")
+@jakarta.inject.Named("SimpleItemWriter")
public class SimpleItemWriter
implements javax.batch.api.chunk.ItemWriter {
diff --git a/appserver/tests/appserv-tests/devtests/batch/pay-roll-job-with-ejb/stateless/ejb/com/oracle/javaee7/samples/batch/simple/JobSubmitterServlet.java b/appserver/tests/appserv-tests/devtests/batch/pay-roll-job-with-ejb/stateless/ejb/com/oracle/javaee7/samples/batch/simple/JobSubmitterServlet.java
index 642c988..72782a5d 100644
--- a/appserver/tests/appserv-tests/devtests/batch/pay-roll-job-with-ejb/stateless/ejb/com/oracle/javaee7/samples/batch/simple/JobSubmitterServlet.java
+++ b/appserver/tests/appserv-tests/devtests/batch/pay-roll-job-with-ejb/stateless/ejb/com/oracle/javaee7/samples/batch/simple/JobSubmitterServlet.java
@@ -31,7 +31,7 @@
import javax.servlet.http.HttpServletResponse;
import javax.batch.runtime.context.BatchContext;
import javax.enterprise.concurrent.ManagedExecutorService;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
/**
*
diff --git a/appserver/tests/appserv-tests/devtests/batch/pay-roll-job-with-ejb/stateless/ejb/com/oracle/javaee7/samples/batch/simple/SimpleItemProcessor.java b/appserver/tests/appserv-tests/devtests/batch/pay-roll-job-with-ejb/stateless/ejb/com/oracle/javaee7/samples/batch/simple/SimpleItemProcessor.java
index 912806d..169b603 100644
--- a/appserver/tests/appserv-tests/devtests/batch/pay-roll-job-with-ejb/stateless/ejb/com/oracle/javaee7/samples/batch/simple/SimpleItemProcessor.java
+++ b/appserver/tests/appserv-tests/devtests/batch/pay-roll-job-with-ejb/stateless/ejb/com/oracle/javaee7/samples/batch/simple/SimpleItemProcessor.java
@@ -14,10 +14,10 @@
*/
package com.oracle.javaee7.samples.batch.simple;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
-@javax.inject.Named//("com.oracle.javaee7.samples.batch.simple.SimpleItemProcessor")
+@jakarta.inject.Named//("com.oracle.javaee7.samples.batch.simple.SimpleItemProcessor")
public class SimpleItemProcessor
implements javax.batch.api.ItemProcessor<String, String> {
diff --git a/appserver/tests/appserv-tests/devtests/batch/pay-roll-job-with-ejb/stateless/ejb/com/oracle/javaee7/samples/batch/simple/SimpleItemReader.java b/appserver/tests/appserv-tests/devtests/batch/pay-roll-job-with-ejb/stateless/ejb/com/oracle/javaee7/samples/batch/simple/SimpleItemReader.java
index 1e4bd8c..9a59afd 100644
--- a/appserver/tests/appserv-tests/devtests/batch/pay-roll-job-with-ejb/stateless/ejb/com/oracle/javaee7/samples/batch/simple/SimpleItemReader.java
+++ b/appserver/tests/appserv-tests/devtests/batch/pay-roll-job-with-ejb/stateless/ejb/com/oracle/javaee7/samples/batch/simple/SimpleItemReader.java
@@ -16,7 +16,7 @@
import java.io.Externalizable;
-@javax.inject.Named("SimpleItemReader")
+@jakarta.inject.Named("SimpleItemReader")
public class SimpleItemReader
extends javax.batch.api.AbstractItemReader<String> {
diff --git a/appserver/tests/appserv-tests/devtests/batch/pay-roll-job-with-ejb/stateless/ejb/com/oracle/javaee7/samples/batch/simple/SimpleItemWriter.java b/appserver/tests/appserv-tests/devtests/batch/pay-roll-job-with-ejb/stateless/ejb/com/oracle/javaee7/samples/batch/simple/SimpleItemWriter.java
index 3d9d8da..3fcf2f4 100644
--- a/appserver/tests/appserv-tests/devtests/batch/pay-roll-job-with-ejb/stateless/ejb/com/oracle/javaee7/samples/batch/simple/SimpleItemWriter.java
+++ b/appserver/tests/appserv-tests/devtests/batch/pay-roll-job-with-ejb/stateless/ejb/com/oracle/javaee7/samples/batch/simple/SimpleItemWriter.java
@@ -16,7 +16,7 @@
import java.io.Externalizable;
import java.util.List;
-@javax.inject.Named("SimpleItemWriter")
+@jakarta.inject.Named("SimpleItemWriter")
public class SimpleItemWriter
extends javax.batch.api.AbstractItemWriter<String> {
diff --git a/appserver/tests/appserv-tests/devtests/batch/simple-batchlet/ejb/com/oracle/javaee7/samples/batch/simple/batchlet/SimpleBatchlet.java b/appserver/tests/appserv-tests/devtests/batch/simple-batchlet/ejb/com/oracle/javaee7/samples/batch/simple/batchlet/SimpleBatchlet.java
index 8263f5a..5d77be5 100644
--- a/appserver/tests/appserv-tests/devtests/batch/simple-batchlet/ejb/com/oracle/javaee7/samples/batch/simple/batchlet/SimpleBatchlet.java
+++ b/appserver/tests/appserv-tests/devtests/batch/simple-batchlet/ejb/com/oracle/javaee7/samples/batch/simple/batchlet/SimpleBatchlet.java
@@ -14,10 +14,10 @@
*/
package com.oracle.javaee7.samples.batch.simple.batchlet;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
-@javax.inject.Named
+@jakarta.inject.Named
public class SimpleBatchlet
implements javax.batch.api.Batchlet {
diff --git a/appserver/tests/appserv-tests/devtests/batch/simple-validation-test/ejb/com/oracle/javaee7/samples/batch/cmt/chunk/JobSubmitterBean.java b/appserver/tests/appserv-tests/devtests/batch/simple-validation-test/ejb/com/oracle/javaee7/samples/batch/cmt/chunk/JobSubmitterBean.java
index a9b67d9..1b3f215 100644
--- a/appserver/tests/appserv-tests/devtests/batch/simple-validation-test/ejb/com/oracle/javaee7/samples/batch/cmt/chunk/JobSubmitterBean.java
+++ b/appserver/tests/appserv-tests/devtests/batch/simple-validation-test/ejb/com/oracle/javaee7/samples/batch/cmt/chunk/JobSubmitterBean.java
@@ -21,7 +21,7 @@
import java.util.Map;
import java.util.HashMap;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
import jakarta.annotation.PostConstruct;
import javax.batch.operations.JobOperator;
diff --git a/appserver/tests/appserv-tests/devtests/batch/simple-validation-test/ejb/com/oracle/javaee7/samples/batch/cmt/chunk/SimpleItemProcessor.java b/appserver/tests/appserv-tests/devtests/batch/simple-validation-test/ejb/com/oracle/javaee7/samples/batch/cmt/chunk/SimpleItemProcessor.java
index 7a4f3de..fdb5336 100644
--- a/appserver/tests/appserv-tests/devtests/batch/simple-validation-test/ejb/com/oracle/javaee7/samples/batch/cmt/chunk/SimpleItemProcessor.java
+++ b/appserver/tests/appserv-tests/devtests/batch/simple-validation-test/ejb/com/oracle/javaee7/samples/batch/cmt/chunk/SimpleItemProcessor.java
@@ -14,10 +14,10 @@
*/
package com.oracle.javaee7.samples.batch.cmt.chunk;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
-@javax.inject.Named("SimpleItemProcessor")
+@jakarta.inject.Named("SimpleItemProcessor")
public class SimpleItemProcessor
implements javax.batch.api.chunk.ItemProcessor {
diff --git a/appserver/tests/appserv-tests/devtests/batch/simple-validation-test/ejb/com/oracle/javaee7/samples/batch/cmt/chunk/SimpleItemReader.java b/appserver/tests/appserv-tests/devtests/batch/simple-validation-test/ejb/com/oracle/javaee7/samples/batch/cmt/chunk/SimpleItemReader.java
index 8354666..dc00205 100644
--- a/appserver/tests/appserv-tests/devtests/batch/simple-validation-test/ejb/com/oracle/javaee7/samples/batch/cmt/chunk/SimpleItemReader.java
+++ b/appserver/tests/appserv-tests/devtests/batch/simple-validation-test/ejb/com/oracle/javaee7/samples/batch/cmt/chunk/SimpleItemReader.java
@@ -16,7 +16,7 @@
import java.io.Serializable;
-@javax.inject.Named("SimpleItemReader")
+@jakarta.inject.Named("SimpleItemReader")
public class SimpleItemReader
implements javax.batch.api.chunk.ItemReader {
diff --git a/appserver/tests/appserv-tests/devtests/batch/simple-validation-test/ejb/com/oracle/javaee7/samples/batch/cmt/chunk/SimpleItemWriter.java b/appserver/tests/appserv-tests/devtests/batch/simple-validation-test/ejb/com/oracle/javaee7/samples/batch/cmt/chunk/SimpleItemWriter.java
index 46f6932..2043df5 100644
--- a/appserver/tests/appserv-tests/devtests/batch/simple-validation-test/ejb/com/oracle/javaee7/samples/batch/cmt/chunk/SimpleItemWriter.java
+++ b/appserver/tests/appserv-tests/devtests/batch/simple-validation-test/ejb/com/oracle/javaee7/samples/batch/cmt/chunk/SimpleItemWriter.java
@@ -16,7 +16,7 @@
import java.io.Serializable;
import java.util.List;
-@javax.inject.Named("SimpleItemWriter")
+@jakarta.inject.Named("SimpleItemWriter")
public class SimpleItemWriter
implements javax.batch.api.chunk.ItemWriter {
diff --git a/appserver/tests/appserv-tests/devtests/batch/two-steps-job/ejb/com/oracle/javaee7/samples/batch/twosteps/SimpleItemProcessor.java b/appserver/tests/appserv-tests/devtests/batch/two-steps-job/ejb/com/oracle/javaee7/samples/batch/twosteps/SimpleItemProcessor.java
index fff0112..a8b9b6c 100644
--- a/appserver/tests/appserv-tests/devtests/batch/two-steps-job/ejb/com/oracle/javaee7/samples/batch/twosteps/SimpleItemProcessor.java
+++ b/appserver/tests/appserv-tests/devtests/batch/two-steps-job/ejb/com/oracle/javaee7/samples/batch/twosteps/SimpleItemProcessor.java
@@ -14,10 +14,10 @@
*/
package com.oracle.javaee7.samples.batch.twosteps;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
-@javax.inject.Named//("com.oracle.javaee7.samples.batch.simple.SimpleItemProcessor")
+@jakarta.inject.Named//("com.oracle.javaee7.samples.batch.simple.SimpleItemProcessor")
public class SimpleItemProcessor
implements javax.batch.api.ItemProcessor<String, String> {
diff --git a/appserver/tests/appserv-tests/devtests/batch/two-steps-job/ejb/com/oracle/javaee7/samples/batch/twosteps/SimpleItemReader.java b/appserver/tests/appserv-tests/devtests/batch/two-steps-job/ejb/com/oracle/javaee7/samples/batch/twosteps/SimpleItemReader.java
index b512335..2b27f0e 100644
--- a/appserver/tests/appserv-tests/devtests/batch/two-steps-job/ejb/com/oracle/javaee7/samples/batch/twosteps/SimpleItemReader.java
+++ b/appserver/tests/appserv-tests/devtests/batch/two-steps-job/ejb/com/oracle/javaee7/samples/batch/twosteps/SimpleItemReader.java
@@ -16,7 +16,7 @@
import java.io.Externalizable;
-@javax.inject.Named("SimpleItemReader")
+@jakarta.inject.Named("SimpleItemReader")
public class SimpleItemReader
extends javax.batch.api.AbstractItemReader<String> {
diff --git a/appserver/tests/appserv-tests/devtests/batch/two-steps-job/ejb/com/oracle/javaee7/samples/batch/twosteps/SimpleItemWriter.java b/appserver/tests/appserv-tests/devtests/batch/two-steps-job/ejb/com/oracle/javaee7/samples/batch/twosteps/SimpleItemWriter.java
index bcc1aa9..04afc61 100644
--- a/appserver/tests/appserv-tests/devtests/batch/two-steps-job/ejb/com/oracle/javaee7/samples/batch/twosteps/SimpleItemWriter.java
+++ b/appserver/tests/appserv-tests/devtests/batch/two-steps-job/ejb/com/oracle/javaee7/samples/batch/twosteps/SimpleItemWriter.java
@@ -16,7 +16,7 @@
import java.io.Externalizable;
import java.util.List;
-@javax.inject.Named("SimpleItemWriter")
+@jakarta.inject.Named("SimpleItemWriter")
public class SimpleItemWriter
extends javax.batch.api.AbstractItemWriter<String> {
diff --git a/appserver/tests/appserv-tests/devtests/cdi/alternatives/servlet/AlternativesServlet.java b/appserver/tests/appserv-tests/devtests/cdi/alternatives/servlet/AlternativesServlet.java
index 77bee4e..155dab5 100644
--- a/appserver/tests/appserv-tests/devtests/cdi/alternatives/servlet/AlternativesServlet.java
+++ b/appserver/tests/appserv-tests/devtests/cdi/alternatives/servlet/AlternativesServlet.java
@@ -17,7 +17,7 @@
import java.io.IOException;
import java.io.PrintWriter;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
import javax.servlet.ServletException;
import javax.servlet.annotation.WebInitParam;
import javax.servlet.annotation.WebServlet;
diff --git a/appserver/tests/appserv-tests/devtests/cdi/alternatives/servlet/test/artifacts/Asynchronous.java b/appserver/tests/appserv-tests/devtests/cdi/alternatives/servlet/test/artifacts/Asynchronous.java
index ca0dd14..ef74b88 100644
--- a/appserver/tests/appserv-tests/devtests/cdi/alternatives/servlet/test/artifacts/Asynchronous.java
+++ b/appserver/tests/appserv-tests/devtests/cdi/alternatives/servlet/test/artifacts/Asynchronous.java
@@ -21,7 +21,7 @@
import java.lang.annotation.RetentionPolicy;
import java.lang.annotation.Target;
-import javax.inject.Qualifier;
+import jakarta.inject.Qualifier;
@Qualifier
@Target({TYPE, METHOD, PARAMETER, FIELD})
diff --git a/appserver/tests/appserv-tests/devtests/cdi/alternatives/servlet/test/artifacts/PayBy.java b/appserver/tests/appserv-tests/devtests/cdi/alternatives/servlet/test/artifacts/PayBy.java
index 179aca6..e8d9f1f 100644
--- a/appserver/tests/appserv-tests/devtests/cdi/alternatives/servlet/test/artifacts/PayBy.java
+++ b/appserver/tests/appserv-tests/devtests/cdi/alternatives/servlet/test/artifacts/PayBy.java
@@ -22,7 +22,7 @@
import java.lang.annotation.Target;
import javax.enterprise.util.Nonbinding;
-import javax.inject.Qualifier;
+import jakarta.inject.Qualifier;
@Qualifier
@Target( { TYPE, METHOD, PARAMETER, FIELD })
diff --git a/appserver/tests/appserv-tests/devtests/cdi/alternatives/servlet/test/artifacts/Reliable.java b/appserver/tests/appserv-tests/devtests/cdi/alternatives/servlet/test/artifacts/Reliable.java
index 8ece693..88ad60b 100644
--- a/appserver/tests/appserv-tests/devtests/cdi/alternatives/servlet/test/artifacts/Reliable.java
+++ b/appserver/tests/appserv-tests/devtests/cdi/alternatives/servlet/test/artifacts/Reliable.java
@@ -21,7 +21,7 @@
import java.lang.annotation.RetentionPolicy;
import java.lang.annotation.Target;
-import javax.inject.Qualifier;
+import jakarta.inject.Qualifier;
@Qualifier
@Target({TYPE, METHOD, PARAMETER, FIELD})
diff --git a/appserver/tests/appserv-tests/devtests/cdi/alternatives/servlet/test/artifacts/Synchronous.java b/appserver/tests/appserv-tests/devtests/cdi/alternatives/servlet/test/artifacts/Synchronous.java
index b4c5d7e..97b9ca3 100644
--- a/appserver/tests/appserv-tests/devtests/cdi/alternatives/servlet/test/artifacts/Synchronous.java
+++ b/appserver/tests/appserv-tests/devtests/cdi/alternatives/servlet/test/artifacts/Synchronous.java
@@ -21,7 +21,7 @@
import java.lang.annotation.RetentionPolicy;
import java.lang.annotation.Target;
-import javax.inject.Qualifier;
+import jakarta.inject.Qualifier;
@Qualifier
@Target({TYPE, METHOD, PARAMETER, FIELD})
diff --git a/appserver/tests/appserv-tests/devtests/cdi/alternatives/servlet/test/beans/BeanToTestAlternatives.java b/appserver/tests/appserv-tests/devtests/cdi/alternatives/servlet/test/beans/BeanToTestAlternatives.java
index a640949..4f07649 100644
--- a/appserver/tests/appserv-tests/devtests/cdi/alternatives/servlet/test/beans/BeanToTestAlternatives.java
+++ b/appserver/tests/appserv-tests/devtests/cdi/alternatives/servlet/test/beans/BeanToTestAlternatives.java
@@ -18,7 +18,7 @@
import javax.enterprise.inject.Any;
import javax.enterprise.inject.Instance;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
import test.artifacts.Asynchronous;
import test.artifacts.MockPaymentProcessor;
diff --git a/appserver/tests/appserv-tests/devtests/cdi/ambiguous-deps/servlet/AmbiguousDependenciesServlet.java b/appserver/tests/appserv-tests/devtests/cdi/ambiguous-deps/servlet/AmbiguousDependenciesServlet.java
index f66b468..8a2da58 100644
--- a/appserver/tests/appserv-tests/devtests/cdi/ambiguous-deps/servlet/AmbiguousDependenciesServlet.java
+++ b/appserver/tests/appserv-tests/devtests/cdi/ambiguous-deps/servlet/AmbiguousDependenciesServlet.java
@@ -17,7 +17,7 @@
import java.io.IOException;
import java.io.PrintWriter;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
import javax.servlet.ServletException;
import javax.servlet.annotation.WebInitParam;
import javax.servlet.annotation.WebServlet;
diff --git a/appserver/tests/appserv-tests/devtests/cdi/ambiguous-deps/servlet/test/artifacts/Asynchronous.java b/appserver/tests/appserv-tests/devtests/cdi/ambiguous-deps/servlet/test/artifacts/Asynchronous.java
index ca0dd14..ef74b88 100644
--- a/appserver/tests/appserv-tests/devtests/cdi/ambiguous-deps/servlet/test/artifacts/Asynchronous.java
+++ b/appserver/tests/appserv-tests/devtests/cdi/ambiguous-deps/servlet/test/artifacts/Asynchronous.java
@@ -21,7 +21,7 @@
import java.lang.annotation.RetentionPolicy;
import java.lang.annotation.Target;
-import javax.inject.Qualifier;
+import jakarta.inject.Qualifier;
@Qualifier
@Target({TYPE, METHOD, PARAMETER, FIELD})
diff --git a/appserver/tests/appserv-tests/devtests/cdi/ambiguous-deps/servlet/test/artifacts/PayBy.java b/appserver/tests/appserv-tests/devtests/cdi/ambiguous-deps/servlet/test/artifacts/PayBy.java
index 179aca6..e8d9f1f 100644
--- a/appserver/tests/appserv-tests/devtests/cdi/ambiguous-deps/servlet/test/artifacts/PayBy.java
+++ b/appserver/tests/appserv-tests/devtests/cdi/ambiguous-deps/servlet/test/artifacts/PayBy.java
@@ -22,7 +22,7 @@
import java.lang.annotation.Target;
import javax.enterprise.util.Nonbinding;
-import javax.inject.Qualifier;
+import jakarta.inject.Qualifier;
@Qualifier
@Target( { TYPE, METHOD, PARAMETER, FIELD })
diff --git a/appserver/tests/appserv-tests/devtests/cdi/ambiguous-deps/servlet/test/artifacts/Reliable.java b/appserver/tests/appserv-tests/devtests/cdi/ambiguous-deps/servlet/test/artifacts/Reliable.java
index 8ece693..88ad60b 100644
--- a/appserver/tests/appserv-tests/devtests/cdi/ambiguous-deps/servlet/test/artifacts/Reliable.java
+++ b/appserver/tests/appserv-tests/devtests/cdi/ambiguous-deps/servlet/test/artifacts/Reliable.java
@@ -21,7 +21,7 @@
import java.lang.annotation.RetentionPolicy;
import java.lang.annotation.Target;
-import javax.inject.Qualifier;
+import jakarta.inject.Qualifier;
@Qualifier
@Target({TYPE, METHOD, PARAMETER, FIELD})
diff --git a/appserver/tests/appserv-tests/devtests/cdi/ambiguous-deps/servlet/test/artifacts/Synchronous.java b/appserver/tests/appserv-tests/devtests/cdi/ambiguous-deps/servlet/test/artifacts/Synchronous.java
index b4c5d7e..97b9ca3 100644
--- a/appserver/tests/appserv-tests/devtests/cdi/ambiguous-deps/servlet/test/artifacts/Synchronous.java
+++ b/appserver/tests/appserv-tests/devtests/cdi/ambiguous-deps/servlet/test/artifacts/Synchronous.java
@@ -21,7 +21,7 @@
import java.lang.annotation.RetentionPolicy;
import java.lang.annotation.Target;
-import javax.inject.Qualifier;
+import jakarta.inject.Qualifier;
@Qualifier
@Target({TYPE, METHOD, PARAMETER, FIELD})
diff --git a/appserver/tests/appserv-tests/devtests/cdi/ambiguous-deps/servlet/test/beans/BeanToTestAmbiguousDependencies.java b/appserver/tests/appserv-tests/devtests/cdi/ambiguous-deps/servlet/test/beans/BeanToTestAmbiguousDependencies.java
index 438d3b9..d109c73 100644
--- a/appserver/tests/appserv-tests/devtests/cdi/ambiguous-deps/servlet/test/beans/BeanToTestAmbiguousDependencies.java
+++ b/appserver/tests/appserv-tests/devtests/cdi/ambiguous-deps/servlet/test/beans/BeanToTestAmbiguousDependencies.java
@@ -18,7 +18,7 @@
import javax.enterprise.inject.Any;
import javax.enterprise.inject.Instance;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
import test.artifacts.Asynchronous;
import test.artifacts.MockPaymentProcessor;
diff --git a/appserver/tests/appserv-tests/devtests/cdi/decorators/decorators-over-beans-from-producer-methods/servlet/test/beans/ProducedAtRuntime.java b/appserver/tests/appserv-tests/devtests/cdi/decorators/decorators-over-beans-from-producer-methods/servlet/test/beans/ProducedAtRuntime.java
index aca6de0..128c6c5 100644
--- a/appserver/tests/appserv-tests/devtests/cdi/decorators/decorators-over-beans-from-producer-methods/servlet/test/beans/ProducedAtRuntime.java
+++ b/appserver/tests/appserv-tests/devtests/cdi/decorators/decorators-over-beans-from-producer-methods/servlet/test/beans/ProducedAtRuntime.java
@@ -25,7 +25,7 @@
import java.lang.annotation.Retention;
import java.lang.annotation.Target;
-import javax.inject.Qualifier;
+import jakarta.inject.Qualifier;
@Qualifier
@Retention(RUNTIME)
diff --git a/appserver/tests/appserv-tests/devtests/cdi/decorators/decorators-over-beans-from-producer-methods/servlet/test/beans/TestBeanDecorator.java b/appserver/tests/appserv-tests/devtests/cdi/decorators/decorators-over-beans-from-producer-methods/servlet/test/beans/TestBeanDecorator.java
index 82d43d0..9acb0c3 100644
--- a/appserver/tests/appserv-tests/devtests/cdi/decorators/decorators-over-beans-from-producer-methods/servlet/test/beans/TestBeanDecorator.java
+++ b/appserver/tests/appserv-tests/devtests/cdi/decorators/decorators-over-beans-from-producer-methods/servlet/test/beans/TestBeanDecorator.java
@@ -18,7 +18,7 @@
import javax.decorator.Decorator;
import javax.decorator.Delegate;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
@Decorator
public abstract class TestBeanDecorator implements TestBeanInterface{
diff --git a/appserver/tests/appserv-tests/devtests/cdi/decorators/decorators-over-beans-from-producer-methods/servlet/test/servlet/TestDecorationOfBeansFromProducerMethodsTestServlet.java b/appserver/tests/appserv-tests/devtests/cdi/decorators/decorators-over-beans-from-producer-methods/servlet/test/servlet/TestDecorationOfBeansFromProducerMethodsTestServlet.java
index 8fa868b..e17fb55 100644
--- a/appserver/tests/appserv-tests/devtests/cdi/decorators/decorators-over-beans-from-producer-methods/servlet/test/servlet/TestDecorationOfBeansFromProducerMethodsTestServlet.java
+++ b/appserver/tests/appserv-tests/devtests/cdi/decorators/decorators-over-beans-from-producer-methods/servlet/test/servlet/TestDecorationOfBeansFromProducerMethodsTestServlet.java
@@ -19,7 +19,7 @@
import java.io.IOException;
import java.io.PrintWriter;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
import javax.servlet.ServletException;
import javax.servlet.annotation.WebServlet;
import javax.servlet.http.HttpServlet;
diff --git a/appserver/tests/appserv-tests/devtests/cdi/decorators/simple-decorator/servlet/test/beans/LargeTransactionDecorator.java b/appserver/tests/appserv-tests/devtests/cdi/decorators/simple-decorator/servlet/test/beans/LargeTransactionDecorator.java
index e0a1302..565424a 100644
--- a/appserver/tests/appserv-tests/devtests/cdi/decorators/simple-decorator/servlet/test/beans/LargeTransactionDecorator.java
+++ b/appserver/tests/appserv-tests/devtests/cdi/decorators/simple-decorator/servlet/test/beans/LargeTransactionDecorator.java
@@ -20,7 +20,7 @@
import javax.decorator.Decorator;
import javax.decorator.Delegate;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
@Decorator
public abstract class LargeTransactionDecorator implements Account {
diff --git a/appserver/tests/appserv-tests/devtests/cdi/decorators/simple-decorator/servlet/test/beans/Preferred.java b/appserver/tests/appserv-tests/devtests/cdi/decorators/simple-decorator/servlet/test/beans/Preferred.java
index fa8fdb7..1e171f7 100644
--- a/appserver/tests/appserv-tests/devtests/cdi/decorators/simple-decorator/servlet/test/beans/Preferred.java
+++ b/appserver/tests/appserv-tests/devtests/cdi/decorators/simple-decorator/servlet/test/beans/Preferred.java
@@ -25,7 +25,7 @@
import java.lang.annotation.RetentionPolicy;
import java.lang.annotation.Target;
-import javax.inject.Qualifier;
+import jakarta.inject.Qualifier;
@Qualifier
@Target({ TYPE, METHOD, PARAMETER, FIELD })
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 566c4b0..e626a37 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
@@ -16,7 +16,7 @@
package test.beans;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
import jakarta.interceptor.AroundInvoke;
import jakarta.interceptor.Interceptor;
import jakarta.interceptor.InvocationContext;
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 641c3d0..afdc156 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
@@ -16,7 +16,7 @@
package test.beans;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
import jakarta.interceptor.AroundInvoke;
import jakarta.interceptor.Interceptor;
import jakarta.interceptor.InvocationContext;
diff --git a/appserver/tests/appserv-tests/devtests/cdi/decorators/simple-decorator/servlet/test/servlet/SimpleDecoratorTestServlet.java b/appserver/tests/appserv-tests/devtests/cdi/decorators/simple-decorator/servlet/test/servlet/SimpleDecoratorTestServlet.java
index a327946..13d64f4 100644
--- a/appserver/tests/appserv-tests/devtests/cdi/decorators/simple-decorator/servlet/test/servlet/SimpleDecoratorTestServlet.java
+++ b/appserver/tests/appserv-tests/devtests/cdi/decorators/simple-decorator/servlet/test/servlet/SimpleDecoratorTestServlet.java
@@ -20,7 +20,7 @@
import java.io.PrintWriter;
import java.math.BigDecimal;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
import javax.servlet.ServletException;
import javax.servlet.annotation.WebServlet;
import javax.servlet.http.HttpServlet;
diff --git a/appserver/tests/appserv-tests/devtests/cdi/events/conditional-observer/servlet/test/beans/Approved.java b/appserver/tests/appserv-tests/devtests/cdi/events/conditional-observer/servlet/test/beans/Approved.java
index 7a107aa..e89ed98 100644
--- a/appserver/tests/appserv-tests/devtests/cdi/events/conditional-observer/servlet/test/beans/Approved.java
+++ b/appserver/tests/appserv-tests/devtests/cdi/events/conditional-observer/servlet/test/beans/Approved.java
@@ -25,7 +25,7 @@
import java.lang.annotation.RetentionPolicy;
import java.lang.annotation.Target;
-import javax.inject.Qualifier;
+import jakarta.inject.Qualifier;
@Qualifier
@Target({ TYPE, METHOD, PARAMETER, FIELD })
diff --git a/appserver/tests/appserv-tests/devtests/cdi/events/conditional-observer/servlet/test/beans/Created.java b/appserver/tests/appserv-tests/devtests/cdi/events/conditional-observer/servlet/test/beans/Created.java
index f71048f..e464af8 100644
--- a/appserver/tests/appserv-tests/devtests/cdi/events/conditional-observer/servlet/test/beans/Created.java
+++ b/appserver/tests/appserv-tests/devtests/cdi/events/conditional-observer/servlet/test/beans/Created.java
@@ -25,7 +25,7 @@
import java.lang.annotation.RetentionPolicy;
import java.lang.annotation.Target;
-import javax.inject.Qualifier;
+import jakarta.inject.Qualifier;
@Qualifier
@Target({ TYPE, METHOD, PARAMETER, FIELD })
diff --git a/appserver/tests/appserv-tests/devtests/cdi/events/conditional-observer/servlet/test/beans/TestEventProducer.java b/appserver/tests/appserv-tests/devtests/cdi/events/conditional-observer/servlet/test/beans/TestEventProducer.java
index 92dafa7..f899bc0 100644
--- a/appserver/tests/appserv-tests/devtests/cdi/events/conditional-observer/servlet/test/beans/TestEventProducer.java
+++ b/appserver/tests/appserv-tests/devtests/cdi/events/conditional-observer/servlet/test/beans/TestEventProducer.java
@@ -18,7 +18,7 @@
import javax.enterprise.event.Event;
import javax.enterprise.util.AnnotationLiteral;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
public class TestEventProducer {
@Inject Event<Document> docEvent;
diff --git a/appserver/tests/appserv-tests/devtests/cdi/events/conditional-observer/servlet/test/beans/Updated.java b/appserver/tests/appserv-tests/devtests/cdi/events/conditional-observer/servlet/test/beans/Updated.java
index 07c6894..c0d025d 100644
--- a/appserver/tests/appserv-tests/devtests/cdi/events/conditional-observer/servlet/test/beans/Updated.java
+++ b/appserver/tests/appserv-tests/devtests/cdi/events/conditional-observer/servlet/test/beans/Updated.java
@@ -25,7 +25,7 @@
import java.lang.annotation.RetentionPolicy;
import java.lang.annotation.Target;
-import javax.inject.Qualifier;
+import jakarta.inject.Qualifier;
@Qualifier
@Target({ TYPE, METHOD, PARAMETER, FIELD })
diff --git a/appserver/tests/appserv-tests/devtests/cdi/events/conditional-observer/servlet/test/servlet/ConditionalObserverTestServlet.java b/appserver/tests/appserv-tests/devtests/cdi/events/conditional-observer/servlet/test/servlet/ConditionalObserverTestServlet.java
index 52863cb..3ec2055 100644
--- a/appserver/tests/appserv-tests/devtests/cdi/events/conditional-observer/servlet/test/servlet/ConditionalObserverTestServlet.java
+++ b/appserver/tests/appserv-tests/devtests/cdi/events/conditional-observer/servlet/test/servlet/ConditionalObserverTestServlet.java
@@ -19,7 +19,7 @@
import java.io.IOException;
import java.io.PrintWriter;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
import javax.servlet.ServletException;
import javax.servlet.annotation.WebServlet;
import javax.servlet.http.HttpServlet;
diff --git a/appserver/tests/appserv-tests/devtests/cdi/events/event-producers/servlet/test/beans/Approved.java b/appserver/tests/appserv-tests/devtests/cdi/events/event-producers/servlet/test/beans/Approved.java
index 7a107aa..e89ed98 100644
--- a/appserver/tests/appserv-tests/devtests/cdi/events/event-producers/servlet/test/beans/Approved.java
+++ b/appserver/tests/appserv-tests/devtests/cdi/events/event-producers/servlet/test/beans/Approved.java
@@ -25,7 +25,7 @@
import java.lang.annotation.RetentionPolicy;
import java.lang.annotation.Target;
-import javax.inject.Qualifier;
+import jakarta.inject.Qualifier;
@Qualifier
@Target({ TYPE, METHOD, PARAMETER, FIELD })
diff --git a/appserver/tests/appserv-tests/devtests/cdi/events/event-producers/servlet/test/beans/Created.java b/appserver/tests/appserv-tests/devtests/cdi/events/event-producers/servlet/test/beans/Created.java
index f71048f..e464af8 100644
--- a/appserver/tests/appserv-tests/devtests/cdi/events/event-producers/servlet/test/beans/Created.java
+++ b/appserver/tests/appserv-tests/devtests/cdi/events/event-producers/servlet/test/beans/Created.java
@@ -25,7 +25,7 @@
import java.lang.annotation.RetentionPolicy;
import java.lang.annotation.Target;
-import javax.inject.Qualifier;
+import jakarta.inject.Qualifier;
@Qualifier
@Target({ TYPE, METHOD, PARAMETER, FIELD })
diff --git a/appserver/tests/appserv-tests/devtests/cdi/events/event-producers/servlet/test/beans/TestEventProducer.java b/appserver/tests/appserv-tests/devtests/cdi/events/event-producers/servlet/test/beans/TestEventProducer.java
index 92dafa7..f899bc0 100644
--- a/appserver/tests/appserv-tests/devtests/cdi/events/event-producers/servlet/test/beans/TestEventProducer.java
+++ b/appserver/tests/appserv-tests/devtests/cdi/events/event-producers/servlet/test/beans/TestEventProducer.java
@@ -18,7 +18,7 @@
import javax.enterprise.event.Event;
import javax.enterprise.util.AnnotationLiteral;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
public class TestEventProducer {
@Inject Event<Document> docEvent;
diff --git a/appserver/tests/appserv-tests/devtests/cdi/events/event-producers/servlet/test/beans/Updated.java b/appserver/tests/appserv-tests/devtests/cdi/events/event-producers/servlet/test/beans/Updated.java
index 07c6894..c0d025d 100644
--- a/appserver/tests/appserv-tests/devtests/cdi/events/event-producers/servlet/test/beans/Updated.java
+++ b/appserver/tests/appserv-tests/devtests/cdi/events/event-producers/servlet/test/beans/Updated.java
@@ -25,7 +25,7 @@
import java.lang.annotation.RetentionPolicy;
import java.lang.annotation.Target;
-import javax.inject.Qualifier;
+import jakarta.inject.Qualifier;
@Qualifier
@Target({ TYPE, METHOD, PARAMETER, FIELD })
diff --git a/appserver/tests/appserv-tests/devtests/cdi/events/event-producers/servlet/test/servlet/SimpleEventObserverTestServlet.java b/appserver/tests/appserv-tests/devtests/cdi/events/event-producers/servlet/test/servlet/SimpleEventObserverTestServlet.java
index b621081..08b4402 100644
--- a/appserver/tests/appserv-tests/devtests/cdi/events/event-producers/servlet/test/servlet/SimpleEventObserverTestServlet.java
+++ b/appserver/tests/appserv-tests/devtests/cdi/events/event-producers/servlet/test/servlet/SimpleEventObserverTestServlet.java
@@ -19,7 +19,7 @@
import java.io.IOException;
import java.io.PrintWriter;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
import javax.servlet.ServletException;
import javax.servlet.annotation.WebServlet;
import javax.servlet.http.HttpServlet;
diff --git a/appserver/tests/appserv-tests/devtests/cdi/events/event-qualifiers-with-members/servlet/test/beans/Approved.java b/appserver/tests/appserv-tests/devtests/cdi/events/event-qualifiers-with-members/servlet/test/beans/Approved.java
index 7a107aa..e89ed98 100644
--- a/appserver/tests/appserv-tests/devtests/cdi/events/event-qualifiers-with-members/servlet/test/beans/Approved.java
+++ b/appserver/tests/appserv-tests/devtests/cdi/events/event-qualifiers-with-members/servlet/test/beans/Approved.java
@@ -25,7 +25,7 @@
import java.lang.annotation.RetentionPolicy;
import java.lang.annotation.Target;
-import javax.inject.Qualifier;
+import jakarta.inject.Qualifier;
@Qualifier
@Target({ TYPE, METHOD, PARAMETER, FIELD })
diff --git a/appserver/tests/appserv-tests/devtests/cdi/events/event-qualifiers-with-members/servlet/test/beans/Created.java b/appserver/tests/appserv-tests/devtests/cdi/events/event-qualifiers-with-members/servlet/test/beans/Created.java
index f71048f..e464af8 100644
--- a/appserver/tests/appserv-tests/devtests/cdi/events/event-qualifiers-with-members/servlet/test/beans/Created.java
+++ b/appserver/tests/appserv-tests/devtests/cdi/events/event-qualifiers-with-members/servlet/test/beans/Created.java
@@ -25,7 +25,7 @@
import java.lang.annotation.RetentionPolicy;
import java.lang.annotation.Target;
-import javax.inject.Qualifier;
+import jakarta.inject.Qualifier;
@Qualifier
@Target({ TYPE, METHOD, PARAMETER, FIELD })
diff --git a/appserver/tests/appserv-tests/devtests/cdi/events/event-qualifiers-with-members/servlet/test/beans/TestEventProducer.java b/appserver/tests/appserv-tests/devtests/cdi/events/event-qualifiers-with-members/servlet/test/beans/TestEventProducer.java
index 407807f..8503f73 100644
--- a/appserver/tests/appserv-tests/devtests/cdi/events/event-qualifiers-with-members/servlet/test/beans/TestEventProducer.java
+++ b/appserver/tests/appserv-tests/devtests/cdi/events/event-qualifiers-with-members/servlet/test/beans/TestEventProducer.java
@@ -18,7 +18,7 @@
import javax.enterprise.event.Event;
import javax.enterprise.util.AnnotationLiteral;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
public class TestEventProducer {
@Inject Event<Document> docEvent;
diff --git a/appserver/tests/appserv-tests/devtests/cdi/events/event-qualifiers-with-members/servlet/test/beans/Updated.java b/appserver/tests/appserv-tests/devtests/cdi/events/event-qualifiers-with-members/servlet/test/beans/Updated.java
index b6893f8..e99861a 100644
--- a/appserver/tests/appserv-tests/devtests/cdi/events/event-qualifiers-with-members/servlet/test/beans/Updated.java
+++ b/appserver/tests/appserv-tests/devtests/cdi/events/event-qualifiers-with-members/servlet/test/beans/Updated.java
@@ -25,7 +25,7 @@
import java.lang.annotation.RetentionPolicy;
import java.lang.annotation.Target;
-import javax.inject.Qualifier;
+import jakarta.inject.Qualifier;
@Qualifier
@Target({ TYPE, METHOD, PARAMETER, FIELD })
diff --git a/appserver/tests/appserv-tests/devtests/cdi/events/event-qualifiers-with-members/servlet/test/servlet/ConditionalObserverTestServlet.java b/appserver/tests/appserv-tests/devtests/cdi/events/event-qualifiers-with-members/servlet/test/servlet/ConditionalObserverTestServlet.java
index 9b25265..a26f429 100644
--- a/appserver/tests/appserv-tests/devtests/cdi/events/event-qualifiers-with-members/servlet/test/servlet/ConditionalObserverTestServlet.java
+++ b/appserver/tests/appserv-tests/devtests/cdi/events/event-qualifiers-with-members/servlet/test/servlet/ConditionalObserverTestServlet.java
@@ -19,7 +19,7 @@
import java.io.IOException;
import java.io.PrintWriter;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
import javax.servlet.ServletException;
import javax.servlet.annotation.WebServlet;
import javax.servlet.http.HttpServlet;
diff --git a/appserver/tests/appserv-tests/devtests/cdi/events/multiple-event-qualifiers/servlet/test/beans/Approved.java b/appserver/tests/appserv-tests/devtests/cdi/events/multiple-event-qualifiers/servlet/test/beans/Approved.java
index 7a107aa..e89ed98 100644
--- a/appserver/tests/appserv-tests/devtests/cdi/events/multiple-event-qualifiers/servlet/test/beans/Approved.java
+++ b/appserver/tests/appserv-tests/devtests/cdi/events/multiple-event-qualifiers/servlet/test/beans/Approved.java
@@ -25,7 +25,7 @@
import java.lang.annotation.RetentionPolicy;
import java.lang.annotation.Target;
-import javax.inject.Qualifier;
+import jakarta.inject.Qualifier;
@Qualifier
@Target({ TYPE, METHOD, PARAMETER, FIELD })
diff --git a/appserver/tests/appserv-tests/devtests/cdi/events/multiple-event-qualifiers/servlet/test/beans/Blog.java b/appserver/tests/appserv-tests/devtests/cdi/events/multiple-event-qualifiers/servlet/test/beans/Blog.java
index 573402b..b0bec92 100644
--- a/appserver/tests/appserv-tests/devtests/cdi/events/multiple-event-qualifiers/servlet/test/beans/Blog.java
+++ b/appserver/tests/appserv-tests/devtests/cdi/events/multiple-event-qualifiers/servlet/test/beans/Blog.java
@@ -25,7 +25,7 @@
import java.lang.annotation.RetentionPolicy;
import java.lang.annotation.Target;
-import javax.inject.Qualifier;
+import jakarta.inject.Qualifier;
@Qualifier
@Target({ TYPE, METHOD, PARAMETER, FIELD })
diff --git a/appserver/tests/appserv-tests/devtests/cdi/events/multiple-event-qualifiers/servlet/test/beans/Created.java b/appserver/tests/appserv-tests/devtests/cdi/events/multiple-event-qualifiers/servlet/test/beans/Created.java
index f71048f..e464af8 100644
--- a/appserver/tests/appserv-tests/devtests/cdi/events/multiple-event-qualifiers/servlet/test/beans/Created.java
+++ b/appserver/tests/appserv-tests/devtests/cdi/events/multiple-event-qualifiers/servlet/test/beans/Created.java
@@ -25,7 +25,7 @@
import java.lang.annotation.RetentionPolicy;
import java.lang.annotation.Target;
-import javax.inject.Qualifier;
+import jakarta.inject.Qualifier;
@Qualifier
@Target({ TYPE, METHOD, PARAMETER, FIELD })
diff --git a/appserver/tests/appserv-tests/devtests/cdi/events/multiple-event-qualifiers/servlet/test/beans/TestEventProducer.java b/appserver/tests/appserv-tests/devtests/cdi/events/multiple-event-qualifiers/servlet/test/beans/TestEventProducer.java
index a1b19d2..267fc5e 100644
--- a/appserver/tests/appserv-tests/devtests/cdi/events/multiple-event-qualifiers/servlet/test/beans/TestEventProducer.java
+++ b/appserver/tests/appserv-tests/devtests/cdi/events/multiple-event-qualifiers/servlet/test/beans/TestEventProducer.java
@@ -18,7 +18,7 @@
import javax.enterprise.event.Event;
import javax.enterprise.util.AnnotationLiteral;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
import com.sun.research.ws.wadl.Doc;
diff --git a/appserver/tests/appserv-tests/devtests/cdi/events/multiple-event-qualifiers/servlet/test/beans/Updated.java b/appserver/tests/appserv-tests/devtests/cdi/events/multiple-event-qualifiers/servlet/test/beans/Updated.java
index 14cebc9..9b46fd0 100644
--- a/appserver/tests/appserv-tests/devtests/cdi/events/multiple-event-qualifiers/servlet/test/beans/Updated.java
+++ b/appserver/tests/appserv-tests/devtests/cdi/events/multiple-event-qualifiers/servlet/test/beans/Updated.java
@@ -25,7 +25,7 @@
import java.lang.annotation.RetentionPolicy;
import java.lang.annotation.Target;
-import javax.inject.Qualifier;
+import jakarta.inject.Qualifier;
@Qualifier
@Target({ TYPE, METHOD, PARAMETER, FIELD })
diff --git a/appserver/tests/appserv-tests/devtests/cdi/events/multiple-event-qualifiers/servlet/test/servlet/MultipleEventQualifierTestServlet.java b/appserver/tests/appserv-tests/devtests/cdi/events/multiple-event-qualifiers/servlet/test/servlet/MultipleEventQualifierTestServlet.java
index cb2684a..887bdca 100644
--- a/appserver/tests/appserv-tests/devtests/cdi/events/multiple-event-qualifiers/servlet/test/servlet/MultipleEventQualifierTestServlet.java
+++ b/appserver/tests/appserv-tests/devtests/cdi/events/multiple-event-qualifiers/servlet/test/servlet/MultipleEventQualifierTestServlet.java
@@ -19,7 +19,7 @@
import java.io.IOException;
import java.io.PrintWriter;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
import javax.servlet.ServletException;
import javax.servlet.annotation.WebServlet;
import javax.servlet.http.HttpServlet;
diff --git a/appserver/tests/appserv-tests/devtests/cdi/events/simple-event-observers/servlet/test/beans/Created.java b/appserver/tests/appserv-tests/devtests/cdi/events/simple-event-observers/servlet/test/beans/Created.java
index f71048f..e464af8 100644
--- a/appserver/tests/appserv-tests/devtests/cdi/events/simple-event-observers/servlet/test/beans/Created.java
+++ b/appserver/tests/appserv-tests/devtests/cdi/events/simple-event-observers/servlet/test/beans/Created.java
@@ -25,7 +25,7 @@
import java.lang.annotation.RetentionPolicy;
import java.lang.annotation.Target;
-import javax.inject.Qualifier;
+import jakarta.inject.Qualifier;
@Qualifier
@Target({ TYPE, METHOD, PARAMETER, FIELD })
diff --git a/appserver/tests/appserv-tests/devtests/cdi/events/simple-event-observers/servlet/test/beans/TestRequestScopedBean.java b/appserver/tests/appserv-tests/devtests/cdi/events/simple-event-observers/servlet/test/beans/TestRequestScopedBean.java
index aa0613e..9df6434 100644
--- a/appserver/tests/appserv-tests/devtests/cdi/events/simple-event-observers/servlet/test/beans/TestRequestScopedBean.java
+++ b/appserver/tests/appserv-tests/devtests/cdi/events/simple-event-observers/servlet/test/beans/TestRequestScopedBean.java
@@ -17,7 +17,7 @@
package test.beans;
import javax.enterprise.event.Event;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
public class TestRequestScopedBean {
@Inject @Created Event<Document> docCreatedEvent;
diff --git a/appserver/tests/appserv-tests/devtests/cdi/events/simple-event-observers/servlet/test/beans/Updated.java b/appserver/tests/appserv-tests/devtests/cdi/events/simple-event-observers/servlet/test/beans/Updated.java
index 07c6894..c0d025d 100644
--- a/appserver/tests/appserv-tests/devtests/cdi/events/simple-event-observers/servlet/test/beans/Updated.java
+++ b/appserver/tests/appserv-tests/devtests/cdi/events/simple-event-observers/servlet/test/beans/Updated.java
@@ -25,7 +25,7 @@
import java.lang.annotation.RetentionPolicy;
import java.lang.annotation.Target;
-import javax.inject.Qualifier;
+import jakarta.inject.Qualifier;
@Qualifier
@Target({ TYPE, METHOD, PARAMETER, FIELD })
diff --git a/appserver/tests/appserv-tests/devtests/cdi/events/simple-event-observers/servlet/test/servlet/SimpleEventObserverTestServlet.java b/appserver/tests/appserv-tests/devtests/cdi/events/simple-event-observers/servlet/test/servlet/SimpleEventObserverTestServlet.java
index af1783e..f563edf 100644
--- a/appserver/tests/appserv-tests/devtests/cdi/events/simple-event-observers/servlet/test/servlet/SimpleEventObserverTestServlet.java
+++ b/appserver/tests/appserv-tests/devtests/cdi/events/simple-event-observers/servlet/test/servlet/SimpleEventObserverTestServlet.java
@@ -19,7 +19,7 @@
import java.io.IOException;
import java.io.PrintWriter;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
import javax.servlet.ServletException;
import javax.servlet.annotation.WebServlet;
import javax.servlet.http.HttpServlet;
diff --git a/appserver/tests/appserv-tests/devtests/cdi/implicit/deployment-option/ejb/SlessEJB.java b/appserver/tests/appserv-tests/devtests/cdi/implicit/deployment-option/ejb/SlessEJB.java
index f0f4d56..7d598f4 100644
--- a/appserver/tests/appserv-tests/devtests/cdi/implicit/deployment-option/ejb/SlessEJB.java
+++ b/appserver/tests/appserv-tests/devtests/cdi/implicit/deployment-option/ejb/SlessEJB.java
@@ -15,7 +15,7 @@
*/
import jakarta.ejb.Stateless;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
@Stateless
diff --git a/appserver/tests/appserv-tests/devtests/cdi/implicit/simple-ejb-cdi/ejb/SlessEJB.java b/appserver/tests/appserv-tests/devtests/cdi/implicit/simple-ejb-cdi/ejb/SlessEJB.java
index f0f4d56..7d598f4 100644
--- a/appserver/tests/appserv-tests/devtests/cdi/implicit/simple-ejb-cdi/ejb/SlessEJB.java
+++ b/appserver/tests/appserv-tests/devtests/cdi/implicit/simple-ejb-cdi/ejb/SlessEJB.java
@@ -15,7 +15,7 @@
*/
import jakarta.ejb.Stateless;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
@Stateless
diff --git a/appserver/tests/appserv-tests/devtests/cdi/injection-point/servlet/InjectionPointServlet.java b/appserver/tests/appserv-tests/devtests/cdi/injection-point/servlet/InjectionPointServlet.java
index 137e205..ab4c93b 100644
--- a/appserver/tests/appserv-tests/devtests/cdi/injection-point/servlet/InjectionPointServlet.java
+++ b/appserver/tests/appserv-tests/devtests/cdi/injection-point/servlet/InjectionPointServlet.java
@@ -19,7 +19,7 @@
import java.util.logging.Logger;
import javax.enterprise.inject.Instance;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
import javax.servlet.ServletException;
import javax.servlet.annotation.WebServlet;
import javax.servlet.http.HttpServlet;
diff --git a/appserver/tests/appserv-tests/devtests/cdi/injection-point/servlet/test/artifacts/HttpParam.java b/appserver/tests/appserv-tests/devtests/cdi/injection-point/servlet/test/artifacts/HttpParam.java
index 88e91c7..99d0f8b 100644
--- a/appserver/tests/appserv-tests/devtests/cdi/injection-point/servlet/test/artifacts/HttpParam.java
+++ b/appserver/tests/appserv-tests/devtests/cdi/injection-point/servlet/test/artifacts/HttpParam.java
@@ -22,7 +22,7 @@
import static java.lang.annotation.ElementType.*;
import javax.enterprise.util.Nonbinding;
-import javax.inject.Qualifier;
+import jakarta.inject.Qualifier;
@Qualifier
@Retention(RetentionPolicy.RUNTIME)
diff --git a/appserver/tests/appserv-tests/devtests/cdi/interceptors/interceptors-bean-validation/servlet/test/beans/AnotherTestBean.java b/appserver/tests/appserv-tests/devtests/cdi/interceptors/interceptors-bean-validation/servlet/test/beans/AnotherTestBean.java
index 4832de4..32fd09d 100644
--- a/appserver/tests/appserv-tests/devtests/cdi/interceptors/interceptors-bean-validation/servlet/test/beans/AnotherTestBean.java
+++ b/appserver/tests/appserv-tests/devtests/cdi/interceptors/interceptors-bean-validation/servlet/test/beans/AnotherTestBean.java
@@ -17,7 +17,7 @@
package test.beans;
import jakarta.annotation.PostConstruct;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
import jakarta.validation.constraints.NotNull;
diff --git a/appserver/tests/appserv-tests/devtests/cdi/interceptors/interceptors-bean-validation/servlet/test/beans/Preferred.java b/appserver/tests/appserv-tests/devtests/cdi/interceptors/interceptors-bean-validation/servlet/test/beans/Preferred.java
index 4323e19..eecbcee 100644
--- a/appserver/tests/appserv-tests/devtests/cdi/interceptors/interceptors-bean-validation/servlet/test/beans/Preferred.java
+++ b/appserver/tests/appserv-tests/devtests/cdi/interceptors/interceptors-bean-validation/servlet/test/beans/Preferred.java
@@ -21,7 +21,7 @@
import java.lang.annotation.Target;
import java.lang.annotation.ElementType;
-import javax.inject.Qualifier;
+import jakarta.inject.Qualifier;
/**
diff --git a/appserver/tests/appserv-tests/devtests/cdi/interceptors/interceptors-bean-validation/servlet/test/beans/TestBean.java b/appserver/tests/appserv-tests/devtests/cdi/interceptors/interceptors-bean-validation/servlet/test/beans/TestBean.java
index e53f953..8179020 100644
--- a/appserver/tests/appserv-tests/devtests/cdi/interceptors/interceptors-bean-validation/servlet/test/beans/TestBean.java
+++ b/appserver/tests/appserv-tests/devtests/cdi/interceptors/interceptors-bean-validation/servlet/test/beans/TestBean.java
@@ -21,7 +21,7 @@
import jakarta.validation.constraints.NotNull;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
@RequestScoped
diff --git a/appserver/tests/appserv-tests/devtests/cdi/interceptors/interceptors-bean-validation/servlet/test/beans/TestDependentBean.java b/appserver/tests/appserv-tests/devtests/cdi/interceptors/interceptors-bean-validation/servlet/test/beans/TestDependentBean.java
index 0811a03..c57978b 100644
--- a/appserver/tests/appserv-tests/devtests/cdi/interceptors/interceptors-bean-validation/servlet/test/beans/TestDependentBean.java
+++ b/appserver/tests/appserv-tests/devtests/cdi/interceptors/interceptors-bean-validation/servlet/test/beans/TestDependentBean.java
@@ -17,7 +17,7 @@
package test.beans;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
public class TestDependentBean {
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 a431518..265f8b7 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
@@ -16,7 +16,7 @@
package test.beans;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
import jakarta.interceptor.AroundConstruct;
import jakarta.interceptor.AroundInvoke;
import jakarta.interceptor.Interceptor;
diff --git a/appserver/tests/appserv-tests/devtests/cdi/interceptors/interceptors-bean-validation/servlet/test/servlet/BusinessMethodInterceptorTestServlet.java b/appserver/tests/appserv-tests/devtests/cdi/interceptors/interceptors-bean-validation/servlet/test/servlet/BusinessMethodInterceptorTestServlet.java
index 5f69a96..a549990 100644
--- a/appserver/tests/appserv-tests/devtests/cdi/interceptors/interceptors-bean-validation/servlet/test/servlet/BusinessMethodInterceptorTestServlet.java
+++ b/appserver/tests/appserv-tests/devtests/cdi/interceptors/interceptors-bean-validation/servlet/test/servlet/BusinessMethodInterceptorTestServlet.java
@@ -19,7 +19,7 @@
import java.io.IOException;
import java.io.PrintWriter;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
import javax.servlet.ServletException;
import javax.servlet.annotation.WebServlet;
import javax.servlet.http.HttpServlet;
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 f133fb0..7035f7d 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
@@ -23,7 +23,7 @@
import java.lang.annotation.RetentionPolicy;
import java.lang.annotation.Target;
-import javax.inject.Qualifier;
+import jakarta.inject.Qualifier;
import jakarta.interceptor.InterceptorBinding;
@Target({ TYPE, METHOD })
diff --git a/appserver/tests/appserv-tests/devtests/cdi/interceptors/interceptors-binding-type-inheritance/servlet/test/beans/Preferred.java b/appserver/tests/appserv-tests/devtests/cdi/interceptors/interceptors-binding-type-inheritance/servlet/test/beans/Preferred.java
index fa8fdb7..1e171f7 100644
--- a/appserver/tests/appserv-tests/devtests/cdi/interceptors/interceptors-binding-type-inheritance/servlet/test/beans/Preferred.java
+++ b/appserver/tests/appserv-tests/devtests/cdi/interceptors/interceptors-binding-type-inheritance/servlet/test/beans/Preferred.java
@@ -25,7 +25,7 @@
import java.lang.annotation.RetentionPolicy;
import java.lang.annotation.Target;
-import javax.inject.Qualifier;
+import jakarta.inject.Qualifier;
@Qualifier
@Target({ TYPE, METHOD, PARAMETER, FIELD })
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 0f8c934..09b915c 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
@@ -23,7 +23,7 @@
import java.lang.annotation.RetentionPolicy;
import java.lang.annotation.Target;
-import javax.inject.Qualifier;
+import jakarta.inject.Qualifier;
import jakarta.interceptor.InterceptorBinding;
@Target({ TYPE, METHOD })
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 71f6d0d..18c1b49 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
@@ -16,7 +16,7 @@
package test.beans;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
import jakarta.interceptor.AroundInvoke;
import jakarta.interceptor.Interceptor;
import jakarta.interceptor.InvocationContext;
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 046f7c6..127ba1b 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
@@ -16,7 +16,7 @@
package test.beans;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
import jakarta.interceptor.AroundInvoke;
import jakarta.interceptor.Interceptor;
import jakarta.interceptor.InvocationContext;
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 6389b46..407b079 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
@@ -16,7 +16,7 @@
package test.beans;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
import jakarta.interceptor.AroundInvoke;
import jakarta.interceptor.Interceptor;
import jakarta.interceptor.InvocationContext;
diff --git a/appserver/tests/appserv-tests/devtests/cdi/interceptors/interceptors-binding-type-inheritance/servlet/test/servlet/BindingTypeInheritanceTestServlet.java b/appserver/tests/appserv-tests/devtests/cdi/interceptors/interceptors-binding-type-inheritance/servlet/test/servlet/BindingTypeInheritanceTestServlet.java
index 0d74aae..0393c78 100644
--- a/appserver/tests/appserv-tests/devtests/cdi/interceptors/interceptors-binding-type-inheritance/servlet/test/servlet/BindingTypeInheritanceTestServlet.java
+++ b/appserver/tests/appserv-tests/devtests/cdi/interceptors/interceptors-binding-type-inheritance/servlet/test/servlet/BindingTypeInheritanceTestServlet.java
@@ -19,7 +19,7 @@
import java.io.IOException;
import java.io.PrintWriter;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
import javax.servlet.ServletException;
import javax.servlet.annotation.WebServlet;
import javax.servlet.http.HttpServlet;
diff --git a/appserver/tests/appserv-tests/devtests/cdi/interceptors/interceptors-binding-type-with-members/servlet/test/beans/Preferred.java b/appserver/tests/appserv-tests/devtests/cdi/interceptors/interceptors-binding-type-with-members/servlet/test/beans/Preferred.java
index fa8fdb7..1e171f7 100644
--- a/appserver/tests/appserv-tests/devtests/cdi/interceptors/interceptors-binding-type-with-members/servlet/test/beans/Preferred.java
+++ b/appserver/tests/appserv-tests/devtests/cdi/interceptors/interceptors-binding-type-with-members/servlet/test/beans/Preferred.java
@@ -25,7 +25,7 @@
import java.lang.annotation.RetentionPolicy;
import java.lang.annotation.Target;
-import javax.inject.Qualifier;
+import jakarta.inject.Qualifier;
@Qualifier
@Target({ TYPE, METHOD, PARAMETER, FIELD })
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 566c4b0..e626a37 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
@@ -16,7 +16,7 @@
package test.beans;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
import jakarta.interceptor.AroundInvoke;
import jakarta.interceptor.Interceptor;
import jakarta.interceptor.InvocationContext;
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 641c3d0..afdc156 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
@@ -16,7 +16,7 @@
package test.beans;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
import jakarta.interceptor.AroundInvoke;
import jakarta.interceptor.Interceptor;
import jakarta.interceptor.InvocationContext;
diff --git a/appserver/tests/appserv-tests/devtests/cdi/interceptors/interceptors-binding-type-with-members/servlet/test/servlet/BusinessMethodInterceptorTestServlet.java b/appserver/tests/appserv-tests/devtests/cdi/interceptors/interceptors-binding-type-with-members/servlet/test/servlet/BusinessMethodInterceptorTestServlet.java
index 7dfbb05..b2adca2 100644
--- a/appserver/tests/appserv-tests/devtests/cdi/interceptors/interceptors-binding-type-with-members/servlet/test/servlet/BusinessMethodInterceptorTestServlet.java
+++ b/appserver/tests/appserv-tests/devtests/cdi/interceptors/interceptors-binding-type-with-members/servlet/test/servlet/BusinessMethodInterceptorTestServlet.java
@@ -19,7 +19,7 @@
import java.io.IOException;
import java.io.PrintWriter;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
import javax.servlet.ServletException;
import javax.servlet.annotation.WebServlet;
import javax.servlet.http.HttpServlet;
diff --git a/appserver/tests/appserv-tests/devtests/cdi/interceptors/interceptors-business-method-interception/servlet/test/beans/Preferred.java b/appserver/tests/appserv-tests/devtests/cdi/interceptors/interceptors-business-method-interception/servlet/test/beans/Preferred.java
index fa8fdb7..1e171f7 100644
--- a/appserver/tests/appserv-tests/devtests/cdi/interceptors/interceptors-business-method-interception/servlet/test/beans/Preferred.java
+++ b/appserver/tests/appserv-tests/devtests/cdi/interceptors/interceptors-business-method-interception/servlet/test/beans/Preferred.java
@@ -25,7 +25,7 @@
import java.lang.annotation.RetentionPolicy;
import java.lang.annotation.Target;
-import javax.inject.Qualifier;
+import jakarta.inject.Qualifier;
@Qualifier
@Target({ TYPE, METHOD, PARAMETER, FIELD })
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 641c3d0..afdc156 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
@@ -16,7 +16,7 @@
package test.beans;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
import jakarta.interceptor.AroundInvoke;
import jakarta.interceptor.Interceptor;
import jakarta.interceptor.InvocationContext;
diff --git a/appserver/tests/appserv-tests/devtests/cdi/interceptors/interceptors-business-method-interception/servlet/test/servlet/BusinessMethodInterceptorTestServlet.java b/appserver/tests/appserv-tests/devtests/cdi/interceptors/interceptors-business-method-interception/servlet/test/servlet/BusinessMethodInterceptorTestServlet.java
index 504d347..c02d26f 100644
--- a/appserver/tests/appserv-tests/devtests/cdi/interceptors/interceptors-business-method-interception/servlet/test/servlet/BusinessMethodInterceptorTestServlet.java
+++ b/appserver/tests/appserv-tests/devtests/cdi/interceptors/interceptors-business-method-interception/servlet/test/servlet/BusinessMethodInterceptorTestServlet.java
@@ -19,7 +19,7 @@
import java.io.IOException;
import java.io.PrintWriter;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
import javax.servlet.ServletException;
import javax.servlet.annotation.WebServlet;
import javax.servlet.http.HttpServlet;
diff --git a/appserver/tests/appserv-tests/devtests/cdi/interceptors/interceptors-invalid-interceptor-specified-at-beans-xml/servlet/test/beans/Preferred.java b/appserver/tests/appserv-tests/devtests/cdi/interceptors/interceptors-invalid-interceptor-specified-at-beans-xml/servlet/test/beans/Preferred.java
index fa8fdb7..1e171f7 100644
--- a/appserver/tests/appserv-tests/devtests/cdi/interceptors/interceptors-invalid-interceptor-specified-at-beans-xml/servlet/test/beans/Preferred.java
+++ b/appserver/tests/appserv-tests/devtests/cdi/interceptors/interceptors-invalid-interceptor-specified-at-beans-xml/servlet/test/beans/Preferred.java
@@ -25,7 +25,7 @@
import java.lang.annotation.RetentionPolicy;
import java.lang.annotation.Target;
-import javax.inject.Qualifier;
+import jakarta.inject.Qualifier;
@Qualifier
@Target({ TYPE, METHOD, PARAMETER, FIELD })
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 641c3d0..afdc156 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
@@ -16,7 +16,7 @@
package test.beans;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
import jakarta.interceptor.AroundInvoke;
import jakarta.interceptor.Interceptor;
import jakarta.interceptor.InvocationContext;
diff --git a/appserver/tests/appserv-tests/devtests/cdi/interceptors/interceptors-invalid-interceptor-specified-at-beans-xml/servlet/test/servlet/InvalidInterceptorInBeansXMLTestServlet.java b/appserver/tests/appserv-tests/devtests/cdi/interceptors/interceptors-invalid-interceptor-specified-at-beans-xml/servlet/test/servlet/InvalidInterceptorInBeansXMLTestServlet.java
index ccce0fb..8b28649 100644
--- a/appserver/tests/appserv-tests/devtests/cdi/interceptors/interceptors-invalid-interceptor-specified-at-beans-xml/servlet/test/servlet/InvalidInterceptorInBeansXMLTestServlet.java
+++ b/appserver/tests/appserv-tests/devtests/cdi/interceptors/interceptors-invalid-interceptor-specified-at-beans-xml/servlet/test/servlet/InvalidInterceptorInBeansXMLTestServlet.java
@@ -19,7 +19,7 @@
import java.io.IOException;
import java.io.PrintWriter;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
import javax.servlet.ServletException;
import javax.servlet.annotation.WebServlet;
import javax.servlet.http.HttpServlet;
diff --git a/appserver/tests/appserv-tests/devtests/cdi/interceptors/interceptors-multiple-interceptor-binding-annotations/servlet/test/beans/Preferred.java b/appserver/tests/appserv-tests/devtests/cdi/interceptors/interceptors-multiple-interceptor-binding-annotations/servlet/test/beans/Preferred.java
index fa8fdb7..1e171f7 100644
--- a/appserver/tests/appserv-tests/devtests/cdi/interceptors/interceptors-multiple-interceptor-binding-annotations/servlet/test/beans/Preferred.java
+++ b/appserver/tests/appserv-tests/devtests/cdi/interceptors/interceptors-multiple-interceptor-binding-annotations/servlet/test/beans/Preferred.java
@@ -25,7 +25,7 @@
import java.lang.annotation.RetentionPolicy;
import java.lang.annotation.Target;
-import javax.inject.Qualifier;
+import jakarta.inject.Qualifier;
@Qualifier
@Target({ TYPE, METHOD, PARAMETER, FIELD })
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 fc997fc..3235212 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
@@ -23,7 +23,7 @@
import java.lang.annotation.RetentionPolicy;
import java.lang.annotation.Target;
-import javax.inject.Qualifier;
+import jakarta.inject.Qualifier;
import jakarta.interceptor.InterceptorBinding;
@Qualifier
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 bf189aa..d52eb58 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
@@ -16,7 +16,7 @@
package test.beans;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
import jakarta.interceptor.AroundInvoke;
import jakarta.interceptor.Interceptor;
import jakarta.interceptor.InvocationContext;
diff --git a/appserver/tests/appserv-tests/devtests/cdi/interceptors/interceptors-multiple-interceptor-binding-annotations/servlet/test/servlet/MultipleInterceptorBindingAnnotationsTestServlet.java b/appserver/tests/appserv-tests/devtests/cdi/interceptors/interceptors-multiple-interceptor-binding-annotations/servlet/test/servlet/MultipleInterceptorBindingAnnotationsTestServlet.java
index 7e2d824..346998c 100644
--- a/appserver/tests/appserv-tests/devtests/cdi/interceptors/interceptors-multiple-interceptor-binding-annotations/servlet/test/servlet/MultipleInterceptorBindingAnnotationsTestServlet.java
+++ b/appserver/tests/appserv-tests/devtests/cdi/interceptors/interceptors-multiple-interceptor-binding-annotations/servlet/test/servlet/MultipleInterceptorBindingAnnotationsTestServlet.java
@@ -19,7 +19,7 @@
import java.io.IOException;
import java.io.PrintWriter;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
import javax.servlet.ServletException;
import javax.servlet.annotation.WebServlet;
import javax.servlet.http.HttpServlet;
diff --git a/appserver/tests/appserv-tests/devtests/cdi/interceptors/interceptors-multiple-interceptors-for-a-binding-type/servlet/test/beans/Preferred.java b/appserver/tests/appserv-tests/devtests/cdi/interceptors/interceptors-multiple-interceptors-for-a-binding-type/servlet/test/beans/Preferred.java
index fa8fdb7..1e171f7 100644
--- a/appserver/tests/appserv-tests/devtests/cdi/interceptors/interceptors-multiple-interceptors-for-a-binding-type/servlet/test/beans/Preferred.java
+++ b/appserver/tests/appserv-tests/devtests/cdi/interceptors/interceptors-multiple-interceptors-for-a-binding-type/servlet/test/beans/Preferred.java
@@ -25,7 +25,7 @@
import java.lang.annotation.RetentionPolicy;
import java.lang.annotation.Target;
-import javax.inject.Qualifier;
+import jakarta.inject.Qualifier;
@Qualifier
@Target({ TYPE, METHOD, PARAMETER, FIELD })
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 d8db4ef..fb0b968 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
@@ -16,7 +16,7 @@
package test.beans;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
import jakarta.interceptor.AroundInvoke;
import jakarta.interceptor.Interceptor;
import jakarta.interceptor.InvocationContext;
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 a818138..c02b628 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
@@ -16,7 +16,7 @@
package test.beans;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
import jakarta.interceptor.AroundInvoke;
import jakarta.interceptor.Interceptor;
import jakarta.interceptor.InvocationContext;
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 3a975a6..0ae310f 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
@@ -16,7 +16,7 @@
package test.beans;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
import jakarta.interceptor.AroundInvoke;
import jakarta.interceptor.Interceptor;
import jakarta.interceptor.InvocationContext;
diff --git a/appserver/tests/appserv-tests/devtests/cdi/interceptors/interceptors-multiple-interceptors-for-a-binding-type/servlet/test/servlet/MultipleInterceptorImplementationsTestServlet.java b/appserver/tests/appserv-tests/devtests/cdi/interceptors/interceptors-multiple-interceptors-for-a-binding-type/servlet/test/servlet/MultipleInterceptorImplementationsTestServlet.java
index bc328db..72f0114 100644
--- a/appserver/tests/appserv-tests/devtests/cdi/interceptors/interceptors-multiple-interceptors-for-a-binding-type/servlet/test/servlet/MultipleInterceptorImplementationsTestServlet.java
+++ b/appserver/tests/appserv-tests/devtests/cdi/interceptors/interceptors-multiple-interceptors-for-a-binding-type/servlet/test/servlet/MultipleInterceptorImplementationsTestServlet.java
@@ -19,7 +19,7 @@
import java.io.IOException;
import java.io.PrintWriter;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
import javax.servlet.ServletException;
import javax.servlet.annotation.WebServlet;
import javax.servlet.http.HttpServlet;
diff --git a/appserver/tests/appserv-tests/devtests/cdi/interceptors/interceptors-use-of-at-interceptors/servlet/test/beans/Preferred.java b/appserver/tests/appserv-tests/devtests/cdi/interceptors/interceptors-use-of-at-interceptors/servlet/test/beans/Preferred.java
index fa8fdb7..1e171f7 100644
--- a/appserver/tests/appserv-tests/devtests/cdi/interceptors/interceptors-use-of-at-interceptors/servlet/test/beans/Preferred.java
+++ b/appserver/tests/appserv-tests/devtests/cdi/interceptors/interceptors-use-of-at-interceptors/servlet/test/beans/Preferred.java
@@ -25,7 +25,7 @@
import java.lang.annotation.RetentionPolicy;
import java.lang.annotation.Target;
-import javax.inject.Qualifier;
+import jakarta.inject.Qualifier;
@Qualifier
@Target({ TYPE, METHOD, PARAMETER, FIELD })
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 fc997fc..3235212 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
@@ -23,7 +23,7 @@
import java.lang.annotation.RetentionPolicy;
import java.lang.annotation.Target;
-import javax.inject.Qualifier;
+import jakarta.inject.Qualifier;
import jakarta.interceptor.InterceptorBinding;
@Qualifier
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 71f6d0d..18c1b49 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
@@ -16,7 +16,7 @@
package test.beans;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
import jakarta.interceptor.AroundInvoke;
import jakarta.interceptor.Interceptor;
import jakarta.interceptor.InvocationContext;
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 046f7c6..127ba1b 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
@@ -16,7 +16,7 @@
package test.beans;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
import jakarta.interceptor.AroundInvoke;
import jakarta.interceptor.Interceptor;
import jakarta.interceptor.InvocationContext;
diff --git a/appserver/tests/appserv-tests/devtests/cdi/interceptors/interceptors-use-of-at-interceptors/servlet/test/servlet/InterceptorsTestServlet.java b/appserver/tests/appserv-tests/devtests/cdi/interceptors/interceptors-use-of-at-interceptors/servlet/test/servlet/InterceptorsTestServlet.java
index e11f7cc..921d259 100644
--- a/appserver/tests/appserv-tests/devtests/cdi/interceptors/interceptors-use-of-at-interceptors/servlet/test/servlet/InterceptorsTestServlet.java
+++ b/appserver/tests/appserv-tests/devtests/cdi/interceptors/interceptors-use-of-at-interceptors/servlet/test/servlet/InterceptorsTestServlet.java
@@ -19,7 +19,7 @@
import java.io.IOException;
import java.io.PrintWriter;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
import javax.servlet.ServletException;
import javax.servlet.annotation.WebServlet;
import javax.servlet.http.HttpServlet;
diff --git a/appserver/tests/appserv-tests/devtests/cdi/javaee-component-resources/em-injection-no-interface-ejb/servlet/test/beans/artifacts/InjectViaAtEJB.java b/appserver/tests/appserv-tests/devtests/cdi/javaee-component-resources/em-injection-no-interface-ejb/servlet/test/beans/artifacts/InjectViaAtEJB.java
index 594448d..da33ae0 100644
--- a/appserver/tests/appserv-tests/devtests/cdi/javaee-component-resources/em-injection-no-interface-ejb/servlet/test/beans/artifacts/InjectViaAtEJB.java
+++ b/appserver/tests/appserv-tests/devtests/cdi/javaee-component-resources/em-injection-no-interface-ejb/servlet/test/beans/artifacts/InjectViaAtEJB.java
@@ -25,7 +25,7 @@
import java.lang.annotation.RetentionPolicy;
import java.lang.annotation.Target;
-import javax.inject.Qualifier;
+import jakarta.inject.Qualifier;
@Qualifier
@Target({ TYPE, METHOD, PARAMETER, FIELD })
diff --git a/appserver/tests/appserv-tests/devtests/cdi/javaee-component-resources/em-injection-no-interface-ejb/servlet/test/beans/artifacts/InjectViaAtInject.java b/appserver/tests/appserv-tests/devtests/cdi/javaee-component-resources/em-injection-no-interface-ejb/servlet/test/beans/artifacts/InjectViaAtInject.java
index 8e11c88..50ec29e 100644
--- a/appserver/tests/appserv-tests/devtests/cdi/javaee-component-resources/em-injection-no-interface-ejb/servlet/test/beans/artifacts/InjectViaAtInject.java
+++ b/appserver/tests/appserv-tests/devtests/cdi/javaee-component-resources/em-injection-no-interface-ejb/servlet/test/beans/artifacts/InjectViaAtInject.java
@@ -25,7 +25,7 @@
import java.lang.annotation.RetentionPolicy;
import java.lang.annotation.Target;
-import javax.inject.Qualifier;
+import jakarta.inject.Qualifier;
@Qualifier
@Target({ TYPE, METHOD, PARAMETER, FIELD })
diff --git a/appserver/tests/appserv-tests/devtests/cdi/javaee-component-resources/em-injection-no-interface-ejb/servlet/test/beans/nonmock/TestBeanSuper.java b/appserver/tests/appserv-tests/devtests/cdi/javaee-component-resources/em-injection-no-interface-ejb/servlet/test/beans/nonmock/TestBeanSuper.java
index 3480165..0116525 100644
--- a/appserver/tests/appserv-tests/devtests/cdi/javaee-component-resources/em-injection-no-interface-ejb/servlet/test/beans/nonmock/TestBeanSuper.java
+++ b/appserver/tests/appserv-tests/devtests/cdi/javaee-component-resources/em-injection-no-interface-ejb/servlet/test/beans/nonmock/TestBeanSuper.java
@@ -16,7 +16,7 @@
package test.beans.nonmock;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
import test.beans.TestBeanInterface;
import test.ejb.TestNoInterfaceEJB;
diff --git a/appserver/tests/appserv-tests/devtests/cdi/javaee-component-resources/em-injection-no-interface-ejb/servlet/test/beans/nonmock/TestEJBInjectionViaAtEJB.java b/appserver/tests/appserv-tests/devtests/cdi/javaee-component-resources/em-injection-no-interface-ejb/servlet/test/beans/nonmock/TestEJBInjectionViaAtEJB.java
index e6b1c7f..d951d2e 100644
--- a/appserver/tests/appserv-tests/devtests/cdi/javaee-component-resources/em-injection-no-interface-ejb/servlet/test/beans/nonmock/TestEJBInjectionViaAtEJB.java
+++ b/appserver/tests/appserv-tests/devtests/cdi/javaee-component-resources/em-injection-no-interface-ejb/servlet/test/beans/nonmock/TestEJBInjectionViaAtEJB.java
@@ -18,7 +18,7 @@
import jakarta.ejb.EJB;
import javax.enterprise.context.RequestScoped;
-import javax.inject.Named;
+import jakarta.inject.Named;
import test.beans.artifacts.InjectViaAtEJB;
import test.ejb.TestNoInterfaceEJB;
diff --git a/appserver/tests/appserv-tests/devtests/cdi/javaee-component-resources/em-injection-no-interface-ejb/servlet/test/beans/nonmock/TestEJBInjectionViaInject.java b/appserver/tests/appserv-tests/devtests/cdi/javaee-component-resources/em-injection-no-interface-ejb/servlet/test/beans/nonmock/TestEJBInjectionViaInject.java
index 83f9383..d95223d 100644
--- a/appserver/tests/appserv-tests/devtests/cdi/javaee-component-resources/em-injection-no-interface-ejb/servlet/test/beans/nonmock/TestEJBInjectionViaInject.java
+++ b/appserver/tests/appserv-tests/devtests/cdi/javaee-component-resources/em-injection-no-interface-ejb/servlet/test/beans/nonmock/TestEJBInjectionViaInject.java
@@ -17,8 +17,8 @@
package test.beans.nonmock;
import javax.enterprise.context.RequestScoped;
-import javax.inject.Inject;
-import javax.inject.Named;
+import jakarta.inject.Inject;
+import jakarta.inject.Named;
import test.beans.artifacts.InjectViaAtInject;
import test.ejb.TestNoInterfaceEJB;
diff --git a/appserver/tests/appserv-tests/devtests/cdi/javaee-component-resources/em-injection-no-interface-ejb/servlet/test/ejb/TestNoInterfaceEJB.java b/appserver/tests/appserv-tests/devtests/cdi/javaee-component-resources/em-injection-no-interface-ejb/servlet/test/ejb/TestNoInterfaceEJB.java
index 0157f7b..ec4e65f 100644
--- a/appserver/tests/appserv-tests/devtests/cdi/javaee-component-resources/em-injection-no-interface-ejb/servlet/test/ejb/TestNoInterfaceEJB.java
+++ b/appserver/tests/appserv-tests/devtests/cdi/javaee-component-resources/em-injection-no-interface-ejb/servlet/test/ejb/TestNoInterfaceEJB.java
@@ -18,7 +18,7 @@
import jakarta.ejb.Stateless;
import jakarta.persistence.EntityManager;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
@Stateless
public class TestNoInterfaceEJB extends TestSuperClass {
diff --git a/appserver/tests/appserv-tests/devtests/cdi/javaee-component-resources/em-injection-no-interface-ejb/servlet/test/servlet/NoInterfaceEJBTestServlet.java b/appserver/tests/appserv-tests/devtests/cdi/javaee-component-resources/em-injection-no-interface-ejb/servlet/test/servlet/NoInterfaceEJBTestServlet.java
index 1c953b0..63a29a4 100644
--- a/appserver/tests/appserv-tests/devtests/cdi/javaee-component-resources/em-injection-no-interface-ejb/servlet/test/servlet/NoInterfaceEJBTestServlet.java
+++ b/appserver/tests/appserv-tests/devtests/cdi/javaee-component-resources/em-injection-no-interface-ejb/servlet/test/servlet/NoInterfaceEJBTestServlet.java
@@ -19,14 +19,14 @@
import java.io.IOException;
import java.io.PrintWriter;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
import javax.servlet.ServletException;
import javax.servlet.annotation.WebServlet;
import javax.servlet.http.HttpServlet;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import jakarta.annotation.Resource;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
import jakarta.persistence.EntityManager;
import jakarta.persistence.EntityManagerFactory;
import jakarta.persistence.PersistenceUnit;
diff --git a/appserver/tests/appserv-tests/devtests/cdi/javaee-component-resources/em-injection-no-interface-ejb/servlet/test/util/JPAResourceProducer.java b/appserver/tests/appserv-tests/devtests/cdi/javaee-component-resources/em-injection-no-interface-ejb/servlet/test/util/JPAResourceProducer.java
index f2434e6..ae693d3 100644
--- a/appserver/tests/appserv-tests/devtests/cdi/javaee-component-resources/em-injection-no-interface-ejb/servlet/test/util/JPAResourceProducer.java
+++ b/appserver/tests/appserv-tests/devtests/cdi/javaee-component-resources/em-injection-no-interface-ejb/servlet/test/util/JPAResourceProducer.java
@@ -17,7 +17,7 @@
package test.util;
import javax.enterprise.inject.Produces;
-import javax.inject.Singleton;
+import jakarta.inject.Singleton;
import jakarta.persistence.EntityManager;
import jakarta.persistence.PersistenceContext;
diff --git a/appserver/tests/appserv-tests/devtests/cdi/javaee-component-resources/em-resource-injection-extended-transaction-context/servlet/test/beans/artifacts/Preferred.java b/appserver/tests/appserv-tests/devtests/cdi/javaee-component-resources/em-resource-injection-extended-transaction-context/servlet/test/beans/artifacts/Preferred.java
index b7584c8..f5cad81 100644
--- a/appserver/tests/appserv-tests/devtests/cdi/javaee-component-resources/em-resource-injection-extended-transaction-context/servlet/test/beans/artifacts/Preferred.java
+++ b/appserver/tests/appserv-tests/devtests/cdi/javaee-component-resources/em-resource-injection-extended-transaction-context/servlet/test/beans/artifacts/Preferred.java
@@ -25,7 +25,7 @@
import java.lang.annotation.RetentionPolicy;
import java.lang.annotation.Target;
-import javax.inject.Qualifier;
+import jakarta.inject.Qualifier;
@Qualifier
@Target({ TYPE, METHOD, PARAMETER, FIELD })
diff --git a/appserver/tests/appserv-tests/devtests/cdi/javaee-component-resources/em-resource-injection-extended-transaction-context/servlet/test/beans/artifacts/TestDatabase.java b/appserver/tests/appserv-tests/devtests/cdi/javaee-component-resources/em-resource-injection-extended-transaction-context/servlet/test/beans/artifacts/TestDatabase.java
index b69ab8e..28cd41b 100644
--- a/appserver/tests/appserv-tests/devtests/cdi/javaee-component-resources/em-resource-injection-extended-transaction-context/servlet/test/beans/artifacts/TestDatabase.java
+++ b/appserver/tests/appserv-tests/devtests/cdi/javaee-component-resources/em-resource-injection-extended-transaction-context/servlet/test/beans/artifacts/TestDatabase.java
@@ -25,7 +25,7 @@
import java.lang.annotation.RetentionPolicy;
import java.lang.annotation.Target;
-import javax.inject.Qualifier;
+import jakarta.inject.Qualifier;
@Qualifier
@Target({ TYPE, METHOD, PARAMETER, FIELD })
diff --git a/appserver/tests/appserv-tests/devtests/cdi/javaee-component-resources/em-resource-injection-extended-transaction-context/servlet/test/beans/nonmock/TestBean.java b/appserver/tests/appserv-tests/devtests/cdi/javaee-component-resources/em-resource-injection-extended-transaction-context/servlet/test/beans/nonmock/TestBean.java
index 97b9e1d..7f3c737 100644
--- a/appserver/tests/appserv-tests/devtests/cdi/javaee-component-resources/em-resource-injection-extended-transaction-context/servlet/test/beans/nonmock/TestBean.java
+++ b/appserver/tests/appserv-tests/devtests/cdi/javaee-component-resources/em-resource-injection-extended-transaction-context/servlet/test/beans/nonmock/TestBean.java
@@ -17,7 +17,7 @@
package test.beans.nonmock;
import javax.enterprise.context.RequestScoped;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
import jakarta.persistence.EntityManager;
import jakarta.persistence.EntityManagerFactory;
diff --git a/appserver/tests/appserv-tests/devtests/cdi/javaee-component-resources/em-resource-injection-extended-transaction-context/servlet/test/servlet/JPAResourceInjectionServlet.java b/appserver/tests/appserv-tests/devtests/cdi/javaee-component-resources/em-resource-injection-extended-transaction-context/servlet/test/servlet/JPAResourceInjectionServlet.java
index c5ff904..42a4bd7 100644
--- a/appserver/tests/appserv-tests/devtests/cdi/javaee-component-resources/em-resource-injection-extended-transaction-context/servlet/test/servlet/JPAResourceInjectionServlet.java
+++ b/appserver/tests/appserv-tests/devtests/cdi/javaee-component-resources/em-resource-injection-extended-transaction-context/servlet/test/servlet/JPAResourceInjectionServlet.java
@@ -20,7 +20,7 @@
import java.io.PrintWriter;
import jakarta.annotation.Resource;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
import jakarta.persistence.EntityManager;
import jakarta.persistence.EntityManagerFactory;
import jakarta.persistence.PersistenceUnit;
diff --git a/appserver/tests/appserv-tests/devtests/cdi/javaee-component-resources/em-resource-injection-extended-transaction-context/servlet/test/util/JPAResourceProducer.java b/appserver/tests/appserv-tests/devtests/cdi/javaee-component-resources/em-resource-injection-extended-transaction-context/servlet/test/util/JPAResourceProducer.java
index 7c5961e..94699e0 100644
--- a/appserver/tests/appserv-tests/devtests/cdi/javaee-component-resources/em-resource-injection-extended-transaction-context/servlet/test/util/JPAResourceProducer.java
+++ b/appserver/tests/appserv-tests/devtests/cdi/javaee-component-resources/em-resource-injection-extended-transaction-context/servlet/test/util/JPAResourceProducer.java
@@ -17,7 +17,7 @@
package test.util;
import javax.enterprise.inject.Produces;
-import javax.inject.Singleton;
+import jakarta.inject.Singleton;
import jakarta.persistence.EntityManager;
import jakarta.persistence.PersistenceContext;
import jakarta.persistence.PersistenceContextType;
diff --git a/appserver/tests/appserv-tests/devtests/cdi/javaee-component-resources/em-resource-injection-with-resource-declaration-in-another-jar/lib/com/acme/util/ResourcesProducer.java b/appserver/tests/appserv-tests/devtests/cdi/javaee-component-resources/em-resource-injection-with-resource-declaration-in-another-jar/lib/com/acme/util/ResourcesProducer.java
index a3f8034..178966a 100644
--- a/appserver/tests/appserv-tests/devtests/cdi/javaee-component-resources/em-resource-injection-with-resource-declaration-in-another-jar/lib/com/acme/util/ResourcesProducer.java
+++ b/appserver/tests/appserv-tests/devtests/cdi/javaee-component-resources/em-resource-injection-with-resource-declaration-in-another-jar/lib/com/acme/util/ResourcesProducer.java
@@ -17,8 +17,8 @@
package com.acme.util;
import javax.enterprise.inject.Produces;
-import javax.inject.Inject;
-import javax.inject.Singleton;
+import jakarta.inject.Inject;
+import jakarta.inject.Singleton;
import jakarta.persistence.EntityManager;
import jakarta.persistence.PersistenceContext;
diff --git a/appserver/tests/appserv-tests/devtests/cdi/javaee-component-resources/em-resource-injection-with-resource-declaration-in-another-jar/lib/com/acme/util/TestDatabase.java b/appserver/tests/appserv-tests/devtests/cdi/javaee-component-resources/em-resource-injection-with-resource-declaration-in-another-jar/lib/com/acme/util/TestDatabase.java
index db9e318..87df59f 100644
--- a/appserver/tests/appserv-tests/devtests/cdi/javaee-component-resources/em-resource-injection-with-resource-declaration-in-another-jar/lib/com/acme/util/TestDatabase.java
+++ b/appserver/tests/appserv-tests/devtests/cdi/javaee-component-resources/em-resource-injection-with-resource-declaration-in-another-jar/lib/com/acme/util/TestDatabase.java
@@ -25,7 +25,7 @@
import java.lang.annotation.RetentionPolicy;
import java.lang.annotation.Target;
-import javax.inject.Qualifier;
+import jakarta.inject.Qualifier;
@Qualifier
@Target( { TYPE, METHOD, PARAMETER, FIELD })
diff --git a/appserver/tests/appserv-tests/devtests/cdi/javaee-component-resources/em-resource-injection-with-resource-declaration-in-another-jar/lib/com/acme/util/TestManagedBean.java b/appserver/tests/appserv-tests/devtests/cdi/javaee-component-resources/em-resource-injection-with-resource-declaration-in-another-jar/lib/com/acme/util/TestManagedBean.java
index b0aed2e..5d85a0f 100644
--- a/appserver/tests/appserv-tests/devtests/cdi/javaee-component-resources/em-resource-injection-with-resource-declaration-in-another-jar/lib/com/acme/util/TestManagedBean.java
+++ b/appserver/tests/appserv-tests/devtests/cdi/javaee-component-resources/em-resource-injection-with-resource-declaration-in-another-jar/lib/com/acme/util/TestManagedBean.java
@@ -17,7 +17,7 @@
package com.acme.util;
import jakarta.annotation.ManagedBean;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
@ManagedBean
public class TestManagedBean {
diff --git a/appserver/tests/appserv-tests/devtests/cdi/javaee-component-resources/em-resource-injection-with-resource-declaration-in-another-jar/war/com/acme/servlet/HelloServlet.java b/appserver/tests/appserv-tests/devtests/cdi/javaee-component-resources/em-resource-injection-with-resource-declaration-in-another-jar/war/com/acme/servlet/HelloServlet.java
index afb12dc..1c0ce55 100644
--- a/appserver/tests/appserv-tests/devtests/cdi/javaee-component-resources/em-resource-injection-with-resource-declaration-in-another-jar/war/com/acme/servlet/HelloServlet.java
+++ b/appserver/tests/appserv-tests/devtests/cdi/javaee-component-resources/em-resource-injection-with-resource-declaration-in-another-jar/war/com/acme/servlet/HelloServlet.java
@@ -21,7 +21,7 @@
import java.io.PrintWriter;
import jakarta.ejb.EJB;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
import jakarta.persistence.EntityManagerFactory;
import jakarta.persistence.PersistenceUnit;
import javax.servlet.ServletException;
diff --git a/appserver/tests/appserv-tests/devtests/cdi/javaee-component-resources/em-resource-injection/servlet/test/beans/artifacts/Preferred.java b/appserver/tests/appserv-tests/devtests/cdi/javaee-component-resources/em-resource-injection/servlet/test/beans/artifacts/Preferred.java
index b7584c8..f5cad81 100644
--- a/appserver/tests/appserv-tests/devtests/cdi/javaee-component-resources/em-resource-injection/servlet/test/beans/artifacts/Preferred.java
+++ b/appserver/tests/appserv-tests/devtests/cdi/javaee-component-resources/em-resource-injection/servlet/test/beans/artifacts/Preferred.java
@@ -25,7 +25,7 @@
import java.lang.annotation.RetentionPolicy;
import java.lang.annotation.Target;
-import javax.inject.Qualifier;
+import jakarta.inject.Qualifier;
@Qualifier
@Target({ TYPE, METHOD, PARAMETER, FIELD })
diff --git a/appserver/tests/appserv-tests/devtests/cdi/javaee-component-resources/em-resource-injection/servlet/test/beans/artifacts/TestDatabase.java b/appserver/tests/appserv-tests/devtests/cdi/javaee-component-resources/em-resource-injection/servlet/test/beans/artifacts/TestDatabase.java
index b69ab8e..28cd41b 100644
--- a/appserver/tests/appserv-tests/devtests/cdi/javaee-component-resources/em-resource-injection/servlet/test/beans/artifacts/TestDatabase.java
+++ b/appserver/tests/appserv-tests/devtests/cdi/javaee-component-resources/em-resource-injection/servlet/test/beans/artifacts/TestDatabase.java
@@ -25,7 +25,7 @@
import java.lang.annotation.RetentionPolicy;
import java.lang.annotation.Target;
-import javax.inject.Qualifier;
+import jakarta.inject.Qualifier;
@Qualifier
@Target({ TYPE, METHOD, PARAMETER, FIELD })
diff --git a/appserver/tests/appserv-tests/devtests/cdi/javaee-component-resources/em-resource-injection/servlet/test/beans/nonmock/TestBean.java b/appserver/tests/appserv-tests/devtests/cdi/javaee-component-resources/em-resource-injection/servlet/test/beans/nonmock/TestBean.java
index 97b9e1d..7f3c737 100644
--- a/appserver/tests/appserv-tests/devtests/cdi/javaee-component-resources/em-resource-injection/servlet/test/beans/nonmock/TestBean.java
+++ b/appserver/tests/appserv-tests/devtests/cdi/javaee-component-resources/em-resource-injection/servlet/test/beans/nonmock/TestBean.java
@@ -17,7 +17,7 @@
package test.beans.nonmock;
import javax.enterprise.context.RequestScoped;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
import jakarta.persistence.EntityManager;
import jakarta.persistence.EntityManagerFactory;
diff --git a/appserver/tests/appserv-tests/devtests/cdi/javaee-component-resources/em-resource-injection/servlet/test/servlet/JPAResourceInjectionServlet.java b/appserver/tests/appserv-tests/devtests/cdi/javaee-component-resources/em-resource-injection/servlet/test/servlet/JPAResourceInjectionServlet.java
index 0b0db6f..dbdf150 100644
--- a/appserver/tests/appserv-tests/devtests/cdi/javaee-component-resources/em-resource-injection/servlet/test/servlet/JPAResourceInjectionServlet.java
+++ b/appserver/tests/appserv-tests/devtests/cdi/javaee-component-resources/em-resource-injection/servlet/test/servlet/JPAResourceInjectionServlet.java
@@ -20,7 +20,7 @@
import java.io.PrintWriter;
import jakarta.annotation.Resource;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
import jakarta.persistence.EntityManager;
import jakarta.persistence.EntityManagerFactory;
import jakarta.persistence.PersistenceUnit;
diff --git a/appserver/tests/appserv-tests/devtests/cdi/javaee-component-resources/em-resource-injection/servlet/test/util/JPAResourceProducer.java b/appserver/tests/appserv-tests/devtests/cdi/javaee-component-resources/em-resource-injection/servlet/test/util/JPAResourceProducer.java
index a37a4a5..512e17a 100644
--- a/appserver/tests/appserv-tests/devtests/cdi/javaee-component-resources/em-resource-injection/servlet/test/util/JPAResourceProducer.java
+++ b/appserver/tests/appserv-tests/devtests/cdi/javaee-component-resources/em-resource-injection/servlet/test/util/JPAResourceProducer.java
@@ -17,7 +17,7 @@
package test.util;
import javax.enterprise.inject.Produces;
-import javax.inject.Singleton;
+import jakarta.inject.Singleton;
import jakarta.persistence.EntityManager;
import jakarta.persistence.PersistenceContext;
diff --git a/appserver/tests/appserv-tests/devtests/cdi/javaee-component-resources/javaee-component-resource-typesafe-injection/servlet/test/beans/artifacts/Preferred.java b/appserver/tests/appserv-tests/devtests/cdi/javaee-component-resources/javaee-component-resource-typesafe-injection/servlet/test/beans/artifacts/Preferred.java
index b7584c8..f5cad81 100644
--- a/appserver/tests/appserv-tests/devtests/cdi/javaee-component-resources/javaee-component-resource-typesafe-injection/servlet/test/beans/artifacts/Preferred.java
+++ b/appserver/tests/appserv-tests/devtests/cdi/javaee-component-resources/javaee-component-resource-typesafe-injection/servlet/test/beans/artifacts/Preferred.java
@@ -25,7 +25,7 @@
import java.lang.annotation.RetentionPolicy;
import java.lang.annotation.Target;
-import javax.inject.Qualifier;
+import jakarta.inject.Qualifier;
@Qualifier
@Target({ TYPE, METHOD, PARAMETER, FIELD })
diff --git a/appserver/tests/appserv-tests/devtests/cdi/javaee-component-resources/javaee-component-resource-typesafe-injection/servlet/test/beans/artifacts/TestDatabase.java b/appserver/tests/appserv-tests/devtests/cdi/javaee-component-resources/javaee-component-resource-typesafe-injection/servlet/test/beans/artifacts/TestDatabase.java
index b69ab8e..28cd41b 100644
--- a/appserver/tests/appserv-tests/devtests/cdi/javaee-component-resources/javaee-component-resource-typesafe-injection/servlet/test/beans/artifacts/TestDatabase.java
+++ b/appserver/tests/appserv-tests/devtests/cdi/javaee-component-resources/javaee-component-resource-typesafe-injection/servlet/test/beans/artifacts/TestDatabase.java
@@ -25,7 +25,7 @@
import java.lang.annotation.RetentionPolicy;
import java.lang.annotation.Target;
-import javax.inject.Qualifier;
+import jakarta.inject.Qualifier;
@Qualifier
@Target({ TYPE, METHOD, PARAMETER, FIELD })
diff --git a/appserver/tests/appserv-tests/devtests/cdi/javaee-component-resources/javaee-component-resource-typesafe-injection/servlet/test/beans/nonmock/TestBean.java b/appserver/tests/appserv-tests/devtests/cdi/javaee-component-resources/javaee-component-resource-typesafe-injection/servlet/test/beans/nonmock/TestBean.java
index 1947fac..8faa131 100644
--- a/appserver/tests/appserv-tests/devtests/cdi/javaee-component-resources/javaee-component-resource-typesafe-injection/servlet/test/beans/nonmock/TestBean.java
+++ b/appserver/tests/appserv-tests/devtests/cdi/javaee-component-resources/javaee-component-resource-typesafe-injection/servlet/test/beans/nonmock/TestBean.java
@@ -17,7 +17,7 @@
package test.beans.nonmock;
import javax.enterprise.context.RequestScoped;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
import javax.sql.DataSource;
import test.beans.TestBeanInterface;
diff --git a/appserver/tests/appserv-tests/devtests/cdi/javaee-component-resources/javaee-component-resource-typesafe-injection/servlet/test/servlet/TypesafeJavaEEResourceInjectionTestServlet.java b/appserver/tests/appserv-tests/devtests/cdi/javaee-component-resources/javaee-component-resource-typesafe-injection/servlet/test/servlet/TypesafeJavaEEResourceInjectionTestServlet.java
index f1d5970..c4347b6 100644
--- a/appserver/tests/appserv-tests/devtests/cdi/javaee-component-resources/javaee-component-resource-typesafe-injection/servlet/test/servlet/TypesafeJavaEEResourceInjectionTestServlet.java
+++ b/appserver/tests/appserv-tests/devtests/cdi/javaee-component-resources/javaee-component-resource-typesafe-injection/servlet/test/servlet/TypesafeJavaEEResourceInjectionTestServlet.java
@@ -19,7 +19,7 @@
import java.io.IOException;
import java.io.PrintWriter;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
import javax.servlet.ServletException;
import javax.servlet.annotation.WebServlet;
import javax.servlet.http.HttpServlet;
diff --git a/appserver/tests/appserv-tests/devtests/cdi/javaee-component-resources/jms-resource-producer-field-in-library-jar/servlet/test/beans/artifacts/Preferred.java b/appserver/tests/appserv-tests/devtests/cdi/javaee-component-resources/jms-resource-producer-field-in-library-jar/servlet/test/beans/artifacts/Preferred.java
index b7584c8..f5cad81 100644
--- a/appserver/tests/appserv-tests/devtests/cdi/javaee-component-resources/jms-resource-producer-field-in-library-jar/servlet/test/beans/artifacts/Preferred.java
+++ b/appserver/tests/appserv-tests/devtests/cdi/javaee-component-resources/jms-resource-producer-field-in-library-jar/servlet/test/beans/artifacts/Preferred.java
@@ -25,7 +25,7 @@
import java.lang.annotation.RetentionPolicy;
import java.lang.annotation.Target;
-import javax.inject.Qualifier;
+import jakarta.inject.Qualifier;
@Qualifier
@Target({ TYPE, METHOD, PARAMETER, FIELD })
diff --git a/appserver/tests/appserv-tests/devtests/cdi/javaee-component-resources/jms-resource-producer-field-in-library-jar/servlet/test/beans/nonmock/TestBean.java b/appserver/tests/appserv-tests/devtests/cdi/javaee-component-resources/jms-resource-producer-field-in-library-jar/servlet/test/beans/nonmock/TestBean.java
index c187bf6..f15ee81 100644
--- a/appserver/tests/appserv-tests/devtests/cdi/javaee-component-resources/jms-resource-producer-field-in-library-jar/servlet/test/beans/nonmock/TestBean.java
+++ b/appserver/tests/appserv-tests/devtests/cdi/javaee-component-resources/jms-resource-producer-field-in-library-jar/servlet/test/beans/nonmock/TestBean.java
@@ -17,7 +17,7 @@
package test.beans.nonmock;
import javax.enterprise.context.RequestScoped;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
import jakarta.jms.Queue;
import test.beans.TestBeanInterface;
diff --git a/appserver/tests/appserv-tests/devtests/cdi/javaee-component-resources/jms-resource-producer-field-in-library-jar/servlet/test/servlet/JMSResourceInjectionInLibraryBeanArchiveTestServlet.java b/appserver/tests/appserv-tests/devtests/cdi/javaee-component-resources/jms-resource-producer-field-in-library-jar/servlet/test/servlet/JMSResourceInjectionInLibraryBeanArchiveTestServlet.java
index 5ca76ca..51e620a 100644
--- a/appserver/tests/appserv-tests/devtests/cdi/javaee-component-resources/jms-resource-producer-field-in-library-jar/servlet/test/servlet/JMSResourceInjectionInLibraryBeanArchiveTestServlet.java
+++ b/appserver/tests/appserv-tests/devtests/cdi/javaee-component-resources/jms-resource-producer-field-in-library-jar/servlet/test/servlet/JMSResourceInjectionInLibraryBeanArchiveTestServlet.java
@@ -19,7 +19,7 @@
import java.io.IOException;
import java.io.PrintWriter;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
import jakarta.jms.Queue;
import jakarta.jms.Session;
import javax.servlet.ServletException;
diff --git a/appserver/tests/appserv-tests/devtests/cdi/javaee-component-resources/jms-resource-producer-field/servlet/test/beans/artifacts/Preferred.java b/appserver/tests/appserv-tests/devtests/cdi/javaee-component-resources/jms-resource-producer-field/servlet/test/beans/artifacts/Preferred.java
index b7584c8..f5cad81 100644
--- a/appserver/tests/appserv-tests/devtests/cdi/javaee-component-resources/jms-resource-producer-field/servlet/test/beans/artifacts/Preferred.java
+++ b/appserver/tests/appserv-tests/devtests/cdi/javaee-component-resources/jms-resource-producer-field/servlet/test/beans/artifacts/Preferred.java
@@ -25,7 +25,7 @@
import java.lang.annotation.RetentionPolicy;
import java.lang.annotation.Target;
-import javax.inject.Qualifier;
+import jakarta.inject.Qualifier;
@Qualifier
@Target({ TYPE, METHOD, PARAMETER, FIELD })
diff --git a/appserver/tests/appserv-tests/devtests/cdi/javaee-component-resources/jms-resource-producer-field/servlet/test/beans/nonmock/TestBean.java b/appserver/tests/appserv-tests/devtests/cdi/javaee-component-resources/jms-resource-producer-field/servlet/test/beans/nonmock/TestBean.java
index c187bf6..f15ee81 100644
--- a/appserver/tests/appserv-tests/devtests/cdi/javaee-component-resources/jms-resource-producer-field/servlet/test/beans/nonmock/TestBean.java
+++ b/appserver/tests/appserv-tests/devtests/cdi/javaee-component-resources/jms-resource-producer-field/servlet/test/beans/nonmock/TestBean.java
@@ -17,7 +17,7 @@
package test.beans.nonmock;
import javax.enterprise.context.RequestScoped;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
import jakarta.jms.Queue;
import test.beans.TestBeanInterface;
diff --git a/appserver/tests/appserv-tests/devtests/cdi/javaee-component-resources/jms-resource-producer-field/servlet/test/servlet/JMSResourceInjectionInLibraryBeanArchiveTestServlet.java b/appserver/tests/appserv-tests/devtests/cdi/javaee-component-resources/jms-resource-producer-field/servlet/test/servlet/JMSResourceInjectionInLibraryBeanArchiveTestServlet.java
index 5ca76ca..51e620a 100644
--- a/appserver/tests/appserv-tests/devtests/cdi/javaee-component-resources/jms-resource-producer-field/servlet/test/servlet/JMSResourceInjectionInLibraryBeanArchiveTestServlet.java
+++ b/appserver/tests/appserv-tests/devtests/cdi/javaee-component-resources/jms-resource-producer-field/servlet/test/servlet/JMSResourceInjectionInLibraryBeanArchiveTestServlet.java
@@ -19,7 +19,7 @@
import java.io.IOException;
import java.io.PrintWriter;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
import jakarta.jms.Queue;
import jakarta.jms.Session;
import javax.servlet.ServletException;
diff --git a/appserver/tests/appserv-tests/devtests/cdi/javaee-component-resources/jpa-resource-injection-non-serializable/servlet/test/beans/artifacts/Preferred.java b/appserver/tests/appserv-tests/devtests/cdi/javaee-component-resources/jpa-resource-injection-non-serializable/servlet/test/beans/artifacts/Preferred.java
index b7584c8..f5cad81 100644
--- a/appserver/tests/appserv-tests/devtests/cdi/javaee-component-resources/jpa-resource-injection-non-serializable/servlet/test/beans/artifacts/Preferred.java
+++ b/appserver/tests/appserv-tests/devtests/cdi/javaee-component-resources/jpa-resource-injection-non-serializable/servlet/test/beans/artifacts/Preferred.java
@@ -25,7 +25,7 @@
import java.lang.annotation.RetentionPolicy;
import java.lang.annotation.Target;
-import javax.inject.Qualifier;
+import jakarta.inject.Qualifier;
@Qualifier
@Target({ TYPE, METHOD, PARAMETER, FIELD })
diff --git a/appserver/tests/appserv-tests/devtests/cdi/javaee-component-resources/jpa-resource-injection-non-serializable/servlet/test/beans/artifacts/TestDatabase.java b/appserver/tests/appserv-tests/devtests/cdi/javaee-component-resources/jpa-resource-injection-non-serializable/servlet/test/beans/artifacts/TestDatabase.java
index b69ab8e..28cd41b 100644
--- a/appserver/tests/appserv-tests/devtests/cdi/javaee-component-resources/jpa-resource-injection-non-serializable/servlet/test/beans/artifacts/TestDatabase.java
+++ b/appserver/tests/appserv-tests/devtests/cdi/javaee-component-resources/jpa-resource-injection-non-serializable/servlet/test/beans/artifacts/TestDatabase.java
@@ -25,7 +25,7 @@
import java.lang.annotation.RetentionPolicy;
import java.lang.annotation.Target;
-import javax.inject.Qualifier;
+import jakarta.inject.Qualifier;
@Qualifier
@Target({ TYPE, METHOD, PARAMETER, FIELD })
diff --git a/appserver/tests/appserv-tests/devtests/cdi/javaee-component-resources/jpa-resource-injection-non-serializable/servlet/test/beans/nonmock/TestBean.java b/appserver/tests/appserv-tests/devtests/cdi/javaee-component-resources/jpa-resource-injection-non-serializable/servlet/test/beans/nonmock/TestBean.java
index 2d315d0..11ada06 100644
--- a/appserver/tests/appserv-tests/devtests/cdi/javaee-component-resources/jpa-resource-injection-non-serializable/servlet/test/beans/nonmock/TestBean.java
+++ b/appserver/tests/appserv-tests/devtests/cdi/javaee-component-resources/jpa-resource-injection-non-serializable/servlet/test/beans/nonmock/TestBean.java
@@ -19,7 +19,7 @@
import java.io.Serializable;
import javax.enterprise.context.SessionScoped;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
import jakarta.persistence.EntityManagerFactory;
import jakarta.persistence.EntityManager;
diff --git a/appserver/tests/appserv-tests/devtests/cdi/javaee-component-resources/jpa-resource-injection-non-serializable/servlet/test/servlet/JPAResourceInjectionServlet.java b/appserver/tests/appserv-tests/devtests/cdi/javaee-component-resources/jpa-resource-injection-non-serializable/servlet/test/servlet/JPAResourceInjectionServlet.java
index 72eee42..6f44b12 100644
--- a/appserver/tests/appserv-tests/devtests/cdi/javaee-component-resources/jpa-resource-injection-non-serializable/servlet/test/servlet/JPAResourceInjectionServlet.java
+++ b/appserver/tests/appserv-tests/devtests/cdi/javaee-component-resources/jpa-resource-injection-non-serializable/servlet/test/servlet/JPAResourceInjectionServlet.java
@@ -20,7 +20,7 @@
import java.io.PrintWriter;
import jakarta.annotation.Resource;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
import jakarta.persistence.EntityManager;
import jakarta.persistence.EntityManagerFactory;
import jakarta.persistence.PersistenceUnit;
diff --git a/appserver/tests/appserv-tests/devtests/cdi/javaee-component-resources/jpa-resource-injection-non-serializable/servlet/test/util/JPAResourceProducer.java b/appserver/tests/appserv-tests/devtests/cdi/javaee-component-resources/jpa-resource-injection-non-serializable/servlet/test/util/JPAResourceProducer.java
index 701697d..fd70e3c 100644
--- a/appserver/tests/appserv-tests/devtests/cdi/javaee-component-resources/jpa-resource-injection-non-serializable/servlet/test/util/JPAResourceProducer.java
+++ b/appserver/tests/appserv-tests/devtests/cdi/javaee-component-resources/jpa-resource-injection-non-serializable/servlet/test/util/JPAResourceProducer.java
@@ -17,7 +17,7 @@
package test.util;
import javax.enterprise.inject.Produces;
-import javax.inject.Singleton;
+import jakarta.inject.Singleton;
import jakarta.persistence.EntityManager;
import jakarta.persistence.EntityManagerFactory;
import jakarta.persistence.PersistenceContext;
diff --git a/appserver/tests/appserv-tests/devtests/cdi/javaee-component-resources/jpa-resource-injection-passivating-scope/servlet/test/beans/artifacts/Preferred.java b/appserver/tests/appserv-tests/devtests/cdi/javaee-component-resources/jpa-resource-injection-passivating-scope/servlet/test/beans/artifacts/Preferred.java
index b7584c8..f5cad81 100644
--- a/appserver/tests/appserv-tests/devtests/cdi/javaee-component-resources/jpa-resource-injection-passivating-scope/servlet/test/beans/artifacts/Preferred.java
+++ b/appserver/tests/appserv-tests/devtests/cdi/javaee-component-resources/jpa-resource-injection-passivating-scope/servlet/test/beans/artifacts/Preferred.java
@@ -25,7 +25,7 @@
import java.lang.annotation.RetentionPolicy;
import java.lang.annotation.Target;
-import javax.inject.Qualifier;
+import jakarta.inject.Qualifier;
@Qualifier
@Target({ TYPE, METHOD, PARAMETER, FIELD })
diff --git a/appserver/tests/appserv-tests/devtests/cdi/javaee-component-resources/jpa-resource-injection-passivating-scope/servlet/test/beans/artifacts/TestDatabase.java b/appserver/tests/appserv-tests/devtests/cdi/javaee-component-resources/jpa-resource-injection-passivating-scope/servlet/test/beans/artifacts/TestDatabase.java
index b69ab8e..28cd41b 100644
--- a/appserver/tests/appserv-tests/devtests/cdi/javaee-component-resources/jpa-resource-injection-passivating-scope/servlet/test/beans/artifacts/TestDatabase.java
+++ b/appserver/tests/appserv-tests/devtests/cdi/javaee-component-resources/jpa-resource-injection-passivating-scope/servlet/test/beans/artifacts/TestDatabase.java
@@ -25,7 +25,7 @@
import java.lang.annotation.RetentionPolicy;
import java.lang.annotation.Target;
-import javax.inject.Qualifier;
+import jakarta.inject.Qualifier;
@Qualifier
@Target({ TYPE, METHOD, PARAMETER, FIELD })
diff --git a/appserver/tests/appserv-tests/devtests/cdi/javaee-component-resources/jpa-resource-injection-passivating-scope/servlet/test/ejb/TestEJB.java b/appserver/tests/appserv-tests/devtests/cdi/javaee-component-resources/jpa-resource-injection-passivating-scope/servlet/test/ejb/TestEJB.java
index 678c693..4192904 100644
--- a/appserver/tests/appserv-tests/devtests/cdi/javaee-component-resources/jpa-resource-injection-passivating-scope/servlet/test/ejb/TestEJB.java
+++ b/appserver/tests/appserv-tests/devtests/cdi/javaee-component-resources/jpa-resource-injection-passivating-scope/servlet/test/ejb/TestEJB.java
@@ -17,7 +17,7 @@
package test.ejb;
import jakarta.ejb.Stateful;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
import jakarta.persistence.EntityManager;
import test.beans.artifacts.TestDatabase;
diff --git a/appserver/tests/appserv-tests/devtests/cdi/javaee-component-resources/jpa-resource-injection-passivating-scope/servlet/test/servlet/JPAResourceInjectionServlet.java b/appserver/tests/appserv-tests/devtests/cdi/javaee-component-resources/jpa-resource-injection-passivating-scope/servlet/test/servlet/JPAResourceInjectionServlet.java
index 4288e8d..eb0ecf1 100644
--- a/appserver/tests/appserv-tests/devtests/cdi/javaee-component-resources/jpa-resource-injection-passivating-scope/servlet/test/servlet/JPAResourceInjectionServlet.java
+++ b/appserver/tests/appserv-tests/devtests/cdi/javaee-component-resources/jpa-resource-injection-passivating-scope/servlet/test/servlet/JPAResourceInjectionServlet.java
@@ -20,7 +20,7 @@
import java.io.PrintWriter;
import jakarta.annotation.Resource;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
import jakarta.persistence.EntityManager;
import jakarta.persistence.EntityManagerFactory;
import jakarta.persistence.PersistenceUnit;
diff --git a/appserver/tests/appserv-tests/devtests/cdi/javaee-component-resources/jpa-resource-injection-passivating-scope/servlet/test/util/JPAResourceProducer.java b/appserver/tests/appserv-tests/devtests/cdi/javaee-component-resources/jpa-resource-injection-passivating-scope/servlet/test/util/JPAResourceProducer.java
index e66eb9d..9c2b2c8 100644
--- a/appserver/tests/appserv-tests/devtests/cdi/javaee-component-resources/jpa-resource-injection-passivating-scope/servlet/test/util/JPAResourceProducer.java
+++ b/appserver/tests/appserv-tests/devtests/cdi/javaee-component-resources/jpa-resource-injection-passivating-scope/servlet/test/util/JPAResourceProducer.java
@@ -18,7 +18,7 @@
import javax.enterprise.context.ConversationScoped;
import javax.enterprise.inject.Produces;
-import javax.inject.Singleton;
+import jakarta.inject.Singleton;
import jakarta.persistence.EntityManager;
import jakarta.persistence.EntityManagerFactory;
import jakarta.persistence.PersistenceContext;
diff --git a/appserver/tests/appserv-tests/devtests/cdi/javaee-component-resources/jpa-resource-injection-with-singleton-ejb-producer/servlet/test/beans/artifacts/Preferred.java b/appserver/tests/appserv-tests/devtests/cdi/javaee-component-resources/jpa-resource-injection-with-singleton-ejb-producer/servlet/test/beans/artifacts/Preferred.java
index b7584c8..f5cad81 100644
--- a/appserver/tests/appserv-tests/devtests/cdi/javaee-component-resources/jpa-resource-injection-with-singleton-ejb-producer/servlet/test/beans/artifacts/Preferred.java
+++ b/appserver/tests/appserv-tests/devtests/cdi/javaee-component-resources/jpa-resource-injection-with-singleton-ejb-producer/servlet/test/beans/artifacts/Preferred.java
@@ -25,7 +25,7 @@
import java.lang.annotation.RetentionPolicy;
import java.lang.annotation.Target;
-import javax.inject.Qualifier;
+import jakarta.inject.Qualifier;
@Qualifier
@Target({ TYPE, METHOD, PARAMETER, FIELD })
diff --git a/appserver/tests/appserv-tests/devtests/cdi/javaee-component-resources/jpa-resource-injection-with-singleton-ejb-producer/servlet/test/beans/artifacts/ProducedViaProducerMethod.java b/appserver/tests/appserv-tests/devtests/cdi/javaee-component-resources/jpa-resource-injection-with-singleton-ejb-producer/servlet/test/beans/artifacts/ProducedViaProducerMethod.java
index 5c60345..9a340e9 100644
--- a/appserver/tests/appserv-tests/devtests/cdi/javaee-component-resources/jpa-resource-injection-with-singleton-ejb-producer/servlet/test/beans/artifacts/ProducedViaProducerMethod.java
+++ b/appserver/tests/appserv-tests/devtests/cdi/javaee-component-resources/jpa-resource-injection-with-singleton-ejb-producer/servlet/test/beans/artifacts/ProducedViaProducerMethod.java
@@ -25,7 +25,7 @@
import java.lang.annotation.RetentionPolicy;
import java.lang.annotation.Target;
-import javax.inject.Qualifier;
+import jakarta.inject.Qualifier;
@Qualifier
@Target({ TYPE, METHOD, PARAMETER, FIELD })
diff --git a/appserver/tests/appserv-tests/devtests/cdi/javaee-component-resources/jpa-resource-injection-with-singleton-ejb-producer/servlet/test/beans/artifacts/ProducedViaStaticField.java b/appserver/tests/appserv-tests/devtests/cdi/javaee-component-resources/jpa-resource-injection-with-singleton-ejb-producer/servlet/test/beans/artifacts/ProducedViaStaticField.java
index e988e7e..72b4058 100644
--- a/appserver/tests/appserv-tests/devtests/cdi/javaee-component-resources/jpa-resource-injection-with-singleton-ejb-producer/servlet/test/beans/artifacts/ProducedViaStaticField.java
+++ b/appserver/tests/appserv-tests/devtests/cdi/javaee-component-resources/jpa-resource-injection-with-singleton-ejb-producer/servlet/test/beans/artifacts/ProducedViaStaticField.java
@@ -25,7 +25,7 @@
import java.lang.annotation.RetentionPolicy;
import java.lang.annotation.Target;
-import javax.inject.Qualifier;
+import jakarta.inject.Qualifier;
@Qualifier
@Target({ TYPE, METHOD, PARAMETER, FIELD })
diff --git a/appserver/tests/appserv-tests/devtests/cdi/javaee-component-resources/jpa-resource-injection-with-singleton-ejb-producer/servlet/test/beans/artifacts/TestDatabase.java b/appserver/tests/appserv-tests/devtests/cdi/javaee-component-resources/jpa-resource-injection-with-singleton-ejb-producer/servlet/test/beans/artifacts/TestDatabase.java
index b69ab8e..28cd41b 100644
--- a/appserver/tests/appserv-tests/devtests/cdi/javaee-component-resources/jpa-resource-injection-with-singleton-ejb-producer/servlet/test/beans/artifacts/TestDatabase.java
+++ b/appserver/tests/appserv-tests/devtests/cdi/javaee-component-resources/jpa-resource-injection-with-singleton-ejb-producer/servlet/test/beans/artifacts/TestDatabase.java
@@ -25,7 +25,7 @@
import java.lang.annotation.RetentionPolicy;
import java.lang.annotation.Target;
-import javax.inject.Qualifier;
+import jakarta.inject.Qualifier;
@Qualifier
@Target({ TYPE, METHOD, PARAMETER, FIELD })
diff --git a/appserver/tests/appserv-tests/devtests/cdi/javaee-component-resources/jpa-resource-injection-with-singleton-ejb-producer/servlet/test/beans/nonmock/TestBean.java b/appserver/tests/appserv-tests/devtests/cdi/javaee-component-resources/jpa-resource-injection-with-singleton-ejb-producer/servlet/test/beans/nonmock/TestBean.java
index 1f90832..364306c 100644
--- a/appserver/tests/appserv-tests/devtests/cdi/javaee-component-resources/jpa-resource-injection-with-singleton-ejb-producer/servlet/test/beans/nonmock/TestBean.java
+++ b/appserver/tests/appserv-tests/devtests/cdi/javaee-component-resources/jpa-resource-injection-with-singleton-ejb-producer/servlet/test/beans/nonmock/TestBean.java
@@ -17,7 +17,7 @@
package test.beans.nonmock;
import javax.enterprise.context.RequestScoped;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
import jakarta.persistence.EntityManagerFactory;
import test.beans.TestBeanInterface;
diff --git a/appserver/tests/appserv-tests/devtests/cdi/javaee-component-resources/jpa-resource-injection-with-singleton-ejb-producer/servlet/test/servlet/JPAResourceInjectionServletFromSingletonEJB.java b/appserver/tests/appserv-tests/devtests/cdi/javaee-component-resources/jpa-resource-injection-with-singleton-ejb-producer/servlet/test/servlet/JPAResourceInjectionServletFromSingletonEJB.java
index d2e8a76..7b1e7e1 100644
--- a/appserver/tests/appserv-tests/devtests/cdi/javaee-component-resources/jpa-resource-injection-with-singleton-ejb-producer/servlet/test/servlet/JPAResourceInjectionServletFromSingletonEJB.java
+++ b/appserver/tests/appserv-tests/devtests/cdi/javaee-component-resources/jpa-resource-injection-with-singleton-ejb-producer/servlet/test/servlet/JPAResourceInjectionServletFromSingletonEJB.java
@@ -20,7 +20,7 @@
import java.io.PrintWriter;
import jakarta.annotation.Resource;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
import jakarta.persistence.EntityManager;
import jakarta.persistence.EntityManagerFactory;
import jakarta.persistence.PersistenceUnit;
diff --git a/appserver/tests/appserv-tests/devtests/cdi/javaee-component-resources/jpa-resource-injection/servlet/test/beans/artifacts/Preferred.java b/appserver/tests/appserv-tests/devtests/cdi/javaee-component-resources/jpa-resource-injection/servlet/test/beans/artifacts/Preferred.java
index b7584c8..f5cad81 100644
--- a/appserver/tests/appserv-tests/devtests/cdi/javaee-component-resources/jpa-resource-injection/servlet/test/beans/artifacts/Preferred.java
+++ b/appserver/tests/appserv-tests/devtests/cdi/javaee-component-resources/jpa-resource-injection/servlet/test/beans/artifacts/Preferred.java
@@ -25,7 +25,7 @@
import java.lang.annotation.RetentionPolicy;
import java.lang.annotation.Target;
-import javax.inject.Qualifier;
+import jakarta.inject.Qualifier;
@Qualifier
@Target({ TYPE, METHOD, PARAMETER, FIELD })
diff --git a/appserver/tests/appserv-tests/devtests/cdi/javaee-component-resources/jpa-resource-injection/servlet/test/beans/artifacts/TestDatabase.java b/appserver/tests/appserv-tests/devtests/cdi/javaee-component-resources/jpa-resource-injection/servlet/test/beans/artifacts/TestDatabase.java
index b69ab8e..28cd41b 100644
--- a/appserver/tests/appserv-tests/devtests/cdi/javaee-component-resources/jpa-resource-injection/servlet/test/beans/artifacts/TestDatabase.java
+++ b/appserver/tests/appserv-tests/devtests/cdi/javaee-component-resources/jpa-resource-injection/servlet/test/beans/artifacts/TestDatabase.java
@@ -25,7 +25,7 @@
import java.lang.annotation.RetentionPolicy;
import java.lang.annotation.Target;
-import javax.inject.Qualifier;
+import jakarta.inject.Qualifier;
@Qualifier
@Target({ TYPE, METHOD, PARAMETER, FIELD })
diff --git a/appserver/tests/appserv-tests/devtests/cdi/javaee-component-resources/jpa-resource-injection/servlet/test/beans/nonmock/TestBean.java b/appserver/tests/appserv-tests/devtests/cdi/javaee-component-resources/jpa-resource-injection/servlet/test/beans/nonmock/TestBean.java
index 33de2a7..39654d2 100644
--- a/appserver/tests/appserv-tests/devtests/cdi/javaee-component-resources/jpa-resource-injection/servlet/test/beans/nonmock/TestBean.java
+++ b/appserver/tests/appserv-tests/devtests/cdi/javaee-component-resources/jpa-resource-injection/servlet/test/beans/nonmock/TestBean.java
@@ -17,7 +17,7 @@
package test.beans.nonmock;
import javax.enterprise.context.RequestScoped;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
import jakarta.persistence.EntityManagerFactory;
import test.beans.TestBeanInterface;
diff --git a/appserver/tests/appserv-tests/devtests/cdi/javaee-component-resources/jpa-resource-injection/servlet/test/servlet/JPAResourceInjectionServlet.java b/appserver/tests/appserv-tests/devtests/cdi/javaee-component-resources/jpa-resource-injection/servlet/test/servlet/JPAResourceInjectionServlet.java
index 741081b..c269997 100644
--- a/appserver/tests/appserv-tests/devtests/cdi/javaee-component-resources/jpa-resource-injection/servlet/test/servlet/JPAResourceInjectionServlet.java
+++ b/appserver/tests/appserv-tests/devtests/cdi/javaee-component-resources/jpa-resource-injection/servlet/test/servlet/JPAResourceInjectionServlet.java
@@ -20,7 +20,7 @@
import java.io.PrintWriter;
import jakarta.annotation.Resource;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
import jakarta.persistence.EntityManager;
import jakarta.persistence.EntityManagerFactory;
import jakarta.persistence.PersistenceUnit;
diff --git a/appserver/tests/appserv-tests/devtests/cdi/javaee-component-resources/jpa-resource-injection/servlet/test/util/JPAResourceProducer.java b/appserver/tests/appserv-tests/devtests/cdi/javaee-component-resources/jpa-resource-injection/servlet/test/util/JPAResourceProducer.java
index 6da48fe..4c87899 100644
--- a/appserver/tests/appserv-tests/devtests/cdi/javaee-component-resources/jpa-resource-injection/servlet/test/util/JPAResourceProducer.java
+++ b/appserver/tests/appserv-tests/devtests/cdi/javaee-component-resources/jpa-resource-injection/servlet/test/util/JPAResourceProducer.java
@@ -17,7 +17,7 @@
package test.util;
import javax.enterprise.inject.Produces;
-import javax.inject.Singleton;
+import jakarta.inject.Singleton;
import jakarta.persistence.EntityManagerFactory;
import jakarta.persistence.PersistenceUnit;
diff --git a/appserver/tests/appserv-tests/devtests/cdi/javaee-component-resources/no-interface-ejb/servlet/test/beans/artifacts/InjectViaAtEJB.java b/appserver/tests/appserv-tests/devtests/cdi/javaee-component-resources/no-interface-ejb/servlet/test/beans/artifacts/InjectViaAtEJB.java
index 594448d..da33ae0 100644
--- a/appserver/tests/appserv-tests/devtests/cdi/javaee-component-resources/no-interface-ejb/servlet/test/beans/artifacts/InjectViaAtEJB.java
+++ b/appserver/tests/appserv-tests/devtests/cdi/javaee-component-resources/no-interface-ejb/servlet/test/beans/artifacts/InjectViaAtEJB.java
@@ -25,7 +25,7 @@
import java.lang.annotation.RetentionPolicy;
import java.lang.annotation.Target;
-import javax.inject.Qualifier;
+import jakarta.inject.Qualifier;
@Qualifier
@Target({ TYPE, METHOD, PARAMETER, FIELD })
diff --git a/appserver/tests/appserv-tests/devtests/cdi/javaee-component-resources/no-interface-ejb/servlet/test/beans/artifacts/InjectViaAtInject.java b/appserver/tests/appserv-tests/devtests/cdi/javaee-component-resources/no-interface-ejb/servlet/test/beans/artifacts/InjectViaAtInject.java
index 8e11c88..50ec29e 100644
--- a/appserver/tests/appserv-tests/devtests/cdi/javaee-component-resources/no-interface-ejb/servlet/test/beans/artifacts/InjectViaAtInject.java
+++ b/appserver/tests/appserv-tests/devtests/cdi/javaee-component-resources/no-interface-ejb/servlet/test/beans/artifacts/InjectViaAtInject.java
@@ -25,7 +25,7 @@
import java.lang.annotation.RetentionPolicy;
import java.lang.annotation.Target;
-import javax.inject.Qualifier;
+import jakarta.inject.Qualifier;
@Qualifier
@Target({ TYPE, METHOD, PARAMETER, FIELD })
diff --git a/appserver/tests/appserv-tests/devtests/cdi/javaee-component-resources/no-interface-ejb/servlet/test/beans/artifacts/LocalEJB.java b/appserver/tests/appserv-tests/devtests/cdi/javaee-component-resources/no-interface-ejb/servlet/test/beans/artifacts/LocalEJB.java
index 04bb97c..21e7626 100644
--- a/appserver/tests/appserv-tests/devtests/cdi/javaee-component-resources/no-interface-ejb/servlet/test/beans/artifacts/LocalEJB.java
+++ b/appserver/tests/appserv-tests/devtests/cdi/javaee-component-resources/no-interface-ejb/servlet/test/beans/artifacts/LocalEJB.java
@@ -25,7 +25,7 @@
import java.lang.annotation.RetentionPolicy;
import java.lang.annotation.Target;
-import javax.inject.Qualifier;
+import jakarta.inject.Qualifier;
@Qualifier
@Target({ TYPE, METHOD, PARAMETER, FIELD })
diff --git a/appserver/tests/appserv-tests/devtests/cdi/javaee-component-resources/no-interface-ejb/servlet/test/beans/artifacts/NoInterfaceBeanView.java b/appserver/tests/appserv-tests/devtests/cdi/javaee-component-resources/no-interface-ejb/servlet/test/beans/artifacts/NoInterfaceBeanView.java
index 6e95330..b4143b5 100644
--- a/appserver/tests/appserv-tests/devtests/cdi/javaee-component-resources/no-interface-ejb/servlet/test/beans/artifacts/NoInterfaceBeanView.java
+++ b/appserver/tests/appserv-tests/devtests/cdi/javaee-component-resources/no-interface-ejb/servlet/test/beans/artifacts/NoInterfaceBeanView.java
@@ -25,7 +25,7 @@
import java.lang.annotation.RetentionPolicy;
import java.lang.annotation.Target;
-import javax.inject.Qualifier;
+import jakarta.inject.Qualifier;
@Qualifier
@Target({ TYPE, METHOD, PARAMETER, FIELD })
diff --git a/appserver/tests/appserv-tests/devtests/cdi/javaee-component-resources/no-interface-ejb/servlet/test/beans/nonmock/local/TestEJBInjectionViaAtEJB.java b/appserver/tests/appserv-tests/devtests/cdi/javaee-component-resources/no-interface-ejb/servlet/test/beans/nonmock/local/TestEJBInjectionViaAtEJB.java
index b0e9baa..6fe8afb 100644
--- a/appserver/tests/appserv-tests/devtests/cdi/javaee-component-resources/no-interface-ejb/servlet/test/beans/nonmock/local/TestEJBInjectionViaAtEJB.java
+++ b/appserver/tests/appserv-tests/devtests/cdi/javaee-component-resources/no-interface-ejb/servlet/test/beans/nonmock/local/TestEJBInjectionViaAtEJB.java
@@ -18,7 +18,7 @@
import jakarta.ejb.EJB;
import javax.enterprise.context.RequestScoped;
-import javax.inject.Named;
+import jakarta.inject.Named;
import test.beans.artifacts.InjectViaAtEJB;
import test.beans.artifacts.LocalEJB;
diff --git a/appserver/tests/appserv-tests/devtests/cdi/javaee-component-resources/no-interface-ejb/servlet/test/beans/nonmock/local/TestEJBInjectionViaInject.java b/appserver/tests/appserv-tests/devtests/cdi/javaee-component-resources/no-interface-ejb/servlet/test/beans/nonmock/local/TestEJBInjectionViaInject.java
index c4dec72..d35b71d 100644
--- a/appserver/tests/appserv-tests/devtests/cdi/javaee-component-resources/no-interface-ejb/servlet/test/beans/nonmock/local/TestEJBInjectionViaInject.java
+++ b/appserver/tests/appserv-tests/devtests/cdi/javaee-component-resources/no-interface-ejb/servlet/test/beans/nonmock/local/TestEJBInjectionViaInject.java
@@ -17,8 +17,8 @@
package test.beans.nonmock.local;
import javax.enterprise.context.RequestScoped;
-import javax.inject.Inject;
-import javax.inject.Named;
+import jakarta.inject.Inject;
+import jakarta.inject.Named;
import test.beans.artifacts.InjectViaAtInject;
import test.beans.artifacts.LocalEJB;
diff --git a/appserver/tests/appserv-tests/devtests/cdi/javaee-component-resources/no-interface-ejb/servlet/test/beans/nonmock/nointerfacebeanview/TestEJBInjectionViaAtEJB.java b/appserver/tests/appserv-tests/devtests/cdi/javaee-component-resources/no-interface-ejb/servlet/test/beans/nonmock/nointerfacebeanview/TestEJBInjectionViaAtEJB.java
index 78ceaef..50bdca4 100644
--- a/appserver/tests/appserv-tests/devtests/cdi/javaee-component-resources/no-interface-ejb/servlet/test/beans/nonmock/nointerfacebeanview/TestEJBInjectionViaAtEJB.java
+++ b/appserver/tests/appserv-tests/devtests/cdi/javaee-component-resources/no-interface-ejb/servlet/test/beans/nonmock/nointerfacebeanview/TestEJBInjectionViaAtEJB.java
@@ -18,7 +18,7 @@
import jakarta.ejb.EJB;
import javax.enterprise.context.RequestScoped;
-import javax.inject.Named;
+import jakarta.inject.Named;
import test.beans.artifacts.InjectViaAtEJB;
import test.beans.artifacts.NoInterfaceBeanView;
diff --git a/appserver/tests/appserv-tests/devtests/cdi/javaee-component-resources/no-interface-ejb/servlet/test/beans/nonmock/nointerfacebeanview/TestEJBInjectionViaInject.java b/appserver/tests/appserv-tests/devtests/cdi/javaee-component-resources/no-interface-ejb/servlet/test/beans/nonmock/nointerfacebeanview/TestEJBInjectionViaInject.java
index 62b1b11..cc0e898 100644
--- a/appserver/tests/appserv-tests/devtests/cdi/javaee-component-resources/no-interface-ejb/servlet/test/beans/nonmock/nointerfacebeanview/TestEJBInjectionViaInject.java
+++ b/appserver/tests/appserv-tests/devtests/cdi/javaee-component-resources/no-interface-ejb/servlet/test/beans/nonmock/nointerfacebeanview/TestEJBInjectionViaInject.java
@@ -17,8 +17,8 @@
package test.beans.nonmock.nointerfacebeanview;
import javax.enterprise.context.RequestScoped;
-import javax.inject.Inject;
-import javax.inject.Named;
+import jakarta.inject.Inject;
+import jakarta.inject.Named;
import test.beans.artifacts.InjectViaAtInject;
import test.beans.artifacts.NoInterfaceBeanView;
diff --git a/appserver/tests/appserv-tests/devtests/cdi/javaee-component-resources/no-interface-ejb/servlet/test/servlet/FooBean.java b/appserver/tests/appserv-tests/devtests/cdi/javaee-component-resources/no-interface-ejb/servlet/test/servlet/FooBean.java
index 1e102af..44e1ece 100644
--- a/appserver/tests/appserv-tests/devtests/cdi/javaee-component-resources/no-interface-ejb/servlet/test/servlet/FooBean.java
+++ b/appserver/tests/appserv-tests/devtests/cdi/javaee-component-resources/no-interface-ejb/servlet/test/servlet/FooBean.java
@@ -16,7 +16,7 @@
package test.servlet;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
import test.beans.TestBeanInterface;
import test.beans.artifacts.InjectViaAtEJB;
diff --git a/appserver/tests/appserv-tests/devtests/cdi/javaee-component-resources/no-interface-ejb/servlet/test/servlet/NoInterfaceEJBTestServlet.java b/appserver/tests/appserv-tests/devtests/cdi/javaee-component-resources/no-interface-ejb/servlet/test/servlet/NoInterfaceEJBTestServlet.java
index d878ef3..1499ab0 100644
--- a/appserver/tests/appserv-tests/devtests/cdi/javaee-component-resources/no-interface-ejb/servlet/test/servlet/NoInterfaceEJBTestServlet.java
+++ b/appserver/tests/appserv-tests/devtests/cdi/javaee-component-resources/no-interface-ejb/servlet/test/servlet/NoInterfaceEJBTestServlet.java
@@ -19,7 +19,7 @@
import java.io.IOException;
import java.io.PrintWriter;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
import javax.servlet.ServletException;
import javax.servlet.annotation.WebServlet;
import javax.servlet.http.HttpServlet;
diff --git a/appserver/tests/appserv-tests/devtests/cdi/javaee-component-resources/slsb-injection-into-sessionscoped/servlet/test/beans/TestSessionScopedBean.java b/appserver/tests/appserv-tests/devtests/cdi/javaee-component-resources/slsb-injection-into-sessionscoped/servlet/test/beans/TestSessionScopedBean.java
index a9fc170..a20c2ae 100644
--- a/appserver/tests/appserv-tests/devtests/cdi/javaee-component-resources/slsb-injection-into-sessionscoped/servlet/test/beans/TestSessionScopedBean.java
+++ b/appserver/tests/appserv-tests/devtests/cdi/javaee-component-resources/slsb-injection-into-sessionscoped/servlet/test/beans/TestSessionScopedBean.java
@@ -18,8 +18,8 @@
import java.io.Serializable;
import javax.enterprise.context.SessionScoped;
-import javax.inject.Inject;
-import javax.inject.Named;
+import jakarta.inject.Inject;
+import jakarta.inject.Named;
import test.ejb.slsb.TestSLSB;
diff --git a/appserver/tests/appserv-tests/devtests/cdi/javaee-component-resources/slsb-injection-into-sessionscoped/servlet/test/beans/artifacts/InjectViaAtEJB.java b/appserver/tests/appserv-tests/devtests/cdi/javaee-component-resources/slsb-injection-into-sessionscoped/servlet/test/beans/artifacts/InjectViaAtEJB.java
index 594448d..da33ae0 100644
--- a/appserver/tests/appserv-tests/devtests/cdi/javaee-component-resources/slsb-injection-into-sessionscoped/servlet/test/beans/artifacts/InjectViaAtEJB.java
+++ b/appserver/tests/appserv-tests/devtests/cdi/javaee-component-resources/slsb-injection-into-sessionscoped/servlet/test/beans/artifacts/InjectViaAtEJB.java
@@ -25,7 +25,7 @@
import java.lang.annotation.RetentionPolicy;
import java.lang.annotation.Target;
-import javax.inject.Qualifier;
+import jakarta.inject.Qualifier;
@Qualifier
@Target({ TYPE, METHOD, PARAMETER, FIELD })
diff --git a/appserver/tests/appserv-tests/devtests/cdi/javaee-component-resources/slsb-injection-into-sessionscoped/servlet/test/beans/artifacts/InjectViaAtInject.java b/appserver/tests/appserv-tests/devtests/cdi/javaee-component-resources/slsb-injection-into-sessionscoped/servlet/test/beans/artifacts/InjectViaAtInject.java
index 8e11c88..50ec29e 100644
--- a/appserver/tests/appserv-tests/devtests/cdi/javaee-component-resources/slsb-injection-into-sessionscoped/servlet/test/beans/artifacts/InjectViaAtInject.java
+++ b/appserver/tests/appserv-tests/devtests/cdi/javaee-component-resources/slsb-injection-into-sessionscoped/servlet/test/beans/artifacts/InjectViaAtInject.java
@@ -25,7 +25,7 @@
import java.lang.annotation.RetentionPolicy;
import java.lang.annotation.Target;
-import javax.inject.Qualifier;
+import jakarta.inject.Qualifier;
@Qualifier
@Target({ TYPE, METHOD, PARAMETER, FIELD })
diff --git a/appserver/tests/appserv-tests/devtests/cdi/javaee-component-resources/slsb-injection-into-sessionscoped/servlet/test/beans/artifacts/LocalEJB.java b/appserver/tests/appserv-tests/devtests/cdi/javaee-component-resources/slsb-injection-into-sessionscoped/servlet/test/beans/artifacts/LocalEJB.java
index 04bb97c..21e7626 100644
--- a/appserver/tests/appserv-tests/devtests/cdi/javaee-component-resources/slsb-injection-into-sessionscoped/servlet/test/beans/artifacts/LocalEJB.java
+++ b/appserver/tests/appserv-tests/devtests/cdi/javaee-component-resources/slsb-injection-into-sessionscoped/servlet/test/beans/artifacts/LocalEJB.java
@@ -25,7 +25,7 @@
import java.lang.annotation.RetentionPolicy;
import java.lang.annotation.Target;
-import javax.inject.Qualifier;
+import jakarta.inject.Qualifier;
@Qualifier
@Target({ TYPE, METHOD, PARAMETER, FIELD })
diff --git a/appserver/tests/appserv-tests/devtests/cdi/javaee-component-resources/slsb-injection-into-sessionscoped/servlet/test/beans/artifacts/NoInterfaceBeanView.java b/appserver/tests/appserv-tests/devtests/cdi/javaee-component-resources/slsb-injection-into-sessionscoped/servlet/test/beans/artifacts/NoInterfaceBeanView.java
index 6e95330..b4143b5 100644
--- a/appserver/tests/appserv-tests/devtests/cdi/javaee-component-resources/slsb-injection-into-sessionscoped/servlet/test/beans/artifacts/NoInterfaceBeanView.java
+++ b/appserver/tests/appserv-tests/devtests/cdi/javaee-component-resources/slsb-injection-into-sessionscoped/servlet/test/beans/artifacts/NoInterfaceBeanView.java
@@ -25,7 +25,7 @@
import java.lang.annotation.RetentionPolicy;
import java.lang.annotation.Target;
-import javax.inject.Qualifier;
+import jakarta.inject.Qualifier;
@Qualifier
@Target({ TYPE, METHOD, PARAMETER, FIELD })
diff --git a/appserver/tests/appserv-tests/devtests/cdi/javaee-component-resources/slsb-injection-into-sessionscoped/servlet/test/beans/nonmock/local/TestEJBInjectionViaAtEJB.java b/appserver/tests/appserv-tests/devtests/cdi/javaee-component-resources/slsb-injection-into-sessionscoped/servlet/test/beans/nonmock/local/TestEJBInjectionViaAtEJB.java
index b0e9baa..6fe8afb 100644
--- a/appserver/tests/appserv-tests/devtests/cdi/javaee-component-resources/slsb-injection-into-sessionscoped/servlet/test/beans/nonmock/local/TestEJBInjectionViaAtEJB.java
+++ b/appserver/tests/appserv-tests/devtests/cdi/javaee-component-resources/slsb-injection-into-sessionscoped/servlet/test/beans/nonmock/local/TestEJBInjectionViaAtEJB.java
@@ -18,7 +18,7 @@
import jakarta.ejb.EJB;
import javax.enterprise.context.RequestScoped;
-import javax.inject.Named;
+import jakarta.inject.Named;
import test.beans.artifacts.InjectViaAtEJB;
import test.beans.artifacts.LocalEJB;
diff --git a/appserver/tests/appserv-tests/devtests/cdi/javaee-component-resources/slsb-injection-into-sessionscoped/servlet/test/beans/nonmock/local/TestEJBInjectionViaInject.java b/appserver/tests/appserv-tests/devtests/cdi/javaee-component-resources/slsb-injection-into-sessionscoped/servlet/test/beans/nonmock/local/TestEJBInjectionViaInject.java
index c4dec72..d35b71d 100644
--- a/appserver/tests/appserv-tests/devtests/cdi/javaee-component-resources/slsb-injection-into-sessionscoped/servlet/test/beans/nonmock/local/TestEJBInjectionViaInject.java
+++ b/appserver/tests/appserv-tests/devtests/cdi/javaee-component-resources/slsb-injection-into-sessionscoped/servlet/test/beans/nonmock/local/TestEJBInjectionViaInject.java
@@ -17,8 +17,8 @@
package test.beans.nonmock.local;
import javax.enterprise.context.RequestScoped;
-import javax.inject.Inject;
-import javax.inject.Named;
+import jakarta.inject.Inject;
+import jakarta.inject.Named;
import test.beans.artifacts.InjectViaAtInject;
import test.beans.artifacts.LocalEJB;
diff --git a/appserver/tests/appserv-tests/devtests/cdi/javaee-component-resources/slsb-injection-into-sessionscoped/servlet/test/beans/nonmock/nointerfacebeanview/TestEJBInjectionViaAtEJB.java b/appserver/tests/appserv-tests/devtests/cdi/javaee-component-resources/slsb-injection-into-sessionscoped/servlet/test/beans/nonmock/nointerfacebeanview/TestEJBInjectionViaAtEJB.java
index 3c75b8a..cb02473 100644
--- a/appserver/tests/appserv-tests/devtests/cdi/javaee-component-resources/slsb-injection-into-sessionscoped/servlet/test/beans/nonmock/nointerfacebeanview/TestEJBInjectionViaAtEJB.java
+++ b/appserver/tests/appserv-tests/devtests/cdi/javaee-component-resources/slsb-injection-into-sessionscoped/servlet/test/beans/nonmock/nointerfacebeanview/TestEJBInjectionViaAtEJB.java
@@ -18,7 +18,7 @@
import jakarta.ejb.EJB;
import javax.enterprise.context.RequestScoped;
-import javax.inject.Named;
+import jakarta.inject.Named;
import test.beans.artifacts.InjectViaAtEJB;
import test.beans.artifacts.NoInterfaceBeanView;
diff --git a/appserver/tests/appserv-tests/devtests/cdi/javaee-component-resources/slsb-injection-into-sessionscoped/servlet/test/beans/nonmock/nointerfacebeanview/TestEJBInjectionViaInject.java b/appserver/tests/appserv-tests/devtests/cdi/javaee-component-resources/slsb-injection-into-sessionscoped/servlet/test/beans/nonmock/nointerfacebeanview/TestEJBInjectionViaInject.java
index 62b1b11..cc0e898 100644
--- a/appserver/tests/appserv-tests/devtests/cdi/javaee-component-resources/slsb-injection-into-sessionscoped/servlet/test/beans/nonmock/nointerfacebeanview/TestEJBInjectionViaInject.java
+++ b/appserver/tests/appserv-tests/devtests/cdi/javaee-component-resources/slsb-injection-into-sessionscoped/servlet/test/beans/nonmock/nointerfacebeanview/TestEJBInjectionViaInject.java
@@ -17,8 +17,8 @@
package test.beans.nonmock.nointerfacebeanview;
import javax.enterprise.context.RequestScoped;
-import javax.inject.Inject;
-import javax.inject.Named;
+import jakarta.inject.Inject;
+import jakarta.inject.Named;
import test.beans.artifacts.InjectViaAtInject;
import test.beans.artifacts.NoInterfaceBeanView;
diff --git a/appserver/tests/appserv-tests/devtests/cdi/javaee-component-resources/slsb-injection-into-sessionscoped/servlet/test/ejb/slsb/TestSLSB.java b/appserver/tests/appserv-tests/devtests/cdi/javaee-component-resources/slsb-injection-into-sessionscoped/servlet/test/ejb/slsb/TestSLSB.java
index 0b6f4ee..8a1ecc4 100644
--- a/appserver/tests/appserv-tests/devtests/cdi/javaee-component-resources/slsb-injection-into-sessionscoped/servlet/test/ejb/slsb/TestSLSB.java
+++ b/appserver/tests/appserv-tests/devtests/cdi/javaee-component-resources/slsb-injection-into-sessionscoped/servlet/test/ejb/slsb/TestSLSB.java
@@ -17,7 +17,7 @@
package test.ejb.slsb;
import jakarta.ejb.Stateless;
import javax.enterprise.context.Dependent;
-import javax.inject.Named;
+import jakarta.inject.Named;
@Named
@Stateless
diff --git a/appserver/tests/appserv-tests/devtests/cdi/javaee-component-resources/slsb-injection-into-sessionscoped/servlet/test/servlet/SLSBInjectionIntoSessionScopedBeanTestServlet.java b/appserver/tests/appserv-tests/devtests/cdi/javaee-component-resources/slsb-injection-into-sessionscoped/servlet/test/servlet/SLSBInjectionIntoSessionScopedBeanTestServlet.java
index c5f0232..3b4304c 100644
--- a/appserver/tests/appserv-tests/devtests/cdi/javaee-component-resources/slsb-injection-into-sessionscoped/servlet/test/servlet/SLSBInjectionIntoSessionScopedBeanTestServlet.java
+++ b/appserver/tests/appserv-tests/devtests/cdi/javaee-component-resources/slsb-injection-into-sessionscoped/servlet/test/servlet/SLSBInjectionIntoSessionScopedBeanTestServlet.java
@@ -19,7 +19,7 @@
import java.io.IOException;
import java.io.PrintWriter;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
import javax.servlet.ServletException;
import javax.servlet.annotation.WebServlet;
import javax.servlet.http.HttpServlet;
diff --git a/appserver/tests/appserv-tests/devtests/cdi/javaee-integration/bean-in-lib-dir-used-by-ejb-in-ear/ejb/com/acme/ejb/impl/HelloSingleton.java b/appserver/tests/appserv-tests/devtests/cdi/javaee-integration/bean-in-lib-dir-used-by-ejb-in-ear/ejb/com/acme/ejb/impl/HelloSingleton.java
index add5220..814451f 100644
--- a/appserver/tests/appserv-tests/devtests/cdi/javaee-integration/bean-in-lib-dir-used-by-ejb-in-ear/ejb/com/acme/ejb/impl/HelloSingleton.java
+++ b/appserver/tests/appserv-tests/devtests/cdi/javaee-integration/bean-in-lib-dir-used-by-ejb-in-ear/ejb/com/acme/ejb/impl/HelloSingleton.java
@@ -23,7 +23,7 @@
import jakarta.ejb.SessionContext;
import jakarta.ejb.Singleton;
import jakarta.ejb.Startup;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
import jakarta.persistence.EntityManagerFactory;
import jakarta.persistence.PersistenceUnit;
diff --git a/appserver/tests/appserv-tests/devtests/cdi/javaee-integration/bean-in-lib-dir-used-by-ejb-in-ear/lib/com/acme/util/ResourcesProducer.java b/appserver/tests/appserv-tests/devtests/cdi/javaee-integration/bean-in-lib-dir-used-by-ejb-in-ear/lib/com/acme/util/ResourcesProducer.java
index a3f8034..178966a 100644
--- a/appserver/tests/appserv-tests/devtests/cdi/javaee-integration/bean-in-lib-dir-used-by-ejb-in-ear/lib/com/acme/util/ResourcesProducer.java
+++ b/appserver/tests/appserv-tests/devtests/cdi/javaee-integration/bean-in-lib-dir-used-by-ejb-in-ear/lib/com/acme/util/ResourcesProducer.java
@@ -17,8 +17,8 @@
package com.acme.util;
import javax.enterprise.inject.Produces;
-import javax.inject.Inject;
-import javax.inject.Singleton;
+import jakarta.inject.Inject;
+import jakarta.inject.Singleton;
import jakarta.persistence.EntityManager;
import jakarta.persistence.PersistenceContext;
diff --git a/appserver/tests/appserv-tests/devtests/cdi/javaee-integration/bean-in-lib-dir-used-by-ejb-in-ear/lib/com/acme/util/TestDatabase.java b/appserver/tests/appserv-tests/devtests/cdi/javaee-integration/bean-in-lib-dir-used-by-ejb-in-ear/lib/com/acme/util/TestDatabase.java
index db9e318..87df59f 100644
--- a/appserver/tests/appserv-tests/devtests/cdi/javaee-integration/bean-in-lib-dir-used-by-ejb-in-ear/lib/com/acme/util/TestDatabase.java
+++ b/appserver/tests/appserv-tests/devtests/cdi/javaee-integration/bean-in-lib-dir-used-by-ejb-in-ear/lib/com/acme/util/TestDatabase.java
@@ -25,7 +25,7 @@
import java.lang.annotation.RetentionPolicy;
import java.lang.annotation.Target;
-import javax.inject.Qualifier;
+import jakarta.inject.Qualifier;
@Qualifier
@Target( { TYPE, METHOD, PARAMETER, FIELD })
diff --git a/appserver/tests/appserv-tests/devtests/cdi/javaee-integration/bean-in-lib-dir-used-by-ejb-in-ear/lib/com/acme/util/TestManagedBean.java b/appserver/tests/appserv-tests/devtests/cdi/javaee-integration/bean-in-lib-dir-used-by-ejb-in-ear/lib/com/acme/util/TestManagedBean.java
index 375994f..769bc54 100644
--- a/appserver/tests/appserv-tests/devtests/cdi/javaee-integration/bean-in-lib-dir-used-by-ejb-in-ear/lib/com/acme/util/TestManagedBean.java
+++ b/appserver/tests/appserv-tests/devtests/cdi/javaee-integration/bean-in-lib-dir-used-by-ejb-in-ear/lib/com/acme/util/TestManagedBean.java
@@ -17,7 +17,7 @@
package com.acme.util;
import jakarta.annotation.ManagedBean;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
@ManagedBean
public class TestManagedBean {
diff --git a/appserver/tests/appserv-tests/devtests/cdi/javaee-integration/builtin-beans/servlet/test/beans/artifacts/Preferred.java b/appserver/tests/appserv-tests/devtests/cdi/javaee-integration/builtin-beans/servlet/test/beans/artifacts/Preferred.java
index b7584c8..f5cad81 100644
--- a/appserver/tests/appserv-tests/devtests/cdi/javaee-integration/builtin-beans/servlet/test/beans/artifacts/Preferred.java
+++ b/appserver/tests/appserv-tests/devtests/cdi/javaee-integration/builtin-beans/servlet/test/beans/artifacts/Preferred.java
@@ -25,7 +25,7 @@
import java.lang.annotation.RetentionPolicy;
import java.lang.annotation.Target;
-import javax.inject.Qualifier;
+import jakarta.inject.Qualifier;
@Qualifier
@Target({ TYPE, METHOD, PARAMETER, FIELD })
diff --git a/appserver/tests/appserv-tests/devtests/cdi/javaee-integration/builtin-beans/servlet/test/beans/artifacts/TestDatabase.java b/appserver/tests/appserv-tests/devtests/cdi/javaee-integration/builtin-beans/servlet/test/beans/artifacts/TestDatabase.java
index b69ab8e..28cd41b 100644
--- a/appserver/tests/appserv-tests/devtests/cdi/javaee-integration/builtin-beans/servlet/test/beans/artifacts/TestDatabase.java
+++ b/appserver/tests/appserv-tests/devtests/cdi/javaee-integration/builtin-beans/servlet/test/beans/artifacts/TestDatabase.java
@@ -25,7 +25,7 @@
import java.lang.annotation.RetentionPolicy;
import java.lang.annotation.Target;
-import javax.inject.Qualifier;
+import jakarta.inject.Qualifier;
@Qualifier
@Target({ TYPE, METHOD, PARAMETER, FIELD })
diff --git a/appserver/tests/appserv-tests/devtests/cdi/javaee-integration/builtin-beans/servlet/test/beans/nonmock/TestBean.java b/appserver/tests/appserv-tests/devtests/cdi/javaee-integration/builtin-beans/servlet/test/beans/nonmock/TestBean.java
index 1947fac..8faa131 100644
--- a/appserver/tests/appserv-tests/devtests/cdi/javaee-integration/builtin-beans/servlet/test/beans/nonmock/TestBean.java
+++ b/appserver/tests/appserv-tests/devtests/cdi/javaee-integration/builtin-beans/servlet/test/beans/nonmock/TestBean.java
@@ -17,7 +17,7 @@
package test.beans.nonmock;
import javax.enterprise.context.RequestScoped;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
import javax.sql.DataSource;
import test.beans.TestBeanInterface;
diff --git a/appserver/tests/appserv-tests/devtests/cdi/javaee-integration/builtin-beans/servlet/test/servlet/SimpleJavaEEIntegrationTestServlet.java b/appserver/tests/appserv-tests/devtests/cdi/javaee-integration/builtin-beans/servlet/test/servlet/SimpleJavaEEIntegrationTestServlet.java
index b58702c..d5ad616 100644
--- a/appserver/tests/appserv-tests/devtests/cdi/javaee-integration/builtin-beans/servlet/test/servlet/SimpleJavaEEIntegrationTestServlet.java
+++ b/appserver/tests/appserv-tests/devtests/cdi/javaee-integration/builtin-beans/servlet/test/servlet/SimpleJavaEEIntegrationTestServlet.java
@@ -20,7 +20,7 @@
import java.io.PrintWriter;
import java.security.Principal;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
import javax.servlet.ServletException;
import javax.servlet.annotation.WebServlet;
import javax.servlet.http.HttpServlet;
diff --git a/appserver/tests/appserv-tests/devtests/cdi/javaee-integration/cdi-servlet-3.0-annotation-with-web-inf-lib-extension-alternative/servlet/test/beans/TestBean.java b/appserver/tests/appserv-tests/devtests/cdi/javaee-integration/cdi-servlet-3.0-annotation-with-web-inf-lib-extension-alternative/servlet/test/beans/TestBean.java
index 0dd31a9..ce9aef7 100644
--- a/appserver/tests/appserv-tests/devtests/cdi/javaee-integration/cdi-servlet-3.0-annotation-with-web-inf-lib-extension-alternative/servlet/test/beans/TestBean.java
+++ b/appserver/tests/appserv-tests/devtests/cdi/javaee-integration/cdi-servlet-3.0-annotation-with-web-inf-lib-extension-alternative/servlet/test/beans/TestBean.java
@@ -17,7 +17,7 @@
package test.beans;
import javax.enterprise.context.RequestScoped;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
import jakarta.persistence.EntityManager;
import test.beans.artifacts.Preferred;
diff --git a/appserver/tests/appserv-tests/devtests/cdi/javaee-integration/cdi-servlet-3.0-annotation-with-web-inf-lib-extension-alternative/servlet/test/beans/artifacts/Preferred.java b/appserver/tests/appserv-tests/devtests/cdi/javaee-integration/cdi-servlet-3.0-annotation-with-web-inf-lib-extension-alternative/servlet/test/beans/artifacts/Preferred.java
index b7584c8..f5cad81 100644
--- a/appserver/tests/appserv-tests/devtests/cdi/javaee-integration/cdi-servlet-3.0-annotation-with-web-inf-lib-extension-alternative/servlet/test/beans/artifacts/Preferred.java
+++ b/appserver/tests/appserv-tests/devtests/cdi/javaee-integration/cdi-servlet-3.0-annotation-with-web-inf-lib-extension-alternative/servlet/test/beans/artifacts/Preferred.java
@@ -25,7 +25,7 @@
import java.lang.annotation.RetentionPolicy;
import java.lang.annotation.Target;
-import javax.inject.Qualifier;
+import jakarta.inject.Qualifier;
@Qualifier
@Target({ TYPE, METHOD, PARAMETER, FIELD })
diff --git a/appserver/tests/appserv-tests/devtests/cdi/javaee-integration/cdi-servlet-3.0-annotation-with-web-inf-lib-extension-alternative/servlet/test/beans/artifacts/TestDatabase.java b/appserver/tests/appserv-tests/devtests/cdi/javaee-integration/cdi-servlet-3.0-annotation-with-web-inf-lib-extension-alternative/servlet/test/beans/artifacts/TestDatabase.java
index b69ab8e..28cd41b 100644
--- a/appserver/tests/appserv-tests/devtests/cdi/javaee-integration/cdi-servlet-3.0-annotation-with-web-inf-lib-extension-alternative/servlet/test/beans/artifacts/TestDatabase.java
+++ b/appserver/tests/appserv-tests/devtests/cdi/javaee-integration/cdi-servlet-3.0-annotation-with-web-inf-lib-extension-alternative/servlet/test/beans/artifacts/TestDatabase.java
@@ -25,7 +25,7 @@
import java.lang.annotation.RetentionPolicy;
import java.lang.annotation.Target;
-import javax.inject.Qualifier;
+import jakarta.inject.Qualifier;
@Qualifier
@Target({ TYPE, METHOD, PARAMETER, FIELD })
diff --git a/appserver/tests/appserv-tests/devtests/cdi/javaee-integration/cdi-servlet-3.0-annotation-with-web-inf-lib-extension-alternative/servlet/test/servlet/TestServlet.java b/appserver/tests/appserv-tests/devtests/cdi/javaee-integration/cdi-servlet-3.0-annotation-with-web-inf-lib-extension-alternative/servlet/test/servlet/TestServlet.java
index 0b96910..5171fbe 100644
--- a/appserver/tests/appserv-tests/devtests/cdi/javaee-integration/cdi-servlet-3.0-annotation-with-web-inf-lib-extension-alternative/servlet/test/servlet/TestServlet.java
+++ b/appserver/tests/appserv-tests/devtests/cdi/javaee-integration/cdi-servlet-3.0-annotation-with-web-inf-lib-extension-alternative/servlet/test/servlet/TestServlet.java
@@ -24,7 +24,7 @@
import javax.enterprise.inject.Any;
import javax.enterprise.inject.spi.BeanManager;
import javax.enterprise.util.AnnotationLiteral;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
import javax.naming.InitialContext;
import jakarta.persistence.EntityManager;
import jakarta.persistence.EntityManagerFactory;
diff --git a/appserver/tests/appserv-tests/devtests/cdi/javaee-integration/cdi-servlet-3.0-annotation-with-web-inf-lib-extension-alternative/servlet/test/util/JPAResourceProducer.java b/appserver/tests/appserv-tests/devtests/cdi/javaee-integration/cdi-servlet-3.0-annotation-with-web-inf-lib-extension-alternative/servlet/test/util/JPAResourceProducer.java
index 470fcbf..6ba0c64 100644
--- a/appserver/tests/appserv-tests/devtests/cdi/javaee-integration/cdi-servlet-3.0-annotation-with-web-inf-lib-extension-alternative/servlet/test/util/JPAResourceProducer.java
+++ b/appserver/tests/appserv-tests/devtests/cdi/javaee-integration/cdi-servlet-3.0-annotation-with-web-inf-lib-extension-alternative/servlet/test/util/JPAResourceProducer.java
@@ -17,7 +17,7 @@
package test.util;
import javax.enterprise.inject.Produces;
-import javax.inject.Singleton;
+import jakarta.inject.Singleton;
import jakarta.persistence.EntityManager;
import jakarta.persistence.PersistenceContext;
diff --git a/appserver/tests/appserv-tests/devtests/cdi/javaee-integration/cdi-servlet-3.0-annotation-with-web-inf-lib-extension-alternative/util/test/beans/wbinflib/AnotherTestBeanInWebInfLib.java b/appserver/tests/appserv-tests/devtests/cdi/javaee-integration/cdi-servlet-3.0-annotation-with-web-inf-lib-extension-alternative/util/test/beans/wbinflib/AnotherTestBeanInWebInfLib.java
index 3140fe1..5ed3a76 100644
--- a/appserver/tests/appserv-tests/devtests/cdi/javaee-integration/cdi-servlet-3.0-annotation-with-web-inf-lib-extension-alternative/util/test/beans/wbinflib/AnotherTestBeanInWebInfLib.java
+++ b/appserver/tests/appserv-tests/devtests/cdi/javaee-integration/cdi-servlet-3.0-annotation-with-web-inf-lib-extension-alternative/util/test/beans/wbinflib/AnotherTestBeanInWebInfLib.java
@@ -16,7 +16,7 @@
package test.beans.wbinflib;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
public class AnotherTestBeanInWebInfLib {
@Inject
diff --git a/appserver/tests/appserv-tests/devtests/cdi/javaee-integration/cdi-servlet-3.0-annotation-with-web-inf-lib-extension-alternative/util/test/beans/wbinflib/TestBeanInWebInfLib.java b/appserver/tests/appserv-tests/devtests/cdi/javaee-integration/cdi-servlet-3.0-annotation-with-web-inf-lib-extension-alternative/util/test/beans/wbinflib/TestBeanInWebInfLib.java
index 061a146..6b1cf6e 100644
--- a/appserver/tests/appserv-tests/devtests/cdi/javaee-integration/cdi-servlet-3.0-annotation-with-web-inf-lib-extension-alternative/util/test/beans/wbinflib/TestBeanInWebInfLib.java
+++ b/appserver/tests/appserv-tests/devtests/cdi/javaee-integration/cdi-servlet-3.0-annotation-with-web-inf-lib-extension-alternative/util/test/beans/wbinflib/TestBeanInWebInfLib.java
@@ -21,7 +21,7 @@
import javax.enterprise.inject.spi.Bean;
import javax.enterprise.inject.spi.BeanManager;
import javax.enterprise.util.AnnotationLiteral;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
import jakarta.persistence.EntityManager;
import jakarta.persistence.PersistenceContext;
diff --git a/appserver/tests/appserv-tests/devtests/cdi/javaee-integration/cdi-servlet-3.0-annotation-with-web-inf-lib-javaee-injection/servlet/test/beans/TestBean.java b/appserver/tests/appserv-tests/devtests/cdi/javaee-integration/cdi-servlet-3.0-annotation-with-web-inf-lib-javaee-injection/servlet/test/beans/TestBean.java
index 019486c..9c3d6f0 100644
--- a/appserver/tests/appserv-tests/devtests/cdi/javaee-integration/cdi-servlet-3.0-annotation-with-web-inf-lib-javaee-injection/servlet/test/beans/TestBean.java
+++ b/appserver/tests/appserv-tests/devtests/cdi/javaee-integration/cdi-servlet-3.0-annotation-with-web-inf-lib-javaee-injection/servlet/test/beans/TestBean.java
@@ -17,7 +17,7 @@
package test.beans;
import javax.enterprise.context.RequestScoped;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
import jakarta.persistence.EntityManager;
import test.beans.artifacts.Preferred;
diff --git a/appserver/tests/appserv-tests/devtests/cdi/javaee-integration/cdi-servlet-3.0-annotation-with-web-inf-lib-javaee-injection/servlet/test/beans/artifacts/Preferred.java b/appserver/tests/appserv-tests/devtests/cdi/javaee-integration/cdi-servlet-3.0-annotation-with-web-inf-lib-javaee-injection/servlet/test/beans/artifacts/Preferred.java
index b7584c8..f5cad81 100644
--- a/appserver/tests/appserv-tests/devtests/cdi/javaee-integration/cdi-servlet-3.0-annotation-with-web-inf-lib-javaee-injection/servlet/test/beans/artifacts/Preferred.java
+++ b/appserver/tests/appserv-tests/devtests/cdi/javaee-integration/cdi-servlet-3.0-annotation-with-web-inf-lib-javaee-injection/servlet/test/beans/artifacts/Preferred.java
@@ -25,7 +25,7 @@
import java.lang.annotation.RetentionPolicy;
import java.lang.annotation.Target;
-import javax.inject.Qualifier;
+import jakarta.inject.Qualifier;
@Qualifier
@Target({ TYPE, METHOD, PARAMETER, FIELD })
diff --git a/appserver/tests/appserv-tests/devtests/cdi/javaee-integration/cdi-servlet-3.0-annotation-with-web-inf-lib-javaee-injection/servlet/test/beans/artifacts/TestDatabase.java b/appserver/tests/appserv-tests/devtests/cdi/javaee-integration/cdi-servlet-3.0-annotation-with-web-inf-lib-javaee-injection/servlet/test/beans/artifacts/TestDatabase.java
index b69ab8e..28cd41b 100644
--- a/appserver/tests/appserv-tests/devtests/cdi/javaee-integration/cdi-servlet-3.0-annotation-with-web-inf-lib-javaee-injection/servlet/test/beans/artifacts/TestDatabase.java
+++ b/appserver/tests/appserv-tests/devtests/cdi/javaee-integration/cdi-servlet-3.0-annotation-with-web-inf-lib-javaee-injection/servlet/test/beans/artifacts/TestDatabase.java
@@ -25,7 +25,7 @@
import java.lang.annotation.RetentionPolicy;
import java.lang.annotation.Target;
-import javax.inject.Qualifier;
+import jakarta.inject.Qualifier;
@Qualifier
@Target({ TYPE, METHOD, PARAMETER, FIELD })
diff --git a/appserver/tests/appserv-tests/devtests/cdi/javaee-integration/cdi-servlet-3.0-annotation-with-web-inf-lib-javaee-injection/servlet/test/servlet/TestServlet.java b/appserver/tests/appserv-tests/devtests/cdi/javaee-integration/cdi-servlet-3.0-annotation-with-web-inf-lib-javaee-injection/servlet/test/servlet/TestServlet.java
index a9ed8ef..e354e7b 100644
--- a/appserver/tests/appserv-tests/devtests/cdi/javaee-integration/cdi-servlet-3.0-annotation-with-web-inf-lib-javaee-injection/servlet/test/servlet/TestServlet.java
+++ b/appserver/tests/appserv-tests/devtests/cdi/javaee-integration/cdi-servlet-3.0-annotation-with-web-inf-lib-javaee-injection/servlet/test/servlet/TestServlet.java
@@ -24,7 +24,7 @@
import javax.enterprise.inject.Any;
import javax.enterprise.inject.spi.BeanManager;
import javax.enterprise.util.AnnotationLiteral;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
import javax.naming.InitialContext;
import jakarta.persistence.EntityManager;
import jakarta.persistence.EntityManagerFactory;
diff --git a/appserver/tests/appserv-tests/devtests/cdi/javaee-integration/cdi-servlet-3.0-annotation-with-web-inf-lib-javaee-injection/servlet/test/util/JPAResourceProducer.java b/appserver/tests/appserv-tests/devtests/cdi/javaee-integration/cdi-servlet-3.0-annotation-with-web-inf-lib-javaee-injection/servlet/test/util/JPAResourceProducer.java
index 470fcbf..6ba0c64 100644
--- a/appserver/tests/appserv-tests/devtests/cdi/javaee-integration/cdi-servlet-3.0-annotation-with-web-inf-lib-javaee-injection/servlet/test/util/JPAResourceProducer.java
+++ b/appserver/tests/appserv-tests/devtests/cdi/javaee-integration/cdi-servlet-3.0-annotation-with-web-inf-lib-javaee-injection/servlet/test/util/JPAResourceProducer.java
@@ -17,7 +17,7 @@
package test.util;
import javax.enterprise.inject.Produces;
-import javax.inject.Singleton;
+import jakarta.inject.Singleton;
import jakarta.persistence.EntityManager;
import jakarta.persistence.PersistenceContext;
diff --git a/appserver/tests/appserv-tests/devtests/cdi/javaee-integration/cdi-servlet-3.0-annotation-with-web-inf-lib-javaee-injection/util/test/beans/wbinflib/TestBeanInWebInfLib.java b/appserver/tests/appserv-tests/devtests/cdi/javaee-integration/cdi-servlet-3.0-annotation-with-web-inf-lib-javaee-injection/util/test/beans/wbinflib/TestBeanInWebInfLib.java
index f7395a6..2cee02f 100644
--- a/appserver/tests/appserv-tests/devtests/cdi/javaee-integration/cdi-servlet-3.0-annotation-with-web-inf-lib-javaee-injection/util/test/beans/wbinflib/TestBeanInWebInfLib.java
+++ b/appserver/tests/appserv-tests/devtests/cdi/javaee-integration/cdi-servlet-3.0-annotation-with-web-inf-lib-javaee-injection/util/test/beans/wbinflib/TestBeanInWebInfLib.java
@@ -22,7 +22,7 @@
import javax.enterprise.inject.spi.Bean;
import javax.enterprise.inject.spi.BeanManager;
import javax.enterprise.util.AnnotationLiteral;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
import jakarta.persistence.EntityManager;
import jakarta.persistence.PersistenceContext;
diff --git a/appserver/tests/appserv-tests/devtests/cdi/javaee-integration/cdi-servlet-3.0-annotation-with-web-inf-lib-ordering-reversed/servlet/TestServlet.java b/appserver/tests/appserv-tests/devtests/cdi/javaee-integration/cdi-servlet-3.0-annotation-with-web-inf-lib-ordering-reversed/servlet/TestServlet.java
index e3cf013..14e9b3c 100644
--- a/appserver/tests/appserv-tests/devtests/cdi/javaee-integration/cdi-servlet-3.0-annotation-with-web-inf-lib-ordering-reversed/servlet/TestServlet.java
+++ b/appserver/tests/appserv-tests/devtests/cdi/javaee-integration/cdi-servlet-3.0-annotation-with-web-inf-lib-ordering-reversed/servlet/TestServlet.java
@@ -25,7 +25,7 @@
import javax.servlet.http.HttpServlet;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
import javax.enterprise.inject.Any;
import javax.enterprise.inject.Default;
import javax.enterprise.inject.spi.BeanManager;
diff --git a/appserver/tests/appserv-tests/devtests/cdi/javaee-integration/cdi-servlet-3.0-annotation-with-web-inf-lib-ordering-reversed/util2/Bar.java b/appserver/tests/appserv-tests/devtests/cdi/javaee-integration/cdi-servlet-3.0-annotation-with-web-inf-lib-ordering-reversed/util2/Bar.java
index f15bc53..ead2389 100644
--- a/appserver/tests/appserv-tests/devtests/cdi/javaee-integration/cdi-servlet-3.0-annotation-with-web-inf-lib-ordering-reversed/util2/Bar.java
+++ b/appserver/tests/appserv-tests/devtests/cdi/javaee-integration/cdi-servlet-3.0-annotation-with-web-inf-lib-ordering-reversed/util2/Bar.java
@@ -16,6 +16,6 @@
@javax.enterprise.context.RequestScoped
public class Bar{
-@javax.inject.Inject
+@jakarta.inject.Inject
Foo f;
}
diff --git a/appserver/tests/appserv-tests/devtests/cdi/javaee-integration/cdi-servlet-3.0-annotation-with-web-inf-lib-ordering/servlet/TestServlet.java b/appserver/tests/appserv-tests/devtests/cdi/javaee-integration/cdi-servlet-3.0-annotation-with-web-inf-lib-ordering/servlet/TestServlet.java
index e3cf013..14e9b3c 100644
--- a/appserver/tests/appserv-tests/devtests/cdi/javaee-integration/cdi-servlet-3.0-annotation-with-web-inf-lib-ordering/servlet/TestServlet.java
+++ b/appserver/tests/appserv-tests/devtests/cdi/javaee-integration/cdi-servlet-3.0-annotation-with-web-inf-lib-ordering/servlet/TestServlet.java
@@ -25,7 +25,7 @@
import javax.servlet.http.HttpServlet;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
import javax.enterprise.inject.Any;
import javax.enterprise.inject.Default;
import javax.enterprise.inject.spi.BeanManager;
diff --git a/appserver/tests/appserv-tests/devtests/cdi/javaee-integration/cdi-servlet-3.0-annotation-with-web-inf-lib-ordering/util2/Bar.java b/appserver/tests/appserv-tests/devtests/cdi/javaee-integration/cdi-servlet-3.0-annotation-with-web-inf-lib-ordering/util2/Bar.java
index f15bc53..ead2389 100644
--- a/appserver/tests/appserv-tests/devtests/cdi/javaee-integration/cdi-servlet-3.0-annotation-with-web-inf-lib-ordering/util2/Bar.java
+++ b/appserver/tests/appserv-tests/devtests/cdi/javaee-integration/cdi-servlet-3.0-annotation-with-web-inf-lib-ordering/util2/Bar.java
@@ -16,6 +16,6 @@
@javax.enterprise.context.RequestScoped
public class Bar{
-@javax.inject.Inject
+@jakarta.inject.Inject
Foo f;
}
diff --git a/appserver/tests/appserv-tests/devtests/cdi/javaee-integration/cdi-servlet-3.0-annotation-with-web-inf-lib/servlet/TestServlet.java b/appserver/tests/appserv-tests/devtests/cdi/javaee-integration/cdi-servlet-3.0-annotation-with-web-inf-lib/servlet/TestServlet.java
index 9145274..214abf8 100644
--- a/appserver/tests/appserv-tests/devtests/cdi/javaee-integration/cdi-servlet-3.0-annotation-with-web-inf-lib/servlet/TestServlet.java
+++ b/appserver/tests/appserv-tests/devtests/cdi/javaee-integration/cdi-servlet-3.0-annotation-with-web-inf-lib/servlet/TestServlet.java
@@ -25,7 +25,7 @@
import javax.servlet.http.HttpServlet;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
import javax.enterprise.inject.Any;
import javax.enterprise.inject.Default;
import javax.enterprise.inject.spi.BeanManager;
diff --git a/appserver/tests/appserv-tests/devtests/cdi/javaee-integration/cdi-servlet-3.0-annotation-with-web-inf-lib/util/TestBeanInWebInfLib.java b/appserver/tests/appserv-tests/devtests/cdi/javaee-integration/cdi-servlet-3.0-annotation-with-web-inf-lib/util/TestBeanInWebInfLib.java
index 2658910..b9713a9 100644
--- a/appserver/tests/appserv-tests/devtests/cdi/javaee-integration/cdi-servlet-3.0-annotation-with-web-inf-lib/util/TestBeanInWebInfLib.java
+++ b/appserver/tests/appserv-tests/devtests/cdi/javaee-integration/cdi-servlet-3.0-annotation-with-web-inf-lib/util/TestBeanInWebInfLib.java
@@ -19,7 +19,7 @@
import javax.enterprise.inject.Any;
import javax.enterprise.inject.spi.BeanManager;
import javax.enterprise.util.AnnotationLiteral;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
import javax.enterprise.inject.spi.Bean;
public class TestBeanInWebInfLib {
diff --git a/appserver/tests/appserv-tests/devtests/cdi/javaee-integration/embedded-resource-adapter-as-bean-archive/app/src/mdb/MyMessageBean.java b/appserver/tests/appserv-tests/devtests/cdi/javaee-integration/embedded-resource-adapter-as-bean-archive/app/src/mdb/MyMessageBean.java
index 7422ff3..dd02039 100644
--- a/appserver/tests/appserv-tests/devtests/cdi/javaee-integration/embedded-resource-adapter-as-bean-archive/app/src/mdb/MyMessageBean.java
+++ b/appserver/tests/appserv-tests/devtests/cdi/javaee-integration/embedded-resource-adapter-as-bean-archive/app/src/mdb/MyMessageBean.java
@@ -33,7 +33,7 @@
private transient MessageDrivenContext mdc = null;
private Context context;
- @javax.inject.Inject
+ @jakarta.inject.Inject
private connector.TestCDIBean tb;
/**
diff --git a/appserver/tests/appserv-tests/devtests/cdi/javaee-integration/no-interface-local-view-proxy-serializable/servlet/test/beans/nonmock/TestBean.java b/appserver/tests/appserv-tests/devtests/cdi/javaee-integration/no-interface-local-view-proxy-serializable/servlet/test/beans/nonmock/TestBean.java
index 5099e36..9c66252 100644
--- a/appserver/tests/appserv-tests/devtests/cdi/javaee-integration/no-interface-local-view-proxy-serializable/servlet/test/beans/nonmock/TestBean.java
+++ b/appserver/tests/appserv-tests/devtests/cdi/javaee-integration/no-interface-local-view-proxy-serializable/servlet/test/beans/nonmock/TestBean.java
@@ -19,7 +19,7 @@
import java.io.Serializable;
import javax.enterprise.context.SessionScoped;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
import test.beans.TestBeanInterface;
import test.ejb.HelloNoInterfaceLocalViewSfulEJB;
diff --git a/appserver/tests/appserv-tests/devtests/cdi/javaee-integration/no-interface-local-view-proxy-serializable/servlet/test/servlet/NoInterfaceProxySerializableEJBTestServlet.java b/appserver/tests/appserv-tests/devtests/cdi/javaee-integration/no-interface-local-view-proxy-serializable/servlet/test/servlet/NoInterfaceProxySerializableEJBTestServlet.java
index 13a603b..245f48b 100644
--- a/appserver/tests/appserv-tests/devtests/cdi/javaee-integration/no-interface-local-view-proxy-serializable/servlet/test/servlet/NoInterfaceProxySerializableEJBTestServlet.java
+++ b/appserver/tests/appserv-tests/devtests/cdi/javaee-integration/no-interface-local-view-proxy-serializable/servlet/test/servlet/NoInterfaceProxySerializableEJBTestServlet.java
@@ -24,7 +24,7 @@
import java.io.ObjectOutputStream;
import java.io.PrintWriter;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
import javax.servlet.ServletException;
import javax.servlet.annotation.WebServlet;
import javax.servlet.http.HttpServlet;
diff --git a/appserver/tests/appserv-tests/devtests/cdi/javaee-integration/normal-bean-injection-ear/war/com/acme/NormalLookupInEARServlet.java b/appserver/tests/appserv-tests/devtests/cdi/javaee-integration/normal-bean-injection-ear/war/com/acme/NormalLookupInEARServlet.java
index 13649f5..426f592 100644
--- a/appserver/tests/appserv-tests/devtests/cdi/javaee-integration/normal-bean-injection-ear/war/com/acme/NormalLookupInEARServlet.java
+++ b/appserver/tests/appserv-tests/devtests/cdi/javaee-integration/normal-bean-injection-ear/war/com/acme/NormalLookupInEARServlet.java
@@ -22,7 +22,7 @@
import jakarta.annotation.Resource;
import jakarta.ejb.EJB;
import javax.enterprise.inject.Instance;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
import javax.naming.InitialContext;
import javax.servlet.ServletConfig;
import javax.servlet.ServletException;
diff --git a/appserver/tests/appserv-tests/devtests/cdi/javaee-integration/programmatic-lookup-ear/war/com/acme/ProgrammaticLookupInEARServlet.java b/appserver/tests/appserv-tests/devtests/cdi/javaee-integration/programmatic-lookup-ear/war/com/acme/ProgrammaticLookupInEARServlet.java
index 8f0c6d7..6352661 100644
--- a/appserver/tests/appserv-tests/devtests/cdi/javaee-integration/programmatic-lookup-ear/war/com/acme/ProgrammaticLookupInEARServlet.java
+++ b/appserver/tests/appserv-tests/devtests/cdi/javaee-integration/programmatic-lookup-ear/war/com/acme/ProgrammaticLookupInEARServlet.java
@@ -22,7 +22,7 @@
import jakarta.annotation.Resource;
import jakarta.ejb.EJB;
import javax.enterprise.inject.Instance;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
import javax.naming.InitialContext;
import javax.servlet.ServletConfig;
import javax.servlet.ServletException;
diff --git a/appserver/tests/appserv-tests/devtests/cdi/javaee-integration/servlet-context-injection-cdi/servlet/tests/cdi/artifacts/Destroyed.java b/appserver/tests/appserv-tests/devtests/cdi/javaee-integration/servlet-context-injection-cdi/servlet/tests/cdi/artifacts/Destroyed.java
index 38d4216..61ef24a 100644
--- a/appserver/tests/appserv-tests/devtests/cdi/javaee-integration/servlet-context-injection-cdi/servlet/tests/cdi/artifacts/Destroyed.java
+++ b/appserver/tests/appserv-tests/devtests/cdi/javaee-integration/servlet-context-injection-cdi/servlet/tests/cdi/artifacts/Destroyed.java
@@ -25,7 +25,7 @@
import java.lang.annotation.RetentionPolicy;
import java.lang.annotation.Target;
-import javax.inject.Qualifier;
+import jakarta.inject.Qualifier;
@Qualifier
@Target({TYPE, METHOD, PARAMETER, FIELD})
diff --git a/appserver/tests/appserv-tests/devtests/cdi/javaee-integration/servlet-context-injection-cdi/servlet/tests/cdi/artifacts/Initialized.java b/appserver/tests/appserv-tests/devtests/cdi/javaee-integration/servlet-context-injection-cdi/servlet/tests/cdi/artifacts/Initialized.java
index 59788c2..9a0a18e 100644
--- a/appserver/tests/appserv-tests/devtests/cdi/javaee-integration/servlet-context-injection-cdi/servlet/tests/cdi/artifacts/Initialized.java
+++ b/appserver/tests/appserv-tests/devtests/cdi/javaee-integration/servlet-context-injection-cdi/servlet/tests/cdi/artifacts/Initialized.java
@@ -25,7 +25,7 @@
import java.lang.annotation.RetentionPolicy;
import java.lang.annotation.Target;
-import javax.inject.Qualifier;
+import jakarta.inject.Qualifier;
@Qualifier
@Target({TYPE, METHOD, PARAMETER, FIELD})
diff --git a/appserver/tests/appserv-tests/devtests/cdi/javaee-integration/servlet-context-injection-cdi/servlet/tests/cdi/artifacts/Preferred.java b/appserver/tests/appserv-tests/devtests/cdi/javaee-integration/servlet-context-injection-cdi/servlet/tests/cdi/artifacts/Preferred.java
index d10f685..83fe44e 100644
--- a/appserver/tests/appserv-tests/devtests/cdi/javaee-integration/servlet-context-injection-cdi/servlet/tests/cdi/artifacts/Preferred.java
+++ b/appserver/tests/appserv-tests/devtests/cdi/javaee-integration/servlet-context-injection-cdi/servlet/tests/cdi/artifacts/Preferred.java
@@ -25,7 +25,7 @@
import java.lang.annotation.RetentionPolicy;
import java.lang.annotation.Target;
-import javax.inject.Qualifier;
+import jakarta.inject.Qualifier;
@Qualifier
@Target({TYPE, METHOD, PARAMETER, FIELD})
diff --git a/appserver/tests/appserv-tests/devtests/cdi/javaee-integration/servlet-context-injection-cdi/servlet/tests/cdi/context/ServletContextBridge.java b/appserver/tests/appserv-tests/devtests/cdi/javaee-integration/servlet-context-injection-cdi/servlet/tests/cdi/context/ServletContextBridge.java
index c978a9b..d99d01b 100644
--- a/appserver/tests/appserv-tests/devtests/cdi/javaee-integration/servlet-context-injection-cdi/servlet/tests/cdi/context/ServletContextBridge.java
+++ b/appserver/tests/appserv-tests/devtests/cdi/javaee-integration/servlet-context-injection-cdi/servlet/tests/cdi/context/ServletContextBridge.java
@@ -20,7 +20,7 @@
import javax.enterprise.inject.spi.BeanManager;
import javax.enterprise.util.AnnotationLiteral;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
import javax.servlet.ServletContextEvent;
import javax.servlet.ServletContextListener;
import javax.servlet.annotation.WebListener;
diff --git a/appserver/tests/appserv-tests/devtests/cdi/javaee-integration/servlet-context-injection-cdi/servlet/tests/cdi/context/ServletContextProducer.java b/appserver/tests/appserv-tests/devtests/cdi/javaee-integration/servlet-context-injection-cdi/servlet/tests/cdi/context/ServletContextProducer.java
index 964aac0..478b7e1 100644
--- a/appserver/tests/appserv-tests/devtests/cdi/javaee-integration/servlet-context-injection-cdi/servlet/tests/cdi/context/ServletContextProducer.java
+++ b/appserver/tests/appserv-tests/devtests/cdi/javaee-integration/servlet-context-injection-cdi/servlet/tests/cdi/context/ServletContextProducer.java
@@ -21,7 +21,7 @@
//import javax.enterprise.event.Observes;
//import javax.enterprise.inject.Produces;
//import javax.enterprise.inject.spi.BeanManager;
-//import javax.inject.Inject;
+//import jakarta.inject.Inject;
//import javax.servlet.ServletContext;
//import javax.servlet.ServletContextEvent;
//
diff --git a/appserver/tests/appserv-tests/devtests/cdi/javaee-integration/servlet-context-injection-cdi/servlet/tests/cdi/servlet/TestBean.java b/appserver/tests/appserv-tests/devtests/cdi/javaee-integration/servlet-context-injection-cdi/servlet/tests/cdi/servlet/TestBean.java
index 182be84..276d9ab 100644
--- a/appserver/tests/appserv-tests/devtests/cdi/javaee-integration/servlet-context-injection-cdi/servlet/tests/cdi/servlet/TestBean.java
+++ b/appserver/tests/appserv-tests/devtests/cdi/javaee-integration/servlet-context-injection-cdi/servlet/tests/cdi/servlet/TestBean.java
@@ -16,7 +16,7 @@
package tests.cdi.servlet;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
import javax.servlet.ServletContext;
//Simple TestBean to test CDI.
diff --git a/appserver/tests/appserv-tests/devtests/cdi/javaee-integration/servlet-context-injection-cdi/servlet/tests/cdi/servlet/TestServlet.java b/appserver/tests/appserv-tests/devtests/cdi/javaee-integration/servlet-context-injection-cdi/servlet/tests/cdi/servlet/TestServlet.java
index 8c70b32..d704e57 100644
--- a/appserver/tests/appserv-tests/devtests/cdi/javaee-integration/servlet-context-injection-cdi/servlet/tests/cdi/servlet/TestServlet.java
+++ b/appserver/tests/appserv-tests/devtests/cdi/javaee-integration/servlet-context-injection-cdi/servlet/tests/cdi/servlet/TestServlet.java
@@ -20,7 +20,7 @@
import java.io.PrintWriter;
import javax.enterprise.inject.spi.BeanManager;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
import javax.naming.InitialContext;
import javax.servlet.ServletContext;
import javax.servlet.ServletException;
diff --git a/appserver/tests/appserv-tests/devtests/cdi/javaee-integration/simple-managed-bean-interceptor-noargconstructor-missing/servlet/test/beans/TestManagedBean.java b/appserver/tests/appserv-tests/devtests/cdi/javaee-integration/simple-managed-bean-interceptor-noargconstructor-missing/servlet/test/beans/TestManagedBean.java
index c112ea9..8bc8014 100644
--- a/appserver/tests/appserv-tests/devtests/cdi/javaee-integration/simple-managed-bean-interceptor-noargconstructor-missing/servlet/test/beans/TestManagedBean.java
+++ b/appserver/tests/appserv-tests/devtests/cdi/javaee-integration/simple-managed-bean-interceptor-noargconstructor-missing/servlet/test/beans/TestManagedBean.java
@@ -29,7 +29,7 @@
}
*/
- @javax.inject.Inject //Constructor based Injection
+ @jakarta.inject.Inject //Constructor based Injection
public TestManagedBean(TestBean tb){
this.tb = tb;
}
diff --git a/appserver/tests/appserv-tests/devtests/cdi/javaee-integration/simple-managed-bean-interceptor-noargconstructor-missing/servlet/test/servlet/TestServlet.java b/appserver/tests/appserv-tests/devtests/cdi/javaee-integration/simple-managed-bean-interceptor-noargconstructor-missing/servlet/test/servlet/TestServlet.java
index 64b65b6..6caedba 100644
--- a/appserver/tests/appserv-tests/devtests/cdi/javaee-integration/simple-managed-bean-interceptor-noargconstructor-missing/servlet/test/servlet/TestServlet.java
+++ b/appserver/tests/appserv-tests/devtests/cdi/javaee-integration/simple-managed-bean-interceptor-noargconstructor-missing/servlet/test/servlet/TestServlet.java
@@ -34,7 +34,7 @@
urlPatterns={"/myurl"},
initParams={ @WebInitParam(name="n1", value="v1"), @WebInitParam(name="n2", value="v2") } )
public class TestServlet extends HttpServlet {
- @javax.inject.Inject TestManagedBean tb1;
+ @jakarta.inject.Inject TestManagedBean tb1;
@jakarta.annotation.Resource TestManagedBean tb;
public void service(HttpServletRequest req, HttpServletResponse res)
diff --git a/appserver/tests/appserv-tests/devtests/cdi/javaee-integration/simple-managed-bean-interceptor-nonnull-package/servlet/test/beans/TestManagedBean.java b/appserver/tests/appserv-tests/devtests/cdi/javaee-integration/simple-managed-bean-interceptor-nonnull-package/servlet/test/beans/TestManagedBean.java
index 8bf4f51..1633c1e 100644
--- a/appserver/tests/appserv-tests/devtests/cdi/javaee-integration/simple-managed-bean-interceptor-nonnull-package/servlet/test/beans/TestManagedBean.java
+++ b/appserver/tests/appserv-tests/devtests/cdi/javaee-integration/simple-managed-bean-interceptor-nonnull-package/servlet/test/beans/TestManagedBean.java
@@ -27,7 +27,7 @@
public TestManagedBean(){
}
- @javax.inject.Inject //Constructor based Injection
+ @jakarta.inject.Inject //Constructor based Injection
public TestManagedBean(TestBean tb){
this.tb = tb;
}
diff --git a/appserver/tests/appserv-tests/devtests/cdi/javaee-integration/simple-managed-bean-interceptor-nonnull-package/servlet/test/servlet/TestServlet.java b/appserver/tests/appserv-tests/devtests/cdi/javaee-integration/simple-managed-bean-interceptor-nonnull-package/servlet/test/servlet/TestServlet.java
index b255024..e3d3f10 100644
--- a/appserver/tests/appserv-tests/devtests/cdi/javaee-integration/simple-managed-bean-interceptor-nonnull-package/servlet/test/servlet/TestServlet.java
+++ b/appserver/tests/appserv-tests/devtests/cdi/javaee-integration/simple-managed-bean-interceptor-nonnull-package/servlet/test/servlet/TestServlet.java
@@ -34,7 +34,7 @@
urlPatterns={"/myurl"},
initParams={ @WebInitParam(name="n1", value="v1"), @WebInitParam(name="n2", value="v2") } )
public class TestServlet extends HttpServlet {
- @javax.inject.Inject TestManagedBean tb1;
+ @jakarta.inject.Inject TestManagedBean tb1;
@jakarta.annotation.Resource TestManagedBean tb;
public void service(HttpServletRequest req, HttpServletResponse res)
diff --git a/appserver/tests/appserv-tests/devtests/cdi/javaee-integration/standalone-resource-adapter-as-bean-archive/app/src/mdb/MyMessageBean.java b/appserver/tests/appserv-tests/devtests/cdi/javaee-integration/standalone-resource-adapter-as-bean-archive/app/src/mdb/MyMessageBean.java
index 5bf9109..2be0f81 100644
--- a/appserver/tests/appserv-tests/devtests/cdi/javaee-integration/standalone-resource-adapter-as-bean-archive/app/src/mdb/MyMessageBean.java
+++ b/appserver/tests/appserv-tests/devtests/cdi/javaee-integration/standalone-resource-adapter-as-bean-archive/app/src/mdb/MyMessageBean.java
@@ -45,7 +45,7 @@
private transient MessageDrivenContext mdc = null;
private Context context;
- @javax.inject.Inject
+ @jakarta.inject.Inject
private connector.TestCDIBean tb;
/**
diff --git a/appserver/tests/appserv-tests/devtests/cdi/managed-beans/managed-bean-lifecycle-polymorphism/servlet/com/tests/TestServlet.java b/appserver/tests/appserv-tests/devtests/cdi/managed-beans/managed-bean-lifecycle-polymorphism/servlet/com/tests/TestServlet.java
index a8703dc..6075a2c 100644
--- a/appserver/tests/appserv-tests/devtests/cdi/managed-beans/managed-bean-lifecycle-polymorphism/servlet/com/tests/TestServlet.java
+++ b/appserver/tests/appserv-tests/devtests/cdi/managed-beans/managed-bean-lifecycle-polymorphism/servlet/com/tests/TestServlet.java
@@ -34,7 +34,7 @@
initParams={ @WebInitParam(name="n1", value="v1"), @WebInitParam(name="n2", value="v2") } )
public class TestServlet extends HttpServlet {
- @javax.inject.Inject
+ @jakarta.inject.Inject
TestManagedBean testResource;
public void service(HttpServletRequest req, HttpServletResponse res)
diff --git a/appserver/tests/appserv-tests/devtests/cdi/osgi-cdi/simple-wab-with-cdi/servlet/tests/cdi/TestServlet.java b/appserver/tests/appserv-tests/devtests/cdi/osgi-cdi/simple-wab-with-cdi/servlet/tests/cdi/TestServlet.java
index 9e733d8..a3be8e7 100644
--- a/appserver/tests/appserv-tests/devtests/cdi/osgi-cdi/simple-wab-with-cdi/servlet/tests/cdi/TestServlet.java
+++ b/appserver/tests/appserv-tests/devtests/cdi/osgi-cdi/simple-wab-with-cdi/servlet/tests/cdi/TestServlet.java
@@ -26,7 +26,7 @@
import javax.servlet.http.HttpServlet;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
import javax.enterprise.inject.spi.BeanManager;
import javax.naming.InitialContext;
diff --git a/appserver/tests/appserv-tests/devtests/cdi/portable-extensions/bean-interface/servlet/test/beans/DuplicateTestBean.java b/appserver/tests/appserv-tests/devtests/cdi/portable-extensions/bean-interface/servlet/test/beans/DuplicateTestBean.java
index 6b766bc..0d2eb25 100644
--- a/appserver/tests/appserv-tests/devtests/cdi/portable-extensions/bean-interface/servlet/test/beans/DuplicateTestBean.java
+++ b/appserver/tests/appserv-tests/devtests/cdi/portable-extensions/bean-interface/servlet/test/beans/DuplicateTestBean.java
@@ -17,7 +17,7 @@
package test.beans;
import javax.enterprise.context.RequestScoped;
-import javax.inject.Named;
+import jakarta.inject.Named;
@Transactional
@RequestScoped
diff --git a/appserver/tests/appserv-tests/devtests/cdi/portable-extensions/bean-interface/servlet/test/beans/Preferred.java b/appserver/tests/appserv-tests/devtests/cdi/portable-extensions/bean-interface/servlet/test/beans/Preferred.java
index fa8fdb7..1e171f7 100644
--- a/appserver/tests/appserv-tests/devtests/cdi/portable-extensions/bean-interface/servlet/test/beans/Preferred.java
+++ b/appserver/tests/appserv-tests/devtests/cdi/portable-extensions/bean-interface/servlet/test/beans/Preferred.java
@@ -25,7 +25,7 @@
import java.lang.annotation.RetentionPolicy;
import java.lang.annotation.Target;
-import javax.inject.Qualifier;
+import jakarta.inject.Qualifier;
@Qualifier
@Target({ TYPE, METHOD, PARAMETER, FIELD })
diff --git a/appserver/tests/appserv-tests/devtests/cdi/portable-extensions/bean-interface/servlet/test/beans/TestNamedBean.java b/appserver/tests/appserv-tests/devtests/cdi/portable-extensions/bean-interface/servlet/test/beans/TestNamedBean.java
index 1c7c311..46dc161 100644
--- a/appserver/tests/appserv-tests/devtests/cdi/portable-extensions/bean-interface/servlet/test/beans/TestNamedBean.java
+++ b/appserver/tests/appserv-tests/devtests/cdi/portable-extensions/bean-interface/servlet/test/beans/TestNamedBean.java
@@ -17,7 +17,7 @@
package test.beans;
import javax.enterprise.context.RequestScoped;
-import javax.inject.Named;
+import jakarta.inject.Named;
@Named("test_named_bean")
@RequestScoped
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 e45e653..c8cd767 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
@@ -16,7 +16,7 @@
package test.beans;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
import jakarta.interceptor.AroundInvoke;
import jakarta.interceptor.Interceptor;
import jakarta.interceptor.InvocationContext;
diff --git a/appserver/tests/appserv-tests/devtests/cdi/portable-extensions/bean-interface/servlet/test/servlet/PortableExtensionBeanInterfaceTestServlet.java b/appserver/tests/appserv-tests/devtests/cdi/portable-extensions/bean-interface/servlet/test/servlet/PortableExtensionBeanInterfaceTestServlet.java
index 5012ab8..f1c4fb3 100644
--- a/appserver/tests/appserv-tests/devtests/cdi/portable-extensions/bean-interface/servlet/test/servlet/PortableExtensionBeanInterfaceTestServlet.java
+++ b/appserver/tests/appserv-tests/devtests/cdi/portable-extensions/bean-interface/servlet/test/servlet/PortableExtensionBeanInterfaceTestServlet.java
@@ -30,7 +30,7 @@
import javax.enterprise.inject.spi.Bean;
import javax.enterprise.inject.spi.BeanManager;
import javax.enterprise.util.AnnotationLiteral;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
import javax.naming.InitialContext;
import javax.naming.NamingException;
import javax.servlet.ServletException;
diff --git a/appserver/tests/appserv-tests/devtests/cdi/portable-extensions/bean-manager/servlet/test/beans/DuplicateTestBean.java b/appserver/tests/appserv-tests/devtests/cdi/portable-extensions/bean-manager/servlet/test/beans/DuplicateTestBean.java
index 6b766bc..0d2eb25 100644
--- a/appserver/tests/appserv-tests/devtests/cdi/portable-extensions/bean-manager/servlet/test/beans/DuplicateTestBean.java
+++ b/appserver/tests/appserv-tests/devtests/cdi/portable-extensions/bean-manager/servlet/test/beans/DuplicateTestBean.java
@@ -17,7 +17,7 @@
package test.beans;
import javax.enterprise.context.RequestScoped;
-import javax.inject.Named;
+import jakarta.inject.Named;
@Transactional
@RequestScoped
diff --git a/appserver/tests/appserv-tests/devtests/cdi/portable-extensions/bean-manager/servlet/test/beans/Preferred.java b/appserver/tests/appserv-tests/devtests/cdi/portable-extensions/bean-manager/servlet/test/beans/Preferred.java
index fa8fdb7..1e171f7 100644
--- a/appserver/tests/appserv-tests/devtests/cdi/portable-extensions/bean-manager/servlet/test/beans/Preferred.java
+++ b/appserver/tests/appserv-tests/devtests/cdi/portable-extensions/bean-manager/servlet/test/beans/Preferred.java
@@ -25,7 +25,7 @@
import java.lang.annotation.RetentionPolicy;
import java.lang.annotation.Target;
-import javax.inject.Qualifier;
+import jakarta.inject.Qualifier;
@Qualifier
@Target({ TYPE, METHOD, PARAMETER, FIELD })
diff --git a/appserver/tests/appserv-tests/devtests/cdi/portable-extensions/bean-manager/servlet/test/beans/TestNamedBean.java b/appserver/tests/appserv-tests/devtests/cdi/portable-extensions/bean-manager/servlet/test/beans/TestNamedBean.java
index 1c7c311..46dc161 100644
--- a/appserver/tests/appserv-tests/devtests/cdi/portable-extensions/bean-manager/servlet/test/beans/TestNamedBean.java
+++ b/appserver/tests/appserv-tests/devtests/cdi/portable-extensions/bean-manager/servlet/test/beans/TestNamedBean.java
@@ -17,7 +17,7 @@
package test.beans;
import javax.enterprise.context.RequestScoped;
-import javax.inject.Named;
+import jakarta.inject.Named;
@Named("test_named_bean")
@RequestScoped
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 e45e653..c8cd767 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
@@ -16,7 +16,7 @@
package test.beans;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
import jakarta.interceptor.AroundInvoke;
import jakarta.interceptor.Interceptor;
import jakarta.interceptor.InvocationContext;
diff --git a/appserver/tests/appserv-tests/devtests/cdi/portable-extensions/bean-manager/servlet/test/servlet/PortableExtensionBeanManagerTestServlet.java b/appserver/tests/appserv-tests/devtests/cdi/portable-extensions/bean-manager/servlet/test/servlet/PortableExtensionBeanManagerTestServlet.java
index b182c37..c5f1b15 100644
--- a/appserver/tests/appserv-tests/devtests/cdi/portable-extensions/bean-manager/servlet/test/servlet/PortableExtensionBeanManagerTestServlet.java
+++ b/appserver/tests/appserv-tests/devtests/cdi/portable-extensions/bean-manager/servlet/test/servlet/PortableExtensionBeanManagerTestServlet.java
@@ -24,7 +24,7 @@
import javax.enterprise.context.SessionScoped;
import javax.enterprise.inject.Default;
import javax.enterprise.inject.spi.BeanManager;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
import javax.naming.InitialContext;
import javax.naming.NamingException;
import javax.servlet.ServletException;
diff --git a/appserver/tests/appserv-tests/devtests/cdi/portable-extensions/injection-target/servlet/test/beans/DuplicateTestBean.java b/appserver/tests/appserv-tests/devtests/cdi/portable-extensions/injection-target/servlet/test/beans/DuplicateTestBean.java
index 6b766bc..0d2eb25 100644
--- a/appserver/tests/appserv-tests/devtests/cdi/portable-extensions/injection-target/servlet/test/beans/DuplicateTestBean.java
+++ b/appserver/tests/appserv-tests/devtests/cdi/portable-extensions/injection-target/servlet/test/beans/DuplicateTestBean.java
@@ -17,7 +17,7 @@
package test.beans;
import javax.enterprise.context.RequestScoped;
-import javax.inject.Named;
+import jakarta.inject.Named;
@Transactional
@RequestScoped
diff --git a/appserver/tests/appserv-tests/devtests/cdi/portable-extensions/injection-target/servlet/test/beans/Preferred.java b/appserver/tests/appserv-tests/devtests/cdi/portable-extensions/injection-target/servlet/test/beans/Preferred.java
index fa8fdb7..1e171f7 100644
--- a/appserver/tests/appserv-tests/devtests/cdi/portable-extensions/injection-target/servlet/test/beans/Preferred.java
+++ b/appserver/tests/appserv-tests/devtests/cdi/portable-extensions/injection-target/servlet/test/beans/Preferred.java
@@ -25,7 +25,7 @@
import java.lang.annotation.RetentionPolicy;
import java.lang.annotation.Target;
-import javax.inject.Qualifier;
+import jakarta.inject.Qualifier;
@Qualifier
@Target({ TYPE, METHOD, PARAMETER, FIELD })
diff --git a/appserver/tests/appserv-tests/devtests/cdi/portable-extensions/injection-target/servlet/test/beans/TestNamedBean.java b/appserver/tests/appserv-tests/devtests/cdi/portable-extensions/injection-target/servlet/test/beans/TestNamedBean.java
index 1c7c311..46dc161 100644
--- a/appserver/tests/appserv-tests/devtests/cdi/portable-extensions/injection-target/servlet/test/beans/TestNamedBean.java
+++ b/appserver/tests/appserv-tests/devtests/cdi/portable-extensions/injection-target/servlet/test/beans/TestNamedBean.java
@@ -17,7 +17,7 @@
package test.beans;
import javax.enterprise.context.RequestScoped;
-import javax.inject.Named;
+import jakarta.inject.Named;
@Named("test_named_bean")
@RequestScoped
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 e45e653..c8cd767 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
@@ -16,7 +16,7 @@
package test.beans;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
import jakarta.interceptor.AroundInvoke;
import jakarta.interceptor.Interceptor;
import jakarta.interceptor.InvocationContext;
diff --git a/appserver/tests/appserv-tests/devtests/cdi/portable-extensions/injection-target/servlet/test/framework/TestFrameworkClassWithConstructorInjection.java b/appserver/tests/appserv-tests/devtests/cdi/portable-extensions/injection-target/servlet/test/framework/TestFrameworkClassWithConstructorInjection.java
index 4a4101f..668db04 100644
--- a/appserver/tests/appserv-tests/devtests/cdi/portable-extensions/injection-target/servlet/test/framework/TestFrameworkClassWithConstructorInjection.java
+++ b/appserver/tests/appserv-tests/devtests/cdi/portable-extensions/injection-target/servlet/test/framework/TestFrameworkClassWithConstructorInjection.java
@@ -18,7 +18,7 @@
import jakarta.annotation.PostConstruct;
import jakarta.annotation.PreDestroy;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
import test.beans.Preferred;
import test.beans.TestBean;
diff --git a/appserver/tests/appserv-tests/devtests/cdi/portable-extensions/injection-target/servlet/test/framework/TestFrameworkClassWithSetterAndFieldInjection.java b/appserver/tests/appserv-tests/devtests/cdi/portable-extensions/injection-target/servlet/test/framework/TestFrameworkClassWithSetterAndFieldInjection.java
index 2d84caa..6e81e0e 100644
--- a/appserver/tests/appserv-tests/devtests/cdi/portable-extensions/injection-target/servlet/test/framework/TestFrameworkClassWithSetterAndFieldInjection.java
+++ b/appserver/tests/appserv-tests/devtests/cdi/portable-extensions/injection-target/servlet/test/framework/TestFrameworkClassWithSetterAndFieldInjection.java
@@ -17,7 +17,7 @@
package test.framework;
import jakarta.annotation.PostConstruct;
import jakarta.annotation.PreDestroy;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
import test.beans.Preferred;
import test.beans.TestBean;
diff --git a/appserver/tests/appserv-tests/devtests/cdi/portable-extensions/injection-target/servlet/test/servlet/PortableExtensionInjectionTargetTestServlet.java b/appserver/tests/appserv-tests/devtests/cdi/portable-extensions/injection-target/servlet/test/servlet/PortableExtensionInjectionTargetTestServlet.java
index 9d21265..b25045e 100644
--- a/appserver/tests/appserv-tests/devtests/cdi/portable-extensions/injection-target/servlet/test/servlet/PortableExtensionInjectionTargetTestServlet.java
+++ b/appserver/tests/appserv-tests/devtests/cdi/portable-extensions/injection-target/servlet/test/servlet/PortableExtensionInjectionTargetTestServlet.java
@@ -26,7 +26,7 @@
import javax.enterprise.inject.spi.AnnotatedType;
import javax.enterprise.inject.spi.BeanManager;
import javax.enterprise.inject.spi.InjectionTarget;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
import javax.naming.InitialContext;
import javax.naming.NamingException;
import javax.servlet.ServletException;
diff --git a/appserver/tests/appserv-tests/devtests/cdi/portable-extensions/new-bean-registration-extension-in-lib/extension/test/fwk/FrameworkService.java b/appserver/tests/appserv-tests/devtests/cdi/portable-extensions/new-bean-registration-extension-in-lib/extension/test/fwk/FrameworkService.java
index 542eef2..68ef46d 100644
--- a/appserver/tests/appserv-tests/devtests/cdi/portable-extensions/new-bean-registration-extension-in-lib/extension/test/fwk/FrameworkService.java
+++ b/appserver/tests/appserv-tests/devtests/cdi/portable-extensions/new-bean-registration-extension-in-lib/extension/test/fwk/FrameworkService.java
@@ -25,7 +25,7 @@
import java.lang.annotation.RetentionPolicy;
import java.lang.annotation.Target;
-import javax.inject.Qualifier;
+import jakarta.inject.Qualifier;
@Qualifier
@Target({ TYPE, METHOD, PARAMETER, FIELD })
diff --git a/appserver/tests/appserv-tests/devtests/cdi/portable-extensions/new-bean-registration-extension-in-lib/servlet/test/beans/Preferred.java b/appserver/tests/appserv-tests/devtests/cdi/portable-extensions/new-bean-registration-extension-in-lib/servlet/test/beans/Preferred.java
index fa8fdb7..1e171f7 100644
--- a/appserver/tests/appserv-tests/devtests/cdi/portable-extensions/new-bean-registration-extension-in-lib/servlet/test/beans/Preferred.java
+++ b/appserver/tests/appserv-tests/devtests/cdi/portable-extensions/new-bean-registration-extension-in-lib/servlet/test/beans/Preferred.java
@@ -25,7 +25,7 @@
import java.lang.annotation.RetentionPolicy;
import java.lang.annotation.Target;
-import javax.inject.Qualifier;
+import jakarta.inject.Qualifier;
@Qualifier
@Target({ TYPE, METHOD, PARAMETER, FIELD })
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 116ec7e..702494e 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
@@ -16,7 +16,7 @@
package test.beans;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
import jakarta.interceptor.AroundInvoke;
import jakarta.interceptor.Interceptor;
import jakarta.interceptor.InvocationContext;
diff --git a/appserver/tests/appserv-tests/devtests/cdi/portable-extensions/new-bean-registration-extension-in-lib/servlet/test/servlet/PortableExtensionBeanRegistrationTestServlet.java b/appserver/tests/appserv-tests/devtests/cdi/portable-extensions/new-bean-registration-extension-in-lib/servlet/test/servlet/PortableExtensionBeanRegistrationTestServlet.java
index 110f809..47b1e28 100644
--- a/appserver/tests/appserv-tests/devtests/cdi/portable-extensions/new-bean-registration-extension-in-lib/servlet/test/servlet/PortableExtensionBeanRegistrationTestServlet.java
+++ b/appserver/tests/appserv-tests/devtests/cdi/portable-extensions/new-bean-registration-extension-in-lib/servlet/test/servlet/PortableExtensionBeanRegistrationTestServlet.java
@@ -28,7 +28,7 @@
import javax.enterprise.inject.spi.Bean;
import javax.enterprise.inject.spi.BeanManager;
import javax.enterprise.util.AnnotationLiteral;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
import javax.servlet.ServletException;
import javax.servlet.annotation.WebServlet;
import javax.servlet.http.HttpServlet;
diff --git a/appserver/tests/appserv-tests/devtests/cdi/portable-extensions/new-bean-registration/servlet/test/beans/Preferred.java b/appserver/tests/appserv-tests/devtests/cdi/portable-extensions/new-bean-registration/servlet/test/beans/Preferred.java
index fa8fdb7..1e171f7 100644
--- a/appserver/tests/appserv-tests/devtests/cdi/portable-extensions/new-bean-registration/servlet/test/beans/Preferred.java
+++ b/appserver/tests/appserv-tests/devtests/cdi/portable-extensions/new-bean-registration/servlet/test/beans/Preferred.java
@@ -25,7 +25,7 @@
import java.lang.annotation.RetentionPolicy;
import java.lang.annotation.Target;
-import javax.inject.Qualifier;
+import jakarta.inject.Qualifier;
@Qualifier
@Target({ TYPE, METHOD, PARAMETER, FIELD })
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 116ec7e..702494e 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
@@ -16,7 +16,7 @@
package test.beans;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
import jakarta.interceptor.AroundInvoke;
import jakarta.interceptor.Interceptor;
import jakarta.interceptor.InvocationContext;
diff --git a/appserver/tests/appserv-tests/devtests/cdi/portable-extensions/new-bean-registration/servlet/test/fwk/FrameworkService.java b/appserver/tests/appserv-tests/devtests/cdi/portable-extensions/new-bean-registration/servlet/test/fwk/FrameworkService.java
index 542eef2..68ef46d 100644
--- a/appserver/tests/appserv-tests/devtests/cdi/portable-extensions/new-bean-registration/servlet/test/fwk/FrameworkService.java
+++ b/appserver/tests/appserv-tests/devtests/cdi/portable-extensions/new-bean-registration/servlet/test/fwk/FrameworkService.java
@@ -25,7 +25,7 @@
import java.lang.annotation.RetentionPolicy;
import java.lang.annotation.Target;
-import javax.inject.Qualifier;
+import jakarta.inject.Qualifier;
@Qualifier
@Target({ TYPE, METHOD, PARAMETER, FIELD })
diff --git a/appserver/tests/appserv-tests/devtests/cdi/portable-extensions/new-bean-registration/servlet/test/servlet/PortableExtensionBeanRegistrationTestServlet.java b/appserver/tests/appserv-tests/devtests/cdi/portable-extensions/new-bean-registration/servlet/test/servlet/PortableExtensionBeanRegistrationTestServlet.java
index f64b749..e923ab8 100644
--- a/appserver/tests/appserv-tests/devtests/cdi/portable-extensions/new-bean-registration/servlet/test/servlet/PortableExtensionBeanRegistrationTestServlet.java
+++ b/appserver/tests/appserv-tests/devtests/cdi/portable-extensions/new-bean-registration/servlet/test/servlet/PortableExtensionBeanRegistrationTestServlet.java
@@ -28,7 +28,7 @@
import javax.enterprise.inject.spi.Bean;
import javax.enterprise.inject.spi.BeanManager;
import javax.enterprise.util.AnnotationLiteral;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
import javax.servlet.ServletException;
import javax.servlet.annotation.WebServlet;
import javax.servlet.http.HttpServlet;
diff --git a/appserver/tests/appserv-tests/devtests/cdi/portable-extensions/package-private-extension-constructor/servlet/test/beans/Preferred.java b/appserver/tests/appserv-tests/devtests/cdi/portable-extensions/package-private-extension-constructor/servlet/test/beans/Preferred.java
index fa8fdb7..1e171f7 100644
--- a/appserver/tests/appserv-tests/devtests/cdi/portable-extensions/package-private-extension-constructor/servlet/test/beans/Preferred.java
+++ b/appserver/tests/appserv-tests/devtests/cdi/portable-extensions/package-private-extension-constructor/servlet/test/beans/Preferred.java
@@ -25,7 +25,7 @@
import java.lang.annotation.RetentionPolicy;
import java.lang.annotation.Target;
-import javax.inject.Qualifier;
+import jakarta.inject.Qualifier;
@Qualifier
@Target({ TYPE, METHOD, PARAMETER, FIELD })
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 1a132f9..a1cf768 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
@@ -16,7 +16,7 @@
package test.beans;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
import jakarta.interceptor.AroundInvoke;
import jakarta.interceptor.Interceptor;
import jakarta.interceptor.InvocationContext;
diff --git a/appserver/tests/appserv-tests/devtests/cdi/portable-extensions/package-private-extension-constructor/servlet/test/extension/Interceptors.java b/appserver/tests/appserv-tests/devtests/cdi/portable-extensions/package-private-extension-constructor/servlet/test/extension/Interceptors.java
index b4c87e5..cc58d6f 100644
--- a/appserver/tests/appserv-tests/devtests/cdi/portable-extensions/package-private-extension-constructor/servlet/test/extension/Interceptors.java
+++ b/appserver/tests/appserv-tests/devtests/cdi/portable-extensions/package-private-extension-constructor/servlet/test/extension/Interceptors.java
@@ -17,7 +17,7 @@
package test.extension;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
public class Interceptors
{
diff --git a/appserver/tests/appserv-tests/devtests/cdi/portable-extensions/package-private-extension-constructor/servlet/test/servlet/PackagePrivateConstructorInPortableExtensionTestServlet.java b/appserver/tests/appserv-tests/devtests/cdi/portable-extensions/package-private-extension-constructor/servlet/test/servlet/PackagePrivateConstructorInPortableExtensionTestServlet.java
index 8f312d1..2f63c73 100644
--- a/appserver/tests/appserv-tests/devtests/cdi/portable-extensions/package-private-extension-constructor/servlet/test/servlet/PackagePrivateConstructorInPortableExtensionTestServlet.java
+++ b/appserver/tests/appserv-tests/devtests/cdi/portable-extensions/package-private-extension-constructor/servlet/test/servlet/PackagePrivateConstructorInPortableExtensionTestServlet.java
@@ -22,7 +22,7 @@
import javax.enterprise.inject.Any;
import javax.enterprise.inject.spi.BeanManager;
import javax.enterprise.util.AnnotationLiteral;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
import javax.servlet.ServletException;
import javax.servlet.annotation.WebServlet;
import javax.servlet.http.HttpServlet;
diff --git a/appserver/tests/appserv-tests/devtests/cdi/portable-extensions/process-injection-target/servlet/test/servlet/PortableExtensionInjectionTargetTestServlet.java b/appserver/tests/appserv-tests/devtests/cdi/portable-extensions/process-injection-target/servlet/test/servlet/PortableExtensionInjectionTargetTestServlet.java
index e2e9d9d..0a58d0c 100644
--- a/appserver/tests/appserv-tests/devtests/cdi/portable-extensions/process-injection-target/servlet/test/servlet/PortableExtensionInjectionTargetTestServlet.java
+++ b/appserver/tests/appserv-tests/devtests/cdi/portable-extensions/process-injection-target/servlet/test/servlet/PortableExtensionInjectionTargetTestServlet.java
@@ -26,7 +26,7 @@
import javax.enterprise.inject.spi.AnnotatedType;
import javax.enterprise.inject.spi.BeanManager;
import javax.enterprise.inject.spi.InjectionTarget;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
import javax.naming.InitialContext;
import javax.naming.NamingException;
import javax.servlet.ServletException;
diff --git a/appserver/tests/appserv-tests/devtests/cdi/portable-extensions/simple-portable-extension/servlet/test/beans/Preferred.java b/appserver/tests/appserv-tests/devtests/cdi/portable-extensions/simple-portable-extension/servlet/test/beans/Preferred.java
index fa8fdb7..1e171f7 100644
--- a/appserver/tests/appserv-tests/devtests/cdi/portable-extensions/simple-portable-extension/servlet/test/beans/Preferred.java
+++ b/appserver/tests/appserv-tests/devtests/cdi/portable-extensions/simple-portable-extension/servlet/test/beans/Preferred.java
@@ -25,7 +25,7 @@
import java.lang.annotation.RetentionPolicy;
import java.lang.annotation.Target;
-import javax.inject.Qualifier;
+import jakarta.inject.Qualifier;
@Qualifier
@Target({ TYPE, METHOD, PARAMETER, FIELD })
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 e45e653..c8cd767 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
@@ -16,7 +16,7 @@
package test.beans;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
import jakarta.interceptor.AroundInvoke;
import jakarta.interceptor.Interceptor;
import jakarta.interceptor.InvocationContext;
diff --git a/appserver/tests/appserv-tests/devtests/cdi/portable-extensions/simple-portable-extension/servlet/test/servlet/SimplePortableExtensionTestServlet.java b/appserver/tests/appserv-tests/devtests/cdi/portable-extensions/simple-portable-extension/servlet/test/servlet/SimplePortableExtensionTestServlet.java
index 032fefd..1f638f1 100644
--- a/appserver/tests/appserv-tests/devtests/cdi/portable-extensions/simple-portable-extension/servlet/test/servlet/SimplePortableExtensionTestServlet.java
+++ b/appserver/tests/appserv-tests/devtests/cdi/portable-extensions/simple-portable-extension/servlet/test/servlet/SimplePortableExtensionTestServlet.java
@@ -22,7 +22,7 @@
import javax.enterprise.inject.Any;
import javax.enterprise.inject.spi.BeanManager;
import javax.enterprise.util.AnnotationLiteral;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
import javax.servlet.ServletException;
import javax.servlet.annotation.WebServlet;
import javax.servlet.http.HttpServlet;
diff --git a/appserver/tests/appserv-tests/devtests/cdi/producer-methods/producer-method-disposes/servlet/test/beans/Preferred.java b/appserver/tests/appserv-tests/devtests/cdi/producer-methods/producer-method-disposes/servlet/test/beans/Preferred.java
index e8dfef4..864d313 100644
--- a/appserver/tests/appserv-tests/devtests/cdi/producer-methods/producer-method-disposes/servlet/test/beans/Preferred.java
+++ b/appserver/tests/appserv-tests/devtests/cdi/producer-methods/producer-method-disposes/servlet/test/beans/Preferred.java
@@ -25,7 +25,7 @@
import java.lang.annotation.RetentionPolicy;
import java.lang.annotation.Target;
-import javax.inject.Qualifier;
+import jakarta.inject.Qualifier;
@Qualifier
@Target({TYPE, METHOD, PARAMETER, FIELD})
diff --git a/appserver/tests/appserv-tests/devtests/cdi/producer-methods/producer-method-disposes/servlet/test/beans/TestQualifier.java b/appserver/tests/appserv-tests/devtests/cdi/producer-methods/producer-method-disposes/servlet/test/beans/TestQualifier.java
index 971a9a3..6e89239 100644
--- a/appserver/tests/appserv-tests/devtests/cdi/producer-methods/producer-method-disposes/servlet/test/beans/TestQualifier.java
+++ b/appserver/tests/appserv-tests/devtests/cdi/producer-methods/producer-method-disposes/servlet/test/beans/TestQualifier.java
@@ -25,7 +25,7 @@
import java.lang.annotation.RetentionPolicy;
import java.lang.annotation.Target;
-import javax.inject.Qualifier;
+import jakarta.inject.Qualifier;
@Qualifier
@Target({TYPE, METHOD, PARAMETER, FIELD})
diff --git a/appserver/tests/appserv-tests/devtests/cdi/producer-methods/producer-method-disposes/servlet/test/servlet/ProducerMethodDisposesTestServlet1.java b/appserver/tests/appserv-tests/devtests/cdi/producer-methods/producer-method-disposes/servlet/test/servlet/ProducerMethodDisposesTestServlet1.java
index ac4dea8..02d68e9 100644
--- a/appserver/tests/appserv-tests/devtests/cdi/producer-methods/producer-method-disposes/servlet/test/servlet/ProducerMethodDisposesTestServlet1.java
+++ b/appserver/tests/appserv-tests/devtests/cdi/producer-methods/producer-method-disposes/servlet/test/servlet/ProducerMethodDisposesTestServlet1.java
@@ -19,7 +19,7 @@
import java.io.IOException;
import java.io.PrintWriter;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
import javax.servlet.ServletException;
import javax.servlet.annotation.WebServlet;
import javax.servlet.http.HttpServlet;
diff --git a/appserver/tests/appserv-tests/devtests/cdi/producer-methods/producer-method-disposes/servlet/test/servlet/ProducerMethodDisposesTestServlet2.java b/appserver/tests/appserv-tests/devtests/cdi/producer-methods/producer-method-disposes/servlet/test/servlet/ProducerMethodDisposesTestServlet2.java
index 70fa961..a7bfd94 100644
--- a/appserver/tests/appserv-tests/devtests/cdi/producer-methods/producer-method-disposes/servlet/test/servlet/ProducerMethodDisposesTestServlet2.java
+++ b/appserver/tests/appserv-tests/devtests/cdi/producer-methods/producer-method-disposes/servlet/test/servlet/ProducerMethodDisposesTestServlet2.java
@@ -19,7 +19,7 @@
import java.io.IOException;
import java.io.PrintWriter;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
import javax.servlet.ServletException;
import javax.servlet.annotation.WebServlet;
import javax.servlet.http.HttpServlet;
diff --git a/appserver/tests/appserv-tests/devtests/cdi/producer-methods/producer-method-qualifiers/servlet/BeanToTestQualiferInProducerMethods.java b/appserver/tests/appserv-tests/devtests/cdi/producer-methods/producer-method-qualifiers/servlet/BeanToTestQualiferInProducerMethods.java
index 0f5641e..f589f6d 100644
--- a/appserver/tests/appserv-tests/devtests/cdi/producer-methods/producer-method-qualifiers/servlet/BeanToTestQualiferInProducerMethods.java
+++ b/appserver/tests/appserv-tests/devtests/cdi/producer-methods/producer-method-qualifiers/servlet/BeanToTestQualiferInProducerMethods.java
@@ -15,7 +15,7 @@
*/
import javax.enterprise.inject.Produces;
-import javax.inject.Named;
+import jakarta.inject.Named;
@Named
public class BeanToTestQualiferInProducerMethods {
diff --git a/appserver/tests/appserv-tests/devtests/cdi/producer-methods/producer-method-qualifiers/servlet/ProducerMethodTestServlet.java b/appserver/tests/appserv-tests/devtests/cdi/producer-methods/producer-method-qualifiers/servlet/ProducerMethodTestServlet.java
index 641a6d8..1d3055a 100644
--- a/appserver/tests/appserv-tests/devtests/cdi/producer-methods/producer-method-qualifiers/servlet/ProducerMethodTestServlet.java
+++ b/appserver/tests/appserv-tests/devtests/cdi/producer-methods/producer-method-qualifiers/servlet/ProducerMethodTestServlet.java
@@ -17,7 +17,7 @@
import java.io.IOException;
import java.io.PrintWriter;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
import javax.servlet.ServletException;
import javax.servlet.annotation.WebInitParam;
import javax.servlet.annotation.WebServlet;
diff --git a/appserver/tests/appserv-tests/devtests/cdi/producer-methods/producer-method-qualifiers/servlet/RandomGreaterThanHundred.java b/appserver/tests/appserv-tests/devtests/cdi/producer-methods/producer-method-qualifiers/servlet/RandomGreaterThanHundred.java
index eaa4ec0..6a7242e 100644
--- a/appserver/tests/appserv-tests/devtests/cdi/producer-methods/producer-method-qualifiers/servlet/RandomGreaterThanHundred.java
+++ b/appserver/tests/appserv-tests/devtests/cdi/producer-methods/producer-method-qualifiers/servlet/RandomGreaterThanHundred.java
@@ -23,7 +23,7 @@
import java.lang.annotation.RetentionPolicy;
import java.lang.annotation.Target;
-import javax.inject.Qualifier;
+import jakarta.inject.Qualifier;
@Qualifier
@Target({TYPE, METHOD, PARAMETER, FIELD})
diff --git a/appserver/tests/appserv-tests/devtests/cdi/producer-methods/producer-method-qualifiers/servlet/RandomLessThanOrEqualToHundred.java b/appserver/tests/appserv-tests/devtests/cdi/producer-methods/producer-method-qualifiers/servlet/RandomLessThanOrEqualToHundred.java
index 49ddef8..3ab7696 100644
--- a/appserver/tests/appserv-tests/devtests/cdi/producer-methods/producer-method-qualifiers/servlet/RandomLessThanOrEqualToHundred.java
+++ b/appserver/tests/appserv-tests/devtests/cdi/producer-methods/producer-method-qualifiers/servlet/RandomLessThanOrEqualToHundred.java
@@ -19,7 +19,7 @@
import java.lang.annotation.Target;
import static java.lang.annotation.ElementType.*;
-import javax.inject.Qualifier;
+import jakarta.inject.Qualifier;
@Qualifier
diff --git a/appserver/tests/appserv-tests/devtests/cdi/producer-methods/producer-method-qualifiers/servlet/RandomNumberGenerator.java b/appserver/tests/appserv-tests/devtests/cdi/producer-methods/producer-method-qualifiers/servlet/RandomNumberGenerator.java
index 7774fa5..7339ed3 100644
--- a/appserver/tests/appserv-tests/devtests/cdi/producer-methods/producer-method-qualifiers/servlet/RandomNumberGenerator.java
+++ b/appserver/tests/appserv-tests/devtests/cdi/producer-methods/producer-method-qualifiers/servlet/RandomNumberGenerator.java
@@ -16,7 +16,7 @@
import javax.enterprise.context.ApplicationScoped;
import javax.enterprise.inject.Produces;
-import javax.inject.Named;
+import jakarta.inject.Named;
@ApplicationScoped
diff --git a/appserver/tests/appserv-tests/devtests/cdi/producer-methods/producer-method-qualifiers/servlet/TestBean.java b/appserver/tests/appserv-tests/devtests/cdi/producer-methods/producer-method-qualifiers/servlet/TestBean.java
index 1c88c96..07c355f 100644
--- a/appserver/tests/appserv-tests/devtests/cdi/producer-methods/producer-method-qualifiers/servlet/TestBean.java
+++ b/appserver/tests/appserv-tests/devtests/cdi/producer-methods/producer-method-qualifiers/servlet/TestBean.java
@@ -14,7 +14,7 @@
* SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
*/
-import javax.inject.Inject;
+import jakarta.inject.Inject;
public class TestBean {
//This should use the int chosen in BeanToTestQualiferInProducerMethods
diff --git a/appserver/tests/appserv-tests/devtests/cdi/producer-methods/producer-method-runtimepolymorphism/servlet/test/beans/Preferred_CreatedProgrammatically.java b/appserver/tests/appserv-tests/devtests/cdi/producer-methods/producer-method-runtimepolymorphism/servlet/test/beans/Preferred_CreatedProgrammatically.java
index f797a5a..3bdd168 100644
--- a/appserver/tests/appserv-tests/devtests/cdi/producer-methods/producer-method-runtimepolymorphism/servlet/test/beans/Preferred_CreatedProgrammatically.java
+++ b/appserver/tests/appserv-tests/devtests/cdi/producer-methods/producer-method-runtimepolymorphism/servlet/test/beans/Preferred_CreatedProgrammatically.java
@@ -25,7 +25,7 @@
import java.lang.annotation.RetentionPolicy;
import java.lang.annotation.Target;
-import javax.inject.Qualifier;
+import jakarta.inject.Qualifier;
@Qualifier
@Target({TYPE, METHOD, PARAMETER, FIELD})
diff --git a/appserver/tests/appserv-tests/devtests/cdi/producer-methods/producer-method-runtimepolymorphism/servlet/test/beans/Preferred_CreatedViaInjection.java b/appserver/tests/appserv-tests/devtests/cdi/producer-methods/producer-method-runtimepolymorphism/servlet/test/beans/Preferred_CreatedViaInjection.java
index d71a27c..d9bcb4c 100644
--- a/appserver/tests/appserv-tests/devtests/cdi/producer-methods/producer-method-runtimepolymorphism/servlet/test/beans/Preferred_CreatedViaInjection.java
+++ b/appserver/tests/appserv-tests/devtests/cdi/producer-methods/producer-method-runtimepolymorphism/servlet/test/beans/Preferred_CreatedViaInjection.java
@@ -25,7 +25,7 @@
import java.lang.annotation.RetentionPolicy;
import java.lang.annotation.Target;
-import javax.inject.Qualifier;
+import jakarta.inject.Qualifier;
@Qualifier
diff --git a/appserver/tests/appserv-tests/devtests/cdi/producer-methods/producer-method-runtimepolymorphism/servlet/test/servlet/ProducerMethodRuntimePolymorhpismTestServlet.java b/appserver/tests/appserv-tests/devtests/cdi/producer-methods/producer-method-runtimepolymorphism/servlet/test/servlet/ProducerMethodRuntimePolymorhpismTestServlet.java
index 7cfb8c3..6636f28 100644
--- a/appserver/tests/appserv-tests/devtests/cdi/producer-methods/producer-method-runtimepolymorphism/servlet/test/servlet/ProducerMethodRuntimePolymorhpismTestServlet.java
+++ b/appserver/tests/appserv-tests/devtests/cdi/producer-methods/producer-method-runtimepolymorphism/servlet/test/servlet/ProducerMethodRuntimePolymorhpismTestServlet.java
@@ -20,7 +20,7 @@
import java.io.PrintWriter;
import javax.enterprise.context.SessionScoped;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
import javax.servlet.ServletException;
import javax.servlet.annotation.WebServlet;
import javax.servlet.http.HttpServlet;
diff --git a/appserver/tests/appserv-tests/devtests/cdi/programmatic-lookup/servlet/test/artifacts/Asynchronous.java b/appserver/tests/appserv-tests/devtests/cdi/programmatic-lookup/servlet/test/artifacts/Asynchronous.java
index ca0dd14..ef74b88 100644
--- a/appserver/tests/appserv-tests/devtests/cdi/programmatic-lookup/servlet/test/artifacts/Asynchronous.java
+++ b/appserver/tests/appserv-tests/devtests/cdi/programmatic-lookup/servlet/test/artifacts/Asynchronous.java
@@ -21,7 +21,7 @@
import java.lang.annotation.RetentionPolicy;
import java.lang.annotation.Target;
-import javax.inject.Qualifier;
+import jakarta.inject.Qualifier;
@Qualifier
@Target({TYPE, METHOD, PARAMETER, FIELD})
diff --git a/appserver/tests/appserv-tests/devtests/cdi/programmatic-lookup/servlet/test/artifacts/PayBy.java b/appserver/tests/appserv-tests/devtests/cdi/programmatic-lookup/servlet/test/artifacts/PayBy.java
index 179aca6..e8d9f1f 100644
--- a/appserver/tests/appserv-tests/devtests/cdi/programmatic-lookup/servlet/test/artifacts/PayBy.java
+++ b/appserver/tests/appserv-tests/devtests/cdi/programmatic-lookup/servlet/test/artifacts/PayBy.java
@@ -22,7 +22,7 @@
import java.lang.annotation.Target;
import javax.enterprise.util.Nonbinding;
-import javax.inject.Qualifier;
+import jakarta.inject.Qualifier;
@Qualifier
@Target( { TYPE, METHOD, PARAMETER, FIELD })
diff --git a/appserver/tests/appserv-tests/devtests/cdi/programmatic-lookup/servlet/test/artifacts/Reliable.java b/appserver/tests/appserv-tests/devtests/cdi/programmatic-lookup/servlet/test/artifacts/Reliable.java
index 8ece693..88ad60b 100644
--- a/appserver/tests/appserv-tests/devtests/cdi/programmatic-lookup/servlet/test/artifacts/Reliable.java
+++ b/appserver/tests/appserv-tests/devtests/cdi/programmatic-lookup/servlet/test/artifacts/Reliable.java
@@ -21,7 +21,7 @@
import java.lang.annotation.RetentionPolicy;
import java.lang.annotation.Target;
-import javax.inject.Qualifier;
+import jakarta.inject.Qualifier;
@Qualifier
@Target({TYPE, METHOD, PARAMETER, FIELD})
diff --git a/appserver/tests/appserv-tests/devtests/cdi/programmatic-lookup/servlet/test/artifacts/Synchronous.java b/appserver/tests/appserv-tests/devtests/cdi/programmatic-lookup/servlet/test/artifacts/Synchronous.java
index b4c5d7e..97b9ca3 100644
--- a/appserver/tests/appserv-tests/devtests/cdi/programmatic-lookup/servlet/test/artifacts/Synchronous.java
+++ b/appserver/tests/appserv-tests/devtests/cdi/programmatic-lookup/servlet/test/artifacts/Synchronous.java
@@ -21,7 +21,7 @@
import java.lang.annotation.RetentionPolicy;
import java.lang.annotation.Target;
-import javax.inject.Qualifier;
+import jakarta.inject.Qualifier;
@Qualifier
@Target({TYPE, METHOD, PARAMETER, FIELD})
diff --git a/appserver/tests/appserv-tests/devtests/cdi/programmatic-lookup/servlet/test/artifacts/TestApplicationScopedBean.java b/appserver/tests/appserv-tests/devtests/cdi/programmatic-lookup/servlet/test/artifacts/TestApplicationScopedBean.java
index c8a651c..28cffb1 100644
--- a/appserver/tests/appserv-tests/devtests/cdi/programmatic-lookup/servlet/test/artifacts/TestApplicationScopedBean.java
+++ b/appserver/tests/appserv-tests/devtests/cdi/programmatic-lookup/servlet/test/artifacts/TestApplicationScopedBean.java
@@ -17,7 +17,7 @@
package test.artifacts;
import javax.enterprise.context.ApplicationScoped;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
@ApplicationScoped
public class TestApplicationScopedBean {
diff --git a/appserver/tests/appserv-tests/devtests/cdi/programmatic-lookup/servlet/test/beans/BeanToTestProgrammaticLookup.java b/appserver/tests/appserv-tests/devtests/cdi/programmatic-lookup/servlet/test/beans/BeanToTestProgrammaticLookup.java
index 15122d6..2f39c26 100644
--- a/appserver/tests/appserv-tests/devtests/cdi/programmatic-lookup/servlet/test/beans/BeanToTestProgrammaticLookup.java
+++ b/appserver/tests/appserv-tests/devtests/cdi/programmatic-lookup/servlet/test/beans/BeanToTestProgrammaticLookup.java
@@ -18,7 +18,7 @@
import javax.enterprise.inject.Any;
import javax.enterprise.inject.Instance;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
import test.artifacts.Asynchronous;
import test.artifacts.MockPaymentProcessor;
diff --git a/appserver/tests/appserv-tests/devtests/cdi/programmatic-lookup/servlet/test/servlets/ProgrammaticLookupServlet.java b/appserver/tests/appserv-tests/devtests/cdi/programmatic-lookup/servlet/test/servlets/ProgrammaticLookupServlet.java
index a24772c..0691522 100644
--- a/appserver/tests/appserv-tests/devtests/cdi/programmatic-lookup/servlet/test/servlets/ProgrammaticLookupServlet.java
+++ b/appserver/tests/appserv-tests/devtests/cdi/programmatic-lookup/servlet/test/servlets/ProgrammaticLookupServlet.java
@@ -23,7 +23,7 @@
import javax.enterprise.inject.Any;
import javax.enterprise.inject.Instance;
import javax.enterprise.util.AnnotationLiteral;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
import javax.servlet.ServletException;
import javax.servlet.annotation.WebInitParam;
import javax.servlet.annotation.WebServlet;
diff --git a/appserver/tests/appserv-tests/devtests/cdi/qualifiers/servlet/QualifierServlet.java b/appserver/tests/appserv-tests/devtests/cdi/qualifiers/servlet/QualifierServlet.java
index 2123b1e..553b35f 100644
--- a/appserver/tests/appserv-tests/devtests/cdi/qualifiers/servlet/QualifierServlet.java
+++ b/appserver/tests/appserv-tests/devtests/cdi/qualifiers/servlet/QualifierServlet.java
@@ -17,7 +17,7 @@
import java.io.IOException;
import java.io.PrintWriter;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
import javax.servlet.ServletException;
import javax.servlet.annotation.WebInitParam;
import javax.servlet.annotation.WebServlet;
diff --git a/appserver/tests/appserv-tests/devtests/cdi/qualifiers/servlet/test/artifacts/Asynchronous.java b/appserver/tests/appserv-tests/devtests/cdi/qualifiers/servlet/test/artifacts/Asynchronous.java
index ca0dd14..ef74b88 100644
--- a/appserver/tests/appserv-tests/devtests/cdi/qualifiers/servlet/test/artifacts/Asynchronous.java
+++ b/appserver/tests/appserv-tests/devtests/cdi/qualifiers/servlet/test/artifacts/Asynchronous.java
@@ -21,7 +21,7 @@
import java.lang.annotation.RetentionPolicy;
import java.lang.annotation.Target;
-import javax.inject.Qualifier;
+import jakarta.inject.Qualifier;
@Qualifier
@Target({TYPE, METHOD, PARAMETER, FIELD})
diff --git a/appserver/tests/appserv-tests/devtests/cdi/qualifiers/servlet/test/artifacts/PayBy.java b/appserver/tests/appserv-tests/devtests/cdi/qualifiers/servlet/test/artifacts/PayBy.java
index 179aca6..e8d9f1f 100644
--- a/appserver/tests/appserv-tests/devtests/cdi/qualifiers/servlet/test/artifacts/PayBy.java
+++ b/appserver/tests/appserv-tests/devtests/cdi/qualifiers/servlet/test/artifacts/PayBy.java
@@ -22,7 +22,7 @@
import java.lang.annotation.Target;
import javax.enterprise.util.Nonbinding;
-import javax.inject.Qualifier;
+import jakarta.inject.Qualifier;
@Qualifier
@Target( { TYPE, METHOD, PARAMETER, FIELD })
diff --git a/appserver/tests/appserv-tests/devtests/cdi/qualifiers/servlet/test/artifacts/Reliable.java b/appserver/tests/appserv-tests/devtests/cdi/qualifiers/servlet/test/artifacts/Reliable.java
index 8ece693..88ad60b 100644
--- a/appserver/tests/appserv-tests/devtests/cdi/qualifiers/servlet/test/artifacts/Reliable.java
+++ b/appserver/tests/appserv-tests/devtests/cdi/qualifiers/servlet/test/artifacts/Reliable.java
@@ -21,7 +21,7 @@
import java.lang.annotation.RetentionPolicy;
import java.lang.annotation.Target;
-import javax.inject.Qualifier;
+import jakarta.inject.Qualifier;
@Qualifier
@Target({TYPE, METHOD, PARAMETER, FIELD})
diff --git a/appserver/tests/appserv-tests/devtests/cdi/qualifiers/servlet/test/artifacts/Synchronous.java b/appserver/tests/appserv-tests/devtests/cdi/qualifiers/servlet/test/artifacts/Synchronous.java
index b4c5d7e..97b9ca3 100644
--- a/appserver/tests/appserv-tests/devtests/cdi/qualifiers/servlet/test/artifacts/Synchronous.java
+++ b/appserver/tests/appserv-tests/devtests/cdi/qualifiers/servlet/test/artifacts/Synchronous.java
@@ -21,7 +21,7 @@
import java.lang.annotation.RetentionPolicy;
import java.lang.annotation.Target;
-import javax.inject.Qualifier;
+import jakarta.inject.Qualifier;
@Qualifier
@Target({TYPE, METHOD, PARAMETER, FIELD})
diff --git a/appserver/tests/appserv-tests/devtests/cdi/qualifiers/servlet/test/beans/BeanToTestAny.java b/appserver/tests/appserv-tests/devtests/cdi/qualifiers/servlet/test/beans/BeanToTestAny.java
index 688b54d..261633c 100644
--- a/appserver/tests/appserv-tests/devtests/cdi/qualifiers/servlet/test/beans/BeanToTestAny.java
+++ b/appserver/tests/appserv-tests/devtests/cdi/qualifiers/servlet/test/beans/BeanToTestAny.java
@@ -18,7 +18,7 @@
import javax.enterprise.inject.Any;
import javax.enterprise.inject.Instance;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
import test.artifacts.PaymentProcessor;
diff --git a/appserver/tests/appserv-tests/devtests/cdi/qualifiers/servlet/test/beans/BeanToTestConstructorInjection.java b/appserver/tests/appserv-tests/devtests/cdi/qualifiers/servlet/test/beans/BeanToTestConstructorInjection.java
index 620cc44..460f320 100644
--- a/appserver/tests/appserv-tests/devtests/cdi/qualifiers/servlet/test/beans/BeanToTestConstructorInjection.java
+++ b/appserver/tests/appserv-tests/devtests/cdi/qualifiers/servlet/test/beans/BeanToTestConstructorInjection.java
@@ -16,7 +16,7 @@
package test.beans;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
import test.artifacts.Asynchronous;
import test.artifacts.AsynchronousPaymentProcessor;
diff --git a/appserver/tests/appserv-tests/devtests/cdi/qualifiers/servlet/test/beans/BeanToTestInitializerMethodInjection.java b/appserver/tests/appserv-tests/devtests/cdi/qualifiers/servlet/test/beans/BeanToTestInitializerMethodInjection.java
index 9562fd6..0237978 100644
--- a/appserver/tests/appserv-tests/devtests/cdi/qualifiers/servlet/test/beans/BeanToTestInitializerMethodInjection.java
+++ b/appserver/tests/appserv-tests/devtests/cdi/qualifiers/servlet/test/beans/BeanToTestInitializerMethodInjection.java
@@ -16,7 +16,7 @@
package test.beans;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
import test.artifacts.Asynchronous;
import test.artifacts.AsynchronousPaymentProcessor;
diff --git a/appserver/tests/appserv-tests/devtests/cdi/qualifiers/servlet/test/beans/BeanToTestMultipleQualifiers.java b/appserver/tests/appserv-tests/devtests/cdi/qualifiers/servlet/test/beans/BeanToTestMultipleQualifiers.java
index 6e94fa1..afc8abb 100644
--- a/appserver/tests/appserv-tests/devtests/cdi/qualifiers/servlet/test/beans/BeanToTestMultipleQualifiers.java
+++ b/appserver/tests/appserv-tests/devtests/cdi/qualifiers/servlet/test/beans/BeanToTestMultipleQualifiers.java
@@ -16,7 +16,7 @@
package test.beans;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
import test.artifacts.CashReliablePaymentProcessor;
import test.artifacts.PayBy;
diff --git a/appserver/tests/appserv-tests/devtests/cdi/qualifiers/servlet/test/beans/BeanToTestQualifierWithMembers.java b/appserver/tests/appserv-tests/devtests/cdi/qualifiers/servlet/test/beans/BeanToTestQualifierWithMembers.java
index 14c8550..68a0ef2 100644
--- a/appserver/tests/appserv-tests/devtests/cdi/qualifiers/servlet/test/beans/BeanToTestQualifierWithMembers.java
+++ b/appserver/tests/appserv-tests/devtests/cdi/qualifiers/servlet/test/beans/BeanToTestQualifierWithMembers.java
@@ -16,7 +16,7 @@
package test.beans;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
import test.artifacts.ChequePaymentProcessor;
import test.artifacts.PayBy;
diff --git a/appserver/tests/appserv-tests/devtests/cdi/scopes/dependent-scope/servlet/test/beans/TestRequestScopedBean.java b/appserver/tests/appserv-tests/devtests/cdi/scopes/dependent-scope/servlet/test/beans/TestRequestScopedBean.java
index bcec05a..f674cd8 100644
--- a/appserver/tests/appserv-tests/devtests/cdi/scopes/dependent-scope/servlet/test/beans/TestRequestScopedBean.java
+++ b/appserver/tests/appserv-tests/devtests/cdi/scopes/dependent-scope/servlet/test/beans/TestRequestScopedBean.java
@@ -17,7 +17,7 @@
package test.beans;
import javax.enterprise.context.RequestScoped;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
@RequestScoped
public class TestRequestScopedBean {
diff --git a/appserver/tests/appserv-tests/devtests/cdi/scopes/dependent-scope/servlet/test/servlets/DependentScopeTestServlet.java b/appserver/tests/appserv-tests/devtests/cdi/scopes/dependent-scope/servlet/test/servlets/DependentScopeTestServlet.java
index d166a62..6569408 100644
--- a/appserver/tests/appserv-tests/devtests/cdi/scopes/dependent-scope/servlet/test/servlets/DependentScopeTestServlet.java
+++ b/appserver/tests/appserv-tests/devtests/cdi/scopes/dependent-scope/servlet/test/servlets/DependentScopeTestServlet.java
@@ -20,7 +20,7 @@
import java.io.PrintWriter;
import javax.enterprise.inject.spi.BeanManager;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
import javax.naming.InitialContext;
import javax.servlet.ServletException;
import javax.servlet.annotation.WebServlet;
diff --git a/appserver/tests/appserv-tests/devtests/cdi/scopes/new-qualifier/servlet/test/servlets/NewQualifierTestServlet.java b/appserver/tests/appserv-tests/devtests/cdi/scopes/new-qualifier/servlet/test/servlets/NewQualifierTestServlet.java
index f47409e..9d37bb7 100644
--- a/appserver/tests/appserv-tests/devtests/cdi/scopes/new-qualifier/servlet/test/servlets/NewQualifierTestServlet.java
+++ b/appserver/tests/appserv-tests/devtests/cdi/scopes/new-qualifier/servlet/test/servlets/NewQualifierTestServlet.java
@@ -21,7 +21,7 @@
import javax.enterprise.inject.New;
import javax.enterprise.inject.Instance;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
import javax.servlet.ServletException;
import javax.servlet.annotation.WebServlet;
import javax.servlet.http.HttpServlet;
diff --git a/appserver/tests/appserv-tests/devtests/cdi/scopes/request-and-application-scope-ejb-mdb/src/test/beans/BeanToTestTimerUse.java b/appserver/tests/appserv-tests/devtests/cdi/scopes/request-and-application-scope-ejb-mdb/src/test/beans/BeanToTestTimerUse.java
index ca77e52..5796543 100644
--- a/appserver/tests/appserv-tests/devtests/cdi/scopes/request-and-application-scope-ejb-mdb/src/test/beans/BeanToTestTimerUse.java
+++ b/appserver/tests/appserv-tests/devtests/cdi/scopes/request-and-application-scope-ejb-mdb/src/test/beans/BeanToTestTimerUse.java
@@ -16,7 +16,7 @@
package test.beans;
-import javax.inject.Singleton;
+import jakarta.inject.Singleton;
//Simple TestBean to test CDI.
diff --git a/appserver/tests/appserv-tests/devtests/cdi/scopes/request-and-application-scope-ejb-mdb/src/test/ejb/mdb/MessageBean.java b/appserver/tests/appserv-tests/devtests/cdi/scopes/request-and-application-scope-ejb-mdb/src/test/ejb/mdb/MessageBean.java
index deb0e67..1496ca1 100644
--- a/appserver/tests/appserv-tests/devtests/cdi/scopes/request-and-application-scope-ejb-mdb/src/test/ejb/mdb/MessageBean.java
+++ b/appserver/tests/appserv-tests/devtests/cdi/scopes/request-and-application-scope-ejb-mdb/src/test/ejb/mdb/MessageBean.java
@@ -23,7 +23,7 @@
import jakarta.ejb.TransactionManagement;
import jakarta.ejb.TransactionManagementType;
import javax.enterprise.inject.spi.BeanManager;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
import jakarta.jms.Message;
import jakarta.jms.MessageListener;
import jakarta.jms.Queue;
diff --git a/appserver/tests/appserv-tests/devtests/cdi/scopes/request-and-application-scope-ejb-mdb/src/test/ejb/session/HelloStatelessRemoteBean.java b/appserver/tests/appserv-tests/devtests/cdi/scopes/request-and-application-scope-ejb-mdb/src/test/ejb/session/HelloStatelessRemoteBean.java
index b212179..6fb1311 100644
--- a/appserver/tests/appserv-tests/devtests/cdi/scopes/request-and-application-scope-ejb-mdb/src/test/ejb/session/HelloStatelessRemoteBean.java
+++ b/appserver/tests/appserv-tests/devtests/cdi/scopes/request-and-application-scope-ejb-mdb/src/test/ejb/session/HelloStatelessRemoteBean.java
@@ -20,7 +20,7 @@
import jakarta.ejb.Remote;
import jakarta.ejb.Stateless;
import javax.enterprise.inject.spi.BeanManager;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
import test.beans.BeanToTestTimerUse;
import test.beans.TestApplicationScopedBean;
diff --git a/appserver/tests/appserv-tests/devtests/cdi/scopes/request-and-application-scope-ejb-mdb/src/test/ejb/timer/TestEJBTimerBean.java b/appserver/tests/appserv-tests/devtests/cdi/scopes/request-and-application-scope-ejb-mdb/src/test/ejb/timer/TestEJBTimerBean.java
index e2ebdef..8b373f2 100644
--- a/appserver/tests/appserv-tests/devtests/cdi/scopes/request-and-application-scope-ejb-mdb/src/test/ejb/timer/TestEJBTimerBean.java
+++ b/appserver/tests/appserv-tests/devtests/cdi/scopes/request-and-application-scope-ejb-mdb/src/test/ejb/timer/TestEJBTimerBean.java
@@ -19,7 +19,7 @@
import jakarta.ejb.Schedule;
import jakarta.ejb.Stateless;
import jakarta.ejb.Timer;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
import test.beans.BeanToTestTimerUse;
import test.beans.TestApplicationScopedBean;
diff --git a/appserver/tests/appserv-tests/devtests/cdi/scopes/singleton-scope/servlet/test/beans/TestSessionScopedBean.java b/appserver/tests/appserv-tests/devtests/cdi/scopes/singleton-scope/servlet/test/beans/TestSessionScopedBean.java
index 7cb3552..9d5a914 100644
--- a/appserver/tests/appserv-tests/devtests/cdi/scopes/singleton-scope/servlet/test/beans/TestSessionScopedBean.java
+++ b/appserver/tests/appserv-tests/devtests/cdi/scopes/singleton-scope/servlet/test/beans/TestSessionScopedBean.java
@@ -20,7 +20,7 @@
import javax.enterprise.context.SessionScoped;
import javax.enterprise.inject.Instance;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
@SessionScoped
public class TestSessionScopedBean implements Serializable{
diff --git a/appserver/tests/appserv-tests/devtests/cdi/scopes/singleton-scope/servlet/test/beans/TestSingletonScopedBean.java b/appserver/tests/appserv-tests/devtests/cdi/scopes/singleton-scope/servlet/test/beans/TestSingletonScopedBean.java
index f51d7ca..b21de98 100644
--- a/appserver/tests/appserv-tests/devtests/cdi/scopes/singleton-scope/servlet/test/beans/TestSingletonScopedBean.java
+++ b/appserver/tests/appserv-tests/devtests/cdi/scopes/singleton-scope/servlet/test/beans/TestSingletonScopedBean.java
@@ -16,7 +16,7 @@
package test.beans;
-import javax.inject.Singleton;
+import jakarta.inject.Singleton;
//Simple TestBean to test CDI Singleton pseudo-scope.
@Singleton
diff --git a/appserver/tests/appserv-tests/devtests/cdi/scopes/singleton-scope/servlet/test/servlets/SingletonScopedServlet.java b/appserver/tests/appserv-tests/devtests/cdi/scopes/singleton-scope/servlet/test/servlets/SingletonScopedServlet.java
index 019f00d..37e0a09 100644
--- a/appserver/tests/appserv-tests/devtests/cdi/scopes/singleton-scope/servlet/test/servlets/SingletonScopedServlet.java
+++ b/appserver/tests/appserv-tests/devtests/cdi/scopes/singleton-scope/servlet/test/servlets/SingletonScopedServlet.java
@@ -20,7 +20,7 @@
import java.io.PrintWriter;
import javax.enterprise.inject.spi.BeanManager;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
import javax.naming.InitialContext;
import javax.servlet.ServletException;
import javax.servlet.annotation.WebServlet;
diff --git a/appserver/tests/appserv-tests/devtests/cdi/smoke-tests/cdi-servlet-3.0-annotation/servlet/TestServlet.java b/appserver/tests/appserv-tests/devtests/cdi/smoke-tests/cdi-servlet-3.0-annotation/servlet/TestServlet.java
index baa7aae..2f6c966 100644
--- a/appserver/tests/appserv-tests/devtests/cdi/smoke-tests/cdi-servlet-3.0-annotation/servlet/TestServlet.java
+++ b/appserver/tests/appserv-tests/devtests/cdi/smoke-tests/cdi-servlet-3.0-annotation/servlet/TestServlet.java
@@ -24,7 +24,7 @@
import javax.servlet.http.HttpServlet;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
import javax.enterprise.inject.spi.BeanManager;
import javax.naming.InitialContext;
diff --git a/appserver/tests/appserv-tests/devtests/cdi/smoke-tests/cdi-servlet-filter-3.0-annotation/servlet/TestFilter.java b/appserver/tests/appserv-tests/devtests/cdi/smoke-tests/cdi-servlet-filter-3.0-annotation/servlet/TestFilter.java
index 7137f70..e646a80 100644
--- a/appserver/tests/appserv-tests/devtests/cdi/smoke-tests/cdi-servlet-filter-3.0-annotation/servlet/TestFilter.java
+++ b/appserver/tests/appserv-tests/devtests/cdi/smoke-tests/cdi-servlet-filter-3.0-annotation/servlet/TestFilter.java
@@ -17,7 +17,7 @@
import java.io.IOException;
import javax.enterprise.inject.spi.BeanManager;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
import javax.servlet.Filter;
import javax.servlet.FilterChain;
import javax.servlet.FilterConfig;
diff --git a/appserver/tests/appserv-tests/devtests/cdi/smoke-tests/cdi-servlet-filter-3.0-annotation/servlet/TestServlet.java b/appserver/tests/appserv-tests/devtests/cdi/smoke-tests/cdi-servlet-filter-3.0-annotation/servlet/TestServlet.java
index 475d9fa..a5c324c 100644
--- a/appserver/tests/appserv-tests/devtests/cdi/smoke-tests/cdi-servlet-filter-3.0-annotation/servlet/TestServlet.java
+++ b/appserver/tests/appserv-tests/devtests/cdi/smoke-tests/cdi-servlet-filter-3.0-annotation/servlet/TestServlet.java
@@ -18,7 +18,7 @@
import java.io.PrintWriter;
import javax.enterprise.inject.spi.BeanManager;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
import javax.naming.InitialContext;
import javax.servlet.ServletException;
import javax.servlet.annotation.WebServlet;
diff --git a/appserver/tests/appserv-tests/devtests/cdi/smoke-tests/optional-unbundled-beans/servlet/TestServlet.java b/appserver/tests/appserv-tests/devtests/cdi/smoke-tests/optional-unbundled-beans/servlet/TestServlet.java
index 7e438a7..42e4d3b 100644
--- a/appserver/tests/appserv-tests/devtests/cdi/smoke-tests/optional-unbundled-beans/servlet/TestServlet.java
+++ b/appserver/tests/appserv-tests/devtests/cdi/smoke-tests/optional-unbundled-beans/servlet/TestServlet.java
@@ -26,7 +26,7 @@
import javax.servlet.http.HttpServlet;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
import javax.enterprise.inject.Any;
import javax.enterprise.inject.spi.Bean;
import javax.enterprise.inject.spi.BeanManager;
diff --git a/appserver/tests/appserv-tests/devtests/cdi/smoke-tests/simple-ejb-cdi/ejb/SfulEJB.java b/appserver/tests/appserv-tests/devtests/cdi/smoke-tests/simple-ejb-cdi/ejb/SfulEJB.java
index 5c26d0a..5eaa970 100644
--- a/appserver/tests/appserv-tests/devtests/cdi/smoke-tests/simple-ejb-cdi/ejb/SfulEJB.java
+++ b/appserver/tests/appserv-tests/devtests/cdi/smoke-tests/simple-ejb-cdi/ejb/SfulEJB.java
@@ -17,7 +17,7 @@
package com.sun.s1asdev.cdi.ejb.hello.session;
import jakarta.ejb.Stateful;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
@Stateful
public class SfulEJB implements Sful
diff --git a/appserver/tests/appserv-tests/devtests/cdi/smoke-tests/simple-ejb-cdi/ejb/SlessEJB.java b/appserver/tests/appserv-tests/devtests/cdi/smoke-tests/simple-ejb-cdi/ejb/SlessEJB.java
index e2f0cda..2def848 100644
--- a/appserver/tests/appserv-tests/devtests/cdi/smoke-tests/simple-ejb-cdi/ejb/SlessEJB.java
+++ b/appserver/tests/appserv-tests/devtests/cdi/smoke-tests/simple-ejb-cdi/ejb/SlessEJB.java
@@ -17,7 +17,7 @@
package com.sun.s1asdev.cdi.ejb.hello.session;
import jakarta.ejb.Stateless;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
@Stateless
public class SlessEJB implements Sless
diff --git a/appserver/tests/appserv-tests/devtests/cdi/smoke-tests/simple-ejb-singleton/hello/ejb/Foo.java b/appserver/tests/appserv-tests/devtests/cdi/smoke-tests/simple-ejb-singleton/hello/ejb/Foo.java
index c28119d..4546976 100644
--- a/appserver/tests/appserv-tests/devtests/cdi/smoke-tests/simple-ejb-singleton/hello/ejb/Foo.java
+++ b/appserver/tests/appserv-tests/devtests/cdi/smoke-tests/simple-ejb-singleton/hello/ejb/Foo.java
@@ -21,7 +21,7 @@
public class Foo {
@EJB Hello hello;
- @javax.inject.Inject TestBean tb;
+ @jakarta.inject.Inject TestBean tb;
public boolean testInjection(){
return tb != null;
diff --git a/appserver/tests/appserv-tests/devtests/cdi/smoke-tests/simple-ejb-singleton/hello/ejb/SingletonBean.java b/appserver/tests/appserv-tests/devtests/cdi/smoke-tests/simple-ejb-singleton/hello/ejb/SingletonBean.java
index 97d3442..b0bc385 100644
--- a/appserver/tests/appserv-tests/devtests/cdi/smoke-tests/simple-ejb-singleton/hello/ejb/SingletonBean.java
+++ b/appserver/tests/appserv-tests/devtests/cdi/smoke-tests/simple-ejb-singleton/hello/ejb/SingletonBean.java
@@ -23,7 +23,7 @@
import javax.naming.InitialContext;
import javax.management.j2ee.ManagementHome;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
@Singleton
@Remote(Hello.class)
diff --git a/appserver/tests/appserv-tests/devtests/cdi/smoke-tests/simple-managed-bean-interceptor-nonnull-package/servlet/com/tests/TestManagedBean.java b/appserver/tests/appserv-tests/devtests/cdi/smoke-tests/simple-managed-bean-interceptor-nonnull-package/servlet/com/tests/TestManagedBean.java
index 9fbd8c2..0c93583 100644
--- a/appserver/tests/appserv-tests/devtests/cdi/smoke-tests/simple-managed-bean-interceptor-nonnull-package/servlet/com/tests/TestManagedBean.java
+++ b/appserver/tests/appserv-tests/devtests/cdi/smoke-tests/simple-managed-bean-interceptor-nonnull-package/servlet/com/tests/TestManagedBean.java
@@ -26,7 +26,7 @@
//A Managed Bean needs to have a no-arg constructor
public TestManagedBean() {}
- @javax.inject.Inject //Constructor based Injection
+ @jakarta.inject.Inject //Constructor based Injection
public TestManagedBean(TestBean tb){
this.tb = tb;
}
diff --git a/appserver/tests/appserv-tests/devtests/cdi/smoke-tests/simple-managed-bean-interceptor-nonnull-package/servlet/com/tests/TestServlet.java b/appserver/tests/appserv-tests/devtests/cdi/smoke-tests/simple-managed-bean-interceptor-nonnull-package/servlet/com/tests/TestServlet.java
index 8107760..f3692ab 100644
--- a/appserver/tests/appserv-tests/devtests/cdi/smoke-tests/simple-managed-bean-interceptor-nonnull-package/servlet/com/tests/TestServlet.java
+++ b/appserver/tests/appserv-tests/devtests/cdi/smoke-tests/simple-managed-bean-interceptor-nonnull-package/servlet/com/tests/TestServlet.java
@@ -31,7 +31,7 @@
urlPatterns={"/myurl"},
initParams={ @WebInitParam(name="n1", value="v1"), @WebInitParam(name="n2", value="v2") } )
public class TestServlet extends HttpServlet {
- @javax.inject.Inject TestManagedBean tb1;
+ @jakarta.inject.Inject TestManagedBean tb1;
@jakarta.annotation.Resource TestManagedBean tb;
public void service(HttpServletRequest req, HttpServletResponse res)
diff --git a/appserver/tests/appserv-tests/devtests/cdi/smoke-tests/simple-managed-bean-interceptor/servlet/TestManagedBean.java b/appserver/tests/appserv-tests/devtests/cdi/smoke-tests/simple-managed-bean-interceptor/servlet/TestManagedBean.java
index 561772c..2a36f10 100644
--- a/appserver/tests/appserv-tests/devtests/cdi/smoke-tests/simple-managed-bean-interceptor/servlet/TestManagedBean.java
+++ b/appserver/tests/appserv-tests/devtests/cdi/smoke-tests/simple-managed-bean-interceptor/servlet/TestManagedBean.java
@@ -24,7 +24,7 @@
//A Managed Bean needs to have a no-arg constructor
public TestManagedBean() {}
- @javax.inject.Inject //Constructor based Injection
+ @jakarta.inject.Inject //Constructor based Injection
public TestManagedBean(TestBean tb){
this.tb = tb;
}
diff --git a/appserver/tests/appserv-tests/devtests/cdi/smoke-tests/simple-managed-bean-interceptor/servlet/TestServlet.java b/appserver/tests/appserv-tests/devtests/cdi/smoke-tests/simple-managed-bean-interceptor/servlet/TestServlet.java
index c79844e..95b2928 100644
--- a/appserver/tests/appserv-tests/devtests/cdi/smoke-tests/simple-managed-bean-interceptor/servlet/TestServlet.java
+++ b/appserver/tests/appserv-tests/devtests/cdi/smoke-tests/simple-managed-bean-interceptor/servlet/TestServlet.java
@@ -29,7 +29,7 @@
urlPatterns={"/myurl"},
initParams={ @WebInitParam(name="n1", value="v1"), @WebInitParam(name="n2", value="v2") } )
public class TestServlet extends HttpServlet {
- @javax.inject.Inject TestManagedBean tb1;
+ @jakarta.inject.Inject TestManagedBean tb1;
@jakarta.annotation.Resource TestManagedBean tb;
public void service(HttpServletRequest req, HttpServletResponse res)
diff --git a/appserver/tests/appserv-tests/devtests/cdi/smoke-tests/simple-managed-bean/servlet/TestManagedBean.java b/appserver/tests/appserv-tests/devtests/cdi/smoke-tests/simple-managed-bean/servlet/TestManagedBean.java
index b000d0f..f3e57ae 100644
--- a/appserver/tests/appserv-tests/devtests/cdi/smoke-tests/simple-managed-bean/servlet/TestManagedBean.java
+++ b/appserver/tests/appserv-tests/devtests/cdi/smoke-tests/simple-managed-bean/servlet/TestManagedBean.java
@@ -23,7 +23,7 @@
public TestManagedBean(){}
- @javax.inject.Inject //Constructor based Injection
+ @jakarta.inject.Inject //Constructor based Injection
public TestManagedBean(TestBean tb){
this.tb = tb;
}
diff --git a/appserver/tests/appserv-tests/devtests/cdi/smoke-tests/simple-managed-bean/servlet/TestServlet.java b/appserver/tests/appserv-tests/devtests/cdi/smoke-tests/simple-managed-bean/servlet/TestServlet.java
index 4074812..9ef3493 100644
--- a/appserver/tests/appserv-tests/devtests/cdi/smoke-tests/simple-managed-bean/servlet/TestServlet.java
+++ b/appserver/tests/appserv-tests/devtests/cdi/smoke-tests/simple-managed-bean/servlet/TestServlet.java
@@ -29,7 +29,7 @@
urlPatterns={"/myurl"},
initParams={ @WebInitParam(name="n1", value="v1"), @WebInitParam(name="n2", value="v2") } )
public class TestServlet extends HttpServlet {
- @javax.inject.Inject TestManagedBean tb1;
+ @jakarta.inject.Inject TestManagedBean tb1;
@jakarta.annotation.Resource TestManagedBean tb;
public void service(HttpServletRequest req, HttpServletResponse res)
diff --git a/appserver/tests/appserv-tests/devtests/cdi/smoke-tests/simple-mdb/ejb/MessageBean.java b/appserver/tests/appserv-tests/devtests/cdi/smoke-tests/simple-mdb/ejb/MessageBean.java
index be9c27d..6e9bac0 100644
--- a/appserver/tests/appserv-tests/devtests/cdi/smoke-tests/simple-mdb/ejb/MessageBean.java
+++ b/appserver/tests/appserv-tests/devtests/cdi/smoke-tests/simple-mdb/ejb/MessageBean.java
@@ -49,7 +49,7 @@
@Resource(mappedName="jms/cdi_hello_mdb_OutQueue") Queue clientQueue;
- @javax.inject.Inject com.sun.s1asdev.cdi.hello.bean.TestBean tb;
+ @jakarta.inject.Inject com.sun.s1asdev.cdi.hello.bean.TestBean tb;
public void onMessage(Message message) {
diff --git a/appserver/tests/appserv-tests/devtests/cdi/smoke-tests/simple-wab-with-cdi/servlet/tests/cdi/TestServlet.java b/appserver/tests/appserv-tests/devtests/cdi/smoke-tests/simple-wab-with-cdi/servlet/tests/cdi/TestServlet.java
index 9e733d8..a3be8e7 100644
--- a/appserver/tests/appserv-tests/devtests/cdi/smoke-tests/simple-wab-with-cdi/servlet/tests/cdi/TestServlet.java
+++ b/appserver/tests/appserv-tests/devtests/cdi/smoke-tests/simple-wab-with-cdi/servlet/tests/cdi/TestServlet.java
@@ -26,7 +26,7 @@
import javax.servlet.http.HttpServlet;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
import javax.enterprise.inject.spi.BeanManager;
import javax.naming.InitialContext;
diff --git a/appserver/tests/appserv-tests/devtests/cdi/smoke-tests/singleton-startup/hello/ejb/com/acme/Foo.java b/appserver/tests/appserv-tests/devtests/cdi/smoke-tests/singleton-startup/hello/ejb/com/acme/Foo.java
index c28119d..4546976 100644
--- a/appserver/tests/appserv-tests/devtests/cdi/smoke-tests/singleton-startup/hello/ejb/com/acme/Foo.java
+++ b/appserver/tests/appserv-tests/devtests/cdi/smoke-tests/singleton-startup/hello/ejb/com/acme/Foo.java
@@ -21,7 +21,7 @@
public class Foo {
@EJB Hello hello;
- @javax.inject.Inject TestBean tb;
+ @jakarta.inject.Inject TestBean tb;
public boolean testInjection(){
return tb != null;
diff --git a/appserver/tests/appserv-tests/devtests/cdi/smoke-tests/singleton-startup/hello/ejb/com/acme/SingletonBean.java b/appserver/tests/appserv-tests/devtests/cdi/smoke-tests/singleton-startup/hello/ejb/com/acme/SingletonBean.java
index 89d2c3e..a754fec 100644
--- a/appserver/tests/appserv-tests/devtests/cdi/smoke-tests/singleton-startup/hello/ejb/com/acme/SingletonBean.java
+++ b/appserver/tests/appserv-tests/devtests/cdi/smoke-tests/singleton-startup/hello/ejb/com/acme/SingletonBean.java
@@ -22,7 +22,7 @@
import jakarta.ejb.EJBException;
import jakarta.ejb.Singleton;
import jakarta.ejb.Startup;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
import org.omg.CORBA.ORB;
diff --git a/appserver/tests/appserv-tests/devtests/cdi/smoke-tests/slf4j-visibility/servlet/TestServlet.java b/appserver/tests/appserv-tests/devtests/cdi/smoke-tests/slf4j-visibility/servlet/TestServlet.java
index bc1c99f..27bcc35 100644
--- a/appserver/tests/appserv-tests/devtests/cdi/smoke-tests/slf4j-visibility/servlet/TestServlet.java
+++ b/appserver/tests/appserv-tests/devtests/cdi/smoke-tests/slf4j-visibility/servlet/TestServlet.java
@@ -18,7 +18,7 @@
import java.io.PrintWriter;
import javax.enterprise.inject.spi.BeanManager;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
import javax.naming.InitialContext;
import javax.servlet.ServletException;
import javax.servlet.annotation.WebInitParam;
diff --git a/appserver/tests/appserv-tests/devtests/cdi/specialization/alternative-leaks/servlet/test/beans/artifacts/LeakQualifier.java b/appserver/tests/appserv-tests/devtests/cdi/specialization/alternative-leaks/servlet/test/beans/artifacts/LeakQualifier.java
index 38fe2cb..b7f751b 100644
--- a/appserver/tests/appserv-tests/devtests/cdi/specialization/alternative-leaks/servlet/test/beans/artifacts/LeakQualifier.java
+++ b/appserver/tests/appserv-tests/devtests/cdi/specialization/alternative-leaks/servlet/test/beans/artifacts/LeakQualifier.java
@@ -25,7 +25,7 @@
import java.lang.annotation.RetentionPolicy;
import java.lang.annotation.Target;
-import javax.inject.Qualifier;
+import jakarta.inject.Qualifier;
@Qualifier
@Target({ TYPE, METHOD, PARAMETER, FIELD })
diff --git a/appserver/tests/appserv-tests/devtests/cdi/specialization/alternative-leaks/servlet/test/beans/artifacts/Preferred.java b/appserver/tests/appserv-tests/devtests/cdi/specialization/alternative-leaks/servlet/test/beans/artifacts/Preferred.java
index b7584c8..f5cad81 100644
--- a/appserver/tests/appserv-tests/devtests/cdi/specialization/alternative-leaks/servlet/test/beans/artifacts/Preferred.java
+++ b/appserver/tests/appserv-tests/devtests/cdi/specialization/alternative-leaks/servlet/test/beans/artifacts/Preferred.java
@@ -25,7 +25,7 @@
import java.lang.annotation.RetentionPolicy;
import java.lang.annotation.Target;
-import javax.inject.Qualifier;
+import jakarta.inject.Qualifier;
@Qualifier
@Target({ TYPE, METHOD, PARAMETER, FIELD })
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 0422634..1be5d11 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
@@ -16,7 +16,7 @@
package test.beans.artifacts;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
import jakarta.interceptor.AroundInvoke;
import jakarta.interceptor.Interceptor;
import jakarta.interceptor.InvocationContext;
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 913c049..89b743a 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
@@ -16,7 +16,7 @@
package test.beans.artifacts;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
import jakarta.interceptor.AroundInvoke;
import jakarta.interceptor.Interceptor;
import jakarta.interceptor.InvocationContext;
diff --git a/appserver/tests/appserv-tests/devtests/cdi/specialization/alternative-leaks/servlet/test/servlet/LeakQualifierTestServlet.java b/appserver/tests/appserv-tests/devtests/cdi/specialization/alternative-leaks/servlet/test/servlet/LeakQualifierTestServlet.java
index e8ea1e1..9dca6a4 100644
--- a/appserver/tests/appserv-tests/devtests/cdi/specialization/alternative-leaks/servlet/test/servlet/LeakQualifierTestServlet.java
+++ b/appserver/tests/appserv-tests/devtests/cdi/specialization/alternative-leaks/servlet/test/servlet/LeakQualifierTestServlet.java
@@ -19,7 +19,7 @@
import java.io.IOException;
import java.io.PrintWriter;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
import javax.servlet.ServletException;
import javax.servlet.annotation.WebServlet;
import javax.servlet.http.HttpServlet;
diff --git a/appserver/tests/appserv-tests/devtests/cdi/specialization/specialization-simple/servlet/test/beans/artifacts/AnotherQualifier.java b/appserver/tests/appserv-tests/devtests/cdi/specialization/specialization-simple/servlet/test/beans/artifacts/AnotherQualifier.java
index 3b7f763..8d611af 100644
--- a/appserver/tests/appserv-tests/devtests/cdi/specialization/specialization-simple/servlet/test/beans/artifacts/AnotherQualifier.java
+++ b/appserver/tests/appserv-tests/devtests/cdi/specialization/specialization-simple/servlet/test/beans/artifacts/AnotherQualifier.java
@@ -25,7 +25,7 @@
import java.lang.annotation.RetentionPolicy;
import java.lang.annotation.Target;
-import javax.inject.Qualifier;
+import jakarta.inject.Qualifier;
@Qualifier
@Target({ TYPE, METHOD, PARAMETER, FIELD })
diff --git a/appserver/tests/appserv-tests/devtests/cdi/specialization/specialization-simple/servlet/test/beans/artifacts/Preferred.java b/appserver/tests/appserv-tests/devtests/cdi/specialization/specialization-simple/servlet/test/beans/artifacts/Preferred.java
index b7584c8..f5cad81 100644
--- a/appserver/tests/appserv-tests/devtests/cdi/specialization/specialization-simple/servlet/test/beans/artifacts/Preferred.java
+++ b/appserver/tests/appserv-tests/devtests/cdi/specialization/specialization-simple/servlet/test/beans/artifacts/Preferred.java
@@ -25,7 +25,7 @@
import java.lang.annotation.RetentionPolicy;
import java.lang.annotation.Target;
-import javax.inject.Qualifier;
+import jakarta.inject.Qualifier;
@Qualifier
@Target({ TYPE, METHOD, PARAMETER, FIELD })
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 0422634..1be5d11 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
@@ -16,7 +16,7 @@
package test.beans.artifacts;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
import jakarta.interceptor.AroundInvoke;
import jakarta.interceptor.Interceptor;
import jakarta.interceptor.InvocationContext;
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 913c049..89b743a 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
@@ -16,7 +16,7 @@
package test.beans.artifacts;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
import jakarta.interceptor.AroundInvoke;
import jakarta.interceptor.Interceptor;
import jakarta.interceptor.InvocationContext;
diff --git a/appserver/tests/appserv-tests/devtests/cdi/specialization/specialization-simple/servlet/test/servlet/SimpleSpecializationTestServlet.java b/appserver/tests/appserv-tests/devtests/cdi/specialization/specialization-simple/servlet/test/servlet/SimpleSpecializationTestServlet.java
index 3605c52..bd71ac0 100644
--- a/appserver/tests/appserv-tests/devtests/cdi/specialization/specialization-simple/servlet/test/servlet/SimpleSpecializationTestServlet.java
+++ b/appserver/tests/appserv-tests/devtests/cdi/specialization/specialization-simple/servlet/test/servlet/SimpleSpecializationTestServlet.java
@@ -19,7 +19,7 @@
import java.io.IOException;
import java.io.PrintWriter;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
import javax.servlet.ServletException;
import javax.servlet.annotation.WebServlet;
import javax.servlet.http.HttpServlet;
diff --git a/appserver/tests/appserv-tests/devtests/cdi/stereotypes/alternative-stereotypes/servlet/test/beans/artifacts/Preferred.java b/appserver/tests/appserv-tests/devtests/cdi/stereotypes/alternative-stereotypes/servlet/test/beans/artifacts/Preferred.java
index b7584c8..f5cad81 100644
--- a/appserver/tests/appserv-tests/devtests/cdi/stereotypes/alternative-stereotypes/servlet/test/beans/artifacts/Preferred.java
+++ b/appserver/tests/appserv-tests/devtests/cdi/stereotypes/alternative-stereotypes/servlet/test/beans/artifacts/Preferred.java
@@ -25,7 +25,7 @@
import java.lang.annotation.RetentionPolicy;
import java.lang.annotation.Target;
-import javax.inject.Qualifier;
+import jakarta.inject.Qualifier;
@Qualifier
@Target({ TYPE, METHOD, PARAMETER, FIELD })
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 0422634..1be5d11 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
@@ -16,7 +16,7 @@
package test.beans.artifacts;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
import jakarta.interceptor.AroundInvoke;
import jakarta.interceptor.Interceptor;
import jakarta.interceptor.InvocationContext;
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 913c049..89b743a 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
@@ -16,7 +16,7 @@
package test.beans.artifacts;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
import jakarta.interceptor.AroundInvoke;
import jakarta.interceptor.Interceptor;
import jakarta.interceptor.InvocationContext;
diff --git a/appserver/tests/appserv-tests/devtests/cdi/stereotypes/alternative-stereotypes/servlet/test/servlet/AlternativeStereotypesTestServlet.java b/appserver/tests/appserv-tests/devtests/cdi/stereotypes/alternative-stereotypes/servlet/test/servlet/AlternativeStereotypesTestServlet.java
index 6903b0d..4bffd3c 100644
--- a/appserver/tests/appserv-tests/devtests/cdi/stereotypes/alternative-stereotypes/servlet/test/servlet/AlternativeStereotypesTestServlet.java
+++ b/appserver/tests/appserv-tests/devtests/cdi/stereotypes/alternative-stereotypes/servlet/test/servlet/AlternativeStereotypesTestServlet.java
@@ -19,7 +19,7 @@
import java.io.IOException;
import java.io.PrintWriter;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
import javax.servlet.ServletException;
import javax.servlet.annotation.WebServlet;
import javax.servlet.http.HttpServlet;
diff --git a/appserver/tests/appserv-tests/devtests/cdi/stereotypes/interceptor-bindings-for-stereotypes/servlet/test/beans/Preferred.java b/appserver/tests/appserv-tests/devtests/cdi/stereotypes/interceptor-bindings-for-stereotypes/servlet/test/beans/Preferred.java
index fa8fdb7..1e171f7 100644
--- a/appserver/tests/appserv-tests/devtests/cdi/stereotypes/interceptor-bindings-for-stereotypes/servlet/test/beans/Preferred.java
+++ b/appserver/tests/appserv-tests/devtests/cdi/stereotypes/interceptor-bindings-for-stereotypes/servlet/test/beans/Preferred.java
@@ -25,7 +25,7 @@
import java.lang.annotation.RetentionPolicy;
import java.lang.annotation.Target;
-import javax.inject.Qualifier;
+import jakarta.inject.Qualifier;
@Qualifier
@Target({ TYPE, METHOD, PARAMETER, FIELD })
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 566c4b0..e626a37 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
@@ -16,7 +16,7 @@
package test.beans;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
import jakarta.interceptor.AroundInvoke;
import jakarta.interceptor.Interceptor;
import jakarta.interceptor.InvocationContext;
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 641c3d0..afdc156 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
@@ -16,7 +16,7 @@
package test.beans;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
import jakarta.interceptor.AroundInvoke;
import jakarta.interceptor.Interceptor;
import jakarta.interceptor.InvocationContext;
diff --git a/appserver/tests/appserv-tests/devtests/cdi/stereotypes/interceptor-bindings-for-stereotypes/servlet/test/servlet/InterceptorBindingsForStereotypesTestServlet.java b/appserver/tests/appserv-tests/devtests/cdi/stereotypes/interceptor-bindings-for-stereotypes/servlet/test/servlet/InterceptorBindingsForStereotypesTestServlet.java
index 3e739ff..391ba72 100644
--- a/appserver/tests/appserv-tests/devtests/cdi/stereotypes/interceptor-bindings-for-stereotypes/servlet/test/servlet/InterceptorBindingsForStereotypesTestServlet.java
+++ b/appserver/tests/appserv-tests/devtests/cdi/stereotypes/interceptor-bindings-for-stereotypes/servlet/test/servlet/InterceptorBindingsForStereotypesTestServlet.java
@@ -19,7 +19,7 @@
import java.io.IOException;
import java.io.PrintWriter;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
import javax.servlet.ServletException;
import javax.servlet.annotation.WebServlet;
import javax.servlet.http.HttpServlet;
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 19ba9cb..857a2df 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
@@ -23,7 +23,7 @@
import java.lang.annotation.RetentionPolicy;
import java.lang.annotation.Target;
-import javax.inject.Qualifier;
+import jakarta.inject.Qualifier;
import jakarta.interceptor.InterceptorBinding;
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 0559627..2a6e580 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
@@ -16,7 +16,7 @@
package test.beans.interceptors;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
import jakarta.interceptor.AroundInvoke;
import jakarta.interceptor.Interceptor;
import jakarta.interceptor.InvocationContext;
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 2c2807e..0867b25 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
@@ -16,7 +16,7 @@
package test.beans.interceptors;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
import jakarta.interceptor.AroundInvoke;
import jakarta.interceptor.Interceptor;
import jakarta.interceptor.InvocationContext;
diff --git a/appserver/tests/appserv-tests/devtests/cdi/stereotypes/stereotype-stacking/servlet/test/beans/qualifiers/Preferred.java b/appserver/tests/appserv-tests/devtests/cdi/stereotypes/stereotype-stacking/servlet/test/beans/qualifiers/Preferred.java
index a839658..03fca87 100644
--- a/appserver/tests/appserv-tests/devtests/cdi/stereotypes/stereotype-stacking/servlet/test/beans/qualifiers/Preferred.java
+++ b/appserver/tests/appserv-tests/devtests/cdi/stereotypes/stereotype-stacking/servlet/test/beans/qualifiers/Preferred.java
@@ -25,7 +25,7 @@
import java.lang.annotation.RetentionPolicy;
import java.lang.annotation.Target;
-import javax.inject.Qualifier;
+import jakarta.inject.Qualifier;
@Qualifier
@Target({ TYPE, METHOD, PARAMETER, FIELD })
diff --git a/appserver/tests/appserv-tests/devtests/cdi/stereotypes/stereotype-stacking/servlet/test/servlet/StereotypeStackingTestServlet.java b/appserver/tests/appserv-tests/devtests/cdi/stereotypes/stereotype-stacking/servlet/test/servlet/StereotypeStackingTestServlet.java
index 953c845..a614a91 100644
--- a/appserver/tests/appserv-tests/devtests/cdi/stereotypes/stereotype-stacking/servlet/test/servlet/StereotypeStackingTestServlet.java
+++ b/appserver/tests/appserv-tests/devtests/cdi/stereotypes/stereotype-stacking/servlet/test/servlet/StereotypeStackingTestServlet.java
@@ -19,7 +19,7 @@
import java.io.IOException;
import java.io.PrintWriter;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
import javax.servlet.ServletException;
import javax.servlet.annotation.WebServlet;
import javax.servlet.http.HttpServlet;
diff --git a/appserver/tests/appserv-tests/devtests/cdi/transactions/transaction-scoped/servlet/test/servlet/TransactionScopedTestServlet.java b/appserver/tests/appserv-tests/devtests/cdi/transactions/transaction-scoped/servlet/test/servlet/TransactionScopedTestServlet.java
index b859466..26b547b 100644
--- a/appserver/tests/appserv-tests/devtests/cdi/transactions/transaction-scoped/servlet/test/servlet/TransactionScopedTestServlet.java
+++ b/appserver/tests/appserv-tests/devtests/cdi/transactions/transaction-scoped/servlet/test/servlet/TransactionScopedTestServlet.java
@@ -20,7 +20,7 @@
import test.beans.Bean2;
import javax.enterprise.context.ContextNotActiveException;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
import javax.servlet.ServletException;
import javax.servlet.ServletOutputStream;
import javax.servlet.annotation.WebServlet;
diff --git a/appserver/tests/appserv-tests/devtests/cdi/unproxyable-deps/servlet/UnproxyableDepsTest.java b/appserver/tests/appserv-tests/devtests/cdi/unproxyable-deps/servlet/UnproxyableDepsTest.java
index 26fe8c9..da96f03 100644
--- a/appserver/tests/appserv-tests/devtests/cdi/unproxyable-deps/servlet/UnproxyableDepsTest.java
+++ b/appserver/tests/appserv-tests/devtests/cdi/unproxyable-deps/servlet/UnproxyableDepsTest.java
@@ -17,7 +17,7 @@
import java.io.IOException;
import java.io.PrintWriter;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
import javax.servlet.ServletException;
import javax.servlet.annotation.WebInitParam;
import javax.servlet.annotation.WebServlet;
diff --git a/appserver/tests/appserv-tests/devtests/cdi/unproxyable-deps/servlet/test/artifacts/AppScopedBean.java b/appserver/tests/appserv-tests/devtests/cdi/unproxyable-deps/servlet/test/artifacts/AppScopedBean.java
index 09251a4..08bb9e1 100644
--- a/appserver/tests/appserv-tests/devtests/cdi/unproxyable-deps/servlet/test/artifacts/AppScopedBean.java
+++ b/appserver/tests/appserv-tests/devtests/cdi/unproxyable-deps/servlet/test/artifacts/AppScopedBean.java
@@ -17,7 +17,7 @@
package test.artifacts;
import javax.enterprise.context.ApplicationScoped;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
@ApplicationScoped
public class AppScopedBean {
diff --git a/appserver/tests/appserv-tests/devtests/cdi/unsatisfied-deps/servlet/UnsatisfiedDependenciesServlet.java b/appserver/tests/appserv-tests/devtests/cdi/unsatisfied-deps/servlet/UnsatisfiedDependenciesServlet.java
index 6e739b8..65af64a 100644
--- a/appserver/tests/appserv-tests/devtests/cdi/unsatisfied-deps/servlet/UnsatisfiedDependenciesServlet.java
+++ b/appserver/tests/appserv-tests/devtests/cdi/unsatisfied-deps/servlet/UnsatisfiedDependenciesServlet.java
@@ -17,7 +17,7 @@
import java.io.IOException;
import java.io.PrintWriter;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
import javax.servlet.ServletException;
import javax.servlet.annotation.WebInitParam;
import javax.servlet.annotation.WebServlet;
diff --git a/appserver/tests/appserv-tests/devtests/cdi/unsatisfied-deps/servlet/test/beans/BeanToTestUnsatisfiedDependencies.java b/appserver/tests/appserv-tests/devtests/cdi/unsatisfied-deps/servlet/test/beans/BeanToTestUnsatisfiedDependencies.java
index fd327c0..e3a279e 100644
--- a/appserver/tests/appserv-tests/devtests/cdi/unsatisfied-deps/servlet/test/beans/BeanToTestUnsatisfiedDependencies.java
+++ b/appserver/tests/appserv-tests/devtests/cdi/unsatisfied-deps/servlet/test/beans/BeanToTestUnsatisfiedDependencies.java
@@ -18,7 +18,7 @@
import javax.enterprise.inject.Any;
import javax.enterprise.inject.Instance;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
import test.artifacts.MockPaymentProcessor;
import test.artifacts.PaymentProcessor;
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb31/embedded/embedasync/ejb/StatefulBean.java b/appserver/tests/appserv-tests/devtests/ejb/ejb31/embedded/embedasync/ejb/StatefulBean.java
index cfd2dd5..98550db 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb31/embedded/embedasync/ejb/StatefulBean.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb31/embedded/embedasync/ejb/StatefulBean.java
@@ -19,7 +19,7 @@
import jakarta.ejb.*;
import jakarta.annotation.*;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
@Stateful
@StatefulTimeout(0)
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 9163c0e..c978178 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
@@ -20,7 +20,7 @@
import jakarta.annotation.*;
import jakarta.interceptor.*;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
public class Bar {
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 ab763bd..67545e2 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
@@ -20,7 +20,7 @@
import jakarta.annotation.*;
import jakarta.interceptor.*;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
public class DependentWithInjectedDataSource {
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 2ff543c..2c68ab0 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
@@ -20,7 +20,7 @@
import jakarta.annotation.*;
import jakarta.interceptor.*;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
import javax.naming.InitialContext;
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 ca282fb..bc99ed3 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
@@ -20,7 +20,7 @@
import jakarta.annotation.*;
import jakarta.interceptor.*;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
import javax.naming.InitialContext;
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 8d943bd..f329c4c 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
@@ -20,7 +20,7 @@
import jakarta.annotation.*;
import jakarta.interceptor.*;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
@Singleton
@Startup
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 21bc403..9bf9c4e 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
@@ -20,7 +20,7 @@
import jakarta.annotation.*;
import jakarta.interceptor.*;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
@Singleton
@Startup
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 d73e188..9ac9ed4 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
@@ -25,8 +25,8 @@
import java.util.ArrayList;
import java.util.List;
-import javax.inject.Inject;
-import javax.inject.Named;
+import jakarta.inject.Inject;
+import jakarta.inject.Named;
import javax.enterprise.event.Observes;
@Stateless
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/jcdifull/ejb/StatelessBean2.java b/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/jcdifull/ejb/StatelessBean2.java
index 008b8fa..06508f8 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/jcdifull/ejb/StatelessBean2.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/jcdifull/ejb/StatelessBean2.java
@@ -19,8 +19,8 @@
import jakarta.ejb.*;
import jakarta.annotation.*;
-import javax.inject.Inject;
-import javax.inject.Named;
+import jakarta.inject.Inject;
+import jakarta.inject.Named;
import javax.enterprise.event.Observes;
@Stateless
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/jcdifull/ejb/TextTranslator.java b/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/jcdifull/ejb/TextTranslator.java
index b047439..7610bbf 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/jcdifull/ejb/TextTranslator.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/jcdifull/ejb/TextTranslator.java
@@ -19,7 +19,7 @@
import java.io.Serializable;
import jakarta.ejb.EJB;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
public class TextTranslator implements Serializable
{
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/jcdifull/ejb/TranslatorControllerBean.java b/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/jcdifull/ejb/TranslatorControllerBean.java
index 89488a8..f94e915 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/jcdifull/ejb/TranslatorControllerBean.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/jcdifull/ejb/TranslatorControllerBean.java
@@ -19,8 +19,8 @@
import jakarta.ejb.Remove;
import jakarta.ejb.Stateful;
import javax.enterprise.context.RequestScoped;
-import javax.inject.Inject;
-import javax.inject.Named;
+import jakarta.inject.Inject;
+import jakarta.inject.Named;
@Stateful
@RequestScoped
diff --git a/appserver/tests/appserv-tests/devtests/jms/JMSXDeliveryCount/MDB1/ejb/MySessionBean.java b/appserver/tests/appserv-tests/devtests/jms/JMSXDeliveryCount/MDB1/ejb/MySessionBean.java
index dd18b9a..4daa8a9 100644
--- a/appserver/tests/appserv-tests/devtests/jms/JMSXDeliveryCount/MDB1/ejb/MySessionBean.java
+++ b/appserver/tests/appserv-tests/devtests/jms/JMSXDeliveryCount/MDB1/ejb/MySessionBean.java
@@ -19,7 +19,7 @@
import java.util.logging.Logger;
import jakarta.annotation.Resource;
import jakarta.ejb.*;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
import jakarta.jms.*;
/**
diff --git a/appserver/tests/appserv-tests/devtests/jms/JMSXDeliveryCount/MDB1/ejb/NewMessageBean.java b/appserver/tests/appserv-tests/devtests/jms/JMSXDeliveryCount/MDB1/ejb/NewMessageBean.java
index 0da9a68..ac090fe 100644
--- a/appserver/tests/appserv-tests/devtests/jms/JMSXDeliveryCount/MDB1/ejb/NewMessageBean.java
+++ b/appserver/tests/appserv-tests/devtests/jms/JMSXDeliveryCount/MDB1/ejb/NewMessageBean.java
@@ -19,7 +19,7 @@
import java.util.logging.*;
import jakarta.annotation.Resource;
import jakarta.ejb.*;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
import jakarta.jms.*;
@MessageDriven(mappedName = "jms/jms_unit_test_Queue", activationConfig = {
diff --git a/appserver/tests/appserv-tests/devtests/jms/JMSXDeliveryCount/MDB2/ejb/MySessionBean.java b/appserver/tests/appserv-tests/devtests/jms/JMSXDeliveryCount/MDB2/ejb/MySessionBean.java
index dd18b9a..4daa8a9 100644
--- a/appserver/tests/appserv-tests/devtests/jms/JMSXDeliveryCount/MDB2/ejb/MySessionBean.java
+++ b/appserver/tests/appserv-tests/devtests/jms/JMSXDeliveryCount/MDB2/ejb/MySessionBean.java
@@ -19,7 +19,7 @@
import java.util.logging.Logger;
import jakarta.annotation.Resource;
import jakarta.ejb.*;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
import jakarta.jms.*;
/**
diff --git a/appserver/tests/appserv-tests/devtests/jms/JMSXDeliveryCount/MDB2/ejb/NewMessageBean.java b/appserver/tests/appserv-tests/devtests/jms/JMSXDeliveryCount/MDB2/ejb/NewMessageBean.java
index 46840bf..2c124bd 100644
--- a/appserver/tests/appserv-tests/devtests/jms/JMSXDeliveryCount/MDB2/ejb/NewMessageBean.java
+++ b/appserver/tests/appserv-tests/devtests/jms/JMSXDeliveryCount/MDB2/ejb/NewMessageBean.java
@@ -19,7 +19,7 @@
import java.util.logging.*;
import jakarta.annotation.Resource;
import jakarta.ejb.*;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
import jakarta.jms.*;
@MessageDriven(mappedName = "jms/jms_unit_test_Queue", activationConfig = {
diff --git a/appserver/tests/appserv-tests/devtests/jms/JMSXDeliveryCount/MDB3/ejb/MySessionBean.java b/appserver/tests/appserv-tests/devtests/jms/JMSXDeliveryCount/MDB3/ejb/MySessionBean.java
index dd18b9a..4daa8a9 100644
--- a/appserver/tests/appserv-tests/devtests/jms/JMSXDeliveryCount/MDB3/ejb/MySessionBean.java
+++ b/appserver/tests/appserv-tests/devtests/jms/JMSXDeliveryCount/MDB3/ejb/MySessionBean.java
@@ -19,7 +19,7 @@
import java.util.logging.Logger;
import jakarta.annotation.Resource;
import jakarta.ejb.*;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
import jakarta.jms.*;
/**
diff --git a/appserver/tests/appserv-tests/devtests/jms/JMSXDeliveryCount/MDB3/ejb/NewMessageBean.java b/appserver/tests/appserv-tests/devtests/jms/JMSXDeliveryCount/MDB3/ejb/NewMessageBean.java
index 543351e..487fbee 100644
--- a/appserver/tests/appserv-tests/devtests/jms/JMSXDeliveryCount/MDB3/ejb/NewMessageBean.java
+++ b/appserver/tests/appserv-tests/devtests/jms/JMSXDeliveryCount/MDB3/ejb/NewMessageBean.java
@@ -19,7 +19,7 @@
import java.util.logging.*;
import jakarta.annotation.Resource;
import jakarta.ejb.*;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
import jakarta.jms.*;
@MessageDriven(mappedName = "jms/jms_unit_test_Queue", activationConfig = {
diff --git a/appserver/tests/appserv-tests/devtests/jms/JMSXDeliveryCount/MDB4/ejb/MySessionBean.java b/appserver/tests/appserv-tests/devtests/jms/JMSXDeliveryCount/MDB4/ejb/MySessionBean.java
index dd18b9a..4daa8a9 100644
--- a/appserver/tests/appserv-tests/devtests/jms/JMSXDeliveryCount/MDB4/ejb/MySessionBean.java
+++ b/appserver/tests/appserv-tests/devtests/jms/JMSXDeliveryCount/MDB4/ejb/MySessionBean.java
@@ -19,7 +19,7 @@
import java.util.logging.Logger;
import jakarta.annotation.Resource;
import jakarta.ejb.*;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
import jakarta.jms.*;
/**
diff --git a/appserver/tests/appserv-tests/devtests/jms/JMSXDeliveryCount/MDB4/ejb/NewMessageBean.java b/appserver/tests/appserv-tests/devtests/jms/JMSXDeliveryCount/MDB4/ejb/NewMessageBean.java
index 38980d3..a40c4b6 100644
--- a/appserver/tests/appserv-tests/devtests/jms/JMSXDeliveryCount/MDB4/ejb/NewMessageBean.java
+++ b/appserver/tests/appserv-tests/devtests/jms/JMSXDeliveryCount/MDB4/ejb/NewMessageBean.java
@@ -19,7 +19,7 @@
import java.util.logging.*;
import jakarta.annotation.Resource;
import jakarta.ejb.*;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
import jakarta.jms.*;
@MessageDriven(mappedName = "jms/jms_unit_test_Queue", activationConfig = {
diff --git a/appserver/tests/appserv-tests/devtests/jms/JMSXDeliveryCount/sessionBean1/ejb/MySessionBean.java b/appserver/tests/appserv-tests/devtests/jms/JMSXDeliveryCount/sessionBean1/ejb/MySessionBean.java
index b6a0d70..1433d38 100644
--- a/appserver/tests/appserv-tests/devtests/jms/JMSXDeliveryCount/sessionBean1/ejb/MySessionBean.java
+++ b/appserver/tests/appserv-tests/devtests/jms/JMSXDeliveryCount/sessionBean1/ejb/MySessionBean.java
@@ -19,7 +19,7 @@
import java.util.logging.Logger;
import jakarta.annotation.Resource;
import jakarta.ejb.*;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
import jakarta.jms.*;
/**
diff --git a/appserver/tests/appserv-tests/devtests/jms/JMSXDeliveryCount/sessionBean2/ejb/MySessionBean.java b/appserver/tests/appserv-tests/devtests/jms/JMSXDeliveryCount/sessionBean2/ejb/MySessionBean.java
index 50ca44f..606bc90 100644
--- a/appserver/tests/appserv-tests/devtests/jms/JMSXDeliveryCount/sessionBean2/ejb/MySessionBean.java
+++ b/appserver/tests/appserv-tests/devtests/jms/JMSXDeliveryCount/sessionBean2/ejb/MySessionBean.java
@@ -19,7 +19,7 @@
import java.util.logging.Logger;
import jakarta.annotation.Resource;
import jakarta.ejb.*;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
import jakarta.jms.*;
/**
diff --git a/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/cluster/ClusterScope/durableWithName/ejb/MySessionBean.java b/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/cluster/ClusterScope/durableWithName/ejb/MySessionBean.java
index b21c9bd..60d41db 100644
--- a/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/cluster/ClusterScope/durableWithName/ejb/MySessionBean.java
+++ b/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/cluster/ClusterScope/durableWithName/ejb/MySessionBean.java
@@ -19,7 +19,7 @@
import java.util.logging.Logger;
import jakarta.annotation.Resource;
import jakarta.ejb.*;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
import jakarta.jms.*;
/**
diff --git a/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/cluster/ClusterScope/durableWithName/ejb/NewMessageBean.java b/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/cluster/ClusterScope/durableWithName/ejb/NewMessageBean.java
index f553fec..5c72efb 100644
--- a/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/cluster/ClusterScope/durableWithName/ejb/NewMessageBean.java
+++ b/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/cluster/ClusterScope/durableWithName/ejb/NewMessageBean.java
@@ -19,7 +19,7 @@
import java.util.logging.*;
import jakarta.annotation.Resource;
import jakarta.ejb.*;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
import jakarta.jms.*;
@MessageDriven(mappedName = "jms/jms_unit_test_Topic", activationConfig = {
diff --git a/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/cluster/ClusterScope/durableWithName/ejb/NewMessageBean2.java b/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/cluster/ClusterScope/durableWithName/ejb/NewMessageBean2.java
index e58da8c..85d7828 100644
--- a/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/cluster/ClusterScope/durableWithName/ejb/NewMessageBean2.java
+++ b/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/cluster/ClusterScope/durableWithName/ejb/NewMessageBean2.java
@@ -19,7 +19,7 @@
import java.util.logging.*;
import jakarta.annotation.Resource;
import jakarta.ejb.*;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
import jakarta.jms.*;
@MessageDriven(mappedName = "jms/jms_unit_test_Topic", activationConfig = {
diff --git a/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/cluster/ClusterScope/durableWithoutName/ejb/MySessionBean.java b/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/cluster/ClusterScope/durableWithoutName/ejb/MySessionBean.java
index 11b9816..388dc18 100644
--- a/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/cluster/ClusterScope/durableWithoutName/ejb/MySessionBean.java
+++ b/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/cluster/ClusterScope/durableWithoutName/ejb/MySessionBean.java
@@ -19,7 +19,7 @@
import java.util.logging.Logger;
import jakarta.annotation.Resource;
import jakarta.ejb.*;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
import jakarta.jms.*;
/**
diff --git a/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/cluster/ClusterScope/durableWithoutName/ejb/NewMessageBean.java b/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/cluster/ClusterScope/durableWithoutName/ejb/NewMessageBean.java
index c66f2f6..9731b9e 100644
--- a/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/cluster/ClusterScope/durableWithoutName/ejb/NewMessageBean.java
+++ b/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/cluster/ClusterScope/durableWithoutName/ejb/NewMessageBean.java
@@ -19,7 +19,7 @@
import java.util.logging.*;
import jakarta.annotation.Resource;
import jakarta.ejb.*;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
import jakarta.jms.*;
@MessageDriven(mappedName = "jms/jms_unit_test_Topic", activationConfig = {
diff --git a/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/cluster/ClusterScope/durableWithoutName/ejb/NewMessageBean2.java b/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/cluster/ClusterScope/durableWithoutName/ejb/NewMessageBean2.java
index a138753..23a8936 100644
--- a/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/cluster/ClusterScope/durableWithoutName/ejb/NewMessageBean2.java
+++ b/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/cluster/ClusterScope/durableWithoutName/ejb/NewMessageBean2.java
@@ -19,7 +19,7 @@
import java.util.logging.*;
import jakarta.annotation.Resource;
import jakarta.ejb.*;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
import jakarta.jms.*;
@MessageDriven(mappedName = "jms/jms_unit_test_Topic", activationConfig = {
diff --git a/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/cluster/ClusterScope/nondurableWithName/ejb/MySessionBean.java b/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/cluster/ClusterScope/nondurableWithName/ejb/MySessionBean.java
index b21c9bd..60d41db 100644
--- a/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/cluster/ClusterScope/nondurableWithName/ejb/MySessionBean.java
+++ b/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/cluster/ClusterScope/nondurableWithName/ejb/MySessionBean.java
@@ -19,7 +19,7 @@
import java.util.logging.Logger;
import jakarta.annotation.Resource;
import jakarta.ejb.*;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
import jakarta.jms.*;
/**
diff --git a/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/cluster/ClusterScope/nondurableWithName/ejb/NewMessageBean.java b/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/cluster/ClusterScope/nondurableWithName/ejb/NewMessageBean.java
index 64a92af..60adbc0 100644
--- a/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/cluster/ClusterScope/nondurableWithName/ejb/NewMessageBean.java
+++ b/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/cluster/ClusterScope/nondurableWithName/ejb/NewMessageBean.java
@@ -19,7 +19,7 @@
import java.util.logging.*;
import jakarta.annotation.Resource;
import jakarta.ejb.*;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
import jakarta.jms.*;
@MessageDriven(mappedName = "jms/jms_unit_test_Topic", activationConfig = {
diff --git a/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/cluster/ClusterScope/nondurableWithName/ejb/NewMessageBean2.java b/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/cluster/ClusterScope/nondurableWithName/ejb/NewMessageBean2.java
index 391abe2..9c43142 100644
--- a/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/cluster/ClusterScope/nondurableWithName/ejb/NewMessageBean2.java
+++ b/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/cluster/ClusterScope/nondurableWithName/ejb/NewMessageBean2.java
@@ -19,7 +19,7 @@
import java.util.logging.*;
import jakarta.annotation.Resource;
import jakarta.ejb.*;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
import jakarta.jms.*;
@MessageDriven(mappedName = "jms/jms_unit_test_Topic", activationConfig = {
diff --git a/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/cluster/ClusterScope/nondurableWithoutName/ejb/MySessionBean.java b/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/cluster/ClusterScope/nondurableWithoutName/ejb/MySessionBean.java
index 11b9816..388dc18 100644
--- a/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/cluster/ClusterScope/nondurableWithoutName/ejb/MySessionBean.java
+++ b/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/cluster/ClusterScope/nondurableWithoutName/ejb/MySessionBean.java
@@ -19,7 +19,7 @@
import java.util.logging.Logger;
import jakarta.annotation.Resource;
import jakarta.ejb.*;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
import jakarta.jms.*;
/**
diff --git a/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/cluster/ClusterScope/nondurableWithoutName/ejb/NewMessageBean.java b/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/cluster/ClusterScope/nondurableWithoutName/ejb/NewMessageBean.java
index ed70d1b..55769e3 100644
--- a/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/cluster/ClusterScope/nondurableWithoutName/ejb/NewMessageBean.java
+++ b/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/cluster/ClusterScope/nondurableWithoutName/ejb/NewMessageBean.java
@@ -19,7 +19,7 @@
import java.util.logging.*;
import jakarta.annotation.Resource;
import jakarta.ejb.*;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
import jakarta.jms.*;
@MessageDriven(mappedName = "jms/jms_unit_test_Topic", activationConfig = {
diff --git a/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/cluster/ClusterScope/nondurableWithoutName/ejb/NewMessageBean2.java b/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/cluster/ClusterScope/nondurableWithoutName/ejb/NewMessageBean2.java
index bb9505d..961d0c9 100644
--- a/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/cluster/ClusterScope/nondurableWithoutName/ejb/NewMessageBean2.java
+++ b/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/cluster/ClusterScope/nondurableWithoutName/ejb/NewMessageBean2.java
@@ -19,7 +19,7 @@
import java.util.logging.*;
import jakarta.annotation.Resource;
import jakarta.ejb.*;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
import jakarta.jms.*;
@MessageDriven(mappedName = "jms/jms_unit_test_Topic", activationConfig = {
diff --git a/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/cluster/InstanceScope/durableWithName/ejb/MySessionBean.java b/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/cluster/InstanceScope/durableWithName/ejb/MySessionBean.java
index 09bde12..50fac2a 100644
--- a/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/cluster/InstanceScope/durableWithName/ejb/MySessionBean.java
+++ b/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/cluster/InstanceScope/durableWithName/ejb/MySessionBean.java
@@ -19,7 +19,7 @@
import java.util.logging.Logger;
import jakarta.annotation.Resource;
import jakarta.ejb.*;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
import jakarta.jms.*;
/**
diff --git a/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/cluster/InstanceScope/durableWithName/ejb/NewMessageBean.java b/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/cluster/InstanceScope/durableWithName/ejb/NewMessageBean.java
index d8c28e8..6bc920b 100644
--- a/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/cluster/InstanceScope/durableWithName/ejb/NewMessageBean.java
+++ b/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/cluster/InstanceScope/durableWithName/ejb/NewMessageBean.java
@@ -19,7 +19,7 @@
import java.util.logging.*;
import jakarta.annotation.Resource;
import jakarta.ejb.*;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
import jakarta.jms.*;
@MessageDriven(mappedName = "jms/jms_unit_test_Topic", activationConfig = {
diff --git a/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/cluster/InstanceScope/durableWithName/ejb/NewMessageBean2.java b/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/cluster/InstanceScope/durableWithName/ejb/NewMessageBean2.java
index 40dbf02..fc59035 100644
--- a/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/cluster/InstanceScope/durableWithName/ejb/NewMessageBean2.java
+++ b/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/cluster/InstanceScope/durableWithName/ejb/NewMessageBean2.java
@@ -19,7 +19,7 @@
import java.util.logging.*;
import jakarta.annotation.Resource;
import jakarta.ejb.*;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
import jakarta.jms.*;
@MessageDriven(mappedName = "jms/jms_unit_test_Topic", activationConfig = {
diff --git a/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/cluster/InstanceScope/durableWithoutName/ejb/MySessionBean.java b/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/cluster/InstanceScope/durableWithoutName/ejb/MySessionBean.java
index 971389a..d5997d9 100644
--- a/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/cluster/InstanceScope/durableWithoutName/ejb/MySessionBean.java
+++ b/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/cluster/InstanceScope/durableWithoutName/ejb/MySessionBean.java
@@ -19,7 +19,7 @@
import java.util.logging.Logger;
import jakarta.annotation.Resource;
import jakarta.ejb.*;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
import jakarta.jms.*;
/**
diff --git a/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/cluster/InstanceScope/durableWithoutName/ejb/NewMessageBean.java b/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/cluster/InstanceScope/durableWithoutName/ejb/NewMessageBean.java
index 8013738..027b409 100644
--- a/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/cluster/InstanceScope/durableWithoutName/ejb/NewMessageBean.java
+++ b/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/cluster/InstanceScope/durableWithoutName/ejb/NewMessageBean.java
@@ -19,7 +19,7 @@
import java.util.logging.*;
import jakarta.annotation.Resource;
import jakarta.ejb.*;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
import jakarta.jms.*;
@MessageDriven(mappedName = "jms/jms_unit_test_Topic", activationConfig = {
diff --git a/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/cluster/InstanceScope/durableWithoutName/ejb/NewMessageBean2.java b/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/cluster/InstanceScope/durableWithoutName/ejb/NewMessageBean2.java
index 72bb270..95619f4 100644
--- a/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/cluster/InstanceScope/durableWithoutName/ejb/NewMessageBean2.java
+++ b/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/cluster/InstanceScope/durableWithoutName/ejb/NewMessageBean2.java
@@ -19,7 +19,7 @@
import java.util.logging.*;
import jakarta.annotation.Resource;
import jakarta.ejb.*;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
import jakarta.jms.*;
@MessageDriven(mappedName = "jms/jms_unit_test_Topic", activationConfig = {
diff --git a/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/cluster/InstanceScope/nondurableWithName/ejb/MySessionBean.java b/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/cluster/InstanceScope/nondurableWithName/ejb/MySessionBean.java
index 11b9816..388dc18 100644
--- a/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/cluster/InstanceScope/nondurableWithName/ejb/MySessionBean.java
+++ b/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/cluster/InstanceScope/nondurableWithName/ejb/MySessionBean.java
@@ -19,7 +19,7 @@
import java.util.logging.Logger;
import jakarta.annotation.Resource;
import jakarta.ejb.*;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
import jakarta.jms.*;
/**
diff --git a/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/cluster/InstanceScope/nondurableWithName/ejb/NewMessageBean.java b/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/cluster/InstanceScope/nondurableWithName/ejb/NewMessageBean.java
index 65c4c48..4ce1e28 100644
--- a/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/cluster/InstanceScope/nondurableWithName/ejb/NewMessageBean.java
+++ b/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/cluster/InstanceScope/nondurableWithName/ejb/NewMessageBean.java
@@ -19,7 +19,7 @@
import java.util.logging.*;
import jakarta.annotation.Resource;
import jakarta.ejb.*;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
import jakarta.jms.*;
@MessageDriven(mappedName = "jms/jms_unit_test_Topic", activationConfig = {
diff --git a/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/cluster/InstanceScope/nondurableWithName/ejb/NewMessageBean2.java b/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/cluster/InstanceScope/nondurableWithName/ejb/NewMessageBean2.java
index 8e8c255..0194c66 100644
--- a/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/cluster/InstanceScope/nondurableWithName/ejb/NewMessageBean2.java
+++ b/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/cluster/InstanceScope/nondurableWithName/ejb/NewMessageBean2.java
@@ -19,7 +19,7 @@
import java.util.logging.*;
import jakarta.annotation.Resource;
import jakarta.ejb.*;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
import jakarta.jms.*;
@MessageDriven(mappedName = "jms/jms_unit_test_Topic", activationConfig = {
diff --git a/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/cluster/InstanceScope/nondurableWithoutName/ejb/MySessionBean.java b/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/cluster/InstanceScope/nondurableWithoutName/ejb/MySessionBean.java
index 971389a..d5997d9 100644
--- a/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/cluster/InstanceScope/nondurableWithoutName/ejb/MySessionBean.java
+++ b/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/cluster/InstanceScope/nondurableWithoutName/ejb/MySessionBean.java
@@ -19,7 +19,7 @@
import java.util.logging.Logger;
import jakarta.annotation.Resource;
import jakarta.ejb.*;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
import jakarta.jms.*;
/**
diff --git a/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/cluster/InstanceScope/nondurableWithoutName/ejb/NewMessageBean.java b/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/cluster/InstanceScope/nondurableWithoutName/ejb/NewMessageBean.java
index 1a89053..9e203c3 100644
--- a/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/cluster/InstanceScope/nondurableWithoutName/ejb/NewMessageBean.java
+++ b/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/cluster/InstanceScope/nondurableWithoutName/ejb/NewMessageBean.java
@@ -19,7 +19,7 @@
import java.util.logging.*;
import jakarta.annotation.Resource;
import jakarta.ejb.*;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
import jakarta.jms.*;
@MessageDriven(mappedName = "jms/jms_unit_test_Topic", activationConfig = {
diff --git a/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/cluster/InstanceScope/nondurableWithoutName/ejb/NewMessageBean2.java b/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/cluster/InstanceScope/nondurableWithoutName/ejb/NewMessageBean2.java
index 9ae2684..8abec85 100644
--- a/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/cluster/InstanceScope/nondurableWithoutName/ejb/NewMessageBean2.java
+++ b/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/cluster/InstanceScope/nondurableWithoutName/ejb/NewMessageBean2.java
@@ -19,7 +19,7 @@
import java.util.logging.*;
import jakarta.annotation.Resource;
import jakarta.ejb.*;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
import jakarta.jms.*;
@MessageDriven(mappedName = "jms/jms_unit_test_Topic", activationConfig = {
diff --git a/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/cluster/noScope/durableNoClientIdWithName/ejb/MySessionBean.java b/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/cluster/noScope/durableNoClientIdWithName/ejb/MySessionBean.java
index b21c9bd..60d41db 100644
--- a/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/cluster/noScope/durableNoClientIdWithName/ejb/MySessionBean.java
+++ b/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/cluster/noScope/durableNoClientIdWithName/ejb/MySessionBean.java
@@ -19,7 +19,7 @@
import java.util.logging.Logger;
import jakarta.annotation.Resource;
import jakarta.ejb.*;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
import jakarta.jms.*;
/**
diff --git a/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/cluster/noScope/durableNoClientIdWithName/ejb/NewMessageBean.java b/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/cluster/noScope/durableNoClientIdWithName/ejb/NewMessageBean.java
index aad4174..93a5d37 100644
--- a/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/cluster/noScope/durableNoClientIdWithName/ejb/NewMessageBean.java
+++ b/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/cluster/noScope/durableNoClientIdWithName/ejb/NewMessageBean.java
@@ -19,7 +19,7 @@
import java.util.logging.*;
import jakarta.annotation.Resource;
import jakarta.ejb.*;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
import jakarta.jms.*;
@MessageDriven(mappedName = "jms/jms_unit_test_Topic", activationConfig = {
diff --git a/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/cluster/noScope/durableWithName/ejb/MySessionBean.java b/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/cluster/noScope/durableWithName/ejb/MySessionBean.java
index b21c9bd..60d41db 100644
--- a/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/cluster/noScope/durableWithName/ejb/MySessionBean.java
+++ b/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/cluster/noScope/durableWithName/ejb/MySessionBean.java
@@ -19,7 +19,7 @@
import java.util.logging.Logger;
import jakarta.annotation.Resource;
import jakarta.ejb.*;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
import jakarta.jms.*;
/**
diff --git a/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/cluster/noScope/durableWithName/ejb/NewMessageBean.java b/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/cluster/noScope/durableWithName/ejb/NewMessageBean.java
index d40359f..1a814ad 100644
--- a/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/cluster/noScope/durableWithName/ejb/NewMessageBean.java
+++ b/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/cluster/noScope/durableWithName/ejb/NewMessageBean.java
@@ -19,7 +19,7 @@
import java.util.logging.*;
import jakarta.annotation.Resource;
import jakarta.ejb.*;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
import jakarta.jms.*;
@MessageDriven(mappedName = "jms/jms_unit_test_Topic", activationConfig = {
diff --git a/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/cluster/noScope/nondurableNotSharedWithName/ejb/MySessionBean.java b/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/cluster/noScope/nondurableNotSharedWithName/ejb/MySessionBean.java
index c960afa..7a1ec24 100644
--- a/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/cluster/noScope/nondurableNotSharedWithName/ejb/MySessionBean.java
+++ b/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/cluster/noScope/nondurableNotSharedWithName/ejb/MySessionBean.java
@@ -19,7 +19,7 @@
import java.util.logging.Logger;
import jakarta.annotation.Resource;
import jakarta.ejb.*;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
import jakarta.jms.*;
/**
diff --git a/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/cluster/noScope/nondurableNotSharedWithName/ejb/NewMessageBean.java b/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/cluster/noScope/nondurableNotSharedWithName/ejb/NewMessageBean.java
index 80bb9b8..2ba5001 100644
--- a/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/cluster/noScope/nondurableNotSharedWithName/ejb/NewMessageBean.java
+++ b/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/cluster/noScope/nondurableNotSharedWithName/ejb/NewMessageBean.java
@@ -19,7 +19,7 @@
import java.util.logging.*;
import jakarta.annotation.Resource;
import jakarta.ejb.*;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
import jakarta.jms.*;
@MessageDriven(mappedName = "jms/jms_unit_test_Topic", activationConfig = {
diff --git a/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/cluster/noScope/nondurableNotSharedWithoutName/ejb/MySessionBean.java b/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/cluster/noScope/nondurableNotSharedWithoutName/ejb/MySessionBean.java
index 11b9816..388dc18 100644
--- a/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/cluster/noScope/nondurableNotSharedWithoutName/ejb/MySessionBean.java
+++ b/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/cluster/noScope/nondurableNotSharedWithoutName/ejb/MySessionBean.java
@@ -19,7 +19,7 @@
import java.util.logging.Logger;
import jakarta.annotation.Resource;
import jakarta.ejb.*;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
import jakarta.jms.*;
/**
diff --git a/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/cluster/noScope/nondurableNotSharedWithoutName/ejb/NewMessageBean.java b/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/cluster/noScope/nondurableNotSharedWithoutName/ejb/NewMessageBean.java
index b236b38..17aa803 100644
--- a/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/cluster/noScope/nondurableNotSharedWithoutName/ejb/NewMessageBean.java
+++ b/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/cluster/noScope/nondurableNotSharedWithoutName/ejb/NewMessageBean.java
@@ -19,7 +19,7 @@
import java.util.logging.*;
import jakarta.annotation.Resource;
import jakarta.ejb.*;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
import jakarta.jms.*;
@MessageDriven(mappedName = "jms/jms_unit_test_Topic", activationConfig = {
diff --git a/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/cluster/noScope/nondurableWithName/ejb/MySessionBean.java b/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/cluster/noScope/nondurableWithName/ejb/MySessionBean.java
index b21c9bd..60d41db 100644
--- a/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/cluster/noScope/nondurableWithName/ejb/MySessionBean.java
+++ b/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/cluster/noScope/nondurableWithName/ejb/MySessionBean.java
@@ -19,7 +19,7 @@
import java.util.logging.Logger;
import jakarta.annotation.Resource;
import jakarta.ejb.*;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
import jakarta.jms.*;
/**
diff --git a/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/cluster/noScope/nondurableWithName/ejb/NewMessageBean.java b/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/cluster/noScope/nondurableWithName/ejb/NewMessageBean.java
index 813fa1b..ab4e1a7 100644
--- a/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/cluster/noScope/nondurableWithName/ejb/NewMessageBean.java
+++ b/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/cluster/noScope/nondurableWithName/ejb/NewMessageBean.java
@@ -19,7 +19,7 @@
import java.util.logging.*;
import jakarta.annotation.Resource;
import jakarta.ejb.*;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
import jakarta.jms.*;
@MessageDriven(mappedName = "jms/jms_unit_test_Topic", activationConfig = {
diff --git a/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/cluster/noScope/nondurableWithoutName/ejb/MySessionBean.java b/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/cluster/noScope/nondurableWithoutName/ejb/MySessionBean.java
index 50db2f6..e99e3a5 100644
--- a/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/cluster/noScope/nondurableWithoutName/ejb/MySessionBean.java
+++ b/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/cluster/noScope/nondurableWithoutName/ejb/MySessionBean.java
@@ -19,7 +19,7 @@
import java.util.logging.Logger;
import jakarta.annotation.Resource;
import jakarta.ejb.*;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
import jakarta.jms.*;
/**
diff --git a/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/cluster/noScope/nondurableWithoutName/ejb/NewMessageBean.java b/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/cluster/noScope/nondurableWithoutName/ejb/NewMessageBean.java
index e0ac9b0..03577c4 100644
--- a/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/cluster/noScope/nondurableWithoutName/ejb/NewMessageBean.java
+++ b/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/cluster/noScope/nondurableWithoutName/ejb/NewMessageBean.java
@@ -19,7 +19,7 @@
import java.util.logging.*;
import jakarta.annotation.Resource;
import jakarta.ejb.*;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
import jakarta.jms.*;
@MessageDriven(mappedName = "jms/jms_unit_test_Topic", activationConfig = {
diff --git a/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/standalone/embedded/ClusterScope/durableWithName/ejb/MySessionBean.java b/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/standalone/embedded/ClusterScope/durableWithName/ejb/MySessionBean.java
index b21c9bd..60d41db 100644
--- a/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/standalone/embedded/ClusterScope/durableWithName/ejb/MySessionBean.java
+++ b/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/standalone/embedded/ClusterScope/durableWithName/ejb/MySessionBean.java
@@ -19,7 +19,7 @@
import java.util.logging.Logger;
import jakarta.annotation.Resource;
import jakarta.ejb.*;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
import jakarta.jms.*;
/**
diff --git a/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/standalone/embedded/ClusterScope/durableWithName/ejb/NewMessageBean.java b/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/standalone/embedded/ClusterScope/durableWithName/ejb/NewMessageBean.java
index 6e21123..0dbf181 100644
--- a/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/standalone/embedded/ClusterScope/durableWithName/ejb/NewMessageBean.java
+++ b/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/standalone/embedded/ClusterScope/durableWithName/ejb/NewMessageBean.java
@@ -19,7 +19,7 @@
import java.util.logging.*;
import jakarta.annotation.Resource;
import jakarta.ejb.*;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
import jakarta.jms.*;
@MessageDriven(mappedName = "jms/jms_unit_test_Topic", activationConfig = {
diff --git a/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/standalone/embedded/ClusterScope/durableWithName/ejb/NewMessageBean2.java b/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/standalone/embedded/ClusterScope/durableWithName/ejb/NewMessageBean2.java
index 775ef68..9ade74b 100644
--- a/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/standalone/embedded/ClusterScope/durableWithName/ejb/NewMessageBean2.java
+++ b/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/standalone/embedded/ClusterScope/durableWithName/ejb/NewMessageBean2.java
@@ -19,7 +19,7 @@
import java.util.logging.*;
import jakarta.annotation.Resource;
import jakarta.ejb.*;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
import jakarta.jms.*;
@MessageDriven(mappedName = "jms/jms_unit_test_Topic", activationConfig = {
diff --git a/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/standalone/embedded/ClusterScope/durableWithoutName/ejb/MySessionBean.java b/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/standalone/embedded/ClusterScope/durableWithoutName/ejb/MySessionBean.java
index 11b9816..388dc18 100644
--- a/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/standalone/embedded/ClusterScope/durableWithoutName/ejb/MySessionBean.java
+++ b/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/standalone/embedded/ClusterScope/durableWithoutName/ejb/MySessionBean.java
@@ -19,7 +19,7 @@
import java.util.logging.Logger;
import jakarta.annotation.Resource;
import jakarta.ejb.*;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
import jakarta.jms.*;
/**
diff --git a/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/standalone/embedded/ClusterScope/durableWithoutName/ejb/NewMessageBean.java b/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/standalone/embedded/ClusterScope/durableWithoutName/ejb/NewMessageBean.java
index 8bc9109..41cfd0b 100644
--- a/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/standalone/embedded/ClusterScope/durableWithoutName/ejb/NewMessageBean.java
+++ b/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/standalone/embedded/ClusterScope/durableWithoutName/ejb/NewMessageBean.java
@@ -19,7 +19,7 @@
import java.util.logging.*;
import jakarta.annotation.Resource;
import jakarta.ejb.*;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
import jakarta.jms.*;
@MessageDriven(mappedName = "jms/jms_unit_test_Topic", activationConfig = {
diff --git a/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/standalone/embedded/ClusterScope/nondurableWithName/ejb/MySessionBean.java b/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/standalone/embedded/ClusterScope/nondurableWithName/ejb/MySessionBean.java
index b21c9bd..60d41db 100644
--- a/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/standalone/embedded/ClusterScope/nondurableWithName/ejb/MySessionBean.java
+++ b/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/standalone/embedded/ClusterScope/nondurableWithName/ejb/MySessionBean.java
@@ -19,7 +19,7 @@
import java.util.logging.Logger;
import jakarta.annotation.Resource;
import jakarta.ejb.*;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
import jakarta.jms.*;
/**
diff --git a/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/standalone/embedded/ClusterScope/nondurableWithName/ejb/NewMessageBean.java b/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/standalone/embedded/ClusterScope/nondurableWithName/ejb/NewMessageBean.java
index b466943..a1bea0d 100644
--- a/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/standalone/embedded/ClusterScope/nondurableWithName/ejb/NewMessageBean.java
+++ b/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/standalone/embedded/ClusterScope/nondurableWithName/ejb/NewMessageBean.java
@@ -19,7 +19,7 @@
import java.util.logging.*;
import jakarta.annotation.Resource;
import jakarta.ejb.*;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
import jakarta.jms.*;
@MessageDriven(mappedName = "jms/jms_unit_test_Topic", activationConfig = {
diff --git a/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/standalone/embedded/ClusterScope/nondurableWithName/ejb/NewMessageBean2.java b/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/standalone/embedded/ClusterScope/nondurableWithName/ejb/NewMessageBean2.java
index 9ba7b08..4e1651f 100644
--- a/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/standalone/embedded/ClusterScope/nondurableWithName/ejb/NewMessageBean2.java
+++ b/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/standalone/embedded/ClusterScope/nondurableWithName/ejb/NewMessageBean2.java
@@ -19,7 +19,7 @@
import java.util.logging.*;
import jakarta.annotation.Resource;
import jakarta.ejb.*;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
import jakarta.jms.*;
@MessageDriven(mappedName = "jms/jms_unit_test_Topic", activationConfig = {
diff --git a/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/standalone/embedded/ClusterScope/nondurableWithoutName/ejb/MySessionBean.java b/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/standalone/embedded/ClusterScope/nondurableWithoutName/ejb/MySessionBean.java
index 11b9816..388dc18 100644
--- a/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/standalone/embedded/ClusterScope/nondurableWithoutName/ejb/MySessionBean.java
+++ b/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/standalone/embedded/ClusterScope/nondurableWithoutName/ejb/MySessionBean.java
@@ -19,7 +19,7 @@
import java.util.logging.Logger;
import jakarta.annotation.Resource;
import jakarta.ejb.*;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
import jakarta.jms.*;
/**
diff --git a/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/standalone/embedded/ClusterScope/nondurableWithoutName/ejb/NewMessageBean.java b/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/standalone/embedded/ClusterScope/nondurableWithoutName/ejb/NewMessageBean.java
index 198c748..18f5ac8 100644
--- a/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/standalone/embedded/ClusterScope/nondurableWithoutName/ejb/NewMessageBean.java
+++ b/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/standalone/embedded/ClusterScope/nondurableWithoutName/ejb/NewMessageBean.java
@@ -19,7 +19,7 @@
import java.util.logging.*;
import jakarta.annotation.Resource;
import jakarta.ejb.*;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
import jakarta.jms.*;
@MessageDriven(mappedName = "jms/jms_unit_test_Topic", activationConfig = {
diff --git a/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/standalone/embedded/ClusterScope/nondurableWithoutName/ejb/NewMessageBean2.java b/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/standalone/embedded/ClusterScope/nondurableWithoutName/ejb/NewMessageBean2.java
index 3a2f313..6bd8934 100644
--- a/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/standalone/embedded/ClusterScope/nondurableWithoutName/ejb/NewMessageBean2.java
+++ b/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/standalone/embedded/ClusterScope/nondurableWithoutName/ejb/NewMessageBean2.java
@@ -19,7 +19,7 @@
import java.util.logging.*;
import jakarta.annotation.Resource;
import jakarta.ejb.*;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
import jakarta.jms.*;
@MessageDriven(mappedName = "jms/jms_unit_test_Topic", activationConfig = {
diff --git a/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/standalone/embedded/InstanceScope/durableWithName/ejb/MySessionBean.java b/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/standalone/embedded/InstanceScope/durableWithName/ejb/MySessionBean.java
index b21c9bd..60d41db 100644
--- a/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/standalone/embedded/InstanceScope/durableWithName/ejb/MySessionBean.java
+++ b/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/standalone/embedded/InstanceScope/durableWithName/ejb/MySessionBean.java
@@ -19,7 +19,7 @@
import java.util.logging.Logger;
import jakarta.annotation.Resource;
import jakarta.ejb.*;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
import jakarta.jms.*;
/**
diff --git a/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/standalone/embedded/InstanceScope/durableWithName/ejb/NewMessageBean.java b/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/standalone/embedded/InstanceScope/durableWithName/ejb/NewMessageBean.java
index 7985e1f..d1c8227 100644
--- a/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/standalone/embedded/InstanceScope/durableWithName/ejb/NewMessageBean.java
+++ b/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/standalone/embedded/InstanceScope/durableWithName/ejb/NewMessageBean.java
@@ -19,7 +19,7 @@
import java.util.logging.*;
import jakarta.annotation.Resource;
import jakarta.ejb.*;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
import jakarta.jms.*;
@MessageDriven(mappedName = "jms/jms_unit_test_Topic", activationConfig = {
diff --git a/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/standalone/embedded/InstanceScope/durableWithName/ejb/NewMessageBean2.java b/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/standalone/embedded/InstanceScope/durableWithName/ejb/NewMessageBean2.java
index af50fb1..c40f17f 100644
--- a/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/standalone/embedded/InstanceScope/durableWithName/ejb/NewMessageBean2.java
+++ b/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/standalone/embedded/InstanceScope/durableWithName/ejb/NewMessageBean2.java
@@ -19,7 +19,7 @@
import java.util.logging.*;
import jakarta.annotation.Resource;
import jakarta.ejb.*;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
import jakarta.jms.*;
@MessageDriven(mappedName = "jms/jms_unit_test_Topic", activationConfig = {
diff --git a/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/standalone/embedded/InstanceScope/durableWithoutName/ejb/MySessionBean.java b/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/standalone/embedded/InstanceScope/durableWithoutName/ejb/MySessionBean.java
index 11b9816..388dc18 100644
--- a/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/standalone/embedded/InstanceScope/durableWithoutName/ejb/MySessionBean.java
+++ b/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/standalone/embedded/InstanceScope/durableWithoutName/ejb/MySessionBean.java
@@ -19,7 +19,7 @@
import java.util.logging.Logger;
import jakarta.annotation.Resource;
import jakarta.ejb.*;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
import jakarta.jms.*;
/**
diff --git a/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/standalone/embedded/InstanceScope/durableWithoutName/ejb/NewMessageBean.java b/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/standalone/embedded/InstanceScope/durableWithoutName/ejb/NewMessageBean.java
index a7a9dbe..ff6a170 100644
--- a/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/standalone/embedded/InstanceScope/durableWithoutName/ejb/NewMessageBean.java
+++ b/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/standalone/embedded/InstanceScope/durableWithoutName/ejb/NewMessageBean.java
@@ -19,7 +19,7 @@
import java.util.logging.*;
import jakarta.annotation.Resource;
import jakarta.ejb.*;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
import jakarta.jms.*;
@MessageDriven(mappedName = "jms/jms_unit_test_Topic", activationConfig = {
diff --git a/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/standalone/embedded/InstanceScope/durableWithoutName/ejb/NewMessageBean2.java b/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/standalone/embedded/InstanceScope/durableWithoutName/ejb/NewMessageBean2.java
index df0e0bb..899876d 100644
--- a/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/standalone/embedded/InstanceScope/durableWithoutName/ejb/NewMessageBean2.java
+++ b/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/standalone/embedded/InstanceScope/durableWithoutName/ejb/NewMessageBean2.java
@@ -19,7 +19,7 @@
import java.util.logging.*;
import jakarta.annotation.Resource;
import jakarta.ejb.*;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
import jakarta.jms.*;
@MessageDriven(mappedName = "jms/jms_unit_test_Topic", activationConfig = {
diff --git a/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/standalone/embedded/InstanceScope/nondurableWithName/ejb/MySessionBean.java b/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/standalone/embedded/InstanceScope/nondurableWithName/ejb/MySessionBean.java
index b21c9bd..60d41db 100644
--- a/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/standalone/embedded/InstanceScope/nondurableWithName/ejb/MySessionBean.java
+++ b/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/standalone/embedded/InstanceScope/nondurableWithName/ejb/MySessionBean.java
@@ -19,7 +19,7 @@
import java.util.logging.Logger;
import jakarta.annotation.Resource;
import jakarta.ejb.*;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
import jakarta.jms.*;
/**
diff --git a/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/standalone/embedded/InstanceScope/nondurableWithName/ejb/NewMessageBean.java b/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/standalone/embedded/InstanceScope/nondurableWithName/ejb/NewMessageBean.java
index 5b1c990..7b5db95 100644
--- a/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/standalone/embedded/InstanceScope/nondurableWithName/ejb/NewMessageBean.java
+++ b/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/standalone/embedded/InstanceScope/nondurableWithName/ejb/NewMessageBean.java
@@ -19,7 +19,7 @@
import java.util.logging.*;
import jakarta.annotation.Resource;
import jakarta.ejb.*;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
import jakarta.jms.*;
@MessageDriven(mappedName = "jms/jms_unit_test_Topic", activationConfig = {
diff --git a/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/standalone/embedded/InstanceScope/nondurableWithName/ejb/NewMessageBean2.java b/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/standalone/embedded/InstanceScope/nondurableWithName/ejb/NewMessageBean2.java
index 2eabe0d..e051f48 100644
--- a/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/standalone/embedded/InstanceScope/nondurableWithName/ejb/NewMessageBean2.java
+++ b/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/standalone/embedded/InstanceScope/nondurableWithName/ejb/NewMessageBean2.java
@@ -19,7 +19,7 @@
import java.util.logging.*;
import jakarta.annotation.Resource;
import jakarta.ejb.*;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
import jakarta.jms.*;
@MessageDriven(mappedName = "jms/jms_unit_test_Topic", activationConfig = {
diff --git a/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/standalone/embedded/InstanceScope/nondurableWithoutName/ejb/MySessionBean.java b/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/standalone/embedded/InstanceScope/nondurableWithoutName/ejb/MySessionBean.java
index 11b9816..388dc18 100644
--- a/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/standalone/embedded/InstanceScope/nondurableWithoutName/ejb/MySessionBean.java
+++ b/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/standalone/embedded/InstanceScope/nondurableWithoutName/ejb/MySessionBean.java
@@ -19,7 +19,7 @@
import java.util.logging.Logger;
import jakarta.annotation.Resource;
import jakarta.ejb.*;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
import jakarta.jms.*;
/**
diff --git a/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/standalone/embedded/InstanceScope/nondurableWithoutName/ejb/NewMessageBean.java b/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/standalone/embedded/InstanceScope/nondurableWithoutName/ejb/NewMessageBean.java
index 3e8f1d3..a68d803 100644
--- a/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/standalone/embedded/InstanceScope/nondurableWithoutName/ejb/NewMessageBean.java
+++ b/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/standalone/embedded/InstanceScope/nondurableWithoutName/ejb/NewMessageBean.java
@@ -19,7 +19,7 @@
import java.util.logging.*;
import jakarta.annotation.Resource;
import jakarta.ejb.*;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
import jakarta.jms.*;
@MessageDriven(mappedName = "jms/jms_unit_test_Topic", activationConfig = {
diff --git a/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/standalone/embedded/InstanceScope/nondurableWithoutName/ejb/NewMessageBean2.java b/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/standalone/embedded/InstanceScope/nondurableWithoutName/ejb/NewMessageBean2.java
index 9baa358..52e273b 100644
--- a/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/standalone/embedded/InstanceScope/nondurableWithoutName/ejb/NewMessageBean2.java
+++ b/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/standalone/embedded/InstanceScope/nondurableWithoutName/ejb/NewMessageBean2.java
@@ -19,7 +19,7 @@
import java.util.logging.*;
import jakarta.annotation.Resource;
import jakarta.ejb.*;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
import jakarta.jms.*;
@MessageDriven(mappedName = "jms/jms_unit_test_Topic", activationConfig = {
diff --git a/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/standalone/embedded/noScope/durableNoClientIdWithName/ejb/MySessionBean.java b/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/standalone/embedded/noScope/durableNoClientIdWithName/ejb/MySessionBean.java
index b21c9bd..60d41db 100644
--- a/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/standalone/embedded/noScope/durableNoClientIdWithName/ejb/MySessionBean.java
+++ b/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/standalone/embedded/noScope/durableNoClientIdWithName/ejb/MySessionBean.java
@@ -19,7 +19,7 @@
import java.util.logging.Logger;
import jakarta.annotation.Resource;
import jakarta.ejb.*;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
import jakarta.jms.*;
/**
diff --git a/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/standalone/embedded/noScope/durableNoClientIdWithName/ejb/NewMessageBean.java b/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/standalone/embedded/noScope/durableNoClientIdWithName/ejb/NewMessageBean.java
index cad5fdf..f9ece8b 100644
--- a/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/standalone/embedded/noScope/durableNoClientIdWithName/ejb/NewMessageBean.java
+++ b/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/standalone/embedded/noScope/durableNoClientIdWithName/ejb/NewMessageBean.java
@@ -19,7 +19,7 @@
import java.util.logging.*;
import jakarta.annotation.Resource;
import jakarta.ejb.*;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
import jakarta.jms.*;
@MessageDriven(mappedName = "jms/jms_unit_test_Topic", activationConfig = {
diff --git a/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/standalone/embedded/noScope/durableWithName/ejb/MySessionBean.java b/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/standalone/embedded/noScope/durableWithName/ejb/MySessionBean.java
index b21c9bd..60d41db 100644
--- a/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/standalone/embedded/noScope/durableWithName/ejb/MySessionBean.java
+++ b/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/standalone/embedded/noScope/durableWithName/ejb/MySessionBean.java
@@ -19,7 +19,7 @@
import java.util.logging.Logger;
import jakarta.annotation.Resource;
import jakarta.ejb.*;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
import jakarta.jms.*;
/**
diff --git a/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/standalone/embedded/noScope/durableWithName/ejb/NewMessageBean.java b/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/standalone/embedded/noScope/durableWithName/ejb/NewMessageBean.java
index 327a0e9..a36c7a1 100644
--- a/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/standalone/embedded/noScope/durableWithName/ejb/NewMessageBean.java
+++ b/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/standalone/embedded/noScope/durableWithName/ejb/NewMessageBean.java
@@ -19,7 +19,7 @@
import java.util.logging.*;
import jakarta.annotation.Resource;
import jakarta.ejb.*;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
import jakarta.jms.*;
@MessageDriven(mappedName = "jms/jms_unit_test_Topic", activationConfig = {
diff --git a/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/standalone/embedded/noScope/nondurableWithName/ejb/MySessionBean.java b/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/standalone/embedded/noScope/nondurableWithName/ejb/MySessionBean.java
index b21c9bd..60d41db 100644
--- a/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/standalone/embedded/noScope/nondurableWithName/ejb/MySessionBean.java
+++ b/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/standalone/embedded/noScope/nondurableWithName/ejb/MySessionBean.java
@@ -19,7 +19,7 @@
import java.util.logging.Logger;
import jakarta.annotation.Resource;
import jakarta.ejb.*;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
import jakarta.jms.*;
/**
diff --git a/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/standalone/embedded/noScope/nondurableWithName/ejb/NewMessageBean.java b/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/standalone/embedded/noScope/nondurableWithName/ejb/NewMessageBean.java
index e368a51..5c912d2 100644
--- a/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/standalone/embedded/noScope/nondurableWithName/ejb/NewMessageBean.java
+++ b/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/standalone/embedded/noScope/nondurableWithName/ejb/NewMessageBean.java
@@ -19,7 +19,7 @@
import java.util.logging.*;
import jakarta.annotation.Resource;
import jakarta.ejb.*;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
import jakarta.jms.*;
@MessageDriven(mappedName = "jms/jms_unit_test_Topic", activationConfig = {
diff --git a/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/standalone/embedded/noScope/nondurableWithoutName/ejb/MySessionBean.java b/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/standalone/embedded/noScope/nondurableWithoutName/ejb/MySessionBean.java
index 50db2f6..e99e3a5 100644
--- a/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/standalone/embedded/noScope/nondurableWithoutName/ejb/MySessionBean.java
+++ b/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/standalone/embedded/noScope/nondurableWithoutName/ejb/MySessionBean.java
@@ -19,7 +19,7 @@
import java.util.logging.Logger;
import jakarta.annotation.Resource;
import jakarta.ejb.*;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
import jakarta.jms.*;
/**
diff --git a/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/standalone/embedded/noScope/nondurableWithoutName/ejb/NewMessageBean.java b/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/standalone/embedded/noScope/nondurableWithoutName/ejb/NewMessageBean.java
index 3e7db94..8916cb2 100644
--- a/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/standalone/embedded/noScope/nondurableWithoutName/ejb/NewMessageBean.java
+++ b/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/standalone/embedded/noScope/nondurableWithoutName/ejb/NewMessageBean.java
@@ -19,7 +19,7 @@
import java.util.logging.*;
import jakarta.annotation.Resource;
import jakarta.ejb.*;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
import jakarta.jms.*;
@MessageDriven(mappedName = "jms/jms_unit_test_Topic", activationConfig = {
diff --git a/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/standalone/local/ClusterScope/durableWithName/ejb/MySessionBean.java b/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/standalone/local/ClusterScope/durableWithName/ejb/MySessionBean.java
index b21c9bd..60d41db 100644
--- a/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/standalone/local/ClusterScope/durableWithName/ejb/MySessionBean.java
+++ b/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/standalone/local/ClusterScope/durableWithName/ejb/MySessionBean.java
@@ -19,7 +19,7 @@
import java.util.logging.Logger;
import jakarta.annotation.Resource;
import jakarta.ejb.*;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
import jakarta.jms.*;
/**
diff --git a/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/standalone/local/ClusterScope/durableWithName/ejb/NewMessageBean.java b/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/standalone/local/ClusterScope/durableWithName/ejb/NewMessageBean.java
index 6e21123..0dbf181 100644
--- a/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/standalone/local/ClusterScope/durableWithName/ejb/NewMessageBean.java
+++ b/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/standalone/local/ClusterScope/durableWithName/ejb/NewMessageBean.java
@@ -19,7 +19,7 @@
import java.util.logging.*;
import jakarta.annotation.Resource;
import jakarta.ejb.*;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
import jakarta.jms.*;
@MessageDriven(mappedName = "jms/jms_unit_test_Topic", activationConfig = {
diff --git a/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/standalone/local/ClusterScope/durableWithName/ejb/NewMessageBean2.java b/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/standalone/local/ClusterScope/durableWithName/ejb/NewMessageBean2.java
index 775ef68..9ade74b 100644
--- a/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/standalone/local/ClusterScope/durableWithName/ejb/NewMessageBean2.java
+++ b/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/standalone/local/ClusterScope/durableWithName/ejb/NewMessageBean2.java
@@ -19,7 +19,7 @@
import java.util.logging.*;
import jakarta.annotation.Resource;
import jakarta.ejb.*;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
import jakarta.jms.*;
@MessageDriven(mappedName = "jms/jms_unit_test_Topic", activationConfig = {
diff --git a/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/standalone/local/ClusterScope/durableWithoutName/ejb/MySessionBean.java b/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/standalone/local/ClusterScope/durableWithoutName/ejb/MySessionBean.java
index 11b9816..388dc18 100644
--- a/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/standalone/local/ClusterScope/durableWithoutName/ejb/MySessionBean.java
+++ b/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/standalone/local/ClusterScope/durableWithoutName/ejb/MySessionBean.java
@@ -19,7 +19,7 @@
import java.util.logging.Logger;
import jakarta.annotation.Resource;
import jakarta.ejb.*;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
import jakarta.jms.*;
/**
diff --git a/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/standalone/local/ClusterScope/durableWithoutName/ejb/NewMessageBean.java b/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/standalone/local/ClusterScope/durableWithoutName/ejb/NewMessageBean.java
index 8bc9109..41cfd0b 100644
--- a/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/standalone/local/ClusterScope/durableWithoutName/ejb/NewMessageBean.java
+++ b/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/standalone/local/ClusterScope/durableWithoutName/ejb/NewMessageBean.java
@@ -19,7 +19,7 @@
import java.util.logging.*;
import jakarta.annotation.Resource;
import jakarta.ejb.*;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
import jakarta.jms.*;
@MessageDriven(mappedName = "jms/jms_unit_test_Topic", activationConfig = {
diff --git a/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/standalone/local/ClusterScope/durableWithoutName/ejb/NewMessageBean2.java b/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/standalone/local/ClusterScope/durableWithoutName/ejb/NewMessageBean2.java
index de638e2..02134b7 100644
--- a/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/standalone/local/ClusterScope/durableWithoutName/ejb/NewMessageBean2.java
+++ b/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/standalone/local/ClusterScope/durableWithoutName/ejb/NewMessageBean2.java
@@ -19,7 +19,7 @@
import java.util.logging.*;
import jakarta.annotation.Resource;
import jakarta.ejb.*;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
import jakarta.jms.*;
@MessageDriven(mappedName = "jms/jms_unit_test_Topic", activationConfig = {
diff --git a/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/standalone/local/ClusterScope/nondurableWithName/ejb/MySessionBean.java b/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/standalone/local/ClusterScope/nondurableWithName/ejb/MySessionBean.java
index b21c9bd..60d41db 100644
--- a/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/standalone/local/ClusterScope/nondurableWithName/ejb/MySessionBean.java
+++ b/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/standalone/local/ClusterScope/nondurableWithName/ejb/MySessionBean.java
@@ -19,7 +19,7 @@
import java.util.logging.Logger;
import jakarta.annotation.Resource;
import jakarta.ejb.*;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
import jakarta.jms.*;
/**
diff --git a/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/standalone/local/ClusterScope/nondurableWithName/ejb/NewMessageBean.java b/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/standalone/local/ClusterScope/nondurableWithName/ejb/NewMessageBean.java
index b466943..a1bea0d 100644
--- a/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/standalone/local/ClusterScope/nondurableWithName/ejb/NewMessageBean.java
+++ b/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/standalone/local/ClusterScope/nondurableWithName/ejb/NewMessageBean.java
@@ -19,7 +19,7 @@
import java.util.logging.*;
import jakarta.annotation.Resource;
import jakarta.ejb.*;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
import jakarta.jms.*;
@MessageDriven(mappedName = "jms/jms_unit_test_Topic", activationConfig = {
diff --git a/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/standalone/local/ClusterScope/nondurableWithName/ejb/NewMessageBean2.java b/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/standalone/local/ClusterScope/nondurableWithName/ejb/NewMessageBean2.java
index 9ba7b08..4e1651f 100644
--- a/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/standalone/local/ClusterScope/nondurableWithName/ejb/NewMessageBean2.java
+++ b/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/standalone/local/ClusterScope/nondurableWithName/ejb/NewMessageBean2.java
@@ -19,7 +19,7 @@
import java.util.logging.*;
import jakarta.annotation.Resource;
import jakarta.ejb.*;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
import jakarta.jms.*;
@MessageDriven(mappedName = "jms/jms_unit_test_Topic", activationConfig = {
diff --git a/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/standalone/local/ClusterScope/nondurableWithoutName/ejb/MySessionBean.java b/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/standalone/local/ClusterScope/nondurableWithoutName/ejb/MySessionBean.java
index 11b9816..388dc18 100644
--- a/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/standalone/local/ClusterScope/nondurableWithoutName/ejb/MySessionBean.java
+++ b/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/standalone/local/ClusterScope/nondurableWithoutName/ejb/MySessionBean.java
@@ -19,7 +19,7 @@
import java.util.logging.Logger;
import jakarta.annotation.Resource;
import jakarta.ejb.*;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
import jakarta.jms.*;
/**
diff --git a/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/standalone/local/ClusterScope/nondurableWithoutName/ejb/NewMessageBean2.java b/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/standalone/local/ClusterScope/nondurableWithoutName/ejb/NewMessageBean2.java
index 3a2f313..6bd8934 100644
--- a/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/standalone/local/ClusterScope/nondurableWithoutName/ejb/NewMessageBean2.java
+++ b/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/standalone/local/ClusterScope/nondurableWithoutName/ejb/NewMessageBean2.java
@@ -19,7 +19,7 @@
import java.util.logging.*;
import jakarta.annotation.Resource;
import jakarta.ejb.*;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
import jakarta.jms.*;
@MessageDriven(mappedName = "jms/jms_unit_test_Topic", activationConfig = {
diff --git a/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/standalone/local/InstanceScope/durableWithName/ejb/MySessionBean.java b/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/standalone/local/InstanceScope/durableWithName/ejb/MySessionBean.java
index b21c9bd..60d41db 100644
--- a/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/standalone/local/InstanceScope/durableWithName/ejb/MySessionBean.java
+++ b/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/standalone/local/InstanceScope/durableWithName/ejb/MySessionBean.java
@@ -19,7 +19,7 @@
import java.util.logging.Logger;
import jakarta.annotation.Resource;
import jakarta.ejb.*;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
import jakarta.jms.*;
/**
diff --git a/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/standalone/local/InstanceScope/durableWithName/ejb/NewMessageBean.java b/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/standalone/local/InstanceScope/durableWithName/ejb/NewMessageBean.java
index 7985e1f..d1c8227 100644
--- a/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/standalone/local/InstanceScope/durableWithName/ejb/NewMessageBean.java
+++ b/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/standalone/local/InstanceScope/durableWithName/ejb/NewMessageBean.java
@@ -19,7 +19,7 @@
import java.util.logging.*;
import jakarta.annotation.Resource;
import jakarta.ejb.*;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
import jakarta.jms.*;
@MessageDriven(mappedName = "jms/jms_unit_test_Topic", activationConfig = {
diff --git a/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/standalone/local/InstanceScope/durableWithName/ejb/NewMessageBean2.java b/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/standalone/local/InstanceScope/durableWithName/ejb/NewMessageBean2.java
index af50fb1..c40f17f 100644
--- a/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/standalone/local/InstanceScope/durableWithName/ejb/NewMessageBean2.java
+++ b/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/standalone/local/InstanceScope/durableWithName/ejb/NewMessageBean2.java
@@ -19,7 +19,7 @@
import java.util.logging.*;
import jakarta.annotation.Resource;
import jakarta.ejb.*;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
import jakarta.jms.*;
@MessageDriven(mappedName = "jms/jms_unit_test_Topic", activationConfig = {
diff --git a/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/standalone/local/InstanceScope/durableWithoutName/ejb/MySessionBean.java b/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/standalone/local/InstanceScope/durableWithoutName/ejb/MySessionBean.java
index 11b9816..388dc18 100644
--- a/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/standalone/local/InstanceScope/durableWithoutName/ejb/MySessionBean.java
+++ b/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/standalone/local/InstanceScope/durableWithoutName/ejb/MySessionBean.java
@@ -19,7 +19,7 @@
import java.util.logging.Logger;
import jakarta.annotation.Resource;
import jakarta.ejb.*;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
import jakarta.jms.*;
/**
diff --git a/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/standalone/local/InstanceScope/durableWithoutName/ejb/NewMessageBean.java b/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/standalone/local/InstanceScope/durableWithoutName/ejb/NewMessageBean.java
index a7a9dbe..ff6a170 100644
--- a/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/standalone/local/InstanceScope/durableWithoutName/ejb/NewMessageBean.java
+++ b/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/standalone/local/InstanceScope/durableWithoutName/ejb/NewMessageBean.java
@@ -19,7 +19,7 @@
import java.util.logging.*;
import jakarta.annotation.Resource;
import jakarta.ejb.*;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
import jakarta.jms.*;
@MessageDriven(mappedName = "jms/jms_unit_test_Topic", activationConfig = {
diff --git a/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/standalone/local/InstanceScope/durableWithoutName/ejb/NewMessageBean2.java b/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/standalone/local/InstanceScope/durableWithoutName/ejb/NewMessageBean2.java
index df0e0bb..899876d 100644
--- a/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/standalone/local/InstanceScope/durableWithoutName/ejb/NewMessageBean2.java
+++ b/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/standalone/local/InstanceScope/durableWithoutName/ejb/NewMessageBean2.java
@@ -19,7 +19,7 @@
import java.util.logging.*;
import jakarta.annotation.Resource;
import jakarta.ejb.*;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
import jakarta.jms.*;
@MessageDriven(mappedName = "jms/jms_unit_test_Topic", activationConfig = {
diff --git a/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/standalone/local/InstanceScope/nondurableWithName/ejb/MySessionBean.java b/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/standalone/local/InstanceScope/nondurableWithName/ejb/MySessionBean.java
index b21c9bd..60d41db 100644
--- a/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/standalone/local/InstanceScope/nondurableWithName/ejb/MySessionBean.java
+++ b/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/standalone/local/InstanceScope/nondurableWithName/ejb/MySessionBean.java
@@ -19,7 +19,7 @@
import java.util.logging.Logger;
import jakarta.annotation.Resource;
import jakarta.ejb.*;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
import jakarta.jms.*;
/**
diff --git a/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/standalone/local/InstanceScope/nondurableWithName/ejb/NewMessageBean.java b/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/standalone/local/InstanceScope/nondurableWithName/ejb/NewMessageBean.java
index 5b1c990..7b5db95 100644
--- a/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/standalone/local/InstanceScope/nondurableWithName/ejb/NewMessageBean.java
+++ b/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/standalone/local/InstanceScope/nondurableWithName/ejb/NewMessageBean.java
@@ -19,7 +19,7 @@
import java.util.logging.*;
import jakarta.annotation.Resource;
import jakarta.ejb.*;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
import jakarta.jms.*;
@MessageDriven(mappedName = "jms/jms_unit_test_Topic", activationConfig = {
diff --git a/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/standalone/local/InstanceScope/nondurableWithName/ejb/NewMessageBean2.java b/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/standalone/local/InstanceScope/nondurableWithName/ejb/NewMessageBean2.java
index cae9cb8..3530a86 100644
--- a/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/standalone/local/InstanceScope/nondurableWithName/ejb/NewMessageBean2.java
+++ b/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/standalone/local/InstanceScope/nondurableWithName/ejb/NewMessageBean2.java
@@ -19,7 +19,7 @@
import java.util.logging.*;
import jakarta.annotation.Resource;
import jakarta.ejb.*;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
import jakarta.jms.*;
@MessageDriven(mappedName = "jms/jms_unit_test_Topic", activationConfig = {
diff --git a/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/standalone/local/InstanceScope/nondurableWithoutName/ejb/MySessionBean.java b/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/standalone/local/InstanceScope/nondurableWithoutName/ejb/MySessionBean.java
index 11b9816..388dc18 100644
--- a/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/standalone/local/InstanceScope/nondurableWithoutName/ejb/MySessionBean.java
+++ b/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/standalone/local/InstanceScope/nondurableWithoutName/ejb/MySessionBean.java
@@ -19,7 +19,7 @@
import java.util.logging.Logger;
import jakarta.annotation.Resource;
import jakarta.ejb.*;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
import jakarta.jms.*;
/**
diff --git a/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/standalone/local/InstanceScope/nondurableWithoutName/ejb/NewMessageBean.java b/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/standalone/local/InstanceScope/nondurableWithoutName/ejb/NewMessageBean.java
index 3e8f1d3..a68d803 100644
--- a/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/standalone/local/InstanceScope/nondurableWithoutName/ejb/NewMessageBean.java
+++ b/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/standalone/local/InstanceScope/nondurableWithoutName/ejb/NewMessageBean.java
@@ -19,7 +19,7 @@
import java.util.logging.*;
import jakarta.annotation.Resource;
import jakarta.ejb.*;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
import jakarta.jms.*;
@MessageDriven(mappedName = "jms/jms_unit_test_Topic", activationConfig = {
diff --git a/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/standalone/local/InstanceScope/nondurableWithoutName/ejb/NewMessageBean2.java b/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/standalone/local/InstanceScope/nondurableWithoutName/ejb/NewMessageBean2.java
index 9baa358..52e273b 100644
--- a/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/standalone/local/InstanceScope/nondurableWithoutName/ejb/NewMessageBean2.java
+++ b/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/standalone/local/InstanceScope/nondurableWithoutName/ejb/NewMessageBean2.java
@@ -19,7 +19,7 @@
import java.util.logging.*;
import jakarta.annotation.Resource;
import jakarta.ejb.*;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
import jakarta.jms.*;
@MessageDriven(mappedName = "jms/jms_unit_test_Topic", activationConfig = {
diff --git a/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/standalone/local/noScope/durableNoClientIdWithName/ejb/MySessionBean.java b/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/standalone/local/noScope/durableNoClientIdWithName/ejb/MySessionBean.java
index b21c9bd..60d41db 100644
--- a/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/standalone/local/noScope/durableNoClientIdWithName/ejb/MySessionBean.java
+++ b/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/standalone/local/noScope/durableNoClientIdWithName/ejb/MySessionBean.java
@@ -19,7 +19,7 @@
import java.util.logging.Logger;
import jakarta.annotation.Resource;
import jakarta.ejb.*;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
import jakarta.jms.*;
/**
diff --git a/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/standalone/local/noScope/durableNoClientIdWithName/ejb/NewMessageBean.java b/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/standalone/local/noScope/durableNoClientIdWithName/ejb/NewMessageBean.java
index cad5fdf..f9ece8b 100644
--- a/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/standalone/local/noScope/durableNoClientIdWithName/ejb/NewMessageBean.java
+++ b/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/standalone/local/noScope/durableNoClientIdWithName/ejb/NewMessageBean.java
@@ -19,7 +19,7 @@
import java.util.logging.*;
import jakarta.annotation.Resource;
import jakarta.ejb.*;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
import jakarta.jms.*;
@MessageDriven(mappedName = "jms/jms_unit_test_Topic", activationConfig = {
diff --git a/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/standalone/local/noScope/durableWithName/ejb/MySessionBean.java b/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/standalone/local/noScope/durableWithName/ejb/MySessionBean.java
index b21c9bd..60d41db 100644
--- a/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/standalone/local/noScope/durableWithName/ejb/MySessionBean.java
+++ b/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/standalone/local/noScope/durableWithName/ejb/MySessionBean.java
@@ -19,7 +19,7 @@
import java.util.logging.Logger;
import jakarta.annotation.Resource;
import jakarta.ejb.*;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
import jakarta.jms.*;
/**
diff --git a/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/standalone/local/noScope/durableWithName/ejb/NewMessageBean.java b/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/standalone/local/noScope/durableWithName/ejb/NewMessageBean.java
index 327a0e9..a36c7a1 100644
--- a/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/standalone/local/noScope/durableWithName/ejb/NewMessageBean.java
+++ b/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/standalone/local/noScope/durableWithName/ejb/NewMessageBean.java
@@ -19,7 +19,7 @@
import java.util.logging.*;
import jakarta.annotation.Resource;
import jakarta.ejb.*;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
import jakarta.jms.*;
@MessageDriven(mappedName = "jms/jms_unit_test_Topic", activationConfig = {
diff --git a/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/standalone/local/noScope/nondurableWithName/ejb/MySessionBean.java b/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/standalone/local/noScope/nondurableWithName/ejb/MySessionBean.java
index b21c9bd..60d41db 100644
--- a/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/standalone/local/noScope/nondurableWithName/ejb/MySessionBean.java
+++ b/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/standalone/local/noScope/nondurableWithName/ejb/MySessionBean.java
@@ -19,7 +19,7 @@
import java.util.logging.Logger;
import jakarta.annotation.Resource;
import jakarta.ejb.*;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
import jakarta.jms.*;
/**
diff --git a/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/standalone/local/noScope/nondurableWithName/ejb/NewMessageBean.java b/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/standalone/local/noScope/nondurableWithName/ejb/NewMessageBean.java
index e368a51..5c912d2 100644
--- a/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/standalone/local/noScope/nondurableWithName/ejb/NewMessageBean.java
+++ b/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/standalone/local/noScope/nondurableWithName/ejb/NewMessageBean.java
@@ -19,7 +19,7 @@
import java.util.logging.*;
import jakarta.annotation.Resource;
import jakarta.ejb.*;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
import jakarta.jms.*;
@MessageDriven(mappedName = "jms/jms_unit_test_Topic", activationConfig = {
diff --git a/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/standalone/local/noScope/nondurableWithoutName/ejb/MySessionBean.java b/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/standalone/local/noScope/nondurableWithoutName/ejb/MySessionBean.java
index 50db2f6..e99e3a5 100644
--- a/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/standalone/local/noScope/nondurableWithoutName/ejb/MySessionBean.java
+++ b/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/standalone/local/noScope/nondurableWithoutName/ejb/MySessionBean.java
@@ -19,7 +19,7 @@
import java.util.logging.Logger;
import jakarta.annotation.Resource;
import jakarta.ejb.*;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
import jakarta.jms.*;
/**
diff --git a/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/standalone/local/noScope/nondurableWithoutName/ejb/NewMessageBean.java b/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/standalone/local/noScope/nondurableWithoutName/ejb/NewMessageBean.java
index 3e7db94..8916cb2 100644
--- a/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/standalone/local/noScope/nondurableWithoutName/ejb/NewMessageBean.java
+++ b/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/standalone/local/noScope/nondurableWithoutName/ejb/NewMessageBean.java
@@ -19,7 +19,7 @@
import java.util.logging.*;
import jakarta.annotation.Resource;
import jakarta.ejb.*;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
import jakarta.jms.*;
@MessageDriven(mappedName = "jms/jms_unit_test_Topic", activationConfig = {
diff --git a/appserver/tests/appserv-tests/devtests/jms/annotation/MDB1/ejb/MyMessageBean.java b/appserver/tests/appserv-tests/devtests/jms/annotation/MDB1/ejb/MyMessageBean.java
index e5ab766..97abe25 100644
--- a/appserver/tests/appserv-tests/devtests/jms/annotation/MDB1/ejb/MyMessageBean.java
+++ b/appserver/tests/appserv-tests/devtests/jms/annotation/MDB1/ejb/MyMessageBean.java
@@ -22,7 +22,7 @@
import jakarta.ejb.ActivationConfigProperty;
import jakarta.ejb.EJBException;
import jakarta.ejb.MessageDriven;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
import jakarta.jms.ConnectionFactory;
import jakarta.jms.JMSConnectionFactory;
import jakarta.jms.JMSContext;
diff --git a/appserver/tests/appserv-tests/devtests/jms/annotation/MDB1/ejb/MySessionBean.java b/appserver/tests/appserv-tests/devtests/jms/annotation/MDB1/ejb/MySessionBean.java
index b6175b2..ab2622b 100644
--- a/appserver/tests/appserv-tests/devtests/jms/annotation/MDB1/ejb/MySessionBean.java
+++ b/appserver/tests/appserv-tests/devtests/jms/annotation/MDB1/ejb/MySessionBean.java
@@ -20,7 +20,7 @@
import jakarta.annotation.Resource;
import jakarta.ejb.EJBException;
import jakarta.ejb.Stateless;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
import jakarta.jms.Connection;
import jakarta.jms.ConnectionFactory;
import jakarta.jms.JMSConnectionFactory;
diff --git a/appserver/tests/appserv-tests/devtests/jms/annotation/MDB2/ejb/MyMessageBean.java b/appserver/tests/appserv-tests/devtests/jms/annotation/MDB2/ejb/MyMessageBean.java
index a013f86..f296bab 100644
--- a/appserver/tests/appserv-tests/devtests/jms/annotation/MDB2/ejb/MyMessageBean.java
+++ b/appserver/tests/appserv-tests/devtests/jms/annotation/MDB2/ejb/MyMessageBean.java
@@ -22,7 +22,7 @@
import jakarta.ejb.ActivationConfigProperty;
import jakarta.ejb.EJBException;
import jakarta.ejb.MessageDriven;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
import jakarta.jms.Connection;
import jakarta.jms.ConnectionFactory;
import jakarta.jms.JMSConnectionFactory;
diff --git a/appserver/tests/appserv-tests/devtests/jms/annotation/MDB2/ejb/MySessionBean.java b/appserver/tests/appserv-tests/devtests/jms/annotation/MDB2/ejb/MySessionBean.java
index abe5c3d..50a5445 100644
--- a/appserver/tests/appserv-tests/devtests/jms/annotation/MDB2/ejb/MySessionBean.java
+++ b/appserver/tests/appserv-tests/devtests/jms/annotation/MDB2/ejb/MySessionBean.java
@@ -20,7 +20,7 @@
import jakarta.annotation.Resource;
import jakarta.ejb.EJBException;
import jakarta.ejb.Stateless;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
import jakarta.jms.Connection;
import jakarta.jms.ConnectionFactory;
import jakarta.jms.JMSConnectionFactory;
diff --git a/appserver/tests/appserv-tests/devtests/jms/annotation/MDB3/ejb/MyMessageBean.java b/appserver/tests/appserv-tests/devtests/jms/annotation/MDB3/ejb/MyMessageBean.java
index 364700f..dc293e6 100644
--- a/appserver/tests/appserv-tests/devtests/jms/annotation/MDB3/ejb/MyMessageBean.java
+++ b/appserver/tests/appserv-tests/devtests/jms/annotation/MDB3/ejb/MyMessageBean.java
@@ -22,7 +22,7 @@
import jakarta.ejb.ActivationConfigProperty;
import jakarta.ejb.EJBException;
import jakarta.ejb.MessageDriven;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
import jakarta.jms.ConnectionFactory;
import jakarta.jms.JMSConnectionFactory;
import jakarta.jms.JMSConnectionFactoryDefinition;
diff --git a/appserver/tests/appserv-tests/devtests/jms/annotation/MDB3/ejb/MySessionBean.java b/appserver/tests/appserv-tests/devtests/jms/annotation/MDB3/ejb/MySessionBean.java
index 5f7a6f8..d815e2b 100644
--- a/appserver/tests/appserv-tests/devtests/jms/annotation/MDB3/ejb/MySessionBean.java
+++ b/appserver/tests/appserv-tests/devtests/jms/annotation/MDB3/ejb/MySessionBean.java
@@ -20,7 +20,7 @@
import jakarta.annotation.Resource;
import jakarta.ejb.EJBException;
import jakarta.ejb.Stateless;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
import jakarta.jms.Connection;
import jakarta.jms.ConnectionFactory;
import jakarta.jms.JMSConnectionFactory;
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 af58f7f..ba41a2c 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
@@ -17,7 +17,7 @@
package org.glassfish.test.jms.injection.ejb;
import jakarta.annotation.Resource;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
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 610f241..64e7ffc 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
@@ -17,7 +17,7 @@
package org.glassfish.test.jms.injection.ejb;
import jakarta.annotation.Resource;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
import jakarta.interceptor.AroundInvoke;
import jakarta.interceptor.InvocationContext;
import jakarta.jms.*;
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 97a42e2..12cd20a 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
@@ -17,7 +17,7 @@
package org.glassfish.test.jms.injection.ejb;
import jakarta.annotation.Resource;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
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 d381f42..81c07cd 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
@@ -16,7 +16,7 @@
package org.glassfish.test.jms.injection.ejb;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
import jakarta.interceptor.AroundInvoke;
import jakarta.interceptor.InvocationContext;
import jakarta.jms.*;
diff --git a/appserver/tests/appserv-tests/devtests/jms/injection/jmsContext/basic/jsfRequestScoped/ejb/MessageReceiverBean.java b/appserver/tests/appserv-tests/devtests/jms/injection/jmsContext/basic/jsfRequestScoped/ejb/MessageReceiverBean.java
index eda2327..83ca8b1 100644
--- a/appserver/tests/appserv-tests/devtests/jms/injection/jmsContext/basic/jsfRequestScoped/ejb/MessageReceiverBean.java
+++ b/appserver/tests/appserv-tests/devtests/jms/injection/jmsContext/basic/jsfRequestScoped/ejb/MessageReceiverBean.java
@@ -18,7 +18,7 @@
import jakarta.annotation.Resource;
import jakarta.ejb.*;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
import jakarta.jms.*;
/**
diff --git a/appserver/tests/appserv-tests/devtests/jms/injection/jmsContext/basic/jsfRequestScoped/servlet/com/oracle/jms/test/NewJSFManagedBean.java b/appserver/tests/appserv-tests/devtests/jms/injection/jmsContext/basic/jsfRequestScoped/servlet/com/oracle/jms/test/NewJSFManagedBean.java
index 2ee5333..9efb518 100644
--- a/appserver/tests/appserv-tests/devtests/jms/injection/jmsContext/basic/jsfRequestScoped/servlet/com/oracle/jms/test/NewJSFManagedBean.java
+++ b/appserver/tests/appserv-tests/devtests/jms/injection/jmsContext/basic/jsfRequestScoped/servlet/com/oracle/jms/test/NewJSFManagedBean.java
@@ -23,7 +23,7 @@
import jakarta.annotation.Resource;
import jakarta.faces.bean.ManagedBean;
import jakarta.faces.bean.ViewScoped;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
import jakarta.jms.*;
/**
diff --git a/appserver/tests/appserv-tests/devtests/jms/injection/jmsContext/basic/jsfTransactionScoped/ejb/MessageReceiverBean.java b/appserver/tests/appserv-tests/devtests/jms/injection/jmsContext/basic/jsfTransactionScoped/ejb/MessageReceiverBean.java
index eda2327..83ca8b1 100644
--- a/appserver/tests/appserv-tests/devtests/jms/injection/jmsContext/basic/jsfTransactionScoped/ejb/MessageReceiverBean.java
+++ b/appserver/tests/appserv-tests/devtests/jms/injection/jmsContext/basic/jsfTransactionScoped/ejb/MessageReceiverBean.java
@@ -18,7 +18,7 @@
import jakarta.annotation.Resource;
import jakarta.ejb.*;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
import jakarta.jms.*;
/**
diff --git a/appserver/tests/appserv-tests/devtests/jms/injection/jmsContext/basic/jsfTransactionScoped/servlet/com/oracle/jms/test/NewJSFManagedBean.java b/appserver/tests/appserv-tests/devtests/jms/injection/jmsContext/basic/jsfTransactionScoped/servlet/com/oracle/jms/test/NewJSFManagedBean.java
index 5d8b8ee..9ac6569 100644
--- a/appserver/tests/appserv-tests/devtests/jms/injection/jmsContext/basic/jsfTransactionScoped/servlet/com/oracle/jms/test/NewJSFManagedBean.java
+++ b/appserver/tests/appserv-tests/devtests/jms/injection/jmsContext/basic/jsfTransactionScoped/servlet/com/oracle/jms/test/NewJSFManagedBean.java
@@ -23,7 +23,7 @@
import jakarta.annotation.Resource;
import jakarta.faces.bean.ManagedBean;
import jakarta.faces.bean.ViewScoped;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
import jakarta.jms.*;
import jakarta.ejb.*;
import jakarta.transaction.UserTransaction;
diff --git a/appserver/tests/appserv-tests/devtests/jms/injection/jmsContext/basic/jspRequestScoped/ejb/MessageReceiverBean.java b/appserver/tests/appserv-tests/devtests/jms/injection/jmsContext/basic/jspRequestScoped/ejb/MessageReceiverBean.java
index eda2327..83ca8b1 100644
--- a/appserver/tests/appserv-tests/devtests/jms/injection/jmsContext/basic/jspRequestScoped/ejb/MessageReceiverBean.java
+++ b/appserver/tests/appserv-tests/devtests/jms/injection/jmsContext/basic/jspRequestScoped/ejb/MessageReceiverBean.java
@@ -18,7 +18,7 @@
import jakarta.annotation.Resource;
import jakarta.ejb.*;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
import jakarta.jms.*;
/**
diff --git a/appserver/tests/appserv-tests/devtests/jms/injection/jmsContext/basic/jspRequestScoped/servlet/test/JSPTagServletContextListener.java b/appserver/tests/appserv-tests/devtests/jms/injection/jmsContext/basic/jspRequestScoped/servlet/test/JSPTagServletContextListener.java
index 0fb4500..bd83038 100644
--- a/appserver/tests/appserv-tests/devtests/jms/injection/jmsContext/basic/jspRequestScoped/servlet/test/JSPTagServletContextListener.java
+++ b/appserver/tests/appserv-tests/devtests/jms/injection/jmsContext/basic/jspRequestScoped/servlet/test/JSPTagServletContextListener.java
@@ -17,7 +17,7 @@
package test;
import jakarta.annotation.Resource;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
import jakarta.jms.*;
import javax.servlet.ServletContextEvent;
import javax.servlet.ServletContextListener;
diff --git a/appserver/tests/appserv-tests/devtests/jms/injection/jmsContext/basic/jspRequestScoped/servlet/test/JmsTagHandler.java b/appserver/tests/appserv-tests/devtests/jms/injection/jmsContext/basic/jspRequestScoped/servlet/test/JmsTagHandler.java
index 4e70809..b9c359e 100644
--- a/appserver/tests/appserv-tests/devtests/jms/injection/jmsContext/basic/jspRequestScoped/servlet/test/JmsTagHandler.java
+++ b/appserver/tests/appserv-tests/devtests/jms/injection/jmsContext/basic/jspRequestScoped/servlet/test/JmsTagHandler.java
@@ -22,7 +22,7 @@
import java.io.IOException;
import jakarta.annotation.Resource;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
import jakarta.jms.*;
import javax.servlet.jsp.JspException;
import javax.servlet.jsp.JspWriter;
diff --git a/appserver/tests/appserv-tests/devtests/jms/injection/jmsContext/basic/jspTransactionScoped/ejb/MessageReceiverBean.java b/appserver/tests/appserv-tests/devtests/jms/injection/jmsContext/basic/jspTransactionScoped/ejb/MessageReceiverBean.java
index eda2327..83ca8b1 100644
--- a/appserver/tests/appserv-tests/devtests/jms/injection/jmsContext/basic/jspTransactionScoped/ejb/MessageReceiverBean.java
+++ b/appserver/tests/appserv-tests/devtests/jms/injection/jmsContext/basic/jspTransactionScoped/ejb/MessageReceiverBean.java
@@ -18,7 +18,7 @@
import jakarta.annotation.Resource;
import jakarta.ejb.*;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
import jakarta.jms.*;
/**
diff --git a/appserver/tests/appserv-tests/devtests/jms/injection/jmsContext/basic/jspTransactionScoped/servlet/test/JSPTagServletContextListener.java b/appserver/tests/appserv-tests/devtests/jms/injection/jmsContext/basic/jspTransactionScoped/servlet/test/JSPTagServletContextListener.java
index 0fb4500..bd83038 100644
--- a/appserver/tests/appserv-tests/devtests/jms/injection/jmsContext/basic/jspTransactionScoped/servlet/test/JSPTagServletContextListener.java
+++ b/appserver/tests/appserv-tests/devtests/jms/injection/jmsContext/basic/jspTransactionScoped/servlet/test/JSPTagServletContextListener.java
@@ -17,7 +17,7 @@
package test;
import jakarta.annotation.Resource;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
import jakarta.jms.*;
import javax.servlet.ServletContextEvent;
import javax.servlet.ServletContextListener;
diff --git a/appserver/tests/appserv-tests/devtests/jms/injection/jmsContext/basic/jspTransactionScoped/servlet/test/JmsTagHandler.java b/appserver/tests/appserv-tests/devtests/jms/injection/jmsContext/basic/jspTransactionScoped/servlet/test/JmsTagHandler.java
index 658bdc2..3d9d342 100644
--- a/appserver/tests/appserv-tests/devtests/jms/injection/jmsContext/basic/jspTransactionScoped/servlet/test/JmsTagHandler.java
+++ b/appserver/tests/appserv-tests/devtests/jms/injection/jmsContext/basic/jspTransactionScoped/servlet/test/JmsTagHandler.java
@@ -21,7 +21,7 @@
package test;
import jakarta.annotation.Resource;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
import jakarta.jms.*;
import javax.servlet.jsp.JspException;
import javax.servlet.jsp.JspWriter;
diff --git a/appserver/tests/appserv-tests/devtests/jms/injection/jmsContext/basic/servletRequestScoped/ejb/MessageReceiverBean.java b/appserver/tests/appserv-tests/devtests/jms/injection/jmsContext/basic/servletRequestScoped/ejb/MessageReceiverBean.java
index 67f6d41..2b84ccb 100644
--- a/appserver/tests/appserv-tests/devtests/jms/injection/jmsContext/basic/servletRequestScoped/ejb/MessageReceiverBean.java
+++ b/appserver/tests/appserv-tests/devtests/jms/injection/jmsContext/basic/servletRequestScoped/ejb/MessageReceiverBean.java
@@ -18,7 +18,7 @@
import jakarta.annotation.Resource;
import jakarta.ejb.*;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
import jakarta.jms.*;
/**
diff --git a/appserver/tests/appserv-tests/devtests/jms/injection/jmsContext/basic/servletRequestScoped/servlet/myfilter/MyFilter.java b/appserver/tests/appserv-tests/devtests/jms/injection/jmsContext/basic/servletRequestScoped/servlet/myfilter/MyFilter.java
index c9dfed3..e6834b5 100644
--- a/appserver/tests/appserv-tests/devtests/jms/injection/jmsContext/basic/servletRequestScoped/servlet/myfilter/MyFilter.java
+++ b/appserver/tests/appserv-tests/devtests/jms/injection/jmsContext/basic/servletRequestScoped/servlet/myfilter/MyFilter.java
@@ -18,7 +18,7 @@
import java.io.*;
import jakarta.annotation.Resource;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
import jakarta.jms.*;
import javax.servlet.*;
import javax.naming.*;
diff --git a/appserver/tests/appserv-tests/devtests/jms/injection/jmsContext/basic/servletRequestScoped/servlet/test/TestServlet.java b/appserver/tests/appserv-tests/devtests/jms/injection/jmsContext/basic/servletRequestScoped/servlet/test/TestServlet.java
index cbe0ee4..3f28827 100644
--- a/appserver/tests/appserv-tests/devtests/jms/injection/jmsContext/basic/servletRequestScoped/servlet/test/TestServlet.java
+++ b/appserver/tests/appserv-tests/devtests/jms/injection/jmsContext/basic/servletRequestScoped/servlet/test/TestServlet.java
@@ -18,7 +18,7 @@
import java.io.*;
import jakarta.annotation.Resource;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
import jakarta.jms.*;
import javax.servlet.*;
import javax.servlet.http.*;
diff --git a/appserver/tests/appserv-tests/devtests/jms/injection/jmsContext/basic/servletTransactionScoped/ejb/MessageReceiverBean.java b/appserver/tests/appserv-tests/devtests/jms/injection/jmsContext/basic/servletTransactionScoped/ejb/MessageReceiverBean.java
index 67f6d41..2b84ccb 100644
--- a/appserver/tests/appserv-tests/devtests/jms/injection/jmsContext/basic/servletTransactionScoped/ejb/MessageReceiverBean.java
+++ b/appserver/tests/appserv-tests/devtests/jms/injection/jmsContext/basic/servletTransactionScoped/ejb/MessageReceiverBean.java
@@ -18,7 +18,7 @@
import jakarta.annotation.Resource;
import jakarta.ejb.*;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
import jakarta.jms.*;
/**
diff --git a/appserver/tests/appserv-tests/devtests/jms/injection/jmsContext/basic/servletTransactionScoped/servlet/myfilter/MyFilter.java b/appserver/tests/appserv-tests/devtests/jms/injection/jmsContext/basic/servletTransactionScoped/servlet/myfilter/MyFilter.java
index c9dfed3..e6834b5 100644
--- a/appserver/tests/appserv-tests/devtests/jms/injection/jmsContext/basic/servletTransactionScoped/servlet/myfilter/MyFilter.java
+++ b/appserver/tests/appserv-tests/devtests/jms/injection/jmsContext/basic/servletTransactionScoped/servlet/myfilter/MyFilter.java
@@ -18,7 +18,7 @@
import java.io.*;
import jakarta.annotation.Resource;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
import jakarta.jms.*;
import javax.servlet.*;
import javax.naming.*;
diff --git a/appserver/tests/appserv-tests/devtests/jms/injection/jmsContext/basic/servletTransactionScoped/servlet/test/TestServlet.java b/appserver/tests/appserv-tests/devtests/jms/injection/jmsContext/basic/servletTransactionScoped/servlet/test/TestServlet.java
index 0210dfd..3e2fa47 100644
--- a/appserver/tests/appserv-tests/devtests/jms/injection/jmsContext/basic/servletTransactionScoped/servlet/test/TestServlet.java
+++ b/appserver/tests/appserv-tests/devtests/jms/injection/jmsContext/basic/servletTransactionScoped/servlet/test/TestServlet.java
@@ -18,7 +18,7 @@
import java.io.*;
import jakarta.annotation.Resource;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
import jakarta.jms.*;
import javax.servlet.*;
import javax.servlet.http.*;
diff --git a/appserver/tests/appserv-tests/devtests/jms/injection/jmsContext/basic/sessionBeanRequestScoped/ejb/SessionBeanInjection.java b/appserver/tests/appserv-tests/devtests/jms/injection/jmsContext/basic/sessionBeanRequestScoped/ejb/SessionBeanInjection.java
index 4c6d5c4..67aabfc 100644
--- a/appserver/tests/appserv-tests/devtests/jms/injection/jmsContext/basic/sessionBeanRequestScoped/ejb/SessionBeanInjection.java
+++ b/appserver/tests/appserv-tests/devtests/jms/injection/jmsContext/basic/sessionBeanRequestScoped/ejb/SessionBeanInjection.java
@@ -18,7 +18,7 @@
import jakarta.annotation.Resource;
import jakarta.ejb.*;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
import jakarta.jms.*;
/**
diff --git a/appserver/tests/appserv-tests/devtests/jms/injection/jmsContext/basic/sessionBeanTransactionScoped/ejb/SessionBeanInjection.java b/appserver/tests/appserv-tests/devtests/jms/injection/jmsContext/basic/sessionBeanTransactionScoped/ejb/SessionBeanInjection.java
index 4d86405..5b6071e 100644
--- a/appserver/tests/appserv-tests/devtests/jms/injection/jmsContext/basic/sessionBeanTransactionScoped/ejb/SessionBeanInjection.java
+++ b/appserver/tests/appserv-tests/devtests/jms/injection/jmsContext/basic/sessionBeanTransactionScoped/ejb/SessionBeanInjection.java
@@ -18,7 +18,7 @@
import jakarta.annotation.Resource;
import jakarta.ejb.*;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
import jakarta.jms.*;
/**
diff --git a/appserver/tests/appserv-tests/devtests/jms/injection/jmsContext/basic/wsRequestScoped/ejb/MessageReceiverBean.java b/appserver/tests/appserv-tests/devtests/jms/injection/jmsContext/basic/wsRequestScoped/ejb/MessageReceiverBean.java
index eda2327..83ca8b1 100644
--- a/appserver/tests/appserv-tests/devtests/jms/injection/jmsContext/basic/wsRequestScoped/ejb/MessageReceiverBean.java
+++ b/appserver/tests/appserv-tests/devtests/jms/injection/jmsContext/basic/wsRequestScoped/ejb/MessageReceiverBean.java
@@ -18,7 +18,7 @@
import jakarta.annotation.Resource;
import jakarta.ejb.*;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
import jakarta.jms.*;
/**
diff --git a/appserver/tests/appserv-tests/devtests/jms/injection/jmsContext/basic/wsRequestScoped/servlet/test/NewWebService.java b/appserver/tests/appserv-tests/devtests/jms/injection/jmsContext/basic/wsRequestScoped/servlet/test/NewWebService.java
index 6d2b6eb..d78d6a0 100644
--- a/appserver/tests/appserv-tests/devtests/jms/injection/jmsContext/basic/wsRequestScoped/servlet/test/NewWebService.java
+++ b/appserver/tests/appserv-tests/devtests/jms/injection/jmsContext/basic/wsRequestScoped/servlet/test/NewWebService.java
@@ -21,7 +21,7 @@
package test;
import jakarta.annotation.Resource;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
import jakarta.jms.*;
import jakarta.jws.WebService;
import jakarta.jws.WebMethod;
diff --git a/appserver/tests/appserv-tests/devtests/jms/injection/jmsContext/basic/wsTransactionScoped/ejb/MessageReceiverBean.java b/appserver/tests/appserv-tests/devtests/jms/injection/jmsContext/basic/wsTransactionScoped/ejb/MessageReceiverBean.java
index eda2327..83ca8b1 100644
--- a/appserver/tests/appserv-tests/devtests/jms/injection/jmsContext/basic/wsTransactionScoped/ejb/MessageReceiverBean.java
+++ b/appserver/tests/appserv-tests/devtests/jms/injection/jmsContext/basic/wsTransactionScoped/ejb/MessageReceiverBean.java
@@ -18,7 +18,7 @@
import jakarta.annotation.Resource;
import jakarta.ejb.*;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
import jakarta.jms.*;
/**
diff --git a/appserver/tests/appserv-tests/devtests/jms/injection/jmsContext/basic/wsTransactionScoped/servlet/test/NewWebService.java b/appserver/tests/appserv-tests/devtests/jms/injection/jmsContext/basic/wsTransactionScoped/servlet/test/NewWebService.java
index 7f41259..b8ae099 100644
--- a/appserver/tests/appserv-tests/devtests/jms/injection/jmsContext/basic/wsTransactionScoped/servlet/test/NewWebService.java
+++ b/appserver/tests/appserv-tests/devtests/jms/injection/jmsContext/basic/wsTransactionScoped/servlet/test/NewWebService.java
@@ -21,7 +21,7 @@
package test;
import jakarta.annotation.Resource;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
import jakarta.jms.*;
import jakarta.jws.WebService;
import jakarta.jws.WebMethod;
diff --git a/appserver/tests/appserv-tests/devtests/jms/injection/jmsContext/mixedScoped/jmsContextDefaultInjection/ejb/SessionBeanInjection1.java b/appserver/tests/appserv-tests/devtests/jms/injection/jmsContext/mixedScoped/jmsContextDefaultInjection/ejb/SessionBeanInjection1.java
index b3aa22f..2b430a3 100644
--- a/appserver/tests/appserv-tests/devtests/jms/injection/jmsContext/mixedScoped/jmsContextDefaultInjection/ejb/SessionBeanInjection1.java
+++ b/appserver/tests/appserv-tests/devtests/jms/injection/jmsContext/mixedScoped/jmsContextDefaultInjection/ejb/SessionBeanInjection1.java
@@ -18,7 +18,7 @@
import jakarta.annotation.Resource;
import jakarta.ejb.*;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
import jakarta.jms.*;
import java.lang.String;
import org.glassfish.test.jms.injection.ejb.SessionBeanInjection2;
diff --git a/appserver/tests/appserv-tests/devtests/jms/injection/jmsContext/mixedScoped/jmsContextDefaultInjection/ejb/SessionBeanInjection2.java b/appserver/tests/appserv-tests/devtests/jms/injection/jmsContext/mixedScoped/jmsContextDefaultInjection/ejb/SessionBeanInjection2.java
index 5dbc33b..5295e67 100644
--- a/appserver/tests/appserv-tests/devtests/jms/injection/jmsContext/mixedScoped/jmsContextDefaultInjection/ejb/SessionBeanInjection2.java
+++ b/appserver/tests/appserv-tests/devtests/jms/injection/jmsContext/mixedScoped/jmsContextDefaultInjection/ejb/SessionBeanInjection2.java
@@ -18,7 +18,7 @@
import jakarta.annotation.Resource;
import jakarta.ejb.*;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
import jakarta.jms.*;
/**
diff --git a/appserver/tests/appserv-tests/devtests/jms/injection/jmsContext/mixedScoped/jmsContextInjectionA/ejb/SessionBeanInjection.java b/appserver/tests/appserv-tests/devtests/jms/injection/jmsContext/mixedScoped/jmsContextInjectionA/ejb/SessionBeanInjection.java
index 4904663..f178f6c 100644
--- a/appserver/tests/appserv-tests/devtests/jms/injection/jmsContext/mixedScoped/jmsContextInjectionA/ejb/SessionBeanInjection.java
+++ b/appserver/tests/appserv-tests/devtests/jms/injection/jmsContext/mixedScoped/jmsContextInjectionA/ejb/SessionBeanInjection.java
@@ -18,7 +18,7 @@
import jakarta.annotation.Resource;
import jakarta.ejb.*;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
import jakarta.jms.*;
/**
diff --git a/appserver/tests/appserv-tests/devtests/jms/injection/jmsContext/mixedScoped/jmsContextInjectionB/ejb/SessionBeanInjection1.java b/appserver/tests/appserv-tests/devtests/jms/injection/jmsContext/mixedScoped/jmsContextInjectionB/ejb/SessionBeanInjection1.java
index efcfaad..1cd1125 100644
--- a/appserver/tests/appserv-tests/devtests/jms/injection/jmsContext/mixedScoped/jmsContextInjectionB/ejb/SessionBeanInjection1.java
+++ b/appserver/tests/appserv-tests/devtests/jms/injection/jmsContext/mixedScoped/jmsContextInjectionB/ejb/SessionBeanInjection1.java
@@ -18,7 +18,7 @@
import jakarta.annotation.Resource;
import jakarta.ejb.*;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
import jakarta.jms.*;
import org.glassfish.test.jms.injection.ejb.SessionBeanInjection2;
diff --git a/appserver/tests/appserv-tests/devtests/jms/injection/jmsContext/mixedScoped/jmsContextInjectionB/ejb/SessionBeanInjection2.java b/appserver/tests/appserv-tests/devtests/jms/injection/jmsContext/mixedScoped/jmsContextInjectionB/ejb/SessionBeanInjection2.java
index c2ea79c..a800ce1 100644
--- a/appserver/tests/appserv-tests/devtests/jms/injection/jmsContext/mixedScoped/jmsContextInjectionB/ejb/SessionBeanInjection2.java
+++ b/appserver/tests/appserv-tests/devtests/jms/injection/jmsContext/mixedScoped/jmsContextInjectionB/ejb/SessionBeanInjection2.java
@@ -18,7 +18,7 @@
import jakarta.annotation.Resource;
import jakarta.ejb.*;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
import jakarta.jms.*;
/**
diff --git a/appserver/tests/appserv-tests/devtests/jms/injection/jmsContext/mixedScoped/jmsContextInjectionC/ejb/SessionBeanInjection1.java b/appserver/tests/appserv-tests/devtests/jms/injection/jmsContext/mixedScoped/jmsContextInjectionC/ejb/SessionBeanInjection1.java
index f2f968c..810e98d 100644
--- a/appserver/tests/appserv-tests/devtests/jms/injection/jmsContext/mixedScoped/jmsContextInjectionC/ejb/SessionBeanInjection1.java
+++ b/appserver/tests/appserv-tests/devtests/jms/injection/jmsContext/mixedScoped/jmsContextInjectionC/ejb/SessionBeanInjection1.java
@@ -18,7 +18,7 @@
import jakarta.annotation.Resource;
import jakarta.ejb.*;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
import jakarta.jms.*;
import java.lang.String;
import org.glassfish.test.jms.injection.ejb.SessionBeanInjection2;
diff --git a/appserver/tests/appserv-tests/devtests/jms/injection/jmsContext/mixedScoped/jmsContextInjectionC/ejb/SessionBeanInjection2.java b/appserver/tests/appserv-tests/devtests/jms/injection/jmsContext/mixedScoped/jmsContextInjectionC/ejb/SessionBeanInjection2.java
index 2bfa214..1436938 100644
--- a/appserver/tests/appserv-tests/devtests/jms/injection/jmsContext/mixedScoped/jmsContextInjectionC/ejb/SessionBeanInjection2.java
+++ b/appserver/tests/appserv-tests/devtests/jms/injection/jmsContext/mixedScoped/jmsContextInjectionC/ejb/SessionBeanInjection2.java
@@ -18,7 +18,7 @@
import jakarta.annotation.Resource;
import jakarta.ejb.*;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
import jakarta.jms.*;
/**
diff --git a/appserver/tests/appserv-tests/devtests/jms/injection/jmsContext/mixedScoped/jmsContextInjectionD/ejb/SessionBeanInjection.java b/appserver/tests/appserv-tests/devtests/jms/injection/jmsContext/mixedScoped/jmsContextInjectionD/ejb/SessionBeanInjection.java
index 6c72089..ecff767 100644
--- a/appserver/tests/appserv-tests/devtests/jms/injection/jmsContext/mixedScoped/jmsContextInjectionD/ejb/SessionBeanInjection.java
+++ b/appserver/tests/appserv-tests/devtests/jms/injection/jmsContext/mixedScoped/jmsContextInjectionD/ejb/SessionBeanInjection.java
@@ -18,7 +18,7 @@
import jakarta.annotation.Resource;
import jakarta.ejb.*;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
import jakarta.jms.*;
/**
diff --git a/appserver/tests/appserv-tests/devtests/jms/injection/jmsContext/mixedScoped/jmsContextInjectionE/ejb/SessionBeanInjection.java b/appserver/tests/appserv-tests/devtests/jms/injection/jmsContext/mixedScoped/jmsContextInjectionE/ejb/SessionBeanInjection.java
index 66f2fe7..6cd478f 100644
--- a/appserver/tests/appserv-tests/devtests/jms/injection/jmsContext/mixedScoped/jmsContextInjectionE/ejb/SessionBeanInjection.java
+++ b/appserver/tests/appserv-tests/devtests/jms/injection/jmsContext/mixedScoped/jmsContextInjectionE/ejb/SessionBeanInjection.java
@@ -18,7 +18,7 @@
import jakarta.annotation.Resource;
import jakarta.ejb.*;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
import jakarta.jms.*;
/**
diff --git a/appserver/tests/appserv-tests/devtests/jms/injection/jmsContext/mixedScoped/jmsContextInjectionF/ejb/SessionBeanInjection1.java b/appserver/tests/appserv-tests/devtests/jms/injection/jmsContext/mixedScoped/jmsContextInjectionF/ejb/SessionBeanInjection1.java
index b36f345..9e77640 100644
--- a/appserver/tests/appserv-tests/devtests/jms/injection/jmsContext/mixedScoped/jmsContextInjectionF/ejb/SessionBeanInjection1.java
+++ b/appserver/tests/appserv-tests/devtests/jms/injection/jmsContext/mixedScoped/jmsContextInjectionF/ejb/SessionBeanInjection1.java
@@ -18,7 +18,7 @@
import jakarta.annotation.Resource;
import jakarta.ejb.*;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
import jakarta.jms.*;
/**
diff --git a/appserver/tests/appserv-tests/devtests/jms/injection/jmsContext/mixedScoped/jmsContextInjectionF/ejb/SessionBeanInjection2.java b/appserver/tests/appserv-tests/devtests/jms/injection/jmsContext/mixedScoped/jmsContextInjectionF/ejb/SessionBeanInjection2.java
index 09a8562..21811a6 100644
--- a/appserver/tests/appserv-tests/devtests/jms/injection/jmsContext/mixedScoped/jmsContextInjectionF/ejb/SessionBeanInjection2.java
+++ b/appserver/tests/appserv-tests/devtests/jms/injection/jmsContext/mixedScoped/jmsContextInjectionF/ejb/SessionBeanInjection2.java
@@ -18,7 +18,7 @@
import jakarta.annotation.Resource;
import jakarta.ejb.*;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
import jakarta.jms.*;
/**
diff --git a/appserver/tests/appserv-tests/devtests/jms/injection/jmsContext/mixedScoped/jmsContextInjectionG/ejb/SessionBeanInjection.java b/appserver/tests/appserv-tests/devtests/jms/injection/jmsContext/mixedScoped/jmsContextInjectionG/ejb/SessionBeanInjection.java
index 4b9fefa..5852086 100644
--- a/appserver/tests/appserv-tests/devtests/jms/injection/jmsContext/mixedScoped/jmsContextInjectionG/ejb/SessionBeanInjection.java
+++ b/appserver/tests/appserv-tests/devtests/jms/injection/jmsContext/mixedScoped/jmsContextInjectionG/ejb/SessionBeanInjection.java
@@ -18,7 +18,7 @@
import jakarta.annotation.Resource;
import jakarta.ejb.*;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
import jakarta.jms.*;
import jakarta.transaction.UserTransaction;
diff --git a/appserver/tests/appserv-tests/devtests/jms/injection/jmsContext/mixedScoped/jmsContextInjectionH/ejb/SessionBeanInjection.java b/appserver/tests/appserv-tests/devtests/jms/injection/jmsContext/mixedScoped/jmsContextInjectionH/ejb/SessionBeanInjection.java
index 01606d6..584e56c 100644
--- a/appserver/tests/appserv-tests/devtests/jms/injection/jmsContext/mixedScoped/jmsContextInjectionH/ejb/SessionBeanInjection.java
+++ b/appserver/tests/appserv-tests/devtests/jms/injection/jmsContext/mixedScoped/jmsContextInjectionH/ejb/SessionBeanInjection.java
@@ -18,7 +18,7 @@
import jakarta.annotation.Resource;
import jakarta.ejb.*;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
import jakarta.jms.*;
import jakarta.transaction.UserTransaction;
diff --git a/appserver/tests/appserv-tests/devtests/jms/injection/jmsContext/mixedScoped/jmsContextInjectionJ/ejb/SessionBeanInjection1.java b/appserver/tests/appserv-tests/devtests/jms/injection/jmsContext/mixedScoped/jmsContextInjectionJ/ejb/SessionBeanInjection1.java
index 293b99a..cabc888 100644
--- a/appserver/tests/appserv-tests/devtests/jms/injection/jmsContext/mixedScoped/jmsContextInjectionJ/ejb/SessionBeanInjection1.java
+++ b/appserver/tests/appserv-tests/devtests/jms/injection/jmsContext/mixedScoped/jmsContextInjectionJ/ejb/SessionBeanInjection1.java
@@ -18,7 +18,7 @@
import jakarta.annotation.Resource;
import jakarta.ejb.*;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
import jakarta.jms.*;
import org.glassfish.test.jms.injection.ejb.SessionBeanInjection2;
diff --git a/appserver/tests/appserv-tests/devtests/jms/injection/jmsContext/mixedScoped/jmsContextInjectionJ/ejb/SessionBeanInjection2.java b/appserver/tests/appserv-tests/devtests/jms/injection/jmsContext/mixedScoped/jmsContextInjectionJ/ejb/SessionBeanInjection2.java
index d0e0362..62cd58d 100644
--- a/appserver/tests/appserv-tests/devtests/jms/injection/jmsContext/mixedScoped/jmsContextInjectionJ/ejb/SessionBeanInjection2.java
+++ b/appserver/tests/appserv-tests/devtests/jms/injection/jmsContext/mixedScoped/jmsContextInjectionJ/ejb/SessionBeanInjection2.java
@@ -18,7 +18,7 @@
import jakarta.annotation.Resource;
import jakarta.ejb.*;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
import jakarta.jms.*;
/**
diff --git a/appserver/tests/appserv-tests/devtests/jms/injection/jmsContext/mixedScoped/jmsContextInjectionK/ejb/SessionBeanInjection1.java b/appserver/tests/appserv-tests/devtests/jms/injection/jmsContext/mixedScoped/jmsContextInjectionK/ejb/SessionBeanInjection1.java
index 31ad25a..06f1d1a 100644
--- a/appserver/tests/appserv-tests/devtests/jms/injection/jmsContext/mixedScoped/jmsContextInjectionK/ejb/SessionBeanInjection1.java
+++ b/appserver/tests/appserv-tests/devtests/jms/injection/jmsContext/mixedScoped/jmsContextInjectionK/ejb/SessionBeanInjection1.java
@@ -18,7 +18,7 @@
import jakarta.annotation.Resource;
import jakarta.ejb.*;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
import jakarta.jms.*;
import org.glassfish.test.jms.injection.ejb.SessionBeanInjection2;
diff --git a/appserver/tests/appserv-tests/devtests/jms/injection/jmsContext/mixedScoped/jmsContextInjectionK/ejb/SessionBeanInjection2.java b/appserver/tests/appserv-tests/devtests/jms/injection/jmsContext/mixedScoped/jmsContextInjectionK/ejb/SessionBeanInjection2.java
index c08d15b..7d257fa 100644
--- a/appserver/tests/appserv-tests/devtests/jms/injection/jmsContext/mixedScoped/jmsContextInjectionK/ejb/SessionBeanInjection2.java
+++ b/appserver/tests/appserv-tests/devtests/jms/injection/jmsContext/mixedScoped/jmsContextInjectionK/ejb/SessionBeanInjection2.java
@@ -18,7 +18,7 @@
import jakarta.annotation.Resource;
import jakarta.ejb.*;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
import jakarta.jms.*;
/**
diff --git a/appserver/tests/appserv-tests/devtests/jms/mdbDest/ejb/MySessionBean.java b/appserver/tests/appserv-tests/devtests/jms/mdbDest/ejb/MySessionBean.java
index 062127e..88e36f1 100644
--- a/appserver/tests/appserv-tests/devtests/jms/mdbDest/ejb/MySessionBean.java
+++ b/appserver/tests/appserv-tests/devtests/jms/mdbDest/ejb/MySessionBean.java
@@ -18,7 +18,7 @@
import jakarta.annotation.Resource;
import jakarta.ejb.*;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
import jakarta.jms.*;
/**
diff --git a/appserver/tests/appserv-tests/devtests/jms/mdbDest/ejb/NewMessageBean.java b/appserver/tests/appserv-tests/devtests/jms/mdbDest/ejb/NewMessageBean.java
index 65b87ed..1b194ef 100644
--- a/appserver/tests/appserv-tests/devtests/jms/mdbDest/ejb/NewMessageBean.java
+++ b/appserver/tests/appserv-tests/devtests/jms/mdbDest/ejb/NewMessageBean.java
@@ -19,7 +19,7 @@
import java.util.logging.*;
import jakarta.annotation.Resource;
import jakarta.ejb.*;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
import jakarta.jms.*;
@MessageDriven(name = "test0", mappedName = "jms/jms_unit_test_Topic", activationConfig = {
diff --git a/appserver/tests/appserv-tests/devtests/jms/mdbDest/ejb/NewMessageBean1.java b/appserver/tests/appserv-tests/devtests/jms/mdbDest/ejb/NewMessageBean1.java
index 4daf381..0fca031 100644
--- a/appserver/tests/appserv-tests/devtests/jms/mdbDest/ejb/NewMessageBean1.java
+++ b/appserver/tests/appserv-tests/devtests/jms/mdbDest/ejb/NewMessageBean1.java
@@ -19,7 +19,7 @@
import java.util.logging.*;
import jakarta.annotation.Resource;
import jakarta.ejb.*;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
import jakarta.jms.*;
@MessageDriven(name = "test1", activationConfig = {
diff --git a/appserver/tests/appserv-tests/devtests/jms/mdbDest/ejb/NewMessageBean2.java b/appserver/tests/appserv-tests/devtests/jms/mdbDest/ejb/NewMessageBean2.java
index 218783a..8d5550c 100644
--- a/appserver/tests/appserv-tests/devtests/jms/mdbDest/ejb/NewMessageBean2.java
+++ b/appserver/tests/appserv-tests/devtests/jms/mdbDest/ejb/NewMessageBean2.java
@@ -19,7 +19,7 @@
import java.util.logging.*;
import jakarta.annotation.Resource;
import jakarta.ejb.*;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
import jakarta.jms.*;
@MessageDriven(name = "test2", activationConfig = {
diff --git a/appserver/tests/appserv-tests/devtests/jms/mdbDest/ejb/NewMessageBean3.java b/appserver/tests/appserv-tests/devtests/jms/mdbDest/ejb/NewMessageBean3.java
index 5a4a738..77045e7 100644
--- a/appserver/tests/appserv-tests/devtests/jms/mdbDest/ejb/NewMessageBean3.java
+++ b/appserver/tests/appserv-tests/devtests/jms/mdbDest/ejb/NewMessageBean3.java
@@ -19,7 +19,7 @@
import java.util.logging.*;
import jakarta.annotation.Resource;
import jakarta.ejb.*;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
import jakarta.jms.*;
@MessageDriven(name = "test3", mappedName="wrongname", activationConfig = {
diff --git a/appserver/tests/appserv-tests/devtests/jms/mdbDest/ejb/NewMessageBean4.java b/appserver/tests/appserv-tests/devtests/jms/mdbDest/ejb/NewMessageBean4.java
index 8e44de2..f021c35 100644
--- a/appserver/tests/appserv-tests/devtests/jms/mdbDest/ejb/NewMessageBean4.java
+++ b/appserver/tests/appserv-tests/devtests/jms/mdbDest/ejb/NewMessageBean4.java
@@ -19,7 +19,7 @@
import java.util.logging.*;
import jakarta.annotation.Resource;
import jakarta.ejb.*;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
import jakarta.jms.*;
@MessageDriven(name = "test4", mappedName="wrongname", activationConfig = {
diff --git a/appserver/tests/appserv-tests/devtests/jms/mdbDest/ejb/NewMessageBean5.java b/appserver/tests/appserv-tests/devtests/jms/mdbDest/ejb/NewMessageBean5.java
index e9a5cf8..90153ce 100644
--- a/appserver/tests/appserv-tests/devtests/jms/mdbDest/ejb/NewMessageBean5.java
+++ b/appserver/tests/appserv-tests/devtests/jms/mdbDest/ejb/NewMessageBean5.java
@@ -19,7 +19,7 @@
import java.util.logging.*;
import jakarta.annotation.Resource;
import jakarta.ejb.*;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
import jakarta.jms.*;
@MessageDriven(name = "test5", activationConfig = {
diff --git a/appserver/tests/appserv-tests/devtests/security/soteria/app-bundled-ham-basic-login-config-form/src/main/java/org/glassfish/soteria/test/BasicAuthenticationServlet.java b/appserver/tests/appserv-tests/devtests/security/soteria/app-bundled-ham-basic-login-config-form/src/main/java/org/glassfish/soteria/test/BasicAuthenticationServlet.java
index b2548ee..d1f7b95 100644
--- a/appserver/tests/appserv-tests/devtests/security/soteria/app-bundled-ham-basic-login-config-form/src/main/java/org/glassfish/soteria/test/BasicAuthenticationServlet.java
+++ b/appserver/tests/appserv-tests/devtests/security/soteria/app-bundled-ham-basic-login-config-form/src/main/java/org/glassfish/soteria/test/BasicAuthenticationServlet.java
@@ -18,7 +18,7 @@
import java.io.IOException;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
import javax.security.enterprise.SecurityContext;
import javax.servlet.ServletException;
import javax.servlet.annotation.HttpConstraint;
diff --git a/appserver/tests/appserv-tests/devtests/security/soteria/app-bundled-ham-basic-login-config-form/src/main/java/org/glassfish/soteria/test/TestAuthenticationMechanism.java b/appserver/tests/appserv-tests/devtests/security/soteria/app-bundled-ham-basic-login-config-form/src/main/java/org/glassfish/soteria/test/TestAuthenticationMechanism.java
index 47a3baf..0dbb2f6 100644
--- a/appserver/tests/appserv-tests/devtests/security/soteria/app-bundled-ham-basic-login-config-form/src/main/java/org/glassfish/soteria/test/TestAuthenticationMechanism.java
+++ b/appserver/tests/appserv-tests/devtests/security/soteria/app-bundled-ham-basic-login-config-form/src/main/java/org/glassfish/soteria/test/TestAuthenticationMechanism.java
@@ -17,7 +17,7 @@
package org.glassfish.soteria.test;
import javax.enterprise.context.RequestScoped;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
import javax.security.enterprise.AuthenticationException;
import javax.security.enterprise.AuthenticationStatus;
import javax.security.enterprise.authentication.mechanism.http.HttpAuthenticationMechanism;
diff --git a/appserver/tests/appserv-tests/devtests/security/soteria/app-caller-principal/src/main/java/org/glassfish/soteria/test/CallerSubjectServlet.java b/appserver/tests/appserv-tests/devtests/security/soteria/app-caller-principal/src/main/java/org/glassfish/soteria/test/CallerSubjectServlet.java
index cc87399..bf79883 100644
--- a/appserver/tests/appserv-tests/devtests/security/soteria/app-caller-principal/src/main/java/org/glassfish/soteria/test/CallerSubjectServlet.java
+++ b/appserver/tests/appserv-tests/devtests/security/soteria/app-caller-principal/src/main/java/org/glassfish/soteria/test/CallerSubjectServlet.java
@@ -18,7 +18,7 @@
import java.io.IOException;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
import javax.security.enterprise.SecurityContext;
import javax.security.enterprise.CallerPrincipal;
import javax.servlet.ServletException;
diff --git a/appserver/tests/appserv-tests/devtests/security/soteria/app-caller-principal/src/main/java/org/glassfish/soteria/test/TestAuthenticationMechanism.java b/appserver/tests/appserv-tests/devtests/security/soteria/app-caller-principal/src/main/java/org/glassfish/soteria/test/TestAuthenticationMechanism.java
index c9357ce..9374f2b 100644
--- a/appserver/tests/appserv-tests/devtests/security/soteria/app-caller-principal/src/main/java/org/glassfish/soteria/test/TestAuthenticationMechanism.java
+++ b/appserver/tests/appserv-tests/devtests/security/soteria/app-caller-principal/src/main/java/org/glassfish/soteria/test/TestAuthenticationMechanism.java
@@ -19,7 +19,7 @@
import static javax.security.enterprise.identitystore.CredentialValidationResult.Status.VALID;
import javax.enterprise.context.RequestScoped;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
import javax.security.enterprise.AuthenticationStatus;
import javax.security.enterprise.AuthenticationException;
import javax.security.enterprise.authentication.mechanism.http.HttpAuthenticationMechanism;
diff --git a/appserver/tests/appserv-tests/devtests/security/soteria/app-custom-identity-store-handler/src/main/java/org/glassfish/soteria/test/ConfigBean.java b/appserver/tests/appserv-tests/devtests/security/soteria/app-custom-identity-store-handler/src/main/java/org/glassfish/soteria/test/ConfigBean.java
index 3b84e9f..267bd20 100644
--- a/appserver/tests/appserv-tests/devtests/security/soteria/app-custom-identity-store-handler/src/main/java/org/glassfish/soteria/test/ConfigBean.java
+++ b/appserver/tests/appserv-tests/devtests/security/soteria/app-custom-identity-store-handler/src/main/java/org/glassfish/soteria/test/ConfigBean.java
@@ -25,7 +25,7 @@
import static javax.security.enterprise.identitystore.LdapIdentityStoreDefinition.LdapSearchScope.SUBTREE;
import javax.enterprise.context.RequestScoped;
-import javax.inject.Named;
+import jakarta.inject.Named;
@RequestScoped
@Named
diff --git a/appserver/tests/appserv-tests/devtests/security/soteria/app-custom-identity-store-handler/src/main/java/org/glassfish/soteria/test/TestAuthenticationMechanism.java b/appserver/tests/appserv-tests/devtests/security/soteria/app-custom-identity-store-handler/src/main/java/org/glassfish/soteria/test/TestAuthenticationMechanism.java
index fa570fe..10cde68 100644
--- a/appserver/tests/appserv-tests/devtests/security/soteria/app-custom-identity-store-handler/src/main/java/org/glassfish/soteria/test/TestAuthenticationMechanism.java
+++ b/appserver/tests/appserv-tests/devtests/security/soteria/app-custom-identity-store-handler/src/main/java/org/glassfish/soteria/test/TestAuthenticationMechanism.java
@@ -17,7 +17,7 @@
package org.glassfish.soteria.test;
import javax.enterprise.context.ApplicationScoped;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
import javax.security.enterprise.AuthenticationException;
import javax.security.enterprise.AuthenticationStatus;
import javax.security.enterprise.authentication.mechanism.http.HttpAuthenticationMechanism;
diff --git a/appserver/tests/appserv-tests/devtests/security/soteria/app-custom-rememberme/src/main/java/org/glassfish/soteria/test/RememberMeConfigBean.java b/appserver/tests/appserv-tests/devtests/security/soteria/app-custom-rememberme/src/main/java/org/glassfish/soteria/test/RememberMeConfigBean.java
index cb01396..86fcbd9 100644
--- a/appserver/tests/appserv-tests/devtests/security/soteria/app-custom-rememberme/src/main/java/org/glassfish/soteria/test/RememberMeConfigBean.java
+++ b/appserver/tests/appserv-tests/devtests/security/soteria/app-custom-rememberme/src/main/java/org/glassfish/soteria/test/RememberMeConfigBean.java
@@ -18,7 +18,7 @@
import javax.enterprise.context.RequestScoped;
-import javax.inject.Named;
+import jakarta.inject.Named;
@RequestScoped
@Named
diff --git a/appserver/tests/appserv-tests/devtests/security/soteria/app-custom-rememberme/src/main/java/org/glassfish/soteria/test/TestAuthenticationMechanism.java b/appserver/tests/appserv-tests/devtests/security/soteria/app-custom-rememberme/src/main/java/org/glassfish/soteria/test/TestAuthenticationMechanism.java
index 0effcca..77094f2 100644
--- a/appserver/tests/appserv-tests/devtests/security/soteria/app-custom-rememberme/src/main/java/org/glassfish/soteria/test/TestAuthenticationMechanism.java
+++ b/appserver/tests/appserv-tests/devtests/security/soteria/app-custom-rememberme/src/main/java/org/glassfish/soteria/test/TestAuthenticationMechanism.java
@@ -18,7 +18,7 @@
import javax.enterprise.context.RequestScoped;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
import javax.security.enterprise.AuthenticationException;
import javax.security.enterprise.AuthenticationStatus;
import javax.security.enterprise.authentication.mechanism.http.HttpAuthenticationMechanism;
diff --git a/appserver/tests/appserv-tests/devtests/security/soteria/app-custom-session/src/main/java/org/glassfish/soteria/test/TestAuthenticationMechanism.java b/appserver/tests/appserv-tests/devtests/security/soteria/app-custom-session/src/main/java/org/glassfish/soteria/test/TestAuthenticationMechanism.java
index 673b083..bbe1789 100644
--- a/appserver/tests/appserv-tests/devtests/security/soteria/app-custom-session/src/main/java/org/glassfish/soteria/test/TestAuthenticationMechanism.java
+++ b/appserver/tests/appserv-tests/devtests/security/soteria/app-custom-session/src/main/java/org/glassfish/soteria/test/TestAuthenticationMechanism.java
@@ -18,7 +18,7 @@
import javax.enterprise.context.RequestScoped;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
import javax.security.enterprise.AuthenticationException;
import javax.security.enterprise.AuthenticationStatus;
import javax.security.enterprise.authentication.mechanism.http.AutoApplySession;
diff --git a/appserver/tests/appserv-tests/devtests/security/soteria/app-custom/src/main/java/org/glassfish/soteria/test/ProtectedServlet.java b/appserver/tests/appserv-tests/devtests/security/soteria/app-custom/src/main/java/org/glassfish/soteria/test/ProtectedServlet.java
index f7bfe5d..145c315 100644
--- a/appserver/tests/appserv-tests/devtests/security/soteria/app-custom/src/main/java/org/glassfish/soteria/test/ProtectedServlet.java
+++ b/appserver/tests/appserv-tests/devtests/security/soteria/app-custom/src/main/java/org/glassfish/soteria/test/ProtectedServlet.java
@@ -18,7 +18,7 @@
import java.io.IOException;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
import javax.security.enterprise.SecurityContext;
import javax.servlet.ServletException;
import javax.servlet.annotation.HttpConstraint;
diff --git a/appserver/tests/appserv-tests/devtests/security/soteria/app-custom/src/main/java/org/glassfish/soteria/test/Servlet.java b/appserver/tests/appserv-tests/devtests/security/soteria/app-custom/src/main/java/org/glassfish/soteria/test/Servlet.java
index db31e2e..e5adfed 100644
--- a/appserver/tests/appserv-tests/devtests/security/soteria/app-custom/src/main/java/org/glassfish/soteria/test/Servlet.java
+++ b/appserver/tests/appserv-tests/devtests/security/soteria/app-custom/src/main/java/org/glassfish/soteria/test/Servlet.java
@@ -19,7 +19,7 @@
import java.io.IOException;
import jakarta.annotation.security.DeclareRoles;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
import javax.security.enterprise.SecurityContext;
import javax.servlet.ServletException;
import javax.servlet.annotation.WebServlet;
diff --git a/appserver/tests/appserv-tests/devtests/security/soteria/app-custom/src/main/java/org/glassfish/soteria/test/TestAuthenticationMechanism.java b/appserver/tests/appserv-tests/devtests/security/soteria/app-custom/src/main/java/org/glassfish/soteria/test/TestAuthenticationMechanism.java
index cae948f..e689b17 100644
--- a/appserver/tests/appserv-tests/devtests/security/soteria/app-custom/src/main/java/org/glassfish/soteria/test/TestAuthenticationMechanism.java
+++ b/appserver/tests/appserv-tests/devtests/security/soteria/app-custom/src/main/java/org/glassfish/soteria/test/TestAuthenticationMechanism.java
@@ -19,7 +19,7 @@
import static javax.security.enterprise.identitystore.CredentialValidationResult.Status.VALID;
import javax.enterprise.context.RequestScoped;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
import javax.security.enterprise.AuthenticationStatus;
import javax.security.enterprise.AuthenticationException;
import javax.security.auth.message.AuthException;
diff --git a/appserver/tests/appserv-tests/devtests/security/soteria/app-db/src/main/java/org/glassfish/soteria/test/ApplicationConfig.java b/appserver/tests/appserv-tests/devtests/security/soteria/app-db/src/main/java/org/glassfish/soteria/test/ApplicationConfig.java
index 86d37da..40162fb 100644
--- a/appserver/tests/appserv-tests/devtests/security/soteria/app-db/src/main/java/org/glassfish/soteria/test/ApplicationConfig.java
+++ b/appserver/tests/appserv-tests/devtests/security/soteria/app-db/src/main/java/org/glassfish/soteria/test/ApplicationConfig.java
@@ -17,7 +17,7 @@
package org.glassfish.soteria.test;
import javax.enterprise.context.ApplicationScoped;
-import javax.inject.Named;
+import jakarta.inject.Named;
import javax.security.enterprise.identitystore.DatabaseIdentityStoreDefinition;
@DatabaseIdentityStoreDefinition(
diff --git a/appserver/tests/appserv-tests/devtests/security/soteria/app-db/src/main/java/org/glassfish/soteria/test/TestAuthenticationMechanism.java b/appserver/tests/appserv-tests/devtests/security/soteria/app-db/src/main/java/org/glassfish/soteria/test/TestAuthenticationMechanism.java
index f8e3c1b..a5b5509 100644
--- a/appserver/tests/appserv-tests/devtests/security/soteria/app-db/src/main/java/org/glassfish/soteria/test/TestAuthenticationMechanism.java
+++ b/appserver/tests/appserv-tests/devtests/security/soteria/app-db/src/main/java/org/glassfish/soteria/test/TestAuthenticationMechanism.java
@@ -18,7 +18,7 @@
import javax.enterprise.context.RequestScoped;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
import javax.security.enterprise.AuthenticationException;
import javax.security.enterprise.AuthenticationStatus;
import javax.security.enterprise.authentication.mechanism.http.HttpAuthenticationMechanism;
diff --git a/appserver/tests/appserv-tests/devtests/security/soteria/app-double-ham/src/main/java/org/glassfish/soteria/test/ProtectedServlet.java b/appserver/tests/appserv-tests/devtests/security/soteria/app-double-ham/src/main/java/org/glassfish/soteria/test/ProtectedServlet.java
index 03c87ad..4e9c41f 100644
--- a/appserver/tests/appserv-tests/devtests/security/soteria/app-double-ham/src/main/java/org/glassfish/soteria/test/ProtectedServlet.java
+++ b/appserver/tests/appserv-tests/devtests/security/soteria/app-double-ham/src/main/java/org/glassfish/soteria/test/ProtectedServlet.java
@@ -18,7 +18,7 @@
import java.io.IOException;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
import javax.security.enterprise.SecurityContext;
import javax.servlet.ServletException;
import javax.servlet.annotation.HttpConstraint;
diff --git a/appserver/tests/appserv-tests/devtests/security/soteria/app-double-ham/src/main/java/org/glassfish/soteria/test/Servlet.java b/appserver/tests/appserv-tests/devtests/security/soteria/app-double-ham/src/main/java/org/glassfish/soteria/test/Servlet.java
index 023d5e1..392fdd2 100644
--- a/appserver/tests/appserv-tests/devtests/security/soteria/app-double-ham/src/main/java/org/glassfish/soteria/test/Servlet.java
+++ b/appserver/tests/appserv-tests/devtests/security/soteria/app-double-ham/src/main/java/org/glassfish/soteria/test/Servlet.java
@@ -19,7 +19,7 @@
import java.io.IOException;
import jakarta.annotation.security.DeclareRoles;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
import javax.security.enterprise.SecurityContext;
import javax.servlet.ServletException;
import javax.servlet.annotation.WebServlet;
diff --git a/appserver/tests/appserv-tests/devtests/security/soteria/app-double-ham/src/main/java/org/glassfish/soteria/test/TestAuthenticationMechanism.java b/appserver/tests/appserv-tests/devtests/security/soteria/app-double-ham/src/main/java/org/glassfish/soteria/test/TestAuthenticationMechanism.java
index 74998f8..8d3de60 100644
--- a/appserver/tests/appserv-tests/devtests/security/soteria/app-double-ham/src/main/java/org/glassfish/soteria/test/TestAuthenticationMechanism.java
+++ b/appserver/tests/appserv-tests/devtests/security/soteria/app-double-ham/src/main/java/org/glassfish/soteria/test/TestAuthenticationMechanism.java
@@ -19,7 +19,7 @@
import static javax.security.enterprise.identitystore.CredentialValidationResult.Status.VALID;
import javax.enterprise.context.RequestScoped;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
import javax.security.enterprise.AuthenticationStatus;
import javax.security.enterprise.AuthenticationException;
import javax.security.enterprise.authentication.mechanism.http.HttpAuthenticationMechanism;
diff --git a/appserver/tests/appserv-tests/devtests/security/soteria/app-ham-ordering/src/main/java/org/glassfish/soteria/test/Servlet.java b/appserver/tests/appserv-tests/devtests/security/soteria/app-ham-ordering/src/main/java/org/glassfish/soteria/test/Servlet.java
index b03bb4f..3d965d3 100644
--- a/appserver/tests/appserv-tests/devtests/security/soteria/app-ham-ordering/src/main/java/org/glassfish/soteria/test/Servlet.java
+++ b/appserver/tests/appserv-tests/devtests/security/soteria/app-ham-ordering/src/main/java/org/glassfish/soteria/test/Servlet.java
@@ -19,7 +19,7 @@
import java.io.IOException;
import jakarta.annotation.security.DeclareRoles;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
import javax.security.enterprise.SecurityContext;
import javax.servlet.ServletException;
import javax.servlet.annotation.WebServlet;
diff --git a/appserver/tests/appserv-tests/devtests/security/soteria/app-ham-ordering/src/main/java/org/glassfish/soteria/test/TestAuthenticationMechanism.java b/appserver/tests/appserv-tests/devtests/security/soteria/app-ham-ordering/src/main/java/org/glassfish/soteria/test/TestAuthenticationMechanism.java
index b615cda..d2bf53d 100644
--- a/appserver/tests/appserv-tests/devtests/security/soteria/app-ham-ordering/src/main/java/org/glassfish/soteria/test/TestAuthenticationMechanism.java
+++ b/appserver/tests/appserv-tests/devtests/security/soteria/app-ham-ordering/src/main/java/org/glassfish/soteria/test/TestAuthenticationMechanism.java
@@ -19,7 +19,7 @@
import static javax.security.enterprise.identitystore.CredentialValidationResult.Status.VALID;
import java.io.IOException;
import javax.enterprise.context.RequestScoped;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
import javax.security.enterprise.AuthenticationStatus;
import javax.security.enterprise.AuthenticationException;
import javax.security.enterprise.authentication.mechanism.http.HttpAuthenticationMechanism;
diff --git a/appserver/tests/appserv-tests/devtests/security/soteria/app-mem-form/src/main/java/org/glassfish/soteria/test/ApplicationConfig.java b/appserver/tests/appserv-tests/devtests/security/soteria/app-mem-form/src/main/java/org/glassfish/soteria/test/ApplicationConfig.java
index 36b4ce8..89efdd3 100644
--- a/appserver/tests/appserv-tests/devtests/security/soteria/app-mem-form/src/main/java/org/glassfish/soteria/test/ApplicationConfig.java
+++ b/appserver/tests/appserv-tests/devtests/security/soteria/app-mem-form/src/main/java/org/glassfish/soteria/test/ApplicationConfig.java
@@ -17,7 +17,7 @@
package org.glassfish.soteria.test;
import javax.enterprise.context.ApplicationScoped;
-import javax.inject.Named;
+import jakarta.inject.Named;
@ApplicationScoped
diff --git a/appserver/tests/appserv-tests/devtests/security/soteria/app-multiple-store-backup/src/main/java/org/glassfish/soteria/test/TestAuthenticationMechanism.java b/appserver/tests/appserv-tests/devtests/security/soteria/app-multiple-store-backup/src/main/java/org/glassfish/soteria/test/TestAuthenticationMechanism.java
index 010114c..9b663e7 100644
--- a/appserver/tests/appserv-tests/devtests/security/soteria/app-multiple-store-backup/src/main/java/org/glassfish/soteria/test/TestAuthenticationMechanism.java
+++ b/appserver/tests/appserv-tests/devtests/security/soteria/app-multiple-store-backup/src/main/java/org/glassfish/soteria/test/TestAuthenticationMechanism.java
@@ -20,7 +20,7 @@
import static org.glassfish.soteria.Utils.notNull;
import javax.enterprise.context.RequestScoped;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
import javax.security.enterprise.AuthenticationException;
import javax.security.enterprise.AuthenticationStatus;
import javax.security.enterprise.authentication.mechanism.http.HttpAuthenticationMechanism;
diff --git a/appserver/tests/appserv-tests/devtests/security/soteria/app-multiple-store/src/main/java/org/glassfish/soteria/test/TestAuthenticationMechanism.java b/appserver/tests/appserv-tests/devtests/security/soteria/app-multiple-store/src/main/java/org/glassfish/soteria/test/TestAuthenticationMechanism.java
index 87a57f6..532d0d3 100644
--- a/appserver/tests/appserv-tests/devtests/security/soteria/app-multiple-store/src/main/java/org/glassfish/soteria/test/TestAuthenticationMechanism.java
+++ b/appserver/tests/appserv-tests/devtests/security/soteria/app-multiple-store/src/main/java/org/glassfish/soteria/test/TestAuthenticationMechanism.java
@@ -20,7 +20,7 @@
import static org.glassfish.soteria.Utils.notNull;
import javax.enterprise.context.RequestScoped;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
import javax.security.enterprise.AuthenticationException;
import javax.security.enterprise.AuthenticationStatus;
import javax.security.enterprise.authentication.mechanism.http.HttpAuthenticationMechanism;
diff --git a/appserver/tests/appserv-tests/devtests/security/soteria/app-no-application-caller-principal/src/main/java/org/glassfish/soteria/test/TestAuthenticationMechanism.java b/appserver/tests/appserv-tests/devtests/security/soteria/app-no-application-caller-principal/src/main/java/org/glassfish/soteria/test/TestAuthenticationMechanism.java
index ffcbffa..63d8de7 100644
--- a/appserver/tests/appserv-tests/devtests/security/soteria/app-no-application-caller-principal/src/main/java/org/glassfish/soteria/test/TestAuthenticationMechanism.java
+++ b/appserver/tests/appserv-tests/devtests/security/soteria/app-no-application-caller-principal/src/main/java/org/glassfish/soteria/test/TestAuthenticationMechanism.java
@@ -19,7 +19,7 @@
import static javax.security.enterprise.identitystore.CredentialValidationResult.Status.VALID;
import javax.enterprise.context.RequestScoped;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
import javax.security.enterprise.AuthenticationStatus;
import javax.security.enterprise.AuthenticationException;
import javax.security.enterprise.authentication.mechanism.http.HttpAuthenticationMechanism;
diff --git a/appserver/tests/appserv-tests/devtests/security/soteria/app-no-application-caller-principal/src/main/java/org/glassfish/soteria/test/ValidateAvailablePrincipalServlet.java b/appserver/tests/appserv-tests/devtests/security/soteria/app-no-application-caller-principal/src/main/java/org/glassfish/soteria/test/ValidateAvailablePrincipalServlet.java
index 85195d1..b3ba29c 100644
--- a/appserver/tests/appserv-tests/devtests/security/soteria/app-no-application-caller-principal/src/main/java/org/glassfish/soteria/test/ValidateAvailablePrincipalServlet.java
+++ b/appserver/tests/appserv-tests/devtests/security/soteria/app-no-application-caller-principal/src/main/java/org/glassfish/soteria/test/ValidateAvailablePrincipalServlet.java
@@ -18,7 +18,7 @@
import java.io.IOException;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
import javax.security.enterprise.SecurityContext;
import javax.security.enterprise.CallerPrincipal;
import javax.servlet.ServletException;
diff --git a/appserver/tests/appserv-tests/devtests/security/soteria/app-securitycontext-auth-ejb/src/main/java/org/glassfish/soteria/test/ProtectedServlet.java b/appserver/tests/appserv-tests/devtests/security/soteria/app-securitycontext-auth-ejb/src/main/java/org/glassfish/soteria/test/ProtectedServlet.java
index 9215334..64bd15b 100644
--- a/appserver/tests/appserv-tests/devtests/security/soteria/app-securitycontext-auth-ejb/src/main/java/org/glassfish/soteria/test/ProtectedServlet.java
+++ b/appserver/tests/appserv-tests/devtests/security/soteria/app-securitycontext-auth-ejb/src/main/java/org/glassfish/soteria/test/ProtectedServlet.java
@@ -21,7 +21,7 @@
import javax.servlet.annotation.ServletSecurity;
import javax.servlet.annotation.HttpConstraint;
import jakarta.annotation.security.DeclareRoles;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
import javax.security.enterprise.AuthenticationStatus;
import javax.security.enterprise.SecurityContext;
import javax.security.enterprise.credential.CallerOnlyCredential;
diff --git a/appserver/tests/appserv-tests/devtests/security/soteria/app-securitycontext-auth-ejb/src/main/java/org/glassfish/soteria/test/Servlet.java b/appserver/tests/appserv-tests/devtests/security/soteria/app-securitycontext-auth-ejb/src/main/java/org/glassfish/soteria/test/Servlet.java
index 5bb66a0..b0d8171 100644
--- a/appserver/tests/appserv-tests/devtests/security/soteria/app-securitycontext-auth-ejb/src/main/java/org/glassfish/soteria/test/Servlet.java
+++ b/appserver/tests/appserv-tests/devtests/security/soteria/app-securitycontext-auth-ejb/src/main/java/org/glassfish/soteria/test/Servlet.java
@@ -30,7 +30,7 @@
import javax.servlet.http.HttpServletResponse;
import java.io.IOException;
import java.util.Set;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
import static javax.security.enterprise.authentication.mechanism.http.AuthenticationParameters.withParams;
import static org.glassfish.soteria.Utils.notNull;
diff --git a/appserver/tests/appserv-tests/devtests/security/soteria/app-securitycontext-auth-ejb/src/main/java/org/glassfish/soteria/test/TestEJB.java b/appserver/tests/appserv-tests/devtests/security/soteria/app-securitycontext-auth-ejb/src/main/java/org/glassfish/soteria/test/TestEJB.java
index 9f103dd..67d10f4 100644
--- a/appserver/tests/appserv-tests/devtests/security/soteria/app-securitycontext-auth-ejb/src/main/java/org/glassfish/soteria/test/TestEJB.java
+++ b/appserver/tests/appserv-tests/devtests/security/soteria/app-securitycontext-auth-ejb/src/main/java/org/glassfish/soteria/test/TestEJB.java
@@ -17,7 +17,7 @@
package org.glassfish.soteria.test;
import jakarta.ejb.Stateless;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
import jakarta.annotation.security.DeclareRoles;
import jakarta.annotation.security.PermitAll;
import jakarta.annotation.Resource;
diff --git a/appserver/tests/appserv-tests/devtests/security/soteria/app-securitycontext-auth/src/main/java/org/glassfish/soteria/test/ProtectedServlet.java b/appserver/tests/appserv-tests/devtests/security/soteria/app-securitycontext-auth/src/main/java/org/glassfish/soteria/test/ProtectedServlet.java
index 9215334..64bd15b 100644
--- a/appserver/tests/appserv-tests/devtests/security/soteria/app-securitycontext-auth/src/main/java/org/glassfish/soteria/test/ProtectedServlet.java
+++ b/appserver/tests/appserv-tests/devtests/security/soteria/app-securitycontext-auth/src/main/java/org/glassfish/soteria/test/ProtectedServlet.java
@@ -21,7 +21,7 @@
import javax.servlet.annotation.ServletSecurity;
import javax.servlet.annotation.HttpConstraint;
import jakarta.annotation.security.DeclareRoles;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
import javax.security.enterprise.AuthenticationStatus;
import javax.security.enterprise.SecurityContext;
import javax.security.enterprise.credential.CallerOnlyCredential;
diff --git a/appserver/tests/appserv-tests/devtests/security/soteria/app-securitycontext-auth/src/main/java/org/glassfish/soteria/test/Servlet.java b/appserver/tests/appserv-tests/devtests/security/soteria/app-securitycontext-auth/src/main/java/org/glassfish/soteria/test/Servlet.java
index de0641b..677e692 100644
--- a/appserver/tests/appserv-tests/devtests/security/soteria/app-securitycontext-auth/src/main/java/org/glassfish/soteria/test/Servlet.java
+++ b/appserver/tests/appserv-tests/devtests/security/soteria/app-securitycontext-auth/src/main/java/org/glassfish/soteria/test/Servlet.java
@@ -19,7 +19,7 @@
import org.glassfish.soteria.SecurityContextImpl;
import jakarta.annotation.security.DeclareRoles;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
import javax.security.enterprise.AuthenticationStatus;
import javax.security.enterprise.SecurityContext;
import javax.security.enterprise.credential.CallerOnlyCredential;
diff --git a/appserver/tests/appserv-tests/devtests/web/servlet-3.1/upgradeWithCDI/servlet/test/ISBNHttpUpgradeHandler.java b/appserver/tests/appserv-tests/devtests/web/servlet-3.1/upgradeWithCDI/servlet/test/ISBNHttpUpgradeHandler.java
index 97e22af..16530a2 100644
--- a/appserver/tests/appserv-tests/devtests/web/servlet-3.1/upgradeWithCDI/servlet/test/ISBNHttpUpgradeHandler.java
+++ b/appserver/tests/appserv-tests/devtests/web/servlet-3.1/upgradeWithCDI/servlet/test/ISBNHttpUpgradeHandler.java
@@ -16,7 +16,7 @@
package test;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
import javax.naming.InitialContext;
import javax.servlet.ServletInputStream;
import javax.servlet.http.HttpUpgradeHandler;
diff --git a/appserver/tests/appserv-tests/devtests/web/weldJsfFormLoginHttpSessionListener/src/test/TestHttpSessionListener.java b/appserver/tests/appserv-tests/devtests/web/weldJsfFormLoginHttpSessionListener/src/test/TestHttpSessionListener.java
index 0a16689..3926b58 100644
--- a/appserver/tests/appserv-tests/devtests/web/weldJsfFormLoginHttpSessionListener/src/test/TestHttpSessionListener.java
+++ b/appserver/tests/appserv-tests/devtests/web/weldJsfFormLoginHttpSessionListener/src/test/TestHttpSessionListener.java
@@ -16,7 +16,7 @@
package test;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
import javax.servlet.http.HttpSessionEvent;
import javax.servlet.http.HttpSessionListener;
diff --git a/appserver/tests/appserv-tests/devtests/web/weldJsfFormLoginHttpSessionListener/src/test/TestMessage.java b/appserver/tests/appserv-tests/devtests/web/weldJsfFormLoginHttpSessionListener/src/test/TestMessage.java
index e4e2c91..8ada045 100644
--- a/appserver/tests/appserv-tests/devtests/web/weldJsfFormLoginHttpSessionListener/src/test/TestMessage.java
+++ b/appserver/tests/appserv-tests/devtests/web/weldJsfFormLoginHttpSessionListener/src/test/TestMessage.java
@@ -20,7 +20,7 @@
import javax.enterprise.context.SessionScoped;
//import jakarta.faces.bean.ManagedBean;
-import javax.inject.Named;
+import jakarta.inject.Named;
@Named
@SessionScoped
diff --git a/appserver/tests/appserv-tests/devtests/web/weldJsfServerAuthModuleRedirect/src/test/TestMessage.java b/appserver/tests/appserv-tests/devtests/web/weldJsfServerAuthModuleRedirect/src/test/TestMessage.java
index e4e2c91..8ada045 100644
--- a/appserver/tests/appserv-tests/devtests/web/weldJsfServerAuthModuleRedirect/src/test/TestMessage.java
+++ b/appserver/tests/appserv-tests/devtests/web/weldJsfServerAuthModuleRedirect/src/test/TestMessage.java
@@ -20,7 +20,7 @@
import javax.enterprise.context.SessionScoped;
//import jakarta.faces.bean.ManagedBean;
-import javax.inject.Named;
+import jakarta.inject.Named;
@Named
@SessionScoped
diff --git a/appserver/tests/cdi/cases/multiBeansXml/ejb1/src/main/java/com/oracle/cdi/cases/devtests/multiejb1/InterceptedEjb1.java b/appserver/tests/cdi/cases/multiBeansXml/ejb1/src/main/java/com/oracle/cdi/cases/devtests/multiejb1/InterceptedEjb1.java
index 9abaf69..de0a98c 100644
--- a/appserver/tests/cdi/cases/multiBeansXml/ejb1/src/main/java/com/oracle/cdi/cases/devtests/multiejb1/InterceptedEjb1.java
+++ b/appserver/tests/cdi/cases/multiBeansXml/ejb1/src/main/java/com/oracle/cdi/cases/devtests/multiejb1/InterceptedEjb1.java
@@ -21,7 +21,7 @@
import jakarta.ejb.Remote;
import jakarta.ejb.Stateless;
import javax.enterprise.inject.spi.BeanManager;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
/**
*
diff --git a/appserver/tests/cdi/cases/multiBeansXml/ejb2/src/main/java/com/oracle/cdi/cases/devtests/multiejb2/InterceptedEjb2.java b/appserver/tests/cdi/cases/multiBeansXml/ejb2/src/main/java/com/oracle/cdi/cases/devtests/multiejb2/InterceptedEjb2.java
index ee0742a..acffd79 100644
--- a/appserver/tests/cdi/cases/multiBeansXml/ejb2/src/main/java/com/oracle/cdi/cases/devtests/multiejb2/InterceptedEjb2.java
+++ b/appserver/tests/cdi/cases/multiBeansXml/ejb2/src/main/java/com/oracle/cdi/cases/devtests/multiejb2/InterceptedEjb2.java
@@ -21,7 +21,7 @@
import jakarta.ejb.Remote;
import jakarta.ejb.Stateless;
import javax.enterprise.inject.spi.BeanManager;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
/**
*
diff --git a/appserver/tests/cdi/cases/preDestroyScoping/lib/src/main/java/com/oracle/cdi/cases/devtests/predestroy/lib/RequestBean.java b/appserver/tests/cdi/cases/preDestroyScoping/lib/src/main/java/com/oracle/cdi/cases/devtests/predestroy/lib/RequestBean.java
index c7aa7c2..d07a1f4 100644
--- a/appserver/tests/cdi/cases/preDestroyScoping/lib/src/main/java/com/oracle/cdi/cases/devtests/predestroy/lib/RequestBean.java
+++ b/appserver/tests/cdi/cases/preDestroyScoping/lib/src/main/java/com/oracle/cdi/cases/devtests/predestroy/lib/RequestBean.java
@@ -17,7 +17,7 @@
package com.oracle.cdi.cases.devtests.predestroy.lib;
import javax.enterprise.context.RequestScoped;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
@RequestScoped
public class RequestBean {
diff --git a/appserver/tests/cdi/cases/preDestroyScoping/web/src/main/java/com/oracle/cdi/cases/devtests/predestroy/war/EventLogServlet.java b/appserver/tests/cdi/cases/preDestroyScoping/web/src/main/java/com/oracle/cdi/cases/devtests/predestroy/war/EventLogServlet.java
index 2c19d4b..6c22ee8 100644
--- a/appserver/tests/cdi/cases/preDestroyScoping/web/src/main/java/com/oracle/cdi/cases/devtests/predestroy/war/EventLogServlet.java
+++ b/appserver/tests/cdi/cases/preDestroyScoping/web/src/main/java/com/oracle/cdi/cases/devtests/predestroy/war/EventLogServlet.java
@@ -17,7 +17,7 @@
package com.oracle.cdi.cases.devtests.predestroy.war;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
import javax.servlet.ServletException;
import javax.servlet.annotation.WebServlet;
import javax.servlet.http.HttpServlet;
diff --git a/appserver/tests/cdi/cases/preDestroyScoping/web/src/main/java/com/oracle/cdi/cases/devtests/predestroy/war/SessionBeanProducer.java b/appserver/tests/cdi/cases/preDestroyScoping/web/src/main/java/com/oracle/cdi/cases/devtests/predestroy/war/SessionBeanProducer.java
index d63d720..efb8b90 100644
--- a/appserver/tests/cdi/cases/preDestroyScoping/web/src/main/java/com/oracle/cdi/cases/devtests/predestroy/war/SessionBeanProducer.java
+++ b/appserver/tests/cdi/cases/preDestroyScoping/web/src/main/java/com/oracle/cdi/cases/devtests/predestroy/war/SessionBeanProducer.java
@@ -22,7 +22,7 @@
import javax.enterprise.context.ContextNotActiveException;
import javax.enterprise.context.SessionScoped;
import javax.enterprise.inject.Produces;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
import com.oracle.cdi.cases.devtests.predestroy.lib.EventLog;
import com.oracle.cdi.cases.devtests.predestroy.lib.PreDestroyConstants;
diff --git a/appserver/tests/cdi/cases/preDestroyScoping/web/src/main/java/com/oracle/cdi/cases/devtests/predestroy/war/SessionBeanServlet.java b/appserver/tests/cdi/cases/preDestroyScoping/web/src/main/java/com/oracle/cdi/cases/devtests/predestroy/war/SessionBeanServlet.java
index 04c729b..41e7075 100644
--- a/appserver/tests/cdi/cases/preDestroyScoping/web/src/main/java/com/oracle/cdi/cases/devtests/predestroy/war/SessionBeanServlet.java
+++ b/appserver/tests/cdi/cases/preDestroyScoping/web/src/main/java/com/oracle/cdi/cases/devtests/predestroy/war/SessionBeanServlet.java
@@ -17,7 +17,7 @@
package com.oracle.cdi.cases.devtests.predestroy.war;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
import javax.servlet.ServletException;
import javax.servlet.annotation.WebServlet;
import javax.servlet.http.HttpServlet;
diff --git a/appserver/tests/cdi/negative/normalScopeWithFinal/src/main/java/com/oracle/cdi/devtest/negative/normalScoped/StatelessEjbWithInjectionPoint.java b/appserver/tests/cdi/negative/normalScopeWithFinal/src/main/java/com/oracle/cdi/devtest/negative/normalScoped/StatelessEjbWithInjectionPoint.java
index 0a523e6..c5d44e1 100644
--- a/appserver/tests/cdi/negative/normalScopeWithFinal/src/main/java/com/oracle/cdi/devtest/negative/normalScoped/StatelessEjbWithInjectionPoint.java
+++ b/appserver/tests/cdi/negative/normalScopeWithFinal/src/main/java/com/oracle/cdi/devtest/negative/normalScoped/StatelessEjbWithInjectionPoint.java
@@ -18,7 +18,7 @@
import jakarta.annotation.PostConstruct;
import jakarta.ejb.Stateless;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
/**
* This is a statless EJB that is injected with a service
diff --git a/appserver/tests/embedded/cdi_basic/src/main/java/org/glassfish/tests/embedded/cdi_basic/BasicCDITestServlet.java b/appserver/tests/embedded/cdi_basic/src/main/java/org/glassfish/tests/embedded/cdi_basic/BasicCDITestServlet.java
index 9edaa12..26994f9 100644
--- a/appserver/tests/embedded/cdi_basic/src/main/java/org/glassfish/tests/embedded/cdi_basic/BasicCDITestServlet.java
+++ b/appserver/tests/embedded/cdi_basic/src/main/java/org/glassfish/tests/embedded/cdi_basic/BasicCDITestServlet.java
@@ -31,8 +31,8 @@
urlPatterns = "/BasicCDITestServlet")
public class BasicCDITestServlet extends HttpServlet {
- @javax.inject.Inject TestBean tb;
- @javax.inject.Inject TestRequestScopedBean trsb;
+ @jakarta.inject.Inject TestBean tb;
+ @jakarta.inject.Inject TestRequestScopedBean trsb;
@Override
protected void doGet(HttpServletRequest httpServletRequest,
diff --git a/appserver/tests/embedded/cdi_ejb_jpa/src/main/java/org/glassfish/tests/embedded/cdi_ejb_jpa/BasicCDITestServlet.java b/appserver/tests/embedded/cdi_ejb_jpa/src/main/java/org/glassfish/tests/embedded/cdi_ejb_jpa/BasicCDITestServlet.java
index 9ab4e6a..cd0616a 100644
--- a/appserver/tests/embedded/cdi_ejb_jpa/src/main/java/org/glassfish/tests/embedded/cdi_ejb_jpa/BasicCDITestServlet.java
+++ b/appserver/tests/embedded/cdi_ejb_jpa/src/main/java/org/glassfish/tests/embedded/cdi_ejb_jpa/BasicCDITestServlet.java
@@ -40,10 +40,10 @@
)
public class BasicCDITestServlet extends HttpServlet {
- @javax.inject.Inject
+ @jakarta.inject.Inject
TestBean testBean;
- @javax.inject.Inject
+ @jakarta.inject.Inject
TestRequestScopedBean trsb;
@Override
diff --git a/appserver/tests/embedded/glassfish_resources_xml/src/main/java/org/glassfish/tests/embedded/cdi_ejb_jpa/BasicCDITestServlet.java b/appserver/tests/embedded/glassfish_resources_xml/src/main/java/org/glassfish/tests/embedded/cdi_ejb_jpa/BasicCDITestServlet.java
index badcaac..8f46ee0 100644
--- a/appserver/tests/embedded/glassfish_resources_xml/src/main/java/org/glassfish/tests/embedded/cdi_ejb_jpa/BasicCDITestServlet.java
+++ b/appserver/tests/embedded/glassfish_resources_xml/src/main/java/org/glassfish/tests/embedded/cdi_ejb_jpa/BasicCDITestServlet.java
@@ -29,10 +29,10 @@
public class BasicCDITestServlet extends HttpServlet {
- @javax.inject.Inject
+ @jakarta.inject.Inject
TestBean testBean;
- @javax.inject.Inject
+ @jakarta.inject.Inject
TestRequestScopedBean trsb;
@Override
diff --git a/appserver/tests/hk2/cdi/basic/ejb1/src/main/java/com/oracle/hk2/devtest/cdi/ejb1/EjbInjectedWithServiceLocator.java b/appserver/tests/hk2/cdi/basic/ejb1/src/main/java/com/oracle/hk2/devtest/cdi/ejb1/EjbInjectedWithServiceLocator.java
index a65549e..96cf155 100644
--- a/appserver/tests/hk2/cdi/basic/ejb1/src/main/java/com/oracle/hk2/devtest/cdi/ejb1/EjbInjectedWithServiceLocator.java
+++ b/appserver/tests/hk2/cdi/basic/ejb1/src/main/java/com/oracle/hk2/devtest/cdi/ejb1/EjbInjectedWithServiceLocator.java
@@ -22,7 +22,7 @@
import jakarta.ejb.Remote;
import jakarta.ejb.Stateless;
import javax.enterprise.inject.spi.BeanManager;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
import org.glassfish.hk2.api.ActiveDescriptor;
import org.glassfish.hk2.api.DynamicConfiguration;
diff --git a/appserver/tests/hk2/cdi/basic/ejb1/src/main/java/com/oracle/hk2/devtest/cdi/ejb1/scoped/CustomScope.java b/appserver/tests/hk2/cdi/basic/ejb1/src/main/java/com/oracle/hk2/devtest/cdi/ejb1/scoped/CustomScope.java
index 937dd45..7127113 100644
--- a/appserver/tests/hk2/cdi/basic/ejb1/src/main/java/com/oracle/hk2/devtest/cdi/ejb1/scoped/CustomScope.java
+++ b/appserver/tests/hk2/cdi/basic/ejb1/src/main/java/com/oracle/hk2/devtest/cdi/ejb1/scoped/CustomScope.java
@@ -23,7 +23,7 @@
import java.lang.annotation.Retention;
import java.lang.annotation.Target;
-import javax.inject.Scope;
+import jakarta.inject.Scope;
import org.glassfish.hk2.api.Proxiable;
diff --git a/appserver/tests/hk2/cdi/basic/ejb1/src/main/java/com/oracle/hk2/devtest/cdi/ejb1/scoped/CustomScopeContext.java b/appserver/tests/hk2/cdi/basic/ejb1/src/main/java/com/oracle/hk2/devtest/cdi/ejb1/scoped/CustomScopeContext.java
index 2951b53..8348c6a 100644
--- a/appserver/tests/hk2/cdi/basic/ejb1/src/main/java/com/oracle/hk2/devtest/cdi/ejb1/scoped/CustomScopeContext.java
+++ b/appserver/tests/hk2/cdi/basic/ejb1/src/main/java/com/oracle/hk2/devtest/cdi/ejb1/scoped/CustomScopeContext.java
@@ -20,7 +20,7 @@
import java.util.HashMap;
import java.util.Map;
-import javax.inject.Singleton;
+import jakarta.inject.Singleton;
import org.glassfish.hk2.api.ActiveDescriptor;
import org.glassfish.hk2.api.Context;
diff --git a/appserver/tests/hk2/cdi/basic/ejb1/src/main/java/com/oracle/hk2/devtest/cdi/ejb1/scoped/CustomScopedEjb.java b/appserver/tests/hk2/cdi/basic/ejb1/src/main/java/com/oracle/hk2/devtest/cdi/ejb1/scoped/CustomScopedEjb.java
index 148e9ca..e94a6a3 100644
--- a/appserver/tests/hk2/cdi/basic/ejb1/src/main/java/com/oracle/hk2/devtest/cdi/ejb1/scoped/CustomScopedEjb.java
+++ b/appserver/tests/hk2/cdi/basic/ejb1/src/main/java/com/oracle/hk2/devtest/cdi/ejb1/scoped/CustomScopedEjb.java
@@ -17,8 +17,8 @@
package com.oracle.hk2.devtest.cdi.ejb1.scoped;
import javax.enterprise.context.RequestScoped;
-import javax.inject.Inject;
-import javax.inject.Named;
+import jakarta.inject.Inject;
+import jakarta.inject.Named;
/**
* @author jwells
diff --git a/appserver/tests/hk2/cdi/basic/ejb1/src/main/java/com/oracle/hk2/devtest/cdi/ejb1/scoped/HK2NamedServiceFactory.java b/appserver/tests/hk2/cdi/basic/ejb1/src/main/java/com/oracle/hk2/devtest/cdi/ejb1/scoped/HK2NamedServiceFactory.java
index cea45af..28953dc 100644
--- a/appserver/tests/hk2/cdi/basic/ejb1/src/main/java/com/oracle/hk2/devtest/cdi/ejb1/scoped/HK2NamedServiceFactory.java
+++ b/appserver/tests/hk2/cdi/basic/ejb1/src/main/java/com/oracle/hk2/devtest/cdi/ejb1/scoped/HK2NamedServiceFactory.java
@@ -16,7 +16,7 @@
package com.oracle.hk2.devtest.cdi.ejb1.scoped;
-import javax.inject.Named;
+import jakarta.inject.Named;
import org.glassfish.hk2.api.Factory;
import org.glassfish.hk2.api.PerLookup;
diff --git a/appserver/tests/hk2/cdi/basic/ejb1/src/main/java/com/oracle/hk2/devtest/cdi/ejb1/scoped/HK2NamedServiceFactory2.java b/appserver/tests/hk2/cdi/basic/ejb1/src/main/java/com/oracle/hk2/devtest/cdi/ejb1/scoped/HK2NamedServiceFactory2.java
index 68460dc..7f474be 100644
--- a/appserver/tests/hk2/cdi/basic/ejb1/src/main/java/com/oracle/hk2/devtest/cdi/ejb1/scoped/HK2NamedServiceFactory2.java
+++ b/appserver/tests/hk2/cdi/basic/ejb1/src/main/java/com/oracle/hk2/devtest/cdi/ejb1/scoped/HK2NamedServiceFactory2.java
@@ -16,7 +16,7 @@
package com.oracle.hk2.devtest.cdi.ejb1.scoped;
-import javax.inject.Named;
+import jakarta.inject.Named;
import org.glassfish.hk2.api.Factory;
import org.jvnet.hk2.annotations.Service;
diff --git a/appserver/tests/hk2/cdi/basic/ejb1/src/main/java/com/oracle/hk2/devtest/cdi/ejb1/scoped/HK2PerLookupInjectedWithCDIApplicationScoped.java b/appserver/tests/hk2/cdi/basic/ejb1/src/main/java/com/oracle/hk2/devtest/cdi/ejb1/scoped/HK2PerLookupInjectedWithCDIApplicationScoped.java
index 8205849..3085e2c 100644
--- a/appserver/tests/hk2/cdi/basic/ejb1/src/main/java/com/oracle/hk2/devtest/cdi/ejb1/scoped/HK2PerLookupInjectedWithCDIApplicationScoped.java
+++ b/appserver/tests/hk2/cdi/basic/ejb1/src/main/java/com/oracle/hk2/devtest/cdi/ejb1/scoped/HK2PerLookupInjectedWithCDIApplicationScoped.java
@@ -16,7 +16,7 @@
package com.oracle.hk2.devtest.cdi.ejb1.scoped;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
import org.glassfish.hk2.api.PerLookup;
import org.jvnet.hk2.annotations.Service;
diff --git a/appserver/tests/hk2/cdi/basic/ejb1/src/main/java/com/oracle/hk2/devtest/cdi/ejb1/scoped/HK2ServiceFactory.java b/appserver/tests/hk2/cdi/basic/ejb1/src/main/java/com/oracle/hk2/devtest/cdi/ejb1/scoped/HK2ServiceFactory.java
index 7b55a54..67e4987 100644
--- a/appserver/tests/hk2/cdi/basic/ejb1/src/main/java/com/oracle/hk2/devtest/cdi/ejb1/scoped/HK2ServiceFactory.java
+++ b/appserver/tests/hk2/cdi/basic/ejb1/src/main/java/com/oracle/hk2/devtest/cdi/ejb1/scoped/HK2ServiceFactory.java
@@ -16,7 +16,7 @@
package com.oracle.hk2.devtest.cdi.ejb1.scoped;
-import javax.inject.Singleton;
+import jakarta.inject.Singleton;
import org.glassfish.hk2.api.Factory;
import org.jvnet.hk2.annotations.Service;
diff --git a/appserver/tests/hk2/cdi/basic/ejb1/src/main/java/com/oracle/hk2/devtest/cdi/extension/CDIExtension.java b/appserver/tests/hk2/cdi/basic/ejb1/src/main/java/com/oracle/hk2/devtest/cdi/extension/CDIExtension.java
index 9620fcc..b2394ac 100644
--- a/appserver/tests/hk2/cdi/basic/ejb1/src/main/java/com/oracle/hk2/devtest/cdi/extension/CDIExtension.java
+++ b/appserver/tests/hk2/cdi/basic/ejb1/src/main/java/com/oracle/hk2/devtest/cdi/extension/CDIExtension.java
@@ -33,7 +33,7 @@
import javax.enterprise.inject.spi.ProcessProducerField;
import javax.enterprise.inject.spi.ProcessProducerMethod;
import javax.enterprise.inject.spi.ProcessSessionBean;
-import javax.inject.Singleton;
+import jakarta.inject.Singleton;
import javax.naming.Context;
import javax.naming.InitialContext;
import javax.naming.NamingException;
diff --git a/appserver/tests/hk2/cdi/basic/ejb1/src/main/java/com/oracle/hk2/devtest/cdi/extension/HK2ExtensionVerifier.java b/appserver/tests/hk2/cdi/basic/ejb1/src/main/java/com/oracle/hk2/devtest/cdi/extension/HK2ExtensionVerifier.java
index b805adb..09ae9ea 100644
--- a/appserver/tests/hk2/cdi/basic/ejb1/src/main/java/com/oracle/hk2/devtest/cdi/extension/HK2ExtensionVerifier.java
+++ b/appserver/tests/hk2/cdi/basic/ejb1/src/main/java/com/oracle/hk2/devtest/cdi/extension/HK2ExtensionVerifier.java
@@ -16,7 +16,7 @@
package com.oracle.hk2.devtest.cdi.extension;
-import javax.inject.Singleton;
+import jakarta.inject.Singleton;
/**
* This is a service that has fields indicating whether or not
diff --git a/appserver/tests/hk2/cdi/basic/ejb1/src/main/java/com/oracle/hk2/devtest/cdi/jit/CDIServiceInjectedWithHK2Service.java b/appserver/tests/hk2/cdi/basic/ejb1/src/main/java/com/oracle/hk2/devtest/cdi/jit/CDIServiceInjectedWithHK2Service.java
index e8ba53f..97e1171 100644
--- a/appserver/tests/hk2/cdi/basic/ejb1/src/main/java/com/oracle/hk2/devtest/cdi/jit/CDIServiceInjectedWithHK2Service.java
+++ b/appserver/tests/hk2/cdi/basic/ejb1/src/main/java/com/oracle/hk2/devtest/cdi/jit/CDIServiceInjectedWithHK2Service.java
@@ -16,7 +16,7 @@
package com.oracle.hk2.devtest.cdi.jit;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
/**
* This is a CDI service injected with the HK2Service
diff --git a/appserver/tests/hk2/cdi/basic/ejb1/src/main/java/com/oracle/hk2/devtest/cdi/jit/JITResolver.java b/appserver/tests/hk2/cdi/basic/ejb1/src/main/java/com/oracle/hk2/devtest/cdi/jit/JITResolver.java
index bda860b..e5c65e7 100644
--- a/appserver/tests/hk2/cdi/basic/ejb1/src/main/java/com/oracle/hk2/devtest/cdi/jit/JITResolver.java
+++ b/appserver/tests/hk2/cdi/basic/ejb1/src/main/java/com/oracle/hk2/devtest/cdi/jit/JITResolver.java
@@ -16,7 +16,7 @@
package com.oracle.hk2.devtest.cdi.jit;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
import org.glassfish.hk2.api.Injectee;
import org.glassfish.hk2.api.JustInTimeInjectionResolver;
diff --git a/appserver/tests/hk2/cdi/basic/ejb1/src/main/java/com/oracle/hk2/devtest/cdi/locator/BasicService.java b/appserver/tests/hk2/cdi/basic/ejb1/src/main/java/com/oracle/hk2/devtest/cdi/locator/BasicService.java
index f27e6dc..1168650 100644
--- a/appserver/tests/hk2/cdi/basic/ejb1/src/main/java/com/oracle/hk2/devtest/cdi/locator/BasicService.java
+++ b/appserver/tests/hk2/cdi/basic/ejb1/src/main/java/com/oracle/hk2/devtest/cdi/locator/BasicService.java
@@ -17,8 +17,8 @@
package com.oracle.hk2.devtest.cdi.locator;
import javax.enterprise.inject.spi.BeanManager;
-import javax.inject.Inject;
-import javax.inject.Singleton;
+import jakarta.inject.Inject;
+import jakarta.inject.Singleton;
/**
* This service will be created with HK2 but will
diff --git a/appserver/tests/hk2/cdi/ear/ejb1/src/main/java/com/oracle/hk2/devtest/cdi/ear/ejb1/Ejb1.java b/appserver/tests/hk2/cdi/ear/ejb1/src/main/java/com/oracle/hk2/devtest/cdi/ear/ejb1/Ejb1.java
index dbadddb..6b69b30 100644
--- a/appserver/tests/hk2/cdi/ear/ejb1/src/main/java/com/oracle/hk2/devtest/cdi/ear/ejb1/Ejb1.java
+++ b/appserver/tests/hk2/cdi/ear/ejb1/src/main/java/com/oracle/hk2/devtest/cdi/ear/ejb1/Ejb1.java
@@ -18,7 +18,7 @@
import jakarta.ejb.Remote;
import jakarta.ejb.Stateless;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
import com.oracle.hk2.devtest.cdi.ear.lib1.HK2Service;
import com.oracle.hk2.devtest.cdi.ear.lib1.Lib1HK2Service;
diff --git a/appserver/tests/hk2/cdi/ear/ejb2/src/main/java/com/oracle/hk2/devtest/cdi/ear/ejb2/Ejb2.java b/appserver/tests/hk2/cdi/ear/ejb2/src/main/java/com/oracle/hk2/devtest/cdi/ear/ejb2/Ejb2.java
index 3015892..fd0f5b5 100644
--- a/appserver/tests/hk2/cdi/ear/ejb2/src/main/java/com/oracle/hk2/devtest/cdi/ear/ejb2/Ejb2.java
+++ b/appserver/tests/hk2/cdi/ear/ejb2/src/main/java/com/oracle/hk2/devtest/cdi/ear/ejb2/Ejb2.java
@@ -18,7 +18,7 @@
import jakarta.ejb.Remote;
import jakarta.ejb.Stateless;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
import com.oracle.hk2.devtest.cdi.ear.ejb1.Ejb1HK2Service;
import com.oracle.hk2.devtest.cdi.ear.lib1.Lib1HK2Service;
diff --git a/appserver/tests/hk2/cdi/ear/war1/src/main/java/com/oracle/hk2/devtest/cdi/ear/war1/War1.java b/appserver/tests/hk2/cdi/ear/war1/src/main/java/com/oracle/hk2/devtest/cdi/ear/war1/War1.java
index 90e88a1..379e568 100644
--- a/appserver/tests/hk2/cdi/ear/war1/src/main/java/com/oracle/hk2/devtest/cdi/ear/war1/War1.java
+++ b/appserver/tests/hk2/cdi/ear/war1/src/main/java/com/oracle/hk2/devtest/cdi/ear/war1/War1.java
@@ -19,7 +19,7 @@
import java.io.IOException;
import java.io.PrintWriter;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
import javax.servlet.ServletException;
import javax.servlet.http.HttpServlet;
import javax.servlet.http.HttpServletRequest;
diff --git a/appserver/tests/hk2/cdi/ear/war2/src/main/java/com/oracle/hk2/devtest/cdi/ear/war2/War2.java b/appserver/tests/hk2/cdi/ear/war2/src/main/java/com/oracle/hk2/devtest/cdi/ear/war2/War2.java
index b6e3e3a..30581b7 100644
--- a/appserver/tests/hk2/cdi/ear/war2/src/main/java/com/oracle/hk2/devtest/cdi/ear/war2/War2.java
+++ b/appserver/tests/hk2/cdi/ear/war2/src/main/java/com/oracle/hk2/devtest/cdi/ear/war2/War2.java
@@ -19,7 +19,7 @@
import java.io.IOException;
import java.io.PrintWriter;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
import javax.servlet.ServletException;
import javax.servlet.http.HttpServlet;
import javax.servlet.http.HttpServletRequest;
diff --git a/appserver/tests/hk2/cdi/jersey/war/src/main/java/org/glassfish/jersey/examples/jersey_cdi/resources/EchoParamConstructorResource.java b/appserver/tests/hk2/cdi/jersey/war/src/main/java/org/glassfish/jersey/examples/jersey_cdi/resources/EchoParamConstructorResource.java
index 15f2c17..d000962 100644
--- a/appserver/tests/hk2/cdi/jersey/war/src/main/java/org/glassfish/jersey/examples/jersey_cdi/resources/EchoParamConstructorResource.java
+++ b/appserver/tests/hk2/cdi/jersey/war/src/main/java/org/glassfish/jersey/examples/jersey_cdi/resources/EchoParamConstructorResource.java
@@ -18,7 +18,7 @@
import jakarta.annotation.ManagedBean;
import javax.enterprise.context.RequestScoped;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
import jakarta.ws.rs.GET;
import jakarta.ws.rs.Produces;
import jakarta.ws.rs.Path;
diff --git a/appserver/tests/hk2/cdi/jersey/war/src/main/java/org/glassfish/jersey/examples/jersey_cdi/resources/FormResource.java b/appserver/tests/hk2/cdi/jersey/war/src/main/java/org/glassfish/jersey/examples/jersey_cdi/resources/FormResource.java
index ff98280..82115fb 100644
--- a/appserver/tests/hk2/cdi/jersey/war/src/main/java/org/glassfish/jersey/examples/jersey_cdi/resources/FormResource.java
+++ b/appserver/tests/hk2/cdi/jersey/war/src/main/java/org/glassfish/jersey/examples/jersey_cdi/resources/FormResource.java
@@ -17,8 +17,8 @@
package org.glassfish.jersey.examples.jersey_cdi.resources;
import javax.enterprise.context.RequestScoped;
-import javax.inject.Inject;
-import javax.inject.Provider;
+import jakarta.inject.Inject;
+import jakarta.inject.Provider;
import jakarta.ws.rs.POST;
import jakarta.ws.rs.Path;
diff --git a/appserver/tests/hk2/cdi/jersey/war/src/main/java/org/glassfish/jersey/examples/jersey_cdi/resources/JCDIBeanDependentExceptionMapper.java b/appserver/tests/hk2/cdi/jersey/war/src/main/java/org/glassfish/jersey/examples/jersey_cdi/resources/JCDIBeanDependentExceptionMapper.java
index fb3b2da..f3c1268 100644
--- a/appserver/tests/hk2/cdi/jersey/war/src/main/java/org/glassfish/jersey/examples/jersey_cdi/resources/JCDIBeanDependentExceptionMapper.java
+++ b/appserver/tests/hk2/cdi/jersey/war/src/main/java/org/glassfish/jersey/examples/jersey_cdi/resources/JCDIBeanDependentExceptionMapper.java
@@ -38,10 +38,10 @@
public class JCDIBeanDependentExceptionMapper implements ExceptionMapper<JDCIBeanDependentException> {
// TODO: this should be using proxiable injection support
- private @Context javax.inject.Provider<UriInfo> uiFieldInjectProvider;
+ private @Context jakarta.inject.Provider<UriInfo> uiFieldInjectProvider;
// TODO: this should be using proxiable injection support
- private @Context javax.inject.Provider<ResourceContext> rcProvider;
+ private @Context jakarta.inject.Provider<ResourceContext> rcProvider;
private UriInfo uiMethodInject;
diff --git a/appserver/tests/hk2/cdi/jersey/war/src/main/java/org/glassfish/jersey/examples/jersey_cdi/resources/JCDIBeanDependentSingletonResource.java b/appserver/tests/hk2/cdi/jersey/war/src/main/java/org/glassfish/jersey/examples/jersey_cdi/resources/JCDIBeanDependentSingletonResource.java
index 5f9f9c8..8432478 100644
--- a/appserver/tests/hk2/cdi/jersey/war/src/main/java/org/glassfish/jersey/examples/jersey_cdi/resources/JCDIBeanDependentSingletonResource.java
+++ b/appserver/tests/hk2/cdi/jersey/war/src/main/java/org/glassfish/jersey/examples/jersey_cdi/resources/JCDIBeanDependentSingletonResource.java
@@ -44,10 +44,10 @@
private @Resource(name="injectedResource") int injectedResource = 0;
// TODO: this should be using proxiable injection support
- private @Context javax.inject.Provider<UriInfo> uiFieldInjectProvider;
+ private @Context jakarta.inject.Provider<UriInfo> uiFieldInjectProvider;
// TODO: this should be using proxiable injection support
- private @Context javax.inject.Provider<ResourceContext> rcProvider;
+ private @Context jakarta.inject.Provider<ResourceContext> rcProvider;
private UriInfo uiMethodInject;
diff --git a/appserver/tests/hk2/cdi/jersey/war/src/main/java/org/glassfish/jersey/examples/jersey_cdi/resources/JerseyResolver.java b/appserver/tests/hk2/cdi/jersey/war/src/main/java/org/glassfish/jersey/examples/jersey_cdi/resources/JerseyResolver.java
index aa9a9c7..c357395 100644
--- a/appserver/tests/hk2/cdi/jersey/war/src/main/java/org/glassfish/jersey/examples/jersey_cdi/resources/JerseyResolver.java
+++ b/appserver/tests/hk2/cdi/jersey/war/src/main/java/org/glassfish/jersey/examples/jersey_cdi/resources/JerseyResolver.java
@@ -17,7 +17,7 @@
package org.glassfish.jersey.examples.jersey_cdi.resources;
import java.util.logging.Logger;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
import org.glassfish.hk2.api.Injectee;
import org.glassfish.hk2.api.JustInTimeInjectionResolver;
import org.glassfish.hk2.api.ServiceLocator;
diff --git a/appserver/tests/hk2/cdi/jersey/war/src/main/java/org/glassfish/jersey/examples/jersey_cdi/resources/inherited/BaseResource.java b/appserver/tests/hk2/cdi/jersey/war/src/main/java/org/glassfish/jersey/examples/jersey_cdi/resources/inherited/BaseResource.java
index ee7b9ba..4a653b0 100644
--- a/appserver/tests/hk2/cdi/jersey/war/src/main/java/org/glassfish/jersey/examples/jersey_cdi/resources/inherited/BaseResource.java
+++ b/appserver/tests/hk2/cdi/jersey/war/src/main/java/org/glassfish/jersey/examples/jersey_cdi/resources/inherited/BaseResource.java
@@ -18,7 +18,7 @@
import javax.enterprise.context.RequestScoped;
import javax.enterprise.inject.spi.BeanManager;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
import jakarta.ws.rs.GET;
import jakarta.ws.rs.Path;
diff --git a/appserver/tests/paas/external-db-service/generatederbyvm/src/main/java/org/glassfish/tests/paas/externaldbservicetest/generatederbyvm/CreateDerbyVM.java b/appserver/tests/paas/external-db-service/generatederbyvm/src/main/java/org/glassfish/tests/paas/externaldbservicetest/generatederbyvm/CreateDerbyVM.java
index a6a1882..fb546c3 100644
--- a/appserver/tests/paas/external-db-service/generatederbyvm/src/main/java/org/glassfish/tests/paas/externaldbservicetest/generatederbyvm/CreateDerbyVM.java
+++ b/appserver/tests/paas/external-db-service/generatederbyvm/src/main/java/org/glassfish/tests/paas/externaldbservicetest/generatederbyvm/CreateDerbyVM.java
@@ -36,7 +36,7 @@
import org.glassfish.virtualization.spi.VirtualMachine;
import org.glassfish.virtualization.util.ServiceType;
import org.glassfish.virtualization.util.SimpleSearchCriteria;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
import org.jvnet.hk2.annotations.Optional;
import org.jvnet.hk2.annotations.Service;
diff --git a/appserver/tests/paas/external-db-service/generatederbyvm/src/main/java/org/glassfish/tests/paas/externaldbservicetest/generatederbyvm/DeleteDerbyVM.java b/appserver/tests/paas/external-db-service/generatederbyvm/src/main/java/org/glassfish/tests/paas/externaldbservicetest/generatederbyvm/DeleteDerbyVM.java
index c313e7d..59bc309 100644
--- a/appserver/tests/paas/external-db-service/generatederbyvm/src/main/java/org/glassfish/tests/paas/externaldbservicetest/generatederbyvm/DeleteDerbyVM.java
+++ b/appserver/tests/paas/external-db-service/generatederbyvm/src/main/java/org/glassfish/tests/paas/externaldbservicetest/generatederbyvm/DeleteDerbyVM.java
@@ -24,7 +24,7 @@
import org.glassfish.virtualization.runtime.VirtualMachineLifecycle;
import org.glassfish.virtualization.spi.VirtualCluster;
import org.glassfish.virtualization.spi.VirtualMachine;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
import org.jvnet.hk2.annotations.Optional;
import org.jvnet.hk2.annotations.Service;
diff --git a/appserver/tests/paas/multiple-spe-test/mydb-plugin/src/main/java/org/glassfish/paas/mydbplugin/MyDBPlugin.java b/appserver/tests/paas/multiple-spe-test/mydb-plugin/src/main/java/org/glassfish/paas/mydbplugin/MyDBPlugin.java
index 208aa39..139ff13 100644
--- a/appserver/tests/paas/multiple-spe-test/mydb-plugin/src/main/java/org/glassfish/paas/mydbplugin/MyDBPlugin.java
+++ b/appserver/tests/paas/multiple-spe-test/mydb-plugin/src/main/java/org/glassfish/paas/mydbplugin/MyDBPlugin.java
@@ -23,7 +23,7 @@
import org.glassfish.internal.api.ServerContext;
import org.glassfish.paas.javadbplugin.DerbyPlugin;
import org.glassfish.virtualization.spi.VirtualMachine;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
import org.jvnet.hk2.annotations.Service;
import org.glassfish.hk2.api.PerLookup;
diff --git a/appserver/tests/quicklook/jms/injection/src/java/SimpleEjb.java b/appserver/tests/quicklook/jms/injection/src/java/SimpleEjb.java
index c172f22..7d4651a 100644
--- a/appserver/tests/quicklook/jms/injection/src/java/SimpleEjb.java
+++ b/appserver/tests/quicklook/jms/injection/src/java/SimpleEjb.java
@@ -17,7 +17,7 @@
package org.glassfish.tests.jms.injection;
import jakarta.ejb.*;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
import jakarta.jms.*;
/**
diff --git a/appserver/tests/quicklook/weld/numberguess/src/java/numberguess/Game.java b/appserver/tests/quicklook/weld/numberguess/src/java/numberguess/Game.java
index f6c824c..38e6c0f 100644
--- a/appserver/tests/quicklook/weld/numberguess/src/java/numberguess/Game.java
+++ b/appserver/tests/quicklook/weld/numberguess/src/java/numberguess/Game.java
@@ -22,8 +22,8 @@
import jakarta.annotation.PostConstruct;
import javax.enterprise.context.SessionScoped;
import javax.enterprise.inject.Instance;
-import javax.inject.Inject;
-import javax.inject.Named;
+import jakarta.inject.Inject;
+import jakarta.inject.Named;
import jakarta.faces.application.FacesMessage;
import jakarta.faces.component.UIComponent;
import jakarta.faces.component.UIInput;
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 a355424..081f837 100644
--- a/appserver/tests/quicklook/weld/numberguess/src/java/numberguess/InterceptorA.java
+++ b/appserver/tests/quicklook/weld/numberguess/src/java/numberguess/InterceptorA.java
@@ -19,7 +19,7 @@
import jakarta.interceptor.*;
import jakarta.annotation.*;
import jakarta.ejb.EJB;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
import java.io.Serializable;
@Interceptor
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 8da8429..2208447 100644
--- a/appserver/tests/quicklook/weld/numberguess/src/java/numberguess/InterceptorB.java
+++ b/appserver/tests/quicklook/weld/numberguess/src/java/numberguess/InterceptorB.java
@@ -24,7 +24,7 @@
import jakarta.ejb.EJB;
import jakarta.ejb.EJBException;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
public class InterceptorB implements Serializable{
diff --git a/appserver/tests/quicklook/weld/numberguess/src/java/numberguess/MaxNumber.java b/appserver/tests/quicklook/weld/numberguess/src/java/numberguess/MaxNumber.java
index 27e023d..b1c3444 100644
--- a/appserver/tests/quicklook/weld/numberguess/src/java/numberguess/MaxNumber.java
+++ b/appserver/tests/quicklook/weld/numberguess/src/java/numberguess/MaxNumber.java
@@ -27,7 +27,7 @@
import java.lang.annotation.Retention;
import java.lang.annotation.Target;
-import javax.inject.Qualifier;
+import jakarta.inject.Qualifier;
@Target( { TYPE, METHOD, PARAMETER, FIELD })
@Retention(RUNTIME)
diff --git a/appserver/tests/quicklook/weld/numberguess/src/java/numberguess/Random.java b/appserver/tests/quicklook/weld/numberguess/src/java/numberguess/Random.java
index 38a33b8..2703fc4 100644
--- a/appserver/tests/quicklook/weld/numberguess/src/java/numberguess/Random.java
+++ b/appserver/tests/quicklook/weld/numberguess/src/java/numberguess/Random.java
@@ -27,7 +27,7 @@
import java.lang.annotation.Retention;
import java.lang.annotation.Target;
-import javax.inject.Qualifier;
+import jakarta.inject.Qualifier;
@Target( { TYPE, METHOD, PARAMETER, FIELD })
@Retention(RUNTIME)
diff --git a/appserver/tests/quicklook/weld/numberguess/src/java/numberguess/SingletonBean.java b/appserver/tests/quicklook/weld/numberguess/src/java/numberguess/SingletonBean.java
index 8e3167f..042c612 100644
--- a/appserver/tests/quicklook/weld/numberguess/src/java/numberguess/SingletonBean.java
+++ b/appserver/tests/quicklook/weld/numberguess/src/java/numberguess/SingletonBean.java
@@ -24,7 +24,7 @@
import jakarta.ejb.Singleton;
import jakarta.ejb.Startup;
import javax.enterprise.context.ApplicationScoped;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
@Singleton
diff --git a/appserver/tests/quicklook/weld/osgiweld/metadata/weld-osgi.properties b/appserver/tests/quicklook/weld/osgiweld/metadata/weld-osgi.properties
index c216e27..e453be4 100644
--- a/appserver/tests/quicklook/weld/osgiweld/metadata/weld-osgi.properties
+++ b/appserver/tests/quicklook/weld/osgiweld/metadata/weld-osgi.properties
@@ -63,4 +63,4 @@
#exports = javax.inject;version="1.0",javax.decorator;uses:="javax.enterprise.inject";version="1.0",javax.enterprise.inject;uses:="javax.inject,javax.enterprise.util,javax.enterprise.context";version="1.0",javax.enterprise.inject.spi;uses:="javax.enterprise.context.spi,javax.el,javax.enterprise.inject,javax.interceptor,javax.enterprise.event";version="1.0",javax.enterprise.context.spi;version="1.0",javax.enterprise.context;uses:="javax.inject";version="1.0",javax.enterprise.util;version="1.0",javax.enterprise.event;uses:="javax.enterprise.util";version="1.0",org.jboss.weld.context;uses:="org.jboss.weld.bootstrap.api,org.jboss.weld,org.jboss.weld.context.api,org.jboss.weld.serialization.spi,javax.enterprise.context.spi,javax.enterprise.context,org.jboss.weld.manager,org.jboss.weld.event,javax.enterprise.inject,org.jboss.weld.injection.spi,org.jboss.weld.construction.api,org.jboss.weld.util,org.jboss.weld.serialization.spi.helpers,javax.enterprise.inject.spi";version="1.0",org.jboss.weld.ejb;uses:="org.jboss.weld.manager,org.jboss.weld.event,org.jboss.weld.context,javax.enterprise.inject,javax.interceptor,org.jboss.weld.bootstrap.api,javax.enterprise.inject.spi,org.jboss.weld.util,org.jboss.weld.resources.spi,org.jboss.weld.bean,org.jboss.weld.ejb.spi,org.jboss.weld.ejb.spi.helpers,org.jboss.weld.injection,org.jboss.weld";version="1.0",org.jboss.weld.bean;uses:="org.jboss.weld.bootstrap.api,javax.enterprise.inject.spi,org.jboss.weld.manager,javax.enterprise.context,org.jboss.weld.bootstrap,javax.enterprise.inject,javax.inject,org.jboss.weld.interceptor.spi.model,org.jboss.weld.util,javax.enterprise.context.spi,org.jboss.weld.injection,javax.enterprise.event,org.jboss.weld.interceptor.spi.metadata,javax.interceptor,org.jboss.weld.context,org.jboss.weld.ejb,org.jboss.weld.bean.proxy,org.jboss.weld.ejb.spi,org.jboss.weld.ejb.api,javax.decorator";version="1.0",org.jboss.weld.bean.builtin;uses:="javax.enterprise.context,javax.enterprise.inject,org.jboss.weld.bootstrap.api,javax.enterprise.inject.spi,org.jboss.weld.bootstrap,org.jboss.weld.manager,org.jboss.weld.bean,org.jboss.weld.context,org.jboss.weld.injection,javax.enterprise.context.spi,org.jboss.weld.util,org.jboss.weld.bean.proxy,org.jboss.weld,javax.enterprise.util,org.jboss.weld.event,javax.enterprise.event,org.jboss.weld.bootstrap.spi,org.jboss.weld.ejb";version="1.0",org.jboss.weld.bean.proxy;uses:="javax.enterprise.inject.spi,org.jboss.weld.util,org.jboss.weld,org.jboss.weld.bootstrap.api,org.jboss.weld.serialization.spi,javax.enterprise.context.spi,javax.enterprise.context,org.jboss.weld.manager,org.jboss.weld.context,org.jboss.weld.injection,org.jboss.weld.serialization.spi.helpers,javax.inject,org.jboss.weld.bean,org.jboss.weld.ejb,org.jboss.weld.ejb.api";version="1.0",org.jboss.weld.servlet.api;uses:="javax.servlet,javax.servlet.http";version="1.0",org.jboss.weld.bootstrap.api;uses:="org.jboss.weld.bootstrap.spi,javax.enterprise.inject.spi,org.jboss.weld.manager.api,org.jboss.weld.ejb.spi,org.jboss.weld.transaction.spi,org.jboss.weld.injection.spi,org.jboss.weld.security.spi,org.jboss.weld.resources.spi,org.jboss.weld.bootstrap.api.helpers";version="1.0",org.jboss.weld.context.api;uses:="javax.enterprise.context.spi";version="1.0",org.jboss.weld.servlet.api.helpers;uses:="org.jboss.weld.servlet.api,javax.servlet,javax.servlet.http";version="1.0",org.jboss.weld.bootstrap.api.helpers;uses:="org.jboss.weld.bootstrap.api,org.jboss.weld.bootstrap.spi,org.jboss.weld.manager.api";version="1.0",org.jboss.weld.ejb.api;version="1.0",org.jboss.weld.manager.api;uses:="org.jboss.weld.bootstrap.api,javax.enterprise.inject.spi,org.jboss.weld.ejb.spi,javax.enterprise.inject,org.jboss.weld.construction.api,javax.enterprise.context.spi";version="1.0",org.jboss.weld.construction.api;uses:="javax.enterprise.inject.spi,javax.enterprise.context.spi";version="1.0",org.jboss.weld.interceptor.spi.model;uses:="org.jboss.weld.interceptor.spi.metadata,javax.enterprise.inject.spi";version="1.0",org.jboss.weld.ejb.spi.helpers;uses:="org.jboss.weld.ejb.spi,org.jboss.weld.ejb.api";version="1.0",org.jboss.weld.validation.spi;uses:="org.jboss.weld.bootstrap.api,jakarta.validation";version="1.0",org.jboss.weld.serialization.spi;uses:="org.jboss.weld.bootstrap.api,org.jboss.weld.serialization.spi.helpers,javax.enterprise.context.spi";version="1.0",org.jboss.weld.interceptor.spi.context;uses:="javax.interceptor";version="1.0",org.jboss.weld.interceptor.spi.metadata;uses:="org.jboss.weld.manager,javax.enterprise.context.spi,org.jboss.weld.interceptor.spi.model";version="1.0",org.jboss.weld.transaction.spi;uses:="org.jboss.weld.bootstrap.api,javax.transaction";version="1.0",org.jboss.weld.injection.spi.helpers;uses:="javax.enterprise.inject.spi,org.jboss.weld.injection.spi,javax.annotation,javax.naming,org.jboss.weld.bootstrap.api,javax.persistence";version="1.0",org.jboss.weld.serialization.spi.helpers;uses:="javax.enterprise.context.spi,org.jboss.weld.context.api";version="1.0",org.jboss.weld.bootstrap.spi;uses:="org.jboss.weld.ejb.spi,org.jboss.weld.bootstrap.api,javax.enterprise.inject.spi";version="1.0",org.jboss.weld.injection.spi;uses:="org.jboss.weld.bootstrap.api,javax.enterprise.inject.spi,javax.persistence";version="1.0",org.jboss.weld.resources.spi;uses:="org.jboss.weld.bootstrap.api";version="1.0",org.jboss.weld.interceptor.spi.instance;uses:="org.jboss.weld.interceptor.spi.metadata";version="1.0",org.jboss.weld.resources.spi.helpers;uses:="org.jboss.weld.resources.spi";version="1.0",org.jboss.weld.bootstrap.spi.helpers;uses:="org.jboss.weld.bootstrap.spi,org.jboss.weld.resources.spi,org.jboss.weld.ejb.spi";version="1.0",org.jboss.weld.ejb.spi;uses:="org.jboss.weld.bootstrap.api,org.jboss.weld.ejb.api,javax.enterprise.inject.spi";version="1.0",org.jboss.weld.security.spi;uses:="org.jboss.weld.bootstrap.api";version="1.0",org.jboss.weld;uses:="org.jboss.weld.bootstrap.spi,org.jboss.weld.bootstrap.api,org.jboss.weld.bootstrap,org.jboss.weld.manager,org.jboss.weld.bean.builtin,javax.enterprise.inject.spi,javax.enterprise.util,javax.enterprise.inject";version="1.0",org.jboss.weld.bootstrap;uses:="org.jboss.weld.bootstrap.api,org.jboss.weld.manager,org.jboss.weld.util,javax.enterprise.inject,org.jboss.weld.bean.builtin,org.jboss.weld,javax.enterprise.inject.spi,org.jboss.weld.event,org.jboss.weld.ejb,org.jboss.weld.bean,org.jboss.weld.interceptor.spi.model,javax.annotation,javax.interceptor,org.jboss.weld.ejb.spi,javax.decorator,org.jboss.weld.resources.spi,javax.enterprise.event,org.jboss.weld.bootstrap.spi,org.jboss.weld.transaction.spi,org.jboss.weld.bootstrap.api.helpers,javax.enterprise.context.spi,org.jboss.weld.security.spi,org.jboss.weld.manager.api,org.jboss.weld.interceptor.spi.metadata,javax.enterprise.context,javax.inject,org.jboss.weld.serialization.spi,org.jboss.weld.bootstrap.spi.helpers,org.jboss.weld.injection,org.jboss.weld.context";version="1.0",org.jboss.weld.event;uses:="org.jboss.weld.injection,javax.enterprise.inject.spi,org.jboss.weld,org.jboss.weld.manager,org.jboss.weld.context,javax.enterprise.inject,org.jboss.weld.bean.builtin,javax.enterprise.util,javax.enterprise.event,javax.enterprise.context.spi,org.jboss.weld.util,org.jboss.weld.bean,org.jboss.weld.bootstrap.api,javax.enterprise.context,javax.inject,org.jboss.weld.transaction.spi,javax.transaction";version="1.0",org.jboss.weld.injection;uses:="javax.enterprise.inject.spi,org.jboss.weld.manager,org.jboss.weld.util,org.jboss.weld.context,org.jboss.weld.injection.spi,javax.enterprise.context.spi,org.jboss.weld.construction.api,javax.enterprise.inject,org.jboss.weld,org.jboss.weld.bootstrap.api,org.jboss.weld.bean.proxy,javax.enterprise.event,javax.inject,org.jboss.weld.ejb";version="1.0",org.jboss.weld.manager;uses:="org.jboss.weld.bootstrap.api,javax.enterprise.inject.spi,org.jboss.weld.bean,javax.enterprise.util,org.jboss.weld.interceptor.spi.model,org.jboss.weld.bean.proxy,org.jboss.weld.bootstrap,org.jboss.weld.util,javax.enterprise.inject,org.jboss.weld.injection,org.jboss.weld.ejb.spi,org.jboss.weld.bean.builtin,javax.el,org.jboss.weld,org.jboss.weld.interceptor.spi.metadata,org.jboss.weld.event,org.jboss.weld.context,org.jboss.weld.ejb,org.jboss.weld.serialization.spi,javax.enterprise.context.spi,org.jboss.weld.el,org.jboss.weld.manager.api,org.jboss.weld.construction.api,org.jboss.weld.bootstrap.spi,org.jboss.weld.injection.spi,javax.decorator";version="1.0",org.jboss.weld.servlet;uses:="org.jboss.weld.manager,org.jboss.weld.context,org.jboss.weld.event,javax.enterprise.inject,javax.servlet.http,javax.servlet,javax.inject,javax.enterprise.context,javax.faces.context,org.jboss.weld.jsf,org.jboss.weld,javax.enterprise.context.spi,org.jboss.weld.bootstrap.api,javax.enterprise.inject.spi,org.jboss.weld.bean.builtin,org.jboss.weld.servlet.api.helpers";version="1.0",org.jboss.weld.util;uses:="javax.enterprise.inject.spi,org.jboss.weld.resources.spi,javax.annotation,org.jboss.weld.manager,javax.enterprise.event,javax.enterprise.inject,org.jboss.weld.injection,javax.inject,org.jboss.weld.bootstrap,org.jboss.weld.interceptor.spi.model,org.jboss.weld.bootstrap.api,javax.interceptor,org.jboss.weld.ejb.spi,org.jboss.weld,javax.enterprise.context.spi,javax.decorator,org.jboss.weld.bean,org.jboss.weld.serialization.spi,org.jboss.weld.bean.proxy,org.jboss.weld.bootstrap.spi,javax.el,org.jboss.weld.event";version="1.0",org.jboss.weld.el;uses:="javax.el,javax.enterprise.inject.spi,org.jboss.weld.manager,org.jboss.weld.context,javax.enterprise.context.spi,javax.enterprise.context,org.jboss.weld.bean.proxy";version="1.0",org.jboss.weld.jsf;uses:="javax.enterprise.context,org.jboss.weld,javax.faces.application,javax.faces.context,org.jboss.weld.manager,org.jboss.weld.context,javax.enterprise.inject,org.jboss.weld.bootstrap.api,org.jboss.weld.util,org.jboss.weld.resources.spi";version="1.0"
#exports for 2.2.9.Final:
-exports = org.jboss.weld.bootstrap.api.helpers;uses:="org.jboss.weld.bootstrap.api,org.jboss.weld.bootstrap.spi,org.jboss.weld.manager.api";version="2.2.9.Final",org.jboss.weld.servlet.api.helpers;uses:="javax.servlet,javax.servlet.http,org.jboss.weld.servlet.api";version="2.2.9.Final",org.jboss.weld.context.api;uses:="javax.enterprise.context.spi";version="2.2.9.Final",org.jboss.weld.construction.api;uses:="javax.enterprise.inject.spi,javax.enterprise.context.spi";version="2.2.9.Final",org.jboss.weld.ejb.api;version="2.2.9.Final",org.jboss.weld.bootstrap.api;uses:="javax.enterprise.inject.spi,org.jboss.weld.bootstrap.spi,org.jboss.weld.manager.api,org.jboss.weld.transaction.spi,org.jboss.weld.resources.spi,org.jboss.weld.security.spi,org.jboss.weld.injection.spi,org.jboss.weld.bootstrap.api.helpers";version="2.2.9.Final",org.jboss.weld.servlet.api;uses:="javax.servlet,javax.servlet.http";version="2.2.9.Final",org.jboss.weld.manager.api;uses:="org.jboss.weld.bootstrap.api,javax.enterprise.inject.spi,org.jboss.weld.serialization.spi,javax.enterprise.inject,org.jboss.weld.construction.api,org.jboss.weld.ejb.spi,javax.enterprise.context.spi";version="2.2.9.Final",org.jboss.weld.ejb.spi;uses:="org.jboss.weld.bootstrap.api,org.jboss.weld.ejb.api,javax.enterprise.inject.spi";version="2.2.9.Final",org.jboss.weld.serialization.spi.helpers;uses:="javax.enterprise.context.spi,org.jboss.weld.context.api";version="2.2.9.Final",org.jboss.weld.injection.spi.helpers;uses:="javax.enterprise.inject.spi,org.jboss.weld.injection.spi,javax.annotation,org.jboss.weld.bootstrap.api,javax.naming,jakarta.persistence";version="2.2.9.Final",org.jboss.weld.servlet.spi;uses:="org.jboss.weld.bootstrap.api,javax.servlet.http";version="2.2.9.Final",org.jboss.weld.security.spi;uses:="org.jboss.weld.bootstrap.api";version="2.2.9.Final",org.jboss.weld.interceptor.spi.metadata;uses:="org.jboss.weld.manager,javax.enterprise.context.spi,org.jboss.weld.interceptor.spi.model";version="2.2.9.Final",org.jboss.weld.bootstrap.spi;uses:="org.jboss.weld.bootstrap.api,org.jboss.weld.ejb.spi,javax.enterprise.inject.spi";version="2.2.9.Final",org.jboss.weld.interceptor.spi.model;uses:="org.jboss.weld.interceptor.spi.metadata,javax.enterprise.inject.spi";version="2.2.9.Final",org.jboss.weld.injection.spi;uses:="org.jboss.weld.bootstrap.api,javax.enterprise.inject.spi,jakarta.persistence";version="2.2.9.Final",org.jboss.weld.transaction.spi;uses:="org.jboss.weld.bootstrap.api,jakarta.transaction";version="2.2.9.Final",org.jboss.weld.ejb.spi.helpers;uses:="org.jboss.weld.ejb.spi,org.jboss.weld.ejb.api";version="2.2.9.Final",org.jboss.weld.servlet.spi.helpers;uses:="javax.servlet.http,org.jboss.weld.servlet.spi";version="2.2.9.Final",org.jboss.weld.bootstrap.spi.helpers;uses:="org.jboss.weld.bootstrap.spi,org.jboss.weld.resources.spi,org.jboss.weld.ejb.spi";version="2.2.9.Final",org.jboss.weld.serialization.spi;uses:="org.jboss.weld.serialization.spi.helpers,org.jboss.weld.bootstrap.api,javax.enterprise.context.spi";version="2.2.9.Final",org.jboss.weld.resources.spi;uses:="org.jboss.weld.bootstrap.api";version="2.2.9.Final",org.jboss.weld.resources.spi.helpers;uses:="org.jboss.weld.resources.spi";version="2.2.9.Final",org.jboss.weld.validation.spi;uses:="org.jboss.weld.bootstrap.api,jakarta.validation";version="2.2.9.Final",org.jboss.weld;uses:="javax.enterprise.inject.spi,javax.enterprise.util,javax.enterprise.inject,org.jboss.weld.manager,org.jboss.weld.bean.builtin,com.google.common.collect,org.jboss.weld.bootstrap,org.jboss.weld.bootstrap.api,org.jboss.weld.bootstrap.spi,org.jboss.weld.bootstrap.api.helpers,com.google.common.cache";version="2.2.9.Final",org.jboss.weld.bean;uses:="javax.enterprise.inject.spi,org.jboss.weld.manager,javax.enterprise.inject,org.jboss.weld.bootstrap,org.jboss.weld.serialization.spi,org.jboss.weld.bootstrap.api,javax.enterprise.context,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,jakarta.transaction";version="2.2.9.Final",org.jboss.weld.injection;uses:="javax.enterprise.inject.spi,org.jboss.weld.manager,javax.enterprise.inject,org.jboss.weld.util,org.jboss.weld.injection.spi,org.jboss.weld.context,javax.enterprise.context.spi,org.jboss.weld.construction.api,org.jboss.weld.bootstrap.api,org.jboss.weld,org.jboss.weld.bean.proxy,javax.enterprise.event,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
+exports = org.jboss.weld.bootstrap.api.helpers;uses:="org.jboss.weld.bootstrap.api,org.jboss.weld.bootstrap.spi,org.jboss.weld.manager.api";version="2.2.9.Final",org.jboss.weld.servlet.api.helpers;uses:="javax.servlet,javax.servlet.http,org.jboss.weld.servlet.api";version="2.2.9.Final",org.jboss.weld.context.api;uses:="javax.enterprise.context.spi";version="2.2.9.Final",org.jboss.weld.construction.api;uses:="javax.enterprise.inject.spi,javax.enterprise.context.spi";version="2.2.9.Final",org.jboss.weld.ejb.api;version="2.2.9.Final",org.jboss.weld.bootstrap.api;uses:="javax.enterprise.inject.spi,org.jboss.weld.bootstrap.spi,org.jboss.weld.manager.api,org.jboss.weld.transaction.spi,org.jboss.weld.resources.spi,org.jboss.weld.security.spi,org.jboss.weld.injection.spi,org.jboss.weld.bootstrap.api.helpers";version="2.2.9.Final",org.jboss.weld.servlet.api;uses:="javax.servlet,javax.servlet.http";version="2.2.9.Final",org.jboss.weld.manager.api;uses:="org.jboss.weld.bootstrap.api,javax.enterprise.inject.spi,org.jboss.weld.serialization.spi,javax.enterprise.inject,org.jboss.weld.construction.api,org.jboss.weld.ejb.spi,javax.enterprise.context.spi";version="2.2.9.Final",org.jboss.weld.ejb.spi;uses:="org.jboss.weld.bootstrap.api,org.jboss.weld.ejb.api,javax.enterprise.inject.spi";version="2.2.9.Final",org.jboss.weld.serialization.spi.helpers;uses:="javax.enterprise.context.spi,org.jboss.weld.context.api";version="2.2.9.Final",org.jboss.weld.injection.spi.helpers;uses:="javax.enterprise.inject.spi,org.jboss.weld.injection.spi,javax.annotation,org.jboss.weld.bootstrap.api,javax.naming,jakarta.persistence";version="2.2.9.Final",org.jboss.weld.servlet.spi;uses:="org.jboss.weld.bootstrap.api,javax.servlet.http";version="2.2.9.Final",org.jboss.weld.security.spi;uses:="org.jboss.weld.bootstrap.api";version="2.2.9.Final",org.jboss.weld.interceptor.spi.metadata;uses:="org.jboss.weld.manager,javax.enterprise.context.spi,org.jboss.weld.interceptor.spi.model";version="2.2.9.Final",org.jboss.weld.bootstrap.spi;uses:="org.jboss.weld.bootstrap.api,org.jboss.weld.ejb.spi,javax.enterprise.inject.spi";version="2.2.9.Final",org.jboss.weld.interceptor.spi.model;uses:="org.jboss.weld.interceptor.spi.metadata,javax.enterprise.inject.spi";version="2.2.9.Final",org.jboss.weld.injection.spi;uses:="org.jboss.weld.bootstrap.api,javax.enterprise.inject.spi,jakarta.persistence";version="2.2.9.Final",org.jboss.weld.transaction.spi;uses:="org.jboss.weld.bootstrap.api,jakarta.transaction";version="2.2.9.Final",org.jboss.weld.ejb.spi.helpers;uses:="org.jboss.weld.ejb.spi,org.jboss.weld.ejb.api";version="2.2.9.Final",org.jboss.weld.servlet.spi.helpers;uses:="javax.servlet.http,org.jboss.weld.servlet.spi";version="2.2.9.Final",org.jboss.weld.bootstrap.spi.helpers;uses:="org.jboss.weld.bootstrap.spi,org.jboss.weld.resources.spi,org.jboss.weld.ejb.spi";version="2.2.9.Final",org.jboss.weld.serialization.spi;uses:="org.jboss.weld.serialization.spi.helpers,org.jboss.weld.bootstrap.api,javax.enterprise.context.spi";version="2.2.9.Final",org.jboss.weld.resources.spi;uses:="org.jboss.weld.bootstrap.api";version="2.2.9.Final",org.jboss.weld.resources.spi.helpers;uses:="org.jboss.weld.resources.spi";version="2.2.9.Final",org.jboss.weld.validation.spi;uses:="org.jboss.weld.bootstrap.api,jakarta.validation";version="2.2.9.Final",org.jboss.weld;uses:="javax.enterprise.inject.spi,javax.enterprise.util,javax.enterprise.inject,org.jboss.weld.manager,org.jboss.weld.bean.builtin,com.google.common.collect,org.jboss.weld.bootstrap,org.jboss.weld.bootstrap.api,org.jboss.weld.bootstrap.spi,org.jboss.weld.bootstrap.api.helpers,com.google.common.cache";version="2.2.9.Final",org.jboss.weld.bean;uses:="javax.enterprise.inject.spi,org.jboss.weld.manager,javax.enterprise.inject,org.jboss.weld.bootstrap,org.jboss.weld.serialization.spi,org.jboss.weld.bootstrap.api,javax.enterprise.context,jakarta.inject,org.jboss.weld.interceptor.spi.model,org.jboss.weld.util,com.google.common.base,javax.enterprise.context.spi,org.jboss.weld.injection,org.jboss.weld.ejb.spi,javax.enterprise.event,jakarta.interceptor,org.jboss.weld.interceptor.spi.metadata,org.jboss.weld.context,org.jboss.weld.ejb,org.jboss.weld.ejb.api,javax.decorator,org.jboss.weld.bean.proxy";version="2.2.9.Final",org.jboss.weld.bean.builtin;uses:="javax.enterprise.inject,javax.enterprise.context,com.google.common.collect,org.jboss.weld.bootstrap,org.jboss.weld.serialization.spi,org.jboss.weld.bean,javax.enterprise.inject.spi,org.jboss.weld.manager,org.jboss.weld.bootstrap.api,org.jboss.weld.context,javax.enterprise.context.spi,org.jboss.weld.injection,org.jboss.weld.util,org.jboss.weld.bean.proxy,org.jboss.weld.bootstrap.spi,org.jboss.weld.construction.api,org.jboss.weld.ejb.spi,org.jboss.weld.manager.api,org.jboss.weld,javax.enterprise.util,org.jboss.weld.event,javax.enterprise.event,org.jboss.weld.ejb,com.google.common.base";version="2.2.9.Final",org.jboss.weld.bean.proxy;uses:="javax.enterprise.inject.spi,org.jboss.weld.util,javax.enterprise.context,com.google.common.collect,javax.enterprise.context.spi,org.jboss.weld.serialization.spi,org.jboss.weld.bootstrap.api,org.jboss.weld,com.google.common.cache,org.jboss.weld.manager,org.jboss.weld.injection,org.jboss.weld.context,org.jboss.weld.serialization.spi.helpers,org.jboss.weld.bean,jakarta.inject,org.jboss.weld.ejb,org.jboss.weld.ejb.api,org.jboss.weld.resources.spi,org.jboss.weld.bootstrap.api.helpers";version="2.2.9.Final",org.jboss.weld.bootstrap;uses:="org.jboss.weld.ejb,javax.enterprise.inject.spi,org.jboss.weld.manager,javax.enterprise.inject,org.jboss.weld.bootstrap.api,org.jboss.weld.util,org.jboss.weld.event,org.jboss.weld.bean,org.jboss.weld.bean.builtin,javax.annotation,org.jboss.weld.bootstrap.spi,org.jboss.weld.resources.spi,jakarta.interceptor,org.jboss.weld.interceptor.spi.model,javax.decorator,org.jboss.weld.ejb.spi,com.google.common.cache,org.jboss.weld,com.google.common.collect,javax.enterprise.event,com.google.common.base,org.jboss.weld.security.spi,javax.enterprise.context.spi,org.jboss.weld.transaction.spi,org.jboss.weld.servlet,org.jboss.weld.bootstrap.api.helpers,org.jboss.weld.manager.api,org.jboss.weld.interceptor.spi.metadata,javax.enterprise.context,jakarta.inject,org.jboss.weld.context,org.jboss.weld.servlet.spi.helpers,org.jboss.weld.bootstrap.spi.helpers,org.jboss.weld.servlet.spi,org.jboss.weld.serialization.spi,org.jboss.weld.injection,org.jboss.weld.bean.proxy";version="2.2.9.Final",org.jboss.weld.context;uses:="org.jboss.weld.bean,org.jboss.weld.context.api,javax.enterprise.context.spi,org.jboss.weld.serialization.spi,org.jboss.weld.bootstrap.api,javax.enterprise.context,org.jboss.weld,org.jboss.weld.manager,org.jboss.weld.event,org.jboss.weld.injection.spi,org.jboss.weld.construction.api,org.jboss.weld.serialization.spi.helpers,org.jboss.weld.util,javax.enterprise.inject.spi";version="2.2.9.Final",org.jboss.weld.ejb;uses:="jakarta.interceptor,org.jboss.weld.manager,javax.enterprise.inject,org.jboss.weld.event,org.jboss.weld.context,org.jboss.weld.bootstrap.api,org.jboss.weld.bean,org.jboss.weld.util,javax.enterprise.inject.spi,org.jboss.weld.resources.spi,com.google.common.base,org.jboss.weld.ejb.spi,com.google.common.collect,org.jboss.weld.ejb.spi.helpers,org.jboss.weld.injection,org.jboss.weld.bootstrap.api.helpers,org.jboss.weld";version="2.2.9.Final",org.jboss.weld.el;uses:="javax.enterprise.inject.spi,org.jboss.weld.manager,javax.enterprise.context,org.jboss.weld.context,javax.enterprise.context.spi,javax.el";version="2.2.9.Final",org.jboss.weld.event;uses:="org.jboss.weld.injection,javax.enterprise.inject.spi,org.jboss.weld.manager,javax.enterprise.inject,org.jboss.weld.context,org.jboss.weld,org.jboss.weld.bean.builtin,javax.enterprise.util,javax.enterprise.context.spi,org.jboss.weld.util,javax.enterprise.event,com.google.common.collect,org.jboss.weld.bean,org.jboss.weld.bootstrap.api,com.google.common.base,javax.enterprise.context,jakarta.inject,com.google.common.cache,org.jboss.weld.transaction.spi,jakarta.transaction";version="2.2.9.Final",org.jboss.weld.injection;uses:="javax.enterprise.inject.spi,org.jboss.weld.manager,javax.enterprise.inject,org.jboss.weld.util,org.jboss.weld.injection.spi,org.jboss.weld.context,javax.enterprise.context.spi,org.jboss.weld.construction.api,org.jboss.weld.bootstrap.api,org.jboss.weld,org.jboss.weld.bean.proxy,javax.enterprise.event,jakarta.inject,org.jboss.weld.bean.builtin,org.jboss.weld.event,org.jboss.weld.ejb,com.google.common.collect";version="2.2.9.Final",org.jboss.weld.jsf;uses:="org.jboss.weld.manager,javax.enterprise.inject,jakarta.faces.application,org.jboss.weld.bootstrap.api.helpers,org.jboss.weld.context,org.jboss.weld,jakarta.faces.context,org.jboss.weld.bootstrap.api,org.jboss.weld.util,org.jboss.weld.resources.spi";version="2.2.9.Final",org.jboss.weld.manager;uses:="org.jboss.weld.bootstrap.api,org.jboss.weld.bean,javax.enterprise.inject.spi,com.google.common.base,com.google.common.collect,javax.enterprise.util,org.jboss.weld.ejb,javax.enterprise.inject,org.jboss.weld.interceptor.spi.model,javax.enterprise.context.spi,org.jboss.weld.injection,org.jboss.weld.util,javax.enterprise.context,org.jboss.weld.ejb.spi,org.jboss.weld.event,javax.el,org.jboss.weld.bean.proxy,org.jboss.weld.construction.api,org.jboss.weld.bootstrap,org.jboss.weld.serialization.spi,org.jboss.weld.el,org.jboss.weld.bean.builtin,org.jboss.weld.context,org.jboss.weld,org.jboss.weld.manager.api,org.jboss.weld.bootstrap.spi,jakarta.interceptor,org.jboss.weld.injection.spi,javax.decorator";version="2.2.9.Final",org.jboss.weld.servlet;uses:="javax.servlet.http,org.jboss.weld.util,org.jboss.weld.manager,org.jboss.weld.event,javax.enterprise.inject,org.jboss.weld.context,javax.servlet,org.jboss.weld.servlet.spi,jakarta.inject,org.jboss.weld.jsf,javax.enterprise.context,jakarta.faces.context,org.jboss.weld.bootstrap.api.helpers,javax.enterprise.context.spi,org.jboss.weld,org.jboss.weld.bootstrap.api,org.jboss.weld.resources.spi,javax.enterprise.inject.spi,org.jboss.weld.bean.builtin,org.jboss.weld.servlet.api,org.jboss.weld.servlet.api.helpers";version="2.2.9.Final",org.jboss.weld.util;uses:="javax.enterprise.inject.spi,org.jboss.weld.bootstrap.api,org.jboss.weld.resources.spi,com.google.common.base,javax.annotation,org.jboss.weld.interceptor.spi.model,com.google.common.collect,org.jboss.weld.manager,javax.enterprise.inject,org.jboss.weld.injection,jakarta.inject,javax.enterprise.event,jakarta.interceptor,org.jboss.weld.ejb,javax.enterprise.context.spi,javax.decorator,javax.enterprise.context,org.jboss.weld.ejb.spi,org.jboss.weld.bean,org.jboss.weld.bootstrap,org.jboss.weld.bean.proxy,org.jboss.weld.serialization.spi,org.jboss.weld.bootstrap.spi,javax.el,org.jboss.weld.event";version="2.2.9.Final"
\ No newline at end of file
diff --git a/appserver/tests/sse/basic/src/main/java/org/glassfish/sse/basic/ExceptionHandler.java b/appserver/tests/sse/basic/src/main/java/org/glassfish/sse/basic/ExceptionHandler.java
index b94c1ac..5e93d69 100644
--- a/appserver/tests/sse/basic/src/main/java/org/glassfish/sse/basic/ExceptionHandler.java
+++ b/appserver/tests/sse/basic/src/main/java/org/glassfish/sse/basic/ExceptionHandler.java
@@ -18,7 +18,7 @@
import org.glassfish.sse.api.*;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
import java.io.IOException;
/**
diff --git a/appserver/tests/sse/videoplayer/src/main/java/org/glassfish/sse/videoplayer/NotificationsHandler.java b/appserver/tests/sse/videoplayer/src/main/java/org/glassfish/sse/videoplayer/NotificationsHandler.java
index e37857b..0add4f3 100644
--- a/appserver/tests/sse/videoplayer/src/main/java/org/glassfish/sse/videoplayer/NotificationsHandler.java
+++ b/appserver/tests/sse/videoplayer/src/main/java/org/glassfish/sse/videoplayer/NotificationsHandler.java
@@ -18,7 +18,7 @@
import org.glassfish.sse.api.*;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
import java.io.IOException;
/**
diff --git a/appserver/tests/sse/videoplayer/src/main/java/org/glassfish/sse/videoplayer/PlayerServlet.java b/appserver/tests/sse/videoplayer/src/main/java/org/glassfish/sse/videoplayer/PlayerServlet.java
index 0a47693..6eca38d 100644
--- a/appserver/tests/sse/videoplayer/src/main/java/org/glassfish/sse/videoplayer/PlayerServlet.java
+++ b/appserver/tests/sse/videoplayer/src/main/java/org/glassfish/sse/videoplayer/PlayerServlet.java
@@ -20,7 +20,7 @@
import javax.servlet.annotation.*;
import javax.servlet.http.*;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
import java.io.IOException;
/**
diff --git a/appserver/tests/sse/videoplayer/src/main/java/org/glassfish/sse/videoplayer/PlayingStatus.java b/appserver/tests/sse/videoplayer/src/main/java/org/glassfish/sse/videoplayer/PlayingStatus.java
index 3a85b3d..def5ae6 100644
--- a/appserver/tests/sse/videoplayer/src/main/java/org/glassfish/sse/videoplayer/PlayingStatus.java
+++ b/appserver/tests/sse/videoplayer/src/main/java/org/glassfish/sse/videoplayer/PlayingStatus.java
@@ -17,7 +17,7 @@
package org.glassfish.sse.videoplayer;
import jakarta.faces.bean.ApplicationScoped;
-import javax.inject.Singleton;
+import jakarta.inject.Singleton;
/**
* @author Jitendra Kotamraju
diff --git a/appserver/transaction/internal-api/src/main/java/com/sun/enterprise/transaction/api/RecoveryResourceRegistry.java b/appserver/transaction/internal-api/src/main/java/com/sun/enterprise/transaction/api/RecoveryResourceRegistry.java
index 4ad041a..4be096c 100644
--- a/appserver/transaction/internal-api/src/main/java/com/sun/enterprise/transaction/api/RecoveryResourceRegistry.java
+++ b/appserver/transaction/internal-api/src/main/java/com/sun/enterprise/transaction/api/RecoveryResourceRegistry.java
@@ -18,7 +18,7 @@
import org.jvnet.hk2.annotations.Service;
-import javax.inject.Singleton;
+import jakarta.inject.Singleton;
import java.util.*;
diff --git a/appserver/transaction/internal-api/src/main/java/com/sun/enterprise/transaction/startup/TransactionLifecycleService.java b/appserver/transaction/internal-api/src/main/java/com/sun/enterprise/transaction/startup/TransactionLifecycleService.java
index b4256b4..ce933eb 100644
--- a/appserver/transaction/internal-api/src/main/java/com/sun/enterprise/transaction/startup/TransactionLifecycleService.java
+++ b/appserver/transaction/internal-api/src/main/java/com/sun/enterprise/transaction/startup/TransactionLifecycleService.java
@@ -18,7 +18,7 @@
import java.util.logging.Logger;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
import javax.naming.Context;
import javax.naming.NamingException;
diff --git a/appserver/transaction/jta/src/main/java/com/sun/enterprise/transaction/JavaEETransactionManagerSimplified.java b/appserver/transaction/jta/src/main/java/com/sun/enterprise/transaction/JavaEETransactionManagerSimplified.java
index ee9ec26..468208a 100644
--- a/appserver/transaction/jta/src/main/java/com/sun/enterprise/transaction/JavaEETransactionManagerSimplified.java
+++ b/appserver/transaction/jta/src/main/java/com/sun/enterprise/transaction/JavaEETransactionManagerSimplified.java
@@ -42,7 +42,7 @@
import com.sun.logging.LogDomains;
import com.sun.enterprise.util.i18n.StringManager;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
import org.jvnet.hk2.annotations.Service;
import org.jvnet.hk2.annotations.ContractsProvided;
import org.glassfish.hk2.api.PostConstruct;
diff --git a/appserver/transaction/jta/src/main/java/com/sun/enterprise/transaction/TransactionInvocationHandler.java b/appserver/transaction/jta/src/main/java/com/sun/enterprise/transaction/TransactionInvocationHandler.java
index 6ece9ec..c643e95 100644
--- a/appserver/transaction/jta/src/main/java/com/sun/enterprise/transaction/TransactionInvocationHandler.java
+++ b/appserver/transaction/jta/src/main/java/com/sun/enterprise/transaction/TransactionInvocationHandler.java
@@ -27,7 +27,7 @@
import org.glassfish.api.invocation.InvocationException;
import org.jvnet.hk2.annotations.Service;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
import org.glassfish.hk2.api.ServiceLocator;
@Service
diff --git a/appserver/transaction/jta/src/main/java/com/sun/enterprise/transaction/TransactionManagerHelper.java b/appserver/transaction/jta/src/main/java/com/sun/enterprise/transaction/TransactionManagerHelper.java
index 50c8738..646e9e1 100644
--- a/appserver/transaction/jta/src/main/java/com/sun/enterprise/transaction/TransactionManagerHelper.java
+++ b/appserver/transaction/jta/src/main/java/com/sun/enterprise/transaction/TransactionManagerHelper.java
@@ -21,7 +21,7 @@
import javax.transaction.xa.XAResource;
import javax.transaction.xa.Xid;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
import org.jvnet.hk2.annotations.Service;
import org.jvnet.hk2.annotations.ContractsProvided;
import org.glassfish.api.invocation.InvocationManager;
diff --git a/appserver/transaction/jta/src/main/java/com/sun/enterprise/transaction/TransactionNamingProxy.java b/appserver/transaction/jta/src/main/java/com/sun/enterprise/transaction/TransactionNamingProxy.java
index 0cfb944..96d41f9 100644
--- a/appserver/transaction/jta/src/main/java/com/sun/enterprise/transaction/TransactionNamingProxy.java
+++ b/appserver/transaction/jta/src/main/java/com/sun/enterprise/transaction/TransactionNamingProxy.java
@@ -23,7 +23,7 @@
import com.sun.enterprise.transaction.spi.TransactionOperationsManager;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
import org.jvnet.hk2.annotations.Service;
import javax.naming.NamingException;
diff --git a/appserver/transaction/jta/src/main/java/com/sun/enterprise/transaction/TransactionServiceConfigListener.java b/appserver/transaction/jta/src/main/java/com/sun/enterprise/transaction/TransactionServiceConfigListener.java
index 58848c7..147c112 100644
--- a/appserver/transaction/jta/src/main/java/com/sun/enterprise/transaction/TransactionServiceConfigListener.java
+++ b/appserver/transaction/jta/src/main/java/com/sun/enterprise/transaction/TransactionServiceConfigListener.java
@@ -25,7 +25,7 @@
import com.sun.enterprise.util.i18n.StringManager;
import org.jvnet.hk2.annotations.Service;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
import org.jvnet.hk2.config.ConfigListener;
import org.jvnet.hk2.config.UnprocessedChangeEvent;
diff --git a/appserver/transaction/jta/src/main/java/com/sun/enterprise/transaction/TransactionSynchronizationRegistryImpl.java b/appserver/transaction/jta/src/main/java/com/sun/enterprise/transaction/TransactionSynchronizationRegistryImpl.java
index 60699bc..80af8d8 100644
--- a/appserver/transaction/jta/src/main/java/com/sun/enterprise/transaction/TransactionSynchronizationRegistryImpl.java
+++ b/appserver/transaction/jta/src/main/java/com/sun/enterprise/transaction/TransactionSynchronizationRegistryImpl.java
@@ -25,7 +25,7 @@
import com.sun.enterprise.util.i18n.StringManager;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
import org.jvnet.hk2.annotations.Service;
import org.jvnet.hk2.annotations.ContractsProvided;
diff --git a/appserver/transaction/jta/src/main/java/com/sun/enterprise/transaction/UserTransactionImpl.java b/appserver/transaction/jta/src/main/java/com/sun/enterprise/transaction/UserTransactionImpl.java
index fe5d59a..b49b813 100644
--- a/appserver/transaction/jta/src/main/java/com/sun/enterprise/transaction/UserTransactionImpl.java
+++ b/appserver/transaction/jta/src/main/java/com/sun/enterprise/transaction/UserTransactionImpl.java
@@ -33,7 +33,7 @@
import org.glassfish.api.invocation.ComponentInvocation;
import org.glassfish.internal.api.Globals;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
import org.jvnet.hk2.annotations.Service;
import org.jvnet.hk2.annotations.ContractsProvided;
diff --git a/appserver/transaction/jta/src/main/java/org/glassfish/jta/admin/cli/FreezeTransactionService.java b/appserver/transaction/jta/src/main/java/org/glassfish/jta/admin/cli/FreezeTransactionService.java
index f2b2ebd..5f022d1 100644
--- a/appserver/transaction/jta/src/main/java/org/glassfish/jta/admin/cli/FreezeTransactionService.java
+++ b/appserver/transaction/jta/src/main/java/org/glassfish/jta/admin/cli/FreezeTransactionService.java
@@ -28,7 +28,7 @@
import org.glassfish.api.Param;
import org.glassfish.config.support.CommandTarget;
import org.glassfish.config.support.TargetType;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
import org.jvnet.hk2.annotations.Service;
import org.glassfish.hk2.api.PerLookup;
diff --git a/appserver/transaction/jta/src/main/java/org/glassfish/jta/admin/cli/RollbackTransaction.java b/appserver/transaction/jta/src/main/java/org/glassfish/jta/admin/cli/RollbackTransaction.java
index 814bb76..bad3193 100644
--- a/appserver/transaction/jta/src/main/java/org/glassfish/jta/admin/cli/RollbackTransaction.java
+++ b/appserver/transaction/jta/src/main/java/org/glassfish/jta/admin/cli/RollbackTransaction.java
@@ -18,7 +18,7 @@
import org.jvnet.hk2.annotations.Service;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
import org.glassfish.hk2.api.PerLookup;
import org.glassfish.api.I18n;
import org.glassfish.api.Param;
diff --git a/appserver/transaction/jta/src/main/java/org/glassfish/jta/admin/cli/UnFreezeTransactionService.java b/appserver/transaction/jta/src/main/java/org/glassfish/jta/admin/cli/UnFreezeTransactionService.java
index 792a8ab..569b188 100644
--- a/appserver/transaction/jta/src/main/java/org/glassfish/jta/admin/cli/UnFreezeTransactionService.java
+++ b/appserver/transaction/jta/src/main/java/org/glassfish/jta/admin/cli/UnFreezeTransactionService.java
@@ -28,7 +28,7 @@
import org.glassfish.api.Param;
import org.glassfish.config.support.CommandTarget;
import org.glassfish.config.support.TargetType;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
import org.jvnet.hk2.annotations.Service;
import org.glassfish.hk2.api.PerLookup;
diff --git a/appserver/transaction/jts/src/main/java/com/sun/enterprise/transaction/jts/JavaEETransactionManagerJTSDelegate.java b/appserver/transaction/jts/src/main/java/com/sun/enterprise/transaction/jts/JavaEETransactionManagerJTSDelegate.java
index 9880858..bcd72fb 100644
--- a/appserver/transaction/jts/src/main/java/com/sun/enterprise/transaction/jts/JavaEETransactionManagerJTSDelegate.java
+++ b/appserver/transaction/jts/src/main/java/com/sun/enterprise/transaction/jts/JavaEETransactionManagerJTSDelegate.java
@@ -63,7 +63,7 @@
import org.jvnet.hk2.annotations.Service;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
import org.glassfish.hk2.api.PostConstruct;
import org.glassfish.hk2.api.ServiceLocator;
diff --git a/appserver/transaction/jts/src/main/java/com/sun/enterprise/transaction/jts/ResourceRecoveryManagerImpl.java b/appserver/transaction/jts/src/main/java/com/sun/enterprise/transaction/jts/ResourceRecoveryManagerImpl.java
index 608d25e..ac903fa 100644
--- a/appserver/transaction/jts/src/main/java/com/sun/enterprise/transaction/jts/ResourceRecoveryManagerImpl.java
+++ b/appserver/transaction/jts/src/main/java/com/sun/enterprise/transaction/jts/ResourceRecoveryManagerImpl.java
@@ -19,7 +19,7 @@
import java.util.*;
import java.util.logging.Level;
import java.util.logging.Logger;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
import javax.transaction.xa.XAResource;
import com.sun.enterprise.config.serverbeans.Config;
diff --git a/appserver/transaction/jts/src/main/java/com/sun/enterprise/transaction/jts/iiop/TransactionIIOPInterceptorFactory.java b/appserver/transaction/jts/src/main/java/com/sun/enterprise/transaction/jts/iiop/TransactionIIOPInterceptorFactory.java
index f04ae42..bdb9a83 100644
--- a/appserver/transaction/jts/src/main/java/com/sun/enterprise/transaction/jts/iiop/TransactionIIOPInterceptorFactory.java
+++ b/appserver/transaction/jts/src/main/java/com/sun/enterprise/transaction/jts/iiop/TransactionIIOPInterceptorFactory.java
@@ -29,7 +29,7 @@
import org.glassfish.api.admin.ProcessEnvironment;
import com.sun.logging.LogDomains;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
import org.jvnet.hk2.annotations.Service;
import org.glassfish.hk2.api.ServiceLocator;
diff --git a/appserver/transaction/jts/src/main/java/com/sun/enterprise/transaction/jts/iiop/TransactionInterceptorFactory.java b/appserver/transaction/jts/src/main/java/com/sun/enterprise/transaction/jts/iiop/TransactionInterceptorFactory.java
index 40477e9..0dddb83 100644
--- a/appserver/transaction/jts/src/main/java/com/sun/enterprise/transaction/jts/iiop/TransactionInterceptorFactory.java
+++ b/appserver/transaction/jts/src/main/java/com/sun/enterprise/transaction/jts/iiop/TransactionInterceptorFactory.java
@@ -20,7 +20,7 @@
import org.glassfish.enterprise.iiop.api.IIOPInterceptorFactory;
import org.glassfish.hk2.api.ServiceLocator;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
import org.jvnet.hk2.annotations.Service;
import org.omg.IOP.Codec;
diff --git a/appserver/transaction/jts/src/main/java/org/glassfish/jts/admin/cli/RecoverTransactions.java b/appserver/transaction/jts/src/main/java/org/glassfish/jts/admin/cli/RecoverTransactions.java
index fffcd95..d03d658 100644
--- a/appserver/transaction/jts/src/main/java/org/glassfish/jts/admin/cli/RecoverTransactions.java
+++ b/appserver/transaction/jts/src/main/java/org/glassfish/jts/admin/cli/RecoverTransactions.java
@@ -31,7 +31,7 @@
import org.jvnet.hk2.annotations.Service;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
import org.glassfish.hk2.api.PerLookup;
import java.util.logging.Level;
diff --git a/appserver/transaction/jts/src/main/java/org/glassfish/jts/admin/cli/RecoverTransactionsBase.java b/appserver/transaction/jts/src/main/java/org/glassfish/jts/admin/cli/RecoverTransactionsBase.java
index a82450b..83a7475 100644
--- a/appserver/transaction/jts/src/main/java/org/glassfish/jts/admin/cli/RecoverTransactionsBase.java
+++ b/appserver/transaction/jts/src/main/java/org/glassfish/jts/admin/cli/RecoverTransactionsBase.java
@@ -16,7 +16,7 @@
package org.glassfish.jts.admin.cli;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
import org.glassfish.api.Param;
import com.sun.enterprise.config.serverbeans.Server;
diff --git a/appserver/transaction/jts/src/main/java/org/glassfish/jts/admin/cli/RecoverTransactionsInternal.java b/appserver/transaction/jts/src/main/java/org/glassfish/jts/admin/cli/RecoverTransactionsInternal.java
index c18a256..3f2987d 100644
--- a/appserver/transaction/jts/src/main/java/org/glassfish/jts/admin/cli/RecoverTransactionsInternal.java
+++ b/appserver/transaction/jts/src/main/java/org/glassfish/jts/admin/cli/RecoverTransactionsInternal.java
@@ -26,7 +26,7 @@
import org.glassfish.config.support.TargetType;
import org.jvnet.hk2.annotations.Service;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
import org.glassfish.hk2.api.PerLookup;
import com.sun.enterprise.transaction.api.ResourceRecoveryManager;
diff --git a/appserver/verifier/verifier-impl/src/main/java/com/sun/enterprise/tools/verifier/DescriptorFactory.java b/appserver/verifier/verifier-impl/src/main/java/com/sun/enterprise/tools/verifier/DescriptorFactory.java
index 9a5fadd..f5c1cb4 100644
--- a/appserver/verifier/verifier-impl/src/main/java/com/sun/enterprise/tools/verifier/DescriptorFactory.java
+++ b/appserver/verifier/verifier-impl/src/main/java/com/sun/enterprise/tools/verifier/DescriptorFactory.java
@@ -39,7 +39,7 @@
import org.glassfish.api.ActionReport;
import org.jvnet.hk2.annotations.Service;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
import org.xml.sax.SAXException;
diff --git a/appserver/verifier/verifier-impl/src/main/java/com/sun/enterprise/tools/verifier/Verifier.java b/appserver/verifier/verifier-impl/src/main/java/com/sun/enterprise/tools/verifier/Verifier.java
index e4f9d91..1fa9ef4 100755
--- a/appserver/verifier/verifier-impl/src/main/java/com/sun/enterprise/tools/verifier/Verifier.java
+++ b/appserver/verifier/verifier-impl/src/main/java/com/sun/enterprise/tools/verifier/Verifier.java
@@ -37,7 +37,7 @@
import org.glassfish.internal.api.ClassLoaderHierarchy;
import org.glassfish.api.admin.ServerEnvironment;
import org.glassfish.internal.deployment.ExtendedDeploymentContext;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
import org.jvnet.hk2.annotations.Service;
import org.glassfish.hk2.api.PerLookup;
diff --git a/appserver/verifier/verifier-impl/src/main/java/com/sun/enterprise/tools/verifier/VerifierModuleStartup.java b/appserver/verifier/verifier-impl/src/main/java/com/sun/enterprise/tools/verifier/VerifierModuleStartup.java
index a52a5fc..e95d247 100644
--- a/appserver/verifier/verifier-impl/src/main/java/com/sun/enterprise/tools/verifier/VerifierModuleStartup.java
+++ b/appserver/verifier/verifier-impl/src/main/java/com/sun/enterprise/tools/verifier/VerifierModuleStartup.java
@@ -20,7 +20,7 @@
import com.sun.enterprise.module.bootstrap.ModuleStartup;
import com.sun.enterprise.module.bootstrap.StartupContext;
import org.glassfish.internal.api.Globals;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
import org.jvnet.hk2.annotations.Service;
/**
diff --git a/appserver/web/admin/src/main/java/org/glassfish/web/admin/cli/CreateHttp.java b/appserver/web/admin/src/main/java/org/glassfish/web/admin/cli/CreateHttp.java
index 50a6742..41278a8 100644
--- a/appserver/web/admin/src/main/java/org/glassfish/web/admin/cli/CreateHttp.java
+++ b/appserver/web/admin/src/main/java/org/glassfish/web/admin/cli/CreateHttp.java
@@ -31,8 +31,8 @@
import org.glassfish.config.support.CommandTarget;
import org.glassfish.config.support.TargetType;
import org.glassfish.web.admin.LogFacade;
-import javax.inject.Inject;
-import javax.inject.Named;
+import jakarta.inject.Inject;
+import jakarta.inject.Named;
import org.jvnet.hk2.annotations.Service;
import org.glassfish.hk2.api.ServiceLocator;
diff --git a/appserver/web/admin/src/main/java/org/glassfish/web/admin/cli/CreateHttpListener.java b/appserver/web/admin/src/main/java/org/glassfish/web/admin/cli/CreateHttpListener.java
index 55303d9..7673d8d 100644
--- a/appserver/web/admin/src/main/java/org/glassfish/web/admin/cli/CreateHttpListener.java
+++ b/appserver/web/admin/src/main/java/org/glassfish/web/admin/cli/CreateHttpListener.java
@@ -22,8 +22,8 @@
import java.util.ResourceBundle;
import java.util.logging.Level;
import java.util.logging.Logger;
-import javax.inject.Inject;
-import javax.inject.Named;
+import jakarta.inject.Inject;
+import jakarta.inject.Named;
import com.sun.enterprise.config.serverbeans.Config;
import com.sun.enterprise.config.serverbeans.Domain;
import com.sun.enterprise.config.serverbeans.HttpService;
diff --git a/appserver/web/admin/src/main/java/org/glassfish/web/admin/cli/CreateHttpRedirect.java b/appserver/web/admin/src/main/java/org/glassfish/web/admin/cli/CreateHttpRedirect.java
index d7f5a41..2cb3928 100644
--- a/appserver/web/admin/src/main/java/org/glassfish/web/admin/cli/CreateHttpRedirect.java
+++ b/appserver/web/admin/src/main/java/org/glassfish/web/admin/cli/CreateHttpRedirect.java
@@ -32,8 +32,8 @@
import org.glassfish.config.support.TargetType;
import org.glassfish.internal.api.Target;
import org.glassfish.web.admin.LogFacade;
-import javax.inject.Inject;
-import javax.inject.Named;
+import jakarta.inject.Inject;
+import jakarta.inject.Named;
import org.jvnet.hk2.annotations.Service;
import org.glassfish.hk2.api.ServiceLocator;
diff --git a/appserver/web/admin/src/main/java/org/glassfish/web/admin/cli/CreateNetworkListener.java b/appserver/web/admin/src/main/java/org/glassfish/web/admin/cli/CreateNetworkListener.java
index 875f7f5..5e35f04 100644
--- a/appserver/web/admin/src/main/java/org/glassfish/web/admin/cli/CreateNetworkListener.java
+++ b/appserver/web/admin/src/main/java/org/glassfish/web/admin/cli/CreateNetworkListener.java
@@ -44,8 +44,8 @@
import org.glassfish.config.support.TargetType;
import org.glassfish.internal.api.Target;
import org.glassfish.web.admin.LogFacade;
-import javax.inject.Inject;
-import javax.inject.Named;
+import jakarta.inject.Inject;
+import jakarta.inject.Named;
import org.jvnet.hk2.annotations.Service;
import org.glassfish.hk2.api.ServiceLocator;
diff --git a/appserver/web/admin/src/main/java/org/glassfish/web/admin/cli/CreateProtocol.java b/appserver/web/admin/src/main/java/org/glassfish/web/admin/cli/CreateProtocol.java
index c3f6ee3..b0fd99a 100644
--- a/appserver/web/admin/src/main/java/org/glassfish/web/admin/cli/CreateProtocol.java
+++ b/appserver/web/admin/src/main/java/org/glassfish/web/admin/cli/CreateProtocol.java
@@ -34,8 +34,8 @@
import org.glassfish.config.support.TargetType;
import org.glassfish.internal.api.Target;
import org.glassfish.web.admin.LogFacade;
-import javax.inject.Inject;
-import javax.inject.Named;
+import jakarta.inject.Inject;
+import jakarta.inject.Named;
import org.jvnet.hk2.annotations.Service;
import org.glassfish.hk2.api.ServiceLocator;
diff --git a/appserver/web/admin/src/main/java/org/glassfish/web/admin/cli/CreateProtocolFilter.java b/appserver/web/admin/src/main/java/org/glassfish/web/admin/cli/CreateProtocolFilter.java
index b26aa1d..8d7335d 100644
--- a/appserver/web/admin/src/main/java/org/glassfish/web/admin/cli/CreateProtocolFilter.java
+++ b/appserver/web/admin/src/main/java/org/glassfish/web/admin/cli/CreateProtocolFilter.java
@@ -37,8 +37,8 @@
import org.glassfish.config.support.CommandTarget;
import org.glassfish.config.support.TargetType;
import org.glassfish.web.admin.LogFacade;
-import javax.inject.Inject;
-import javax.inject.Named;
+import jakarta.inject.Inject;
+import jakarta.inject.Named;
import org.jvnet.hk2.annotations.Service;
import org.glassfish.hk2.api.ServiceLocator;
diff --git a/appserver/web/admin/src/main/java/org/glassfish/web/admin/cli/CreateProtocolFinder.java b/appserver/web/admin/src/main/java/org/glassfish/web/admin/cli/CreateProtocolFinder.java
index b1ddc6e..b8453ba 100644
--- a/appserver/web/admin/src/main/java/org/glassfish/web/admin/cli/CreateProtocolFinder.java
+++ b/appserver/web/admin/src/main/java/org/glassfish/web/admin/cli/CreateProtocolFinder.java
@@ -36,8 +36,8 @@
import org.glassfish.config.support.CommandTarget;
import org.glassfish.config.support.TargetType;
import org.glassfish.web.admin.LogFacade;
-import javax.inject.Inject;
-import javax.inject.Named;
+import jakarta.inject.Inject;
+import jakarta.inject.Named;
import org.jvnet.hk2.annotations.Service;
import org.glassfish.hk2.api.ServiceLocator;
diff --git a/appserver/web/admin/src/main/java/org/glassfish/web/admin/cli/CreateTransport.java b/appserver/web/admin/src/main/java/org/glassfish/web/admin/cli/CreateTransport.java
index 4e432d6..eb0e8bd 100644
--- a/appserver/web/admin/src/main/java/org/glassfish/web/admin/cli/CreateTransport.java
+++ b/appserver/web/admin/src/main/java/org/glassfish/web/admin/cli/CreateTransport.java
@@ -34,8 +34,8 @@
import org.glassfish.config.support.CommandTarget;
import org.glassfish.config.support.TargetType;
import org.glassfish.web.admin.LogFacade;
-import javax.inject.Inject;
-import javax.inject.Named;
+import jakarta.inject.Inject;
+import jakarta.inject.Named;
import org.jvnet.hk2.annotations.Service;
import org.glassfish.hk2.api.ServiceLocator;
diff --git a/appserver/web/admin/src/main/java/org/glassfish/web/admin/cli/CreateVirtualServer.java b/appserver/web/admin/src/main/java/org/glassfish/web/admin/cli/CreateVirtualServer.java
index e9d27ee..cd1aa6a 100644
--- a/appserver/web/admin/src/main/java/org/glassfish/web/admin/cli/CreateVirtualServer.java
+++ b/appserver/web/admin/src/main/java/org/glassfish/web/admin/cli/CreateVirtualServer.java
@@ -40,8 +40,8 @@
import org.glassfish.config.support.TargetType;
import org.glassfish.config.support.CommandTarget;
import org.glassfish.web.admin.LogFacade;
-import javax.inject.Inject;
-import javax.inject.Named;
+import jakarta.inject.Inject;
+import jakarta.inject.Named;
import org.jvnet.hk2.annotations.Service;
import org.glassfish.hk2.api.ServiceLocator;
diff --git a/appserver/web/admin/src/main/java/org/glassfish/web/admin/cli/DeleteHttp.java b/appserver/web/admin/src/main/java/org/glassfish/web/admin/cli/DeleteHttp.java
index ff2b9f1..049b617 100644
--- a/appserver/web/admin/src/main/java/org/glassfish/web/admin/cli/DeleteHttp.java
+++ b/appserver/web/admin/src/main/java/org/glassfish/web/admin/cli/DeleteHttp.java
@@ -35,8 +35,8 @@
import org.glassfish.config.support.CommandTarget;
import org.glassfish.config.support.TargetType;
import org.glassfish.web.admin.LogFacade;
-import javax.inject.Inject;
-import javax.inject.Named;
+import jakarta.inject.Inject;
+import jakarta.inject.Named;
import org.jvnet.hk2.annotations.Service;
import org.glassfish.hk2.api.ServiceLocator;
diff --git a/appserver/web/admin/src/main/java/org/glassfish/web/admin/cli/DeleteHttpListener.java b/appserver/web/admin/src/main/java/org/glassfish/web/admin/cli/DeleteHttpListener.java
index a2b019f..335742a 100644
--- a/appserver/web/admin/src/main/java/org/glassfish/web/admin/cli/DeleteHttpListener.java
+++ b/appserver/web/admin/src/main/java/org/glassfish/web/admin/cli/DeleteHttpListener.java
@@ -45,8 +45,8 @@
import org.glassfish.config.support.CommandTarget;
import org.glassfish.config.support.TargetType;
import org.glassfish.web.admin.LogFacade;
-import javax.inject.Inject;
-import javax.inject.Named;
+import jakarta.inject.Inject;
+import jakarta.inject.Named;
import org.jvnet.hk2.annotations.Service;
import org.glassfish.hk2.api.ServiceLocator;
diff --git a/appserver/web/admin/src/main/java/org/glassfish/web/admin/cli/DeleteHttpRedirect.java b/appserver/web/admin/src/main/java/org/glassfish/web/admin/cli/DeleteHttpRedirect.java
index 110eb89..555cdc3 100644
--- a/appserver/web/admin/src/main/java/org/glassfish/web/admin/cli/DeleteHttpRedirect.java
+++ b/appserver/web/admin/src/main/java/org/glassfish/web/admin/cli/DeleteHttpRedirect.java
@@ -32,8 +32,8 @@
import org.glassfish.config.support.TargetType;
import org.glassfish.internal.api.Target;
import org.glassfish.web.admin.LogFacade;
-import javax.inject.Inject;
-import javax.inject.Named;
+import jakarta.inject.Inject;
+import jakarta.inject.Named;
import org.jvnet.hk2.annotations.Service;
import org.glassfish.hk2.api.ServiceLocator;
import org.glassfish.hk2.api.PerLookup;
diff --git a/appserver/web/admin/src/main/java/org/glassfish/web/admin/cli/DeleteNetworkListener.java b/appserver/web/admin/src/main/java/org/glassfish/web/admin/cli/DeleteNetworkListener.java
index c240013..695b9cf 100644
--- a/appserver/web/admin/src/main/java/org/glassfish/web/admin/cli/DeleteNetworkListener.java
+++ b/appserver/web/admin/src/main/java/org/glassfish/web/admin/cli/DeleteNetworkListener.java
@@ -39,8 +39,8 @@
import org.glassfish.config.support.CommandTarget;
import org.glassfish.config.support.TargetType;
import org.glassfish.web.admin.LogFacade;
-import javax.inject.Inject;
-import javax.inject.Named;
+import jakarta.inject.Inject;
+import jakarta.inject.Named;
import org.jvnet.hk2.annotations.Service;
import org.glassfish.hk2.api.ServiceLocator;
diff --git a/appserver/web/admin/src/main/java/org/glassfish/web/admin/cli/DeleteProtocol.java b/appserver/web/admin/src/main/java/org/glassfish/web/admin/cli/DeleteProtocol.java
index d601209..6b6576b 100644
--- a/appserver/web/admin/src/main/java/org/glassfish/web/admin/cli/DeleteProtocol.java
+++ b/appserver/web/admin/src/main/java/org/glassfish/web/admin/cli/DeleteProtocol.java
@@ -38,8 +38,8 @@
import org.glassfish.config.support.CommandTarget;
import org.glassfish.config.support.TargetType;
import org.glassfish.web.admin.LogFacade;
-import javax.inject.Inject;
-import javax.inject.Named;
+import jakarta.inject.Inject;
+import jakarta.inject.Named;
import org.jvnet.hk2.annotations.Service;
import org.glassfish.hk2.api.ServiceLocator;
diff --git a/appserver/web/admin/src/main/java/org/glassfish/web/admin/cli/DeleteProtocolFilter.java b/appserver/web/admin/src/main/java/org/glassfish/web/admin/cli/DeleteProtocolFilter.java
index d7b7923..b3a37aa 100644
--- a/appserver/web/admin/src/main/java/org/glassfish/web/admin/cli/DeleteProtocolFilter.java
+++ b/appserver/web/admin/src/main/java/org/glassfish/web/admin/cli/DeleteProtocolFilter.java
@@ -38,8 +38,8 @@
import org.glassfish.config.support.CommandTarget;
import org.glassfish.config.support.TargetType;
import org.glassfish.web.admin.LogFacade;
-import javax.inject.Inject;
-import javax.inject.Named;
+import jakarta.inject.Inject;
+import jakarta.inject.Named;
import org.jvnet.hk2.annotations.Service;
import org.glassfish.hk2.api.ServiceLocator;
diff --git a/appserver/web/admin/src/main/java/org/glassfish/web/admin/cli/DeleteProtocolFinder.java b/appserver/web/admin/src/main/java/org/glassfish/web/admin/cli/DeleteProtocolFinder.java
index 688b02c..a067a8a 100644
--- a/appserver/web/admin/src/main/java/org/glassfish/web/admin/cli/DeleteProtocolFinder.java
+++ b/appserver/web/admin/src/main/java/org/glassfish/web/admin/cli/DeleteProtocolFinder.java
@@ -36,8 +36,8 @@
import org.glassfish.config.support.CommandTarget;
import org.glassfish.config.support.TargetType;
import org.glassfish.web.admin.LogFacade;
-import javax.inject.Inject;
-import javax.inject.Named;
+import jakarta.inject.Inject;
+import jakarta.inject.Named;
import org.jvnet.hk2.annotations.Service;
import org.glassfish.hk2.api.ServiceLocator;
diff --git a/appserver/web/admin/src/main/java/org/glassfish/web/admin/cli/DeleteTransport.java b/appserver/web/admin/src/main/java/org/glassfish/web/admin/cli/DeleteTransport.java
index 139a05f..dc5003e 100644
--- a/appserver/web/admin/src/main/java/org/glassfish/web/admin/cli/DeleteTransport.java
+++ b/appserver/web/admin/src/main/java/org/glassfish/web/admin/cli/DeleteTransport.java
@@ -38,8 +38,8 @@
import org.glassfish.config.support.CommandTarget;
import org.glassfish.config.support.TargetType;
import org.glassfish.web.admin.LogFacade;
-import javax.inject.Inject;
-import javax.inject.Named;
+import jakarta.inject.Inject;
+import jakarta.inject.Named;
import org.jvnet.hk2.annotations.Service;
import org.glassfish.hk2.api.ServiceLocator;
diff --git a/appserver/web/admin/src/main/java/org/glassfish/web/admin/cli/DeleteVirtualServer.java b/appserver/web/admin/src/main/java/org/glassfish/web/admin/cli/DeleteVirtualServer.java
index 7cbc214..dab94b8 100644
--- a/appserver/web/admin/src/main/java/org/glassfish/web/admin/cli/DeleteVirtualServer.java
+++ b/appserver/web/admin/src/main/java/org/glassfish/web/admin/cli/DeleteVirtualServer.java
@@ -45,8 +45,8 @@
import org.glassfish.config.support.CommandTarget;
import org.glassfish.config.support.TargetType;
import org.glassfish.web.admin.LogFacade;
-import javax.inject.Inject;
-import javax.inject.Named;
+import jakarta.inject.Inject;
+import jakarta.inject.Named;
import org.jvnet.hk2.annotations.Service;
import org.glassfish.hk2.api.ServiceLocator;
diff --git a/appserver/web/admin/src/main/java/org/glassfish/web/admin/cli/ListHttpListeners.java b/appserver/web/admin/src/main/java/org/glassfish/web/admin/cli/ListHttpListeners.java
index 2d636a8..e84d73f 100644
--- a/appserver/web/admin/src/main/java/org/glassfish/web/admin/cli/ListHttpListeners.java
+++ b/appserver/web/admin/src/main/java/org/glassfish/web/admin/cli/ListHttpListeners.java
@@ -30,8 +30,8 @@
import org.glassfish.config.support.CommandTarget;
import org.glassfish.config.support.TargetType;
import org.glassfish.internal.api.Target;
-import javax.inject.Inject;
-import javax.inject.Named;
+import jakarta.inject.Inject;
+import jakarta.inject.Named;
import org.jvnet.hk2.annotations.Service;
import org.glassfish.hk2.api.ServiceLocator;
diff --git a/appserver/web/admin/src/main/java/org/glassfish/web/admin/cli/ListNetworkListeners.java b/appserver/web/admin/src/main/java/org/glassfish/web/admin/cli/ListNetworkListeners.java
index cae1b30..74eb866 100644
--- a/appserver/web/admin/src/main/java/org/glassfish/web/admin/cli/ListNetworkListeners.java
+++ b/appserver/web/admin/src/main/java/org/glassfish/web/admin/cli/ListNetworkListeners.java
@@ -30,8 +30,8 @@
import org.glassfish.config.support.CommandTarget;
import org.glassfish.config.support.TargetType;
import org.glassfish.internal.api.Target;
-import javax.inject.Inject;
-import javax.inject.Named;
+import jakarta.inject.Inject;
+import jakarta.inject.Named;
import org.jvnet.hk2.annotations.Service;
import org.glassfish.hk2.api.ServiceLocator;
diff --git a/appserver/web/admin/src/main/java/org/glassfish/web/admin/cli/ListProtocolFilters.java b/appserver/web/admin/src/main/java/org/glassfish/web/admin/cli/ListProtocolFilters.java
index 0985b6f..fa50a73 100644
--- a/appserver/web/admin/src/main/java/org/glassfish/web/admin/cli/ListProtocolFilters.java
+++ b/appserver/web/admin/src/main/java/org/glassfish/web/admin/cli/ListProtocolFilters.java
@@ -30,8 +30,8 @@
import org.glassfish.api.admin.*;
import org.glassfish.config.support.CommandTarget;
import org.glassfish.config.support.TargetType;
-import javax.inject.Inject;
-import javax.inject.Named;
+import jakarta.inject.Inject;
+import jakarta.inject.Named;
import org.jvnet.hk2.annotations.Service;
import org.glassfish.hk2.api.ServiceLocator;
diff --git a/appserver/web/admin/src/main/java/org/glassfish/web/admin/cli/ListProtocolFinders.java b/appserver/web/admin/src/main/java/org/glassfish/web/admin/cli/ListProtocolFinders.java
index 0753d5f..a14c45b 100644
--- a/appserver/web/admin/src/main/java/org/glassfish/web/admin/cli/ListProtocolFinders.java
+++ b/appserver/web/admin/src/main/java/org/glassfish/web/admin/cli/ListProtocolFinders.java
@@ -30,8 +30,8 @@
import org.glassfish.api.admin.*;
import org.glassfish.config.support.CommandTarget;
import org.glassfish.config.support.TargetType;
-import javax.inject.Inject;
-import javax.inject.Named;
+import jakarta.inject.Inject;
+import jakarta.inject.Named;
import org.jvnet.hk2.annotations.Service;
import org.glassfish.hk2.api.ServiceLocator;
diff --git a/appserver/web/admin/src/main/java/org/glassfish/web/admin/cli/ListProtocols.java b/appserver/web/admin/src/main/java/org/glassfish/web/admin/cli/ListProtocols.java
index 7abf697..0c512fb 100644
--- a/appserver/web/admin/src/main/java/org/glassfish/web/admin/cli/ListProtocols.java
+++ b/appserver/web/admin/src/main/java/org/glassfish/web/admin/cli/ListProtocols.java
@@ -30,8 +30,8 @@
import org.glassfish.config.support.CommandTarget;
import org.glassfish.config.support.TargetType;
import org.glassfish.internal.api.Target;
-import javax.inject.Inject;
-import javax.inject.Named;
+import jakarta.inject.Inject;
+import jakarta.inject.Named;
import org.jvnet.hk2.annotations.Service;
import org.glassfish.hk2.api.ServiceLocator;
diff --git a/appserver/web/admin/src/main/java/org/glassfish/web/admin/cli/ListTransports.java b/appserver/web/admin/src/main/java/org/glassfish/web/admin/cli/ListTransports.java
index 80c7337..0f77ca1 100644
--- a/appserver/web/admin/src/main/java/org/glassfish/web/admin/cli/ListTransports.java
+++ b/appserver/web/admin/src/main/java/org/glassfish/web/admin/cli/ListTransports.java
@@ -29,8 +29,8 @@
import org.glassfish.api.admin.*;
import org.glassfish.config.support.CommandTarget;
import org.glassfish.config.support.TargetType;
-import javax.inject.Inject;
-import javax.inject.Named;
+import jakarta.inject.Inject;
+import jakarta.inject.Named;
import org.jvnet.hk2.annotations.Service;
import org.glassfish.hk2.api.ServiceLocator;
diff --git a/appserver/web/admin/src/main/java/org/glassfish/web/admin/cli/ListVirtualServers.java b/appserver/web/admin/src/main/java/org/glassfish/web/admin/cli/ListVirtualServers.java
index a093558..6c73790 100644
--- a/appserver/web/admin/src/main/java/org/glassfish/web/admin/cli/ListVirtualServers.java
+++ b/appserver/web/admin/src/main/java/org/glassfish/web/admin/cli/ListVirtualServers.java
@@ -31,8 +31,8 @@
import org.glassfish.config.support.CommandTarget;
import org.glassfish.config.support.TargetType;
import org.glassfish.internal.api.Target;
-import javax.inject.Inject;
-import javax.inject.Named;
+import jakarta.inject.Inject;
+import jakarta.inject.Named;
import org.jvnet.hk2.annotations.Service;
import org.glassfish.hk2.api.ServiceLocator;
diff --git a/appserver/web/admin/src/main/java/org/glassfish/web/admin/monitor/HttpServiceStatsProviderBootstrap.java b/appserver/web/admin/src/main/java/org/glassfish/web/admin/monitor/HttpServiceStatsProviderBootstrap.java
index 5b7722c..a117fb8 100644
--- a/appserver/web/admin/src/main/java/org/glassfish/web/admin/monitor/HttpServiceStatsProviderBootstrap.java
+++ b/appserver/web/admin/src/main/java/org/glassfish/web/admin/monitor/HttpServiceStatsProviderBootstrap.java
@@ -30,12 +30,12 @@
import org.glassfish.external.probe.provider.PluginPoint;
import org.glassfish.external.probe.provider.StatsProviderManager;
import org.glassfish.web.admin.LogFacade;
-import javax.inject.Inject;
-import javax.inject.Named;
+import jakarta.inject.Inject;
+import jakarta.inject.Named;
import org.jvnet.hk2.annotations.Service;
import org.glassfish.hk2.api.PostConstruct;
-import javax.inject.Singleton;
+import jakarta.inject.Singleton;
import org.jvnet.hk2.config.ConfigurationException;
/**
diff --git a/appserver/web/admin/src/main/java/org/glassfish/web/admin/monitor/WebStatsProviderBootstrap.java b/appserver/web/admin/src/main/java/org/glassfish/web/admin/monitor/WebStatsProviderBootstrap.java
index 8b1eec0..42c5fd1 100644
--- a/appserver/web/admin/src/main/java/org/glassfish/web/admin/monitor/WebStatsProviderBootstrap.java
+++ b/appserver/web/admin/src/main/java/org/glassfish/web/admin/monitor/WebStatsProviderBootstrap.java
@@ -29,11 +29,11 @@
import java.util.concurrent.atomic.AtomicBoolean;
import org.glassfish.external.probe.provider.PluginPoint;
import org.glassfish.external.probe.provider.StatsProviderManager;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
import org.jvnet.hk2.annotations.Service;
import org.glassfish.hk2.api.PostConstruct;
-import javax.inject.Singleton;
+import jakarta.inject.Singleton;
/**
*
diff --git a/appserver/web/admin/src/main/java/org/glassfish/web/admin/monitor/statistics/AltServletStatsImpl.java b/appserver/web/admin/src/main/java/org/glassfish/web/admin/monitor/statistics/AltServletStatsImpl.java
index 163efab..3becf68 100644
--- a/appserver/web/admin/src/main/java/org/glassfish/web/admin/monitor/statistics/AltServletStatsImpl.java
+++ b/appserver/web/admin/src/main/java/org/glassfish/web/admin/monitor/statistics/AltServletStatsImpl.java
@@ -19,7 +19,7 @@
import org.jvnet.hk2.annotations.Service;
import org.glassfish.hk2.api.PerLookup;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
import org.glassfish.api.ActionReport;
import org.glassfish.api.ActionReport.ExitCode;
import org.glassfish.external.statistics.CountStatistic;
diff --git a/appserver/web/admin/src/main/java/org/glassfish/web/admin/monitor/statistics/HTTPListenerStatsImpl.java b/appserver/web/admin/src/main/java/org/glassfish/web/admin/monitor/statistics/HTTPListenerStatsImpl.java
index 759d503..c7f6e85 100644
--- a/appserver/web/admin/src/main/java/org/glassfish/web/admin/monitor/statistics/HTTPListenerStatsImpl.java
+++ b/appserver/web/admin/src/main/java/org/glassfish/web/admin/monitor/statistics/HTTPListenerStatsImpl.java
@@ -19,7 +19,7 @@
import org.jvnet.hk2.annotations.Service;
import org.glassfish.hk2.api.PerLookup;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
import org.glassfish.api.ActionReport;
import org.glassfish.api.ActionReport.ExitCode;
import org.glassfish.external.statistics.CountStatistic;
diff --git a/appserver/web/admin/src/main/java/org/glassfish/web/admin/monitor/statistics/WebModuleVirtualServerStatsImpl.java b/appserver/web/admin/src/main/java/org/glassfish/web/admin/monitor/statistics/WebModuleVirtualServerStatsImpl.java
index 58d9473..5baeecb 100644
--- a/appserver/web/admin/src/main/java/org/glassfish/web/admin/monitor/statistics/WebModuleVirtualServerStatsImpl.java
+++ b/appserver/web/admin/src/main/java/org/glassfish/web/admin/monitor/statistics/WebModuleVirtualServerStatsImpl.java
@@ -19,7 +19,7 @@
import org.jvnet.hk2.annotations.Service;
import org.glassfish.hk2.api.PerLookup;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
import org.glassfish.api.ActionReport;
import org.glassfish.api.ActionReport.ExitCode;
import org.glassfish.external.statistics.CountStatistic;
diff --git a/appserver/web/gf-web-connector/src/main/java/org/glassfish/web/WarType.java b/appserver/web/gf-web-connector/src/main/java/org/glassfish/web/WarType.java
index 375e3f4..1da0bb4 100644
--- a/appserver/web/gf-web-connector/src/main/java/org/glassfish/web/WarType.java
+++ b/appserver/web/gf-web-connector/src/main/java/org/glassfish/web/WarType.java
@@ -26,7 +26,7 @@
* @author sanjeeb.sahoo@oracle.com
*/
@Service(name = WarType.ARCHIVE_TYPE)
-@javax.inject.Singleton
+@jakarta.inject.Singleton
public class WarType extends ArchiveType {
/**
* same as what's returned by {@link javax.enterprise.deploy.shared.ModuleType#WAR#toString()}
diff --git a/appserver/web/gf-web-connector/src/main/java/org/glassfish/web/sniffer/WarDetector.java b/appserver/web/gf-web-connector/src/main/java/org/glassfish/web/sniffer/WarDetector.java
index e73b5cb..95fce83 100644
--- a/appserver/web/gf-web-connector/src/main/java/org/glassfish/web/sniffer/WarDetector.java
+++ b/appserver/web/gf-web-connector/src/main/java/org/glassfish/web/sniffer/WarDetector.java
@@ -23,11 +23,11 @@
import org.glassfish.deployment.common.DeploymentUtils;
import com.sun.enterprise.deployment.deploy.shared.Util;
import org.glassfish.web.WarType;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
import org.jvnet.hk2.annotations.Service;
import org.glassfish.hk2.api.ServiceLocator;
-import javax.inject.Singleton;
+import jakarta.inject.Singleton;
import java.io.IOException;
import java.util.logging.Logger;
diff --git a/appserver/web/gf-web-connector/src/main/java/org/glassfish/web/sniffer/WebSniffer.java b/appserver/web/gf-web-connector/src/main/java/org/glassfish/web/sniffer/WebSniffer.java
index 3dd469c..7515d05 100644
--- a/appserver/web/gf-web-connector/src/main/java/org/glassfish/web/sniffer/WebSniffer.java
+++ b/appserver/web/gf-web-connector/src/main/java/org/glassfish/web/sniffer/WebSniffer.java
@@ -23,10 +23,10 @@
import org.glassfish.hk2.api.ServiceLocator;
import org.glassfish.internal.deployment.GenericSniffer;
import org.glassfish.web.WarType;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
import org.jvnet.hk2.annotations.Service;
-import javax.inject.Singleton;
+import jakarta.inject.Singleton;
import java.util.ArrayList;
import java.util.List;
diff --git a/appserver/web/gf-weld-connector/src/main/java/org/glassfish/weld/connector/WeldCompositeSniffer.java b/appserver/web/gf-weld-connector/src/main/java/org/glassfish/weld/connector/WeldCompositeSniffer.java
index 52f9c1d..1380dc1 100644
--- a/appserver/web/gf-weld-connector/src/main/java/org/glassfish/weld/connector/WeldCompositeSniffer.java
+++ b/appserver/web/gf-weld-connector/src/main/java/org/glassfish/weld/connector/WeldCompositeSniffer.java
@@ -25,7 +25,7 @@
import org.glassfish.javaee.core.deployment.ApplicationHolder;
import org.jvnet.hk2.annotations.Service;
-import javax.inject.Singleton;
+import jakarta.inject.Singleton;
import javax.enterprise.deploy.shared.ModuleType;
diff --git a/appserver/web/gf-weld-connector/src/main/java/org/glassfish/weld/connector/WeldSniffer.java b/appserver/web/gf-weld-connector/src/main/java/org/glassfish/weld/connector/WeldSniffer.java
index 5394dbd..53c3e27 100644
--- a/appserver/web/gf-weld-connector/src/main/java/org/glassfish/weld/connector/WeldSniffer.java
+++ b/appserver/web/gf-weld-connector/src/main/java/org/glassfish/weld/connector/WeldSniffer.java
@@ -23,7 +23,7 @@
import org.jvnet.hk2.annotations.Service;
import javax.enterprise.deploy.shared.ModuleType;
-import javax.inject.Singleton;
+import jakarta.inject.Singleton;
import java.io.IOException;
import java.io.InputStream;
import java.util.Enumeration;
diff --git a/appserver/web/gf-weld-connector/src/main/java/org/glassfish/weld/connector/WeldUtils.java b/appserver/web/gf-weld-connector/src/main/java/org/glassfish/weld/connector/WeldUtils.java
index cc6d5d1..fee31f9 100644
--- a/appserver/web/gf-weld-connector/src/main/java/org/glassfish/weld/connector/WeldUtils.java
+++ b/appserver/web/gf-weld-connector/src/main/java/org/glassfish/weld/connector/WeldUtils.java
@@ -41,8 +41,8 @@
import jakarta.enterprise.context.RequestScoped;
import jakarta.enterprise.context.SessionScoped;
import jakarta.enterprise.inject.Stereotype;
-import javax.inject.Scope;
-import javax.inject.Singleton;
+import jakarta.inject.Scope;
+import jakarta.inject.Singleton;
import jakarta.interceptor.Interceptor;
import javax.xml.parsers.SAXParser;
import javax.xml.parsers.SAXParserFactory;
diff --git a/appserver/web/gui-plugin-common/src/main/java/org/glassfish/web/plugin/common/WebModuleConfigCommand.java b/appserver/web/gui-plugin-common/src/main/java/org/glassfish/web/plugin/common/WebModuleConfigCommand.java
index 2d723c8..97f3ce8 100644
--- a/appserver/web/gui-plugin-common/src/main/java/org/glassfish/web/plugin/common/WebModuleConfigCommand.java
+++ b/appserver/web/gui-plugin-common/src/main/java/org/glassfish/web/plugin/common/WebModuleConfigCommand.java
@@ -25,7 +25,7 @@
import org.glassfish.api.Param;
import org.glassfish.api.admin.AdminCommand;
import org.glassfish.web.config.serverbeans.WebModuleConfig;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
/**
* Superclass of all web module config-related commands.
diff --git a/appserver/web/jersey-mvc-connector/src/main/java/org/glassfish/main/web/jersey/server/mvc/jsp/integration/JerseyMvcTldProvider.java b/appserver/web/jersey-mvc-connector/src/main/java/org/glassfish/main/web/jersey/server/mvc/jsp/integration/JerseyMvcTldProvider.java
index b7cffc8..5601164 100644
--- a/appserver/web/jersey-mvc-connector/src/main/java/org/glassfish/main/web/jersey/server/mvc/jsp/integration/JerseyMvcTldProvider.java
+++ b/appserver/web/jersey-mvc-connector/src/main/java/org/glassfish/main/web/jersey/server/mvc/jsp/integration/JerseyMvcTldProvider.java
@@ -29,8 +29,8 @@
import java.util.logging.Logger;
import java.util.regex.Pattern;
-import javax.inject.Inject;
-import javax.inject.Singleton;
+import jakarta.inject.Inject;
+import jakarta.inject.Singleton;
import org.glassfish.hk2.api.PostConstruct;
diff --git a/appserver/web/jsf-connector/src/main/java/org/glassfish/faces/integration/GlassFishTldProvider.java b/appserver/web/jsf-connector/src/main/java/org/glassfish/faces/integration/GlassFishTldProvider.java
index 818c000..5fb96f1 100644
--- a/appserver/web/jsf-connector/src/main/java/org/glassfish/faces/integration/GlassFishTldProvider.java
+++ b/appserver/web/jsf-connector/src/main/java/org/glassfish/faces/integration/GlassFishTldProvider.java
@@ -31,8 +31,8 @@
import java.util.logging.Level;
import java.util.logging.Logger;
import java.util.regex.Pattern;
-import javax.inject.Inject;
-import javax.inject.Singleton;
+import jakarta.inject.Inject;
+import jakarta.inject.Singleton;
import org.glassfish.web.loader.LogFacade;
diff --git a/appserver/web/jspcaching-connector/src/main/java/org/glassfish/jspcaching/integration/GlassFishTldProvider.java b/appserver/web/jspcaching-connector/src/main/java/org/glassfish/jspcaching/integration/GlassFishTldProvider.java
index 95f436f..5c16788 100644
--- a/appserver/web/jspcaching-connector/src/main/java/org/glassfish/jspcaching/integration/GlassFishTldProvider.java
+++ b/appserver/web/jspcaching-connector/src/main/java/org/glassfish/jspcaching/integration/GlassFishTldProvider.java
@@ -26,8 +26,8 @@
import com.sun.enterprise.util.net.JarURIPattern;
import com.sun.enterprise.module.HK2Module;
import com.sun.enterprise.module.ModulesRegistry;
-import javax.inject.Inject;
-import javax.inject.Singleton;
+import jakarta.inject.Inject;
+import jakarta.inject.Singleton;
import org.glassfish.api.admin.ServerEnvironment;
import org.glassfish.api.web.TldProvider;
import org.glassfish.hk2.api.PostConstruct;
diff --git a/appserver/web/jstl-connector/src/main/java/org/glassfish/jstl/integration/GlassFishTldProvider.java b/appserver/web/jstl-connector/src/main/java/org/glassfish/jstl/integration/GlassFishTldProvider.java
index e69e804..9655c5e 100644
--- a/appserver/web/jstl-connector/src/main/java/org/glassfish/jstl/integration/GlassFishTldProvider.java
+++ b/appserver/web/jstl-connector/src/main/java/org/glassfish/jstl/integration/GlassFishTldProvider.java
@@ -28,8 +28,8 @@
import java.util.logging.Level;
import java.util.logging.Logger;
import java.util.regex.Pattern;
-import javax.inject.Inject;
-import javax.inject.Singleton;
+import jakarta.inject.Inject;
+import jakarta.inject.Singleton;
import com.sun.enterprise.module.HK2Module;
import com.sun.enterprise.module.ModulesRegistry;
import com.sun.enterprise.util.net.JarURIPattern;
diff --git a/appserver/web/war-util/src/main/java/com/sun/enterprise/glassfish/web/WarHandler.java b/appserver/web/war-util/src/main/java/com/sun/enterprise/glassfish/web/WarHandler.java
index 12081d8..731122f 100644
--- a/appserver/web/war-util/src/main/java/com/sun/enterprise/glassfish/web/WarHandler.java
+++ b/appserver/web/war-util/src/main/java/com/sun/enterprise/glassfish/web/WarHandler.java
@@ -35,8 +35,8 @@
import org.glassfish.web.loader.WebappClassLoader;
import org.glassfish.web.sniffer.WarDetector;
import org.glassfish.loader.util.ASClassLoaderUtil;
-import javax.inject.Inject;
-import javax.inject.Named;
+import jakarta.inject.Inject;
+import jakarta.inject.Named;
import org.jvnet.hk2.config.types.Property;
import org.jvnet.hk2.annotations.Service;
diff --git a/appserver/web/web-core/src/main/java/org/apache/catalina/startup/DigesterFactory.java b/appserver/web/web-core/src/main/java/org/apache/catalina/startup/DigesterFactory.java
index 2236f94..438f603 100644
--- a/appserver/web/web-core/src/main/java/org/apache/catalina/startup/DigesterFactory.java
+++ b/appserver/web/web-core/src/main/java/org/apache/catalina/startup/DigesterFactory.java
@@ -21,8 +21,8 @@
import org.apache.catalina.LogFacade;
import org.apache.tomcat.util.digester.Digester;
import org.apache.tomcat.util.digester.RuleSet;
-import javax.inject.Inject;
-import javax.inject.Named;
+import jakarta.inject.Inject;
+import jakarta.inject.Named;
import org.jvnet.hk2.annotations.Optional;
import org.jvnet.hk2.annotations.Service;
import org.xml.sax.EntityResolver;
diff --git a/appserver/web/web-glue/src/main/java/com/sun/enterprise/web/EmbeddedWebContainer.java b/appserver/web/web-glue/src/main/java/com/sun/enterprise/web/EmbeddedWebContainer.java
index 9d8685f..216fe80 100644
--- a/appserver/web/web-glue/src/main/java/com/sun/enterprise/web/EmbeddedWebContainer.java
+++ b/appserver/web/web-glue/src/main/java/com/sun/enterprise/web/EmbeddedWebContainer.java
@@ -23,8 +23,8 @@
import java.text.MessageFormat;
import java.util.logging.Level;
import java.util.logging.Logger;
-import javax.inject.Inject;
-import javax.inject.Singleton;
+import jakarta.inject.Inject;
+import jakarta.inject.Singleton;
import com.sun.web.server.WebContainerListener;
import org.apache.catalina.*;
import org.apache.catalina.core.StandardEngine;
diff --git a/appserver/web/web-glue/src/main/java/com/sun/enterprise/web/ServerConfigLookup.java b/appserver/web/web-glue/src/main/java/com/sun/enterprise/web/ServerConfigLookup.java
index 3e0ede5..957297d 100644
--- a/appserver/web/web-glue/src/main/java/com/sun/enterprise/web/ServerConfigLookup.java
+++ b/appserver/web/web-glue/src/main/java/com/sun/enterprise/web/ServerConfigLookup.java
@@ -25,8 +25,8 @@
import org.glassfish.web.LogFacade;
import org.glassfish.web.config.serverbeans.*;
import org.glassfish.web.config.serverbeans.WebContainer;
-import javax.inject.Inject;
-import javax.inject.Named;
+import jakarta.inject.Inject;
+import jakarta.inject.Named;
import org.jvnet.hk2.annotations.Service;
import org.glassfish.hk2.api.PerLookup;
diff --git a/appserver/web/web-glue/src/main/java/com/sun/enterprise/web/WebContainer.java b/appserver/web/web-glue/src/main/java/com/sun/enterprise/web/WebContainer.java
index c130c6c..04e9d63 100644
--- a/appserver/web/web-glue/src/main/java/com/sun/enterprise/web/WebContainer.java
+++ b/appserver/web/web-glue/src/main/java/com/sun/enterprise/web/WebContainer.java
@@ -36,9 +36,9 @@
import java.util.ResourceBundle;
import javax.imageio.ImageIO;
-import javax.inject.Inject;
-import javax.inject.Named;
-import javax.inject.Singleton;
+import jakarta.inject.Inject;
+import jakarta.inject.Named;
+import jakarta.inject.Singleton;
import jakarta.servlet.Filter;
import jakarta.servlet.Servlet;
import jakarta.servlet.http.HttpUpgradeHandler;
diff --git a/appserver/web/web-glue/src/main/java/com/sun/enterprise/web/WebDeployer.java b/appserver/web/web-glue/src/main/java/com/sun/enterprise/web/WebDeployer.java
index b1e3958..8b86b0f 100644
--- a/appserver/web/web-glue/src/main/java/com/sun/enterprise/web/WebDeployer.java
+++ b/appserver/web/web-glue/src/main/java/com/sun/enterprise/web/WebDeployer.java
@@ -32,7 +32,7 @@
import org.glassfish.web.LogFacade;
import org.glassfish.web.jsp.JSPCompiler;
import org.glassfish.web.deployment.descriptor.WebBundleDescriptorImpl;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
import org.jvnet.hk2.annotations.Service;
import java.io.File;
diff --git a/appserver/web/web-glue/src/main/java/com/sun/enterprise/web/logger/FileLoggerHandlerFactory.java b/appserver/web/web-glue/src/main/java/com/sun/enterprise/web/logger/FileLoggerHandlerFactory.java
index c20fa5f..dfb4cd8 100644
--- a/appserver/web/web-glue/src/main/java/com/sun/enterprise/web/logger/FileLoggerHandlerFactory.java
+++ b/appserver/web/web-glue/src/main/java/com/sun/enterprise/web/logger/FileLoggerHandlerFactory.java
@@ -20,7 +20,7 @@
import java.util.concurrent.ConcurrentMap;
import java.util.logging.Formatter;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
import org.jvnet.hk2.annotations.Optional;
import org.jvnet.hk2.annotations.Service;
import org.glassfish.hk2.api.PostConstruct;
diff --git a/appserver/web/web-glue/src/main/java/com/sun/enterprise/web/reconfig/WebConfigListener.java b/appserver/web/web-glue/src/main/java/com/sun/enterprise/web/reconfig/WebConfigListener.java
index 4f0e7d8..b9b0616 100644
--- a/appserver/web/web-glue/src/main/java/com/sun/enterprise/web/reconfig/WebConfigListener.java
+++ b/appserver/web/web-glue/src/main/java/com/sun/enterprise/web/reconfig/WebConfigListener.java
@@ -29,9 +29,9 @@
import org.glassfish.web.config.serverbeans.ManagerProperties;
import org.glassfish.web.config.serverbeans.WebContainerAvailability;
import org.apache.catalina.LifecycleException;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
import org.jvnet.hk2.annotations.Optional;
-import javax.inject.Named;
+import jakarta.inject.Named;
import org.jvnet.hk2.config.*;
import org.jvnet.hk2.config.types.Property;
diff --git a/appserver/web/web-glue/src/main/java/org/glassfish/web/LibrariesTldProvider.java b/appserver/web/web-glue/src/main/java/org/glassfish/web/LibrariesTldProvider.java
index 9b741ad..5ba512a 100644
--- a/appserver/web/web-glue/src/main/java/org/glassfish/web/LibrariesTldProvider.java
+++ b/appserver/web/web-glue/src/main/java/org/glassfish/web/LibrariesTldProvider.java
@@ -19,11 +19,11 @@
import com.sun.enterprise.util.net.JarURIPattern;
import org.glassfish.api.admin.ServerEnvironment;
import org.glassfish.api.web.TldProvider;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
import org.jvnet.hk2.annotations.Service;
import org.glassfish.hk2.api.PostConstruct;
-import javax.inject.Singleton;
+import jakarta.inject.Singleton;
import java.io.File;
import java.io.FileFilter;
diff --git a/appserver/web/web-glue/src/main/java/org/glassfish/web/WebEntityResolver.java b/appserver/web/web-glue/src/main/java/org/glassfish/web/WebEntityResolver.java
index d6e9ed4..c9a4674 100644
--- a/appserver/web/web-glue/src/main/java/org/glassfish/web/WebEntityResolver.java
+++ b/appserver/web/web-glue/src/main/java/org/glassfish/web/WebEntityResolver.java
@@ -20,7 +20,7 @@
import org.apache.catalina.startup.Constants;
import org.glassfish.internal.api.ServerContext;
import org.jvnet.hk2.annotations.ContractsProvided;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
import org.jvnet.hk2.annotations.Service;
import org.glassfish.hk2.api.PostConstruct;
import org.xml.sax.EntityResolver;
diff --git a/appserver/web/web-glue/src/main/java/org/glassfish/web/deployment/annotation/impl/WarScanner.java b/appserver/web/web-glue/src/main/java/org/glassfish/web/deployment/annotation/impl/WarScanner.java
index 3dd8b68..5715145 100644
--- a/appserver/web/web-glue/src/main/java/org/glassfish/web/deployment/annotation/impl/WarScanner.java
+++ b/appserver/web/web-glue/src/main/java/org/glassfish/web/deployment/annotation/impl/WarScanner.java
@@ -28,7 +28,7 @@
import org.glassfish.hk2.classmodel.reflect.ParsingContext;
import org.glassfish.internal.api.ClassLoaderHierarchy;
import org.glassfish.web.deployment.descriptor.*;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
import org.jvnet.hk2.annotations.Service;
import java.io.File;
diff --git a/appserver/web/web-glue/src/main/java/org/glassfish/web/deployment/archivist/WebArchivist.java b/appserver/web/web-glue/src/main/java/org/glassfish/web/deployment/archivist/WebArchivist.java
index 2843444..5b07706 100644
--- a/appserver/web/web-glue/src/main/java/org/glassfish/web/deployment/archivist/WebArchivist.java
+++ b/appserver/web/web-glue/src/main/java/org/glassfish/web/deployment/archivist/WebArchivist.java
@@ -40,7 +40,7 @@
import org.glassfish.web.deployment.io.WebDeploymentDescriptorFile;
import org.glassfish.web.deployment.util.*;
import org.jvnet.hk2.annotations.Service;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
import org.xml.sax.SAXException;
diff --git a/appserver/web/web-glue/src/main/java/org/glassfish/web/embed/impl/EmbeddedWebEntityResolver.java b/appserver/web/web-glue/src/main/java/org/glassfish/web/embed/impl/EmbeddedWebEntityResolver.java
index cb7e0d2..63ed60a 100644
--- a/appserver/web/web-glue/src/main/java/org/glassfish/web/embed/impl/EmbeddedWebEntityResolver.java
+++ b/appserver/web/web-glue/src/main/java/org/glassfish/web/embed/impl/EmbeddedWebEntityResolver.java
@@ -18,7 +18,7 @@
import org.apache.catalina.startup.Constants;
import org.glassfish.internal.api.ServerContext;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
import org.glassfish.hk2.api.PostConstruct;
import org.xml.sax.EntityResolver;
import org.xml.sax.InputSource;
diff --git a/appserver/web/web-glue/src/main/java/org/glassfish/web/embed/impl/WebContainerImpl.java b/appserver/web/web-glue/src/main/java/org/glassfish/web/embed/impl/WebContainerImpl.java
index f63a8b3..7820bd8 100644
--- a/appserver/web/web-glue/src/main/java/org/glassfish/web/embed/impl/WebContainerImpl.java
+++ b/appserver/web/web-glue/src/main/java/org/glassfish/web/embed/impl/WebContainerImpl.java
@@ -61,8 +61,8 @@
import org.glassfish.internal.api.ServerContext;
import org.jvnet.hk2.annotations.ContractsProvided;
import org.jvnet.hk2.annotations.Service;
-import javax.inject.Inject;
-import javax.inject.Named;
+import jakarta.inject.Inject;
+import jakarta.inject.Named;
import org.jvnet.hk2.config.*;
import org.jvnet.hk2.config.types.Property;
diff --git a/appserver/web/web-glue/src/main/java/org/glassfish/web/upgrade/WebConfigurationUpgrade.java b/appserver/web/web-glue/src/main/java/org/glassfish/web/upgrade/WebConfigurationUpgrade.java
index 637c6cb..80807b7 100644
--- a/appserver/web/web-glue/src/main/java/org/glassfish/web/upgrade/WebConfigurationUpgrade.java
+++ b/appserver/web/web-glue/src/main/java/org/glassfish/web/upgrade/WebConfigurationUpgrade.java
@@ -25,7 +25,7 @@
import org.glassfish.api.admin.config.ConfigurationUpgrade;
import org.glassfish.hk2.api.PostConstruct;
import org.glassfish.web.LogFacade;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
import org.jvnet.hk2.annotations.Service;
diff --git a/appserver/web/web-ha/src/main/java/org/glassfish/web/ha/HACNonceCacheImpl.java b/appserver/web/web-ha/src/main/java/org/glassfish/web/ha/HACNonceCacheImpl.java
index 6eaca00..7982d03 100644
--- a/appserver/web/web-ha/src/main/java/org/glassfish/web/ha/HACNonceCacheImpl.java
+++ b/appserver/web/web-ha/src/main/java/org/glassfish/web/ha/HACNonceCacheImpl.java
@@ -28,7 +28,7 @@
import org.glassfish.ha.store.api.BackingStoreConfiguration;
import org.glassfish.ha.store.api.BackingStoreException;
import org.glassfish.ha.store.api.BackingStoreFactory;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
import org.jvnet.hk2.annotations.Service;
import org.glassfish.hk2.api.ServiceLocator;
diff --git a/appserver/web/web-ha/src/main/java/org/glassfish/web/ha/HAUtilImpl.java b/appserver/web/web-ha/src/main/java/org/glassfish/web/ha/HAUtilImpl.java
index 90edc44..e976ae4 100644
--- a/appserver/web/web-ha/src/main/java/org/glassfish/web/ha/HAUtilImpl.java
+++ b/appserver/web/web-ha/src/main/java/org/glassfish/web/ha/HAUtilImpl.java
@@ -22,9 +22,9 @@
import org.glassfish.api.admin.ServerEnvironment;
import org.glassfish.gms.bootstrap.GMSAdapterService;
import org.glassfish.security.common.HAUtil;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
import org.jvnet.hk2.annotations.Optional;
-import javax.inject.Named;
+import jakarta.inject.Named;
import org.jvnet.hk2.annotations.Service;
import org.glassfish.hk2.api.PerLookup;
diff --git a/appserver/web/web-ha/src/main/java/org/glassfish/web/ha/HAWebContainerFeatureFactoryImpl.java b/appserver/web/web-ha/src/main/java/org/glassfish/web/ha/HAWebContainerFeatureFactoryImpl.java
index 3e13481..9a338f8 100755
--- a/appserver/web/web-ha/src/main/java/org/glassfish/web/ha/HAWebContainerFeatureFactoryImpl.java
+++ b/appserver/web/web-ha/src/main/java/org/glassfish/web/ha/HAWebContainerFeatureFactoryImpl.java
@@ -23,7 +23,7 @@
import org.glassfish.hk2.api.ServiceLocator;
import org.glassfish.web.ha.authenticator.HASSOFactory;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
import org.jvnet.hk2.annotations.Service;
/**
diff --git a/appserver/web/web-ha/src/main/java/org/glassfish/web/ha/authenticator/HASSOFactory.java b/appserver/web/web-ha/src/main/java/org/glassfish/web/ha/authenticator/HASSOFactory.java
index 2917288..2047ce7 100644
--- a/appserver/web/web-ha/src/main/java/org/glassfish/web/ha/authenticator/HASSOFactory.java
+++ b/appserver/web/web-ha/src/main/java/org/glassfish/web/ha/authenticator/HASSOFactory.java
@@ -34,7 +34,7 @@
import org.glassfish.ha.store.api.BackingStoreConfiguration;
import org.glassfish.ha.store.api.BackingStoreException;
import org.glassfish.ha.store.api.BackingStoreFactory;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
import org.jvnet.hk2.annotations.Service;
import org.glassfish.hk2.api.ServiceLocator;
diff --git a/appserver/web/web-ha/src/main/java/org/glassfish/web/ha/session/management/ReplicationWebEventPersistentManager.java b/appserver/web/web-ha/src/main/java/org/glassfish/web/ha/session/management/ReplicationWebEventPersistentManager.java
index 6c45033..41b6bd2 100755
--- a/appserver/web/web-ha/src/main/java/org/glassfish/web/ha/session/management/ReplicationWebEventPersistentManager.java
+++ b/appserver/web/web-ha/src/main/java/org/glassfish/web/ha/session/management/ReplicationWebEventPersistentManager.java
@@ -34,7 +34,7 @@
import org.glassfish.ha.store.api.BackingStoreFactory;
import org.glassfish.ha.store.api.Storeable;
import org.glassfish.web.ha.LogFacade;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
import org.jvnet.hk2.annotations.Service;
import org.glassfish.hk2.api.ServiceLocator;
diff --git a/appserver/web/web-ha/src/main/java/org/glassfish/web/ha/strategy/builder/ReplicatedWebMethodSessionStrategyBuilder.java b/appserver/web/web-ha/src/main/java/org/glassfish/web/ha/strategy/builder/ReplicatedWebMethodSessionStrategyBuilder.java
index d99e013..efa22a4 100644
--- a/appserver/web/web-ha/src/main/java/org/glassfish/web/ha/strategy/builder/ReplicatedWebMethodSessionStrategyBuilder.java
+++ b/appserver/web/web-ha/src/main/java/org/glassfish/web/ha/strategy/builder/ReplicatedWebMethodSessionStrategyBuilder.java
@@ -27,7 +27,7 @@
import org.glassfish.ha.store.util.SimpleMetadata;
import org.glassfish.web.ha.session.management.*;
import org.glassfish.web.valve.GlassFishValve;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
import org.jvnet.hk2.annotations.Service;
import org.glassfish.hk2.api.PerLookup;
diff --git a/appserver/web/web-sse/pom.xml b/appserver/web/web-sse/pom.xml
index cacd7fb..f62fff2 100755
--- a/appserver/web/web-sse/pom.xml
+++ b/appserver/web/web-sse/pom.xml
@@ -58,8 +58,8 @@
<scope>provided</scope>
</dependency>
<dependency>
- <groupId>org.glassfish.hk2.external</groupId>
- <artifactId>jakarta.inject</artifactId>
+ <groupId>jakarta.inject</groupId>
+ <artifactId>jakarta.inject-api</artifactId>
<scope>provided</scope>
</dependency>
</dependencies>
diff --git a/appserver/web/web-sse/src/main/java/org/glassfish/sse/api/ServerSentEventContext.java b/appserver/web/web-sse/src/main/java/org/glassfish/sse/api/ServerSentEventContext.java
index bc80c71..7a0522f 100644
--- a/appserver/web/web-sse/src/main/java/org/glassfish/sse/api/ServerSentEventContext.java
+++ b/appserver/web/web-sse/src/main/java/org/glassfish/sse/api/ServerSentEventContext.java
@@ -21,7 +21,7 @@
import java.lang.annotation.RetentionPolicy;
import java.lang.annotation.Target;
import jakarta.enterprise.util.Nonbinding;
-import javax.inject.Qualifier;
+import jakarta.inject.Qualifier;
/**
* Qualifier for ServerSentEventHandlerContext. If there is Server-Sent Event
diff --git a/appserver/web/web-sse/src/main/java/org/glassfish/sse/impl/ServerSentEventServlet.java b/appserver/web/web-sse/src/main/java/org/glassfish/sse/impl/ServerSentEventServlet.java
index 5ea1283..1ae19c3 100644
--- a/appserver/web/web-sse/src/main/java/org/glassfish/sse/impl/ServerSentEventServlet.java
+++ b/appserver/web/web-sse/src/main/java/org/glassfish/sse/impl/ServerSentEventServlet.java
@@ -21,7 +21,7 @@
import jakarta.enterprise.context.spi.CreationalContext;
import jakarta.enterprise.inject.spi.Bean;
import jakarta.enterprise.inject.spi.BeanManager;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
import jakarta.servlet.AsyncContext;
import jakarta.servlet.ServletException;
import jakarta.servlet.annotation.WebServlet;
diff --git a/appserver/web/weld-integration/src/main/java/org/glassfish/cdi/hk2/CDIContextBridge.java b/appserver/web/weld-integration/src/main/java/org/glassfish/cdi/hk2/CDIContextBridge.java
index c8f7c44..d7eaa8c 100644
--- a/appserver/web/weld-integration/src/main/java/org/glassfish/cdi/hk2/CDIContextBridge.java
+++ b/appserver/web/weld-integration/src/main/java/org/glassfish/cdi/hk2/CDIContextBridge.java
@@ -18,7 +18,7 @@
import java.lang.annotation.Annotation;
-import javax.inject.Singleton;
+import jakarta.inject.Singleton;
import org.glassfish.hk2.api.ActiveDescriptor;
import org.glassfish.hk2.api.Context;
diff --git a/appserver/web/weld-integration/src/main/java/org/glassfish/cdi/hk2/CDIHK2Descriptor.java b/appserver/web/weld-integration/src/main/java/org/glassfish/cdi/hk2/CDIHK2Descriptor.java
index 05ad65e..dbc495b 100644
--- a/appserver/web/weld-integration/src/main/java/org/glassfish/cdi/hk2/CDIHK2Descriptor.java
+++ b/appserver/web/weld-integration/src/main/java/org/glassfish/cdi/hk2/CDIHK2Descriptor.java
@@ -29,7 +29,7 @@
import jakarta.enterprise.inject.Default;
import jakarta.enterprise.inject.spi.Bean;
import jakarta.enterprise.inject.spi.BeanManager;
-import javax.inject.Singleton;
+import jakarta.inject.Singleton;
import org.glassfish.hk2.api.DescriptorType;
import org.glassfish.hk2.api.DescriptorVisibility;
diff --git a/appserver/web/weld-integration/src/main/java/org/glassfish/cdi/hk2/CDIScope.java b/appserver/web/weld-integration/src/main/java/org/glassfish/cdi/hk2/CDIScope.java
index 423c07d..2a182dd 100644
--- a/appserver/web/weld-integration/src/main/java/org/glassfish/cdi/hk2/CDIScope.java
+++ b/appserver/web/weld-integration/src/main/java/org/glassfish/cdi/hk2/CDIScope.java
@@ -24,7 +24,7 @@
import java.lang.annotation.Retention;
import java.lang.annotation.Target;
-import javax.inject.Scope;
+import jakarta.inject.Scope;
/**
* This scope is given from HK2 beans that are representing CDI services
diff --git a/appserver/web/weld-integration/src/main/java/org/glassfish/cdi/hk2/CDISecondChanceResolver.java b/appserver/web/weld-integration/src/main/java/org/glassfish/cdi/hk2/CDISecondChanceResolver.java
index 55ba384..5df0054 100644
--- a/appserver/web/weld-integration/src/main/java/org/glassfish/cdi/hk2/CDISecondChanceResolver.java
+++ b/appserver/web/weld-integration/src/main/java/org/glassfish/cdi/hk2/CDISecondChanceResolver.java
@@ -22,8 +22,8 @@
import jakarta.enterprise.inject.spi.Bean;
import jakarta.enterprise.inject.spi.BeanManager;
-import javax.inject.Inject;
-import javax.inject.Singleton;
+import jakarta.inject.Inject;
+import jakarta.inject.Singleton;
import javax.naming.Context;
import javax.naming.InitialContext;
import javax.naming.NamingException;
diff --git a/appserver/web/weld-integration/src/main/java/org/glassfish/cdi/hk2/HK2IntegrationExtension.java b/appserver/web/weld-integration/src/main/java/org/glassfish/cdi/hk2/HK2IntegrationExtension.java
index e9eac3c..25b6e09 100644
--- a/appserver/web/weld-integration/src/main/java/org/glassfish/cdi/hk2/HK2IntegrationExtension.java
+++ b/appserver/web/weld-integration/src/main/java/org/glassfish/cdi/hk2/HK2IntegrationExtension.java
@@ -29,7 +29,7 @@
import jakarta.enterprise.inject.spi.InjectionPoint;
import jakarta.enterprise.inject.spi.InjectionTarget;
import jakarta.enterprise.inject.spi.ProcessInjectionTarget;
-import javax.inject.Singleton;
+import jakarta.inject.Singleton;
import org.glassfish.hk2.api.ActiveDescriptor;
import org.glassfish.hk2.api.DynamicConfiguration;
diff --git a/appserver/web/weld-integration/src/main/java/org/glassfish/cdi/hk2/HK2IntegrationUtilities.java b/appserver/web/weld-integration/src/main/java/org/glassfish/cdi/hk2/HK2IntegrationUtilities.java
index e920a04..9c1abdd 100644
--- a/appserver/web/weld-integration/src/main/java/org/glassfish/cdi/hk2/HK2IntegrationUtilities.java
+++ b/appserver/web/weld-integration/src/main/java/org/glassfish/cdi/hk2/HK2IntegrationUtilities.java
@@ -27,7 +27,7 @@
import jakarta.enterprise.inject.spi.AnnotatedField;
import jakarta.enterprise.inject.spi.AnnotatedParameter;
import jakarta.enterprise.inject.spi.InjectionPoint;
-import javax.inject.Named;
+import jakarta.inject.Named;
import javax.naming.Context;
import javax.naming.InitialContext;
import javax.naming.NamingException;
diff --git a/appserver/web/weld-integration/src/main/java/org/glassfish/cdi/transaction/TransactionScopedCDIEventHelperImpl.java b/appserver/web/weld-integration/src/main/java/org/glassfish/cdi/transaction/TransactionScopedCDIEventHelperImpl.java
index c7a906f..8913330 100644
--- a/appserver/web/weld-integration/src/main/java/org/glassfish/cdi/transaction/TransactionScopedCDIEventHelperImpl.java
+++ b/appserver/web/weld-integration/src/main/java/org/glassfish/cdi/transaction/TransactionScopedCDIEventHelperImpl.java
@@ -19,7 +19,7 @@
import jakarta.enterprise.context.Destroyed;
import jakarta.enterprise.context.Initialized;
import jakarta.enterprise.event.Event;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
import jakarta.transaction.TransactionScoped;
/**
diff --git a/appserver/web/weld-integration/src/main/java/org/glassfish/weld/BeanManagerNamingProxy.java b/appserver/web/weld-integration/src/main/java/org/glassfish/weld/BeanManagerNamingProxy.java
index a38ce65..cf071bc 100644
--- a/appserver/web/weld-integration/src/main/java/org/glassfish/weld/BeanManagerNamingProxy.java
+++ b/appserver/web/weld-integration/src/main/java/org/glassfish/weld/BeanManagerNamingProxy.java
@@ -24,7 +24,7 @@
import org.glassfish.api.naming.NamedNamingObjectProxy;
import org.jboss.weld.bootstrap.WeldBootstrap;
import org.jboss.weld.bootstrap.spi.BeanDeploymentArchive;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
import org.jvnet.hk2.annotations.Service;
import com.sun.enterprise.container.common.spi.util.ComponentEnvManager;
diff --git a/appserver/web/weld-integration/src/main/java/org/glassfish/weld/ValidationNamingProxy.java b/appserver/web/weld-integration/src/main/java/org/glassfish/weld/ValidationNamingProxy.java
index 26c1533..a5cd4c0 100644
--- a/appserver/web/weld-integration/src/main/java/org/glassfish/weld/ValidationNamingProxy.java
+++ b/appserver/web/weld-integration/src/main/java/org/glassfish/weld/ValidationNamingProxy.java
@@ -31,8 +31,8 @@
import jakarta.enterprise.inject.spi.Bean;
import jakarta.enterprise.inject.spi.BeanManager;
-import javax.inject.Inject;
-import javax.inject.Named;
+import jakarta.inject.Inject;
+import jakarta.inject.Named;
import javax.naming.NamingException;
import jakarta.validation.Validation;
import jakarta.validation.Validator;
diff --git a/appserver/web/weld-integration/src/main/java/org/glassfish/weld/WeldContextListener.java b/appserver/web/weld-integration/src/main/java/org/glassfish/weld/WeldContextListener.java
index 0030983..dca6c2c 100644
--- a/appserver/web/weld-integration/src/main/java/org/glassfish/weld/WeldContextListener.java
+++ b/appserver/web/weld-integration/src/main/java/org/glassfish/weld/WeldContextListener.java
@@ -17,7 +17,7 @@
package org.glassfish.weld;
import jakarta.enterprise.inject.spi.BeanManager;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
import jakarta.servlet.ServletContextEvent;
import jakarta.servlet.ServletContextListener;
import jakarta.servlet.jsp.JspApplicationContext;
diff --git a/appserver/web/weld-integration/src/main/java/org/glassfish/weld/WeldDeployer.java b/appserver/web/weld-integration/src/main/java/org/glassfish/weld/WeldDeployer.java
index b52a2a5..62387cd 100644
--- a/appserver/web/weld-integration/src/main/java/org/glassfish/weld/WeldDeployer.java
+++ b/appserver/web/weld-integration/src/main/java/org/glassfish/weld/WeldDeployer.java
@@ -58,7 +58,7 @@
import org.jboss.weld.security.spi.SecurityServices;
import org.jboss.weld.serialization.spi.ProxyServices;
import org.jboss.weld.transaction.spi.TransactionServices;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
import jakarta.servlet.jsp.tagext.JspTag;
import org.jvnet.hk2.annotations.Service;
diff --git a/appserver/web/weld-integration/src/main/java/org/glassfish/weld/services/JCDIServiceImpl.java b/appserver/web/weld-integration/src/main/java/org/glassfish/weld/services/JCDIServiceImpl.java
index 848135a..0f6ceec 100644
--- a/appserver/web/weld-integration/src/main/java/org/glassfish/weld/services/JCDIServiceImpl.java
+++ b/appserver/web/weld-integration/src/main/java/org/glassfish/weld/services/JCDIServiceImpl.java
@@ -54,8 +54,8 @@
import jakarta.enterprise.inject.spi.BeanManager;
import jakarta.enterprise.inject.spi.InjectionTarget;
import jakarta.enterprise.inject.spi.Interceptor;
-import javax.inject.Inject;
-import javax.inject.Scope;
+import jakarta.inject.Inject;
+import jakarta.inject.Scope;
import javax.naming.InitialContext;
import javax.naming.NamingException;
import jakarta.servlet.ServletContext;
diff --git a/appserver/webservices/connector/src/main/java/org/glassfish/webservices/connector/WebServicesSniffer.java b/appserver/webservices/connector/src/main/java/org/glassfish/webservices/connector/WebServicesSniffer.java
index d5222b4..d842752 100644
--- a/appserver/webservices/connector/src/main/java/org/glassfish/webservices/connector/WebServicesSniffer.java
+++ b/appserver/webservices/connector/src/main/java/org/glassfish/webservices/connector/WebServicesSniffer.java
@@ -21,7 +21,7 @@
import org.glassfish.api.deployment.archive.ArchiveType;
import org.jvnet.hk2.annotations.Service;
-import javax.inject.Singleton;
+import jakarta.inject.Singleton;
import javax.enterprise.deploy.shared.ModuleType;
import java.io.IOException;
diff --git a/appserver/webservices/jsr109-impl/src/main/java/org/glassfish/webservices/WebServiceContractImpl.java b/appserver/webservices/jsr109-impl/src/main/java/org/glassfish/webservices/WebServiceContractImpl.java
index c54ace1..140f06b 100644
--- a/appserver/webservices/jsr109-impl/src/main/java/org/glassfish/webservices/WebServiceContractImpl.java
+++ b/appserver/webservices/jsr109-impl/src/main/java/org/glassfish/webservices/WebServiceContractImpl.java
@@ -21,9 +21,9 @@
import org.glassfish.api.admin.ServerEnvironment;
import org.glassfish.api.container.Adapter;
-import javax.inject.Inject;
-import javax.inject.Named;
-import javax.inject.Provider;
+import jakarta.inject.Inject;
+import jakarta.inject.Named;
+import jakarta.inject.Provider;
import org.glassfish.hk2.api.IterableProvider;
import org.jvnet.hk2.annotations.Optional;
diff --git a/appserver/webservices/jsr109-impl/src/main/java/org/glassfish/webservices/WebServiceEjbEndpointRegistry.java b/appserver/webservices/jsr109-impl/src/main/java/org/glassfish/webservices/WebServiceEjbEndpointRegistry.java
index 9e3ca24..543f2ca 100644
--- a/appserver/webservices/jsr109-impl/src/main/java/org/glassfish/webservices/WebServiceEjbEndpointRegistry.java
+++ b/appserver/webservices/jsr109-impl/src/main/java/org/glassfish/webservices/WebServiceEjbEndpointRegistry.java
@@ -31,7 +31,7 @@
import java.util.concurrent.ConcurrentHashMap;
import java.util.logging.Level;
import java.util.logging.Logger;
-import javax.inject.Singleton;
+import jakarta.inject.Singleton;
import org.jvnet.hk2.annotations.Service;
import org.glassfish.webservices.monitoring.WebServiceEngineImpl;
diff --git a/appserver/webservices/jsr109-impl/src/main/java/org/glassfish/webservices/WebServiceReferenceManagerImpl.java b/appserver/webservices/jsr109-impl/src/main/java/org/glassfish/webservices/WebServiceReferenceManagerImpl.java
index 1875b9d..d9791b0 100644
--- a/appserver/webservices/jsr109-impl/src/main/java/org/glassfish/webservices/WebServiceReferenceManagerImpl.java
+++ b/appserver/webservices/jsr109-impl/src/main/java/org/glassfish/webservices/WebServiceReferenceManagerImpl.java
@@ -27,7 +27,7 @@
import com.sun.xml.ws.api.FeatureConstructor;
import com.sun.xml.ws.resources.ModelerMessages;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
import javax.naming.Context;
import javax.naming.NamingException;
import javax.naming.InitialContext;
diff --git a/appserver/webservices/jsr109-impl/src/main/java/org/glassfish/webservices/WebServicesContainer.java b/appserver/webservices/jsr109-impl/src/main/java/org/glassfish/webservices/WebServicesContainer.java
index 557d024..40e026a 100644
--- a/appserver/webservices/jsr109-impl/src/main/java/org/glassfish/webservices/WebServicesContainer.java
+++ b/appserver/webservices/jsr109-impl/src/main/java/org/glassfish/webservices/WebServicesContainer.java
@@ -28,7 +28,7 @@
import org.jvnet.hk2.annotations.Service;
import org.glassfish.hk2.api.PostConstruct;
import org.glassfish.hk2.api.PreDestroy;
-import javax.inject.Singleton;
+import jakarta.inject.Singleton;
import javax.management.ObjectName;
import java.io.IOException;
diff --git a/appserver/webservices/jsr109-impl/src/main/java/org/glassfish/webservices/WebServicesContract.java b/appserver/webservices/jsr109-impl/src/main/java/org/glassfish/webservices/WebServicesContract.java
index ddaa6ce..50f2a25 100644
--- a/appserver/webservices/jsr109-impl/src/main/java/org/glassfish/webservices/WebServicesContract.java
+++ b/appserver/webservices/jsr109-impl/src/main/java/org/glassfish/webservices/WebServicesContract.java
@@ -16,7 +16,7 @@
package org.glassfish.webservices;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
import org.jvnet.hk2.annotations.Service;
import org.jvnet.hk2.annotations.Contract;
import org.glassfish.hk2.api.PostConstruct;
diff --git a/appserver/webservices/jsr109-impl/src/main/java/org/glassfish/webservices/WebServicesDeployer.java b/appserver/webservices/jsr109-impl/src/main/java/org/glassfish/webservices/WebServicesDeployer.java
index c1f3e38..685cbc9 100644
--- a/appserver/webservices/jsr109-impl/src/main/java/org/glassfish/webservices/WebServicesDeployer.java
+++ b/appserver/webservices/jsr109-impl/src/main/java/org/glassfish/webservices/WebServicesDeployer.java
@@ -40,7 +40,7 @@
import org.glassfish.javaee.core.deployment.JavaEEDeployer;
import org.glassfish.internal.api.JAXRPCCodeGenFacade;
import org.jvnet.hk2.annotations.Service;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
import org.w3c.dom.Document;
import org.w3c.dom.NamedNodeMap;
import org.w3c.dom.Node;
diff --git a/appserver/webservices/jsr109-impl/src/main/java/org/glassfish/webservices/cli/ListWebServicesCommand.java b/appserver/webservices/jsr109-impl/src/main/java/org/glassfish/webservices/cli/ListWebServicesCommand.java
index 686a3fe..3df3120 100644
--- a/appserver/webservices/jsr109-impl/src/main/java/org/glassfish/webservices/cli/ListWebServicesCommand.java
+++ b/appserver/webservices/jsr109-impl/src/main/java/org/glassfish/webservices/cli/ListWebServicesCommand.java
@@ -34,8 +34,8 @@
import java.util.Map;
import java.util.Properties;
-import javax.inject.Inject;
-import javax.inject.Provider;
+import jakarta.inject.Inject;
+import jakarta.inject.Provider;
import org.glassfish.api.admin.RestEndpoint;
import org.glassfish.api.admin.RestEndpoints;
import org.glassfish.api.admin.RestParam;
diff --git a/appserver/webservices/metro-glue/src/main/java/org/glassfish/webservices/metroglue/MetroContainer.java b/appserver/webservices/metro-glue/src/main/java/org/glassfish/webservices/metroglue/MetroContainer.java
index d79a37a..94b75d9 100644
--- a/appserver/webservices/metro-glue/src/main/java/org/glassfish/webservices/metroglue/MetroContainer.java
+++ b/appserver/webservices/metro-glue/src/main/java/org/glassfish/webservices/metroglue/MetroContainer.java
@@ -55,15 +55,15 @@
import org.glassfish.webservices.WebServiceDeploymentListener;
import org.glassfish.webservices.WebServicesDeployer;
-import javax.inject.Inject;
-import javax.inject.Named;
+import jakarta.inject.Inject;
+import jakarta.inject.Named;
import org.jvnet.hk2.annotations.Optional;
import org.jvnet.hk2.annotations.Service;
import org.glassfish.hk2.api.PostConstruct;
import org.glassfish.hk2.api.ServiceLocator;
-import javax.inject.Singleton;
+import jakarta.inject.Singleton;
import org.jvnet.hk2.config.types.Property;
/**
diff --git a/nucleus/admin/cli/src/main/java/com/sun/enterprise/admin/cli/CLICommand.java b/nucleus/admin/cli/src/main/java/com/sun/enterprise/admin/cli/CLICommand.java
index 280d930..c827bfe 100644
--- a/nucleus/admin/cli/src/main/java/com/sun/enterprise/admin/cli/CLICommand.java
+++ b/nucleus/admin/cli/src/main/java/com/sun/enterprise/admin/cli/CLICommand.java
@@ -48,9 +48,9 @@
import com.sun.enterprise.admin.cli.remote.RemoteCLICommand;
import com.sun.enterprise.admin.remote.Metrix;
-import javax.inject.Inject;
-import javax.inject.Scope;
-import javax.inject.Singleton;
+import jakarta.inject.Inject;
+import jakarta.inject.Scope;
+import jakarta.inject.Singleton;
/**
diff --git a/nucleus/admin/cli/src/main/java/com/sun/enterprise/admin/cli/CLIContainer.java b/nucleus/admin/cli/src/main/java/com/sun/enterprise/admin/cli/CLIContainer.java
index 05d5fa9..ec905ec 100644
--- a/nucleus/admin/cli/src/main/java/com/sun/enterprise/admin/cli/CLIContainer.java
+++ b/nucleus/admin/cli/src/main/java/com/sun/enterprise/admin/cli/CLIContainer.java
@@ -38,7 +38,7 @@
import java.util.logging.Level;
import java.util.logging.Logger;
import java.util.zip.ZipEntry;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
import org.glassfish.hk2.api.MultiException;
import org.glassfish.hk2.api.PerLookup;
import org.glassfish.hk2.api.ServiceLocator;
diff --git a/nucleus/admin/cli/src/main/java/com/sun/enterprise/admin/cli/HelpCommand.java b/nucleus/admin/cli/src/main/java/com/sun/enterprise/admin/cli/HelpCommand.java
index ca1ba12..e73c02f 100644
--- a/nucleus/admin/cli/src/main/java/com/sun/enterprise/admin/cli/HelpCommand.java
+++ b/nucleus/admin/cli/src/main/java/com/sun/enterprise/admin/cli/HelpCommand.java
@@ -26,7 +26,7 @@
import com.sun.enterprise.universal.i18n.LocalStringsImpl;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
/**
* The help command will display the help text for all the commands and their
diff --git a/nucleus/admin/cli/src/main/java/com/sun/enterprise/admin/cli/ListCommandsCommand.java b/nucleus/admin/cli/src/main/java/com/sun/enterprise/admin/cli/ListCommandsCommand.java
index f20edba..8351048 100644
--- a/nucleus/admin/cli/src/main/java/com/sun/enterprise/admin/cli/ListCommandsCommand.java
+++ b/nucleus/admin/cli/src/main/java/com/sun/enterprise/admin/cli/ListCommandsCommand.java
@@ -26,7 +26,7 @@
import com.sun.enterprise.universal.i18n.LocalStringsImpl;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
import static com.sun.enterprise.admin.cli.CLIConstants.EOL;
diff --git a/nucleus/admin/cli/src/main/java/com/sun/enterprise/admin/cli/MultimodeCommand.java b/nucleus/admin/cli/src/main/java/com/sun/enterprise/admin/cli/MultimodeCommand.java
index 192b2a6..f359ba7 100644
--- a/nucleus/admin/cli/src/main/java/com/sun/enterprise/admin/cli/MultimodeCommand.java
+++ b/nucleus/admin/cli/src/main/java/com/sun/enterprise/admin/cli/MultimodeCommand.java
@@ -34,7 +34,7 @@
import com.sun.enterprise.admin.util.*;
import com.sun.enterprise.universal.i18n.LocalStringsImpl;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
/**
* A scaled-down implementation of multi-mode command.
diff --git a/nucleus/admin/cli/src/main/java/com/sun/enterprise/admin/cli/embeddable/CommandExecutorImpl.java b/nucleus/admin/cli/src/main/java/com/sun/enterprise/admin/cli/embeddable/CommandExecutorImpl.java
index 3e39a81..b9f46c4 100644
--- a/nucleus/admin/cli/src/main/java/com/sun/enterprise/admin/cli/embeddable/CommandExecutorImpl.java
+++ b/nucleus/admin/cli/src/main/java/com/sun/enterprise/admin/cli/embeddable/CommandExecutorImpl.java
@@ -22,7 +22,7 @@
import java.util.Map;
import java.util.logging.Logger;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
import org.glassfish.api.ActionReport;
import org.glassfish.api.admin.CommandException;
diff --git a/nucleus/admin/cli/src/main/java/com/sun/enterprise/admin/cli/embeddable/DeployerImpl.java b/nucleus/admin/cli/src/main/java/com/sun/enterprise/admin/cli/embeddable/DeployerImpl.java
index f6b952b..9384d9c 100644
--- a/nucleus/admin/cli/src/main/java/com/sun/enterprise/admin/cli/embeddable/DeployerImpl.java
+++ b/nucleus/admin/cli/src/main/java/com/sun/enterprise/admin/cli/embeddable/DeployerImpl.java
@@ -30,7 +30,7 @@
import org.glassfish.hk2.api.PerLookup;
import org.glassfish.hk2.api.ServiceLocator;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
import java.io.ByteArrayInputStream;
import java.io.ByteArrayOutputStream;
import java.io.File;
diff --git a/nucleus/admin/cli/src/main/java/com/sun/enterprise/admin/cli/schemadoc/GenerateDomainSchema.java b/nucleus/admin/cli/src/main/java/com/sun/enterprise/admin/cli/schemadoc/GenerateDomainSchema.java
index dea233f..d08ef49 100644
--- a/nucleus/admin/cli/src/main/java/com/sun/enterprise/admin/cli/schemadoc/GenerateDomainSchema.java
+++ b/nucleus/admin/cli/src/main/java/com/sun/enterprise/admin/cli/schemadoc/GenerateDomainSchema.java
@@ -43,7 +43,7 @@
import org.glassfish.hk2.api.PerLookup;
import org.objectweb.asm.ClassReader;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
@Service(name = "generate-domain-schema")
@PerLookup
diff --git a/nucleus/admin/config-api/src/main/java/com/sun/enterprise/config/modularity/ConfigBeanInstaller.java b/nucleus/admin/config-api/src/main/java/com/sun/enterprise/config/modularity/ConfigBeanInstaller.java
index 09048a9..3a70f03 100644
--- a/nucleus/admin/config-api/src/main/java/com/sun/enterprise/config/modularity/ConfigBeanInstaller.java
+++ b/nucleus/admin/config-api/src/main/java/com/sun/enterprise/config/modularity/ConfigBeanInstaller.java
@@ -30,8 +30,8 @@
import org.glassfish.hk2.api.ServiceLocator;
import org.jvnet.hk2.annotations.Service;
-import javax.inject.Inject;
-import javax.inject.Named;
+import jakarta.inject.Inject;
+import jakarta.inject.Named;
import java.lang.annotation.Annotation;
import java.util.List;
diff --git a/nucleus/admin/config-api/src/main/java/com/sun/enterprise/config/modularity/ConfigModularityJustInTimeInjectionResolver.java b/nucleus/admin/config-api/src/main/java/com/sun/enterprise/config/modularity/ConfigModularityJustInTimeInjectionResolver.java
index 230bd98..ecf19be 100644
--- a/nucleus/admin/config-api/src/main/java/com/sun/enterprise/config/modularity/ConfigModularityJustInTimeInjectionResolver.java
+++ b/nucleus/admin/config-api/src/main/java/com/sun/enterprise/config/modularity/ConfigModularityJustInTimeInjectionResolver.java
@@ -28,8 +28,8 @@
import org.jvnet.hk2.annotations.Service;
import org.jvnet.hk2.config.ConfigBeanProxy;
-import javax.inject.Inject;
-import javax.inject.Singleton;
+import jakarta.inject.Inject;
+import jakarta.inject.Singleton;
import java.util.ArrayList;
import java.util.List;
import java.util.logging.Logger;
diff --git a/nucleus/admin/config-api/src/main/java/com/sun/enterprise/config/modularity/ConfigModularityUtils.java b/nucleus/admin/config-api/src/main/java/com/sun/enterprise/config/modularity/ConfigModularityUtils.java
index 1afe41b..47bb229 100644
--- a/nucleus/admin/config-api/src/main/java/com/sun/enterprise/config/modularity/ConfigModularityUtils.java
+++ b/nucleus/admin/config-api/src/main/java/com/sun/enterprise/config/modularity/ConfigModularityUtils.java
@@ -62,7 +62,7 @@
import org.jvnet.hk2.config.SingleConfigCode;
import org.jvnet.hk2.config.TransactionFailure;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
import javax.xml.stream.XMLOutputFactory;
import javax.xml.stream.XMLStreamException;
import javax.xml.stream.XMLStreamReader;
diff --git a/nucleus/admin/config-api/src/main/java/com/sun/enterprise/config/modularity/ExtensionPatternInvocationImpl.java b/nucleus/admin/config-api/src/main/java/com/sun/enterprise/config/modularity/ExtensionPatternInvocationImpl.java
index 0e665fa..edd6b18 100644
--- a/nucleus/admin/config-api/src/main/java/com/sun/enterprise/config/modularity/ExtensionPatternInvocationImpl.java
+++ b/nucleus/admin/config-api/src/main/java/com/sun/enterprise/config/modularity/ExtensionPatternInvocationImpl.java
@@ -27,7 +27,7 @@
import org.jvnet.hk2.config.ConfigExtensionHandler;
import org.jvnet.hk2.config.TransactionFailure;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
import java.util.List;
import java.util.logging.Level;
diff --git a/nucleus/admin/config-api/src/main/java/com/sun/enterprise/config/modularity/GetSetModularityHelper.java b/nucleus/admin/config-api/src/main/java/com/sun/enterprise/config/modularity/GetSetModularityHelper.java
index c05cdff..b3a7df8 100644
--- a/nucleus/admin/config-api/src/main/java/com/sun/enterprise/config/modularity/GetSetModularityHelper.java
+++ b/nucleus/admin/config-api/src/main/java/com/sun/enterprise/config/modularity/GetSetModularityHelper.java
@@ -21,7 +21,7 @@
import org.glassfish.config.support.Singleton;
import org.jvnet.hk2.annotations.Service;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
import java.lang.reflect.Method;
import java.util.Locale;
import java.util.StringTokenizer;
diff --git a/nucleus/admin/config-api/src/main/java/com/sun/enterprise/config/modularity/annotation/CustomConfiguration.java b/nucleus/admin/config-api/src/main/java/com/sun/enterprise/config/modularity/annotation/CustomConfiguration.java
index f22441a..a9c344f 100644
--- a/nucleus/admin/config-api/src/main/java/com/sun/enterprise/config/modularity/annotation/CustomConfiguration.java
+++ b/nucleus/admin/config-api/src/main/java/com/sun/enterprise/config/modularity/annotation/CustomConfiguration.java
@@ -16,7 +16,7 @@
package com.sun.enterprise.config.modularity.annotation;
-import javax.inject.Qualifier;
+import jakarta.inject.Qualifier;
import java.lang.annotation.ElementType;
import java.lang.annotation.Retention;
import java.lang.annotation.RetentionPolicy;
diff --git a/nucleus/admin/config-api/src/main/java/com/sun/enterprise/config/modularity/annotation/HasCustomizationTokens.java b/nucleus/admin/config-api/src/main/java/com/sun/enterprise/config/modularity/annotation/HasCustomizationTokens.java
index 4a7c099..73577a5 100644
--- a/nucleus/admin/config-api/src/main/java/com/sun/enterprise/config/modularity/annotation/HasCustomizationTokens.java
+++ b/nucleus/admin/config-api/src/main/java/com/sun/enterprise/config/modularity/annotation/HasCustomizationTokens.java
@@ -16,7 +16,7 @@
package com.sun.enterprise.config.modularity.annotation;
-import javax.inject.Qualifier;
+import jakarta.inject.Qualifier;
import java.lang.annotation.ElementType;
import java.lang.annotation.Retention;
import java.lang.annotation.RetentionPolicy;
diff --git a/nucleus/admin/config-api/src/main/java/com/sun/enterprise/config/modularity/command/AbstractConfigModularityCommand.java b/nucleus/admin/config-api/src/main/java/com/sun/enterprise/config/modularity/command/AbstractConfigModularityCommand.java
index 9b58fcb..e828e10 100644
--- a/nucleus/admin/config-api/src/main/java/com/sun/enterprise/config/modularity/command/AbstractConfigModularityCommand.java
+++ b/nucleus/admin/config-api/src/main/java/com/sun/enterprise/config/modularity/command/AbstractConfigModularityCommand.java
@@ -28,7 +28,7 @@
import org.jvnet.hk2.annotations.Service;
import org.jvnet.hk2.config.ConfigBeanProxy;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
import java.util.ArrayList;
import java.util.Collection;
import java.util.List;
diff --git a/nucleus/admin/config-api/src/main/java/com/sun/enterprise/config/modularity/command/CreateModuleConfigCommand.java b/nucleus/admin/config-api/src/main/java/com/sun/enterprise/config/modularity/command/CreateModuleConfigCommand.java
index 872875f..9ee309f 100644
--- a/nucleus/admin/config-api/src/main/java/com/sun/enterprise/config/modularity/command/CreateModuleConfigCommand.java
+++ b/nucleus/admin/config-api/src/main/java/com/sun/enterprise/config/modularity/command/CreateModuleConfigCommand.java
@@ -49,8 +49,8 @@
import org.jvnet.hk2.annotations.Service;
import org.jvnet.hk2.config.Dom;
-import javax.inject.Inject;
-import javax.inject.Named;
+import jakarta.inject.Inject;
+import jakarta.inject.Named;
import java.util.ArrayList;
import java.util.Arrays;
diff --git a/nucleus/admin/config-api/src/main/java/com/sun/enterprise/config/modularity/command/DeleteModuleConfigCommand.java b/nucleus/admin/config-api/src/main/java/com/sun/enterprise/config/modularity/command/DeleteModuleConfigCommand.java
index 72df9ca..ec526d6 100644
--- a/nucleus/admin/config-api/src/main/java/com/sun/enterprise/config/modularity/command/DeleteModuleConfigCommand.java
+++ b/nucleus/admin/config-api/src/main/java/com/sun/enterprise/config/modularity/command/DeleteModuleConfigCommand.java
@@ -50,8 +50,8 @@
import org.jvnet.hk2.config.SingleConfigCode;
import org.jvnet.hk2.config.TransactionFailure;
-import javax.inject.Inject;
-import javax.inject.Named;
+import jakarta.inject.Inject;
+import jakarta.inject.Named;
import java.beans.PropertyVetoException;
import java.lang.reflect.Method;
diff --git a/nucleus/admin/config-api/src/main/java/com/sun/enterprise/config/modularity/command/GetActiveConfigCommand.java b/nucleus/admin/config-api/src/main/java/com/sun/enterprise/config/modularity/command/GetActiveConfigCommand.java
index e2b5659..fc8e570 100644
--- a/nucleus/admin/config-api/src/main/java/com/sun/enterprise/config/modularity/command/GetActiveConfigCommand.java
+++ b/nucleus/admin/config-api/src/main/java/com/sun/enterprise/config/modularity/command/GetActiveConfigCommand.java
@@ -48,8 +48,8 @@
import org.jvnet.hk2.annotations.Service;
import org.jvnet.hk2.config.ConfigBeanProxy;
-import javax.inject.Inject;
-import javax.inject.Named;
+import jakarta.inject.Inject;
+import jakarta.inject.Named;
import java.lang.reflect.InvocationTargetException;
import java.util.ArrayList;
diff --git a/nucleus/admin/config-api/src/main/java/com/sun/enterprise/config/modularity/parser/ConfigurationParser.java b/nucleus/admin/config-api/src/main/java/com/sun/enterprise/config/modularity/parser/ConfigurationParser.java
index de2afe7..3df14f1 100644
--- a/nucleus/admin/config-api/src/main/java/com/sun/enterprise/config/modularity/parser/ConfigurationParser.java
+++ b/nucleus/admin/config-api/src/main/java/com/sun/enterprise/config/modularity/parser/ConfigurationParser.java
@@ -35,7 +35,7 @@
import org.jvnet.hk2.config.SingleConfigCode;
import org.jvnet.hk2.config.TransactionFailure;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
import javax.xml.stream.XMLStreamReader;
import java.beans.PropertyVetoException;
diff --git a/nucleus/admin/config-api/src/main/java/com/sun/enterprise/config/modularity/parser/ModuleConfigurationLoader.java b/nucleus/admin/config-api/src/main/java/com/sun/enterprise/config/modularity/parser/ModuleConfigurationLoader.java
index 5f88e40..22369ff 100644
--- a/nucleus/admin/config-api/src/main/java/com/sun/enterprise/config/modularity/parser/ModuleConfigurationLoader.java
+++ b/nucleus/admin/config-api/src/main/java/com/sun/enterprise/config/modularity/parser/ModuleConfigurationLoader.java
@@ -35,7 +35,7 @@
import org.jvnet.hk2.config.SingleConfigCode;
import org.jvnet.hk2.config.TransactionFailure;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
import java.beans.PropertyVetoException;
import java.util.List;
diff --git a/nucleus/admin/config-api/src/main/java/com/sun/enterprise/config/serverbeans/Cluster.java b/nucleus/admin/config-api/src/main/java/com/sun/enterprise/config/serverbeans/Cluster.java
index 0216d32..165bf44 100644
--- a/nucleus/admin/config-api/src/main/java/com/sun/enterprise/config/serverbeans/Cluster.java
+++ b/nucleus/admin/config-api/src/main/java/com/sun/enterprise/config/serverbeans/Cluster.java
@@ -56,7 +56,7 @@
import org.glassfish.quality.ToDo;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
import jakarta.validation.Payload;
import jakarta.validation.constraints.Max;
import jakarta.validation.constraints.Min;
diff --git a/nucleus/admin/config-api/src/main/java/com/sun/enterprise/config/serverbeans/ConfigBeansUtilities.java b/nucleus/admin/config-api/src/main/java/com/sun/enterprise/config/serverbeans/ConfigBeansUtilities.java
index 7bd334b..400c99b 100644
--- a/nucleus/admin/config-api/src/main/java/com/sun/enterprise/config/serverbeans/ConfigBeansUtilities.java
+++ b/nucleus/admin/config-api/src/main/java/com/sun/enterprise/config/serverbeans/ConfigBeansUtilities.java
@@ -27,8 +27,8 @@
import org.glassfish.api.admin.config.ApplicationName;
import org.jvnet.hk2.annotations.Service;
-import javax.inject.Inject;
-import javax.inject.Singleton;
+import jakarta.inject.Inject;
+import jakarta.inject.Singleton;
/**
* Bunch of utility methods for the new serverbeans config api based on jaxb
diff --git a/nucleus/admin/config-api/src/main/java/com/sun/enterprise/config/serverbeans/CopyConfig.java b/nucleus/admin/config-api/src/main/java/com/sun/enterprise/config/serverbeans/CopyConfig.java
index 93adc1f..7a691c4 100644
--- a/nucleus/admin/config-api/src/main/java/com/sun/enterprise/config/serverbeans/CopyConfig.java
+++ b/nucleus/admin/config-api/src/main/java/com/sun/enterprise/config/serverbeans/CopyConfig.java
@@ -26,7 +26,7 @@
import org.glassfish.server.ServerEnvironmentImpl;
import org.jvnet.hk2.config.TransactionFailure;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
import java.beans.PropertyVetoException;
import java.io.File;
import java.io.IOException;
diff --git a/nucleus/admin/config-api/src/main/java/com/sun/enterprise/config/serverbeans/DomainExtensionResolver.java b/nucleus/admin/config-api/src/main/java/com/sun/enterprise/config/serverbeans/DomainExtensionResolver.java
index 2e6caf8..862bc84 100644
--- a/nucleus/admin/config-api/src/main/java/com/sun/enterprise/config/serverbeans/DomainExtensionResolver.java
+++ b/nucleus/admin/config-api/src/main/java/com/sun/enterprise/config/serverbeans/DomainExtensionResolver.java
@@ -16,7 +16,7 @@
package com.sun.enterprise.config.serverbeans;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
import org.glassfish.api.admin.AdminCommandContext;
import org.glassfish.config.support.CrudResolver;
import org.jvnet.hk2.annotations.Service;
diff --git a/nucleus/admin/config-api/src/main/java/com/sun/enterprise/config/serverbeans/Node.java b/nucleus/admin/config-api/src/main/java/com/sun/enterprise/config/serverbeans/Node.java
index 8909a25..d841749 100644
--- a/nucleus/admin/config-api/src/main/java/com/sun/enterprise/config/serverbeans/Node.java
+++ b/nucleus/admin/config-api/src/main/java/com/sun/enterprise/config/serverbeans/Node.java
@@ -36,7 +36,7 @@
import org.glassfish.api.admin.config.Named;
import org.glassfish.api.admin.config.ReferenceContainer;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
import jakarta.validation.Payload;
import java.beans.PropertyVetoException;
import java.io.File;
diff --git a/nucleus/admin/config-api/src/main/java/com/sun/enterprise/config/serverbeans/SecureAdminInternalUser.java b/nucleus/admin/config-api/src/main/java/com/sun/enterprise/config/serverbeans/SecureAdminInternalUser.java
index 74ad5db..22a7d79 100644
--- a/nucleus/admin/config-api/src/main/java/com/sun/enterprise/config/serverbeans/SecureAdminInternalUser.java
+++ b/nucleus/admin/config-api/src/main/java/com/sun/enterprise/config/serverbeans/SecureAdminInternalUser.java
@@ -28,7 +28,7 @@
import org.jvnet.hk2.config.Configured;
import org.jvnet.hk2.config.TransactionFailure;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
@Configured
/**
diff --git a/nucleus/admin/config-api/src/main/java/com/sun/enterprise/config/serverbeans/SecureAdminPrincipal.java b/nucleus/admin/config-api/src/main/java/com/sun/enterprise/config/serverbeans/SecureAdminPrincipal.java
index 482444d..1ed9b35 100644
--- a/nucleus/admin/config-api/src/main/java/com/sun/enterprise/config/serverbeans/SecureAdminPrincipal.java
+++ b/nucleus/admin/config-api/src/main/java/com/sun/enterprise/config/serverbeans/SecureAdminPrincipal.java
@@ -32,7 +32,7 @@
import org.jvnet.hk2.config.Configured;
import org.jvnet.hk2.config.TransactionFailure;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
@Configured
diff --git a/nucleus/admin/config-api/src/main/java/com/sun/enterprise/config/serverbeans/Server.java b/nucleus/admin/config-api/src/main/java/com/sun/enterprise/config/serverbeans/Server.java
index adcef90..802693e 100644
--- a/nucleus/admin/config-api/src/main/java/com/sun/enterprise/config/serverbeans/Server.java
+++ b/nucleus/admin/config-api/src/main/java/com/sun/enterprise/config/serverbeans/Server.java
@@ -53,7 +53,7 @@
import java.util.Properties;
import java.util.logging.Level;
import java.util.logging.Logger;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
import jakarta.validation.Payload;
import jakarta.validation.constraints.Min;
import jakarta.validation.constraints.NotNull;
diff --git a/nucleus/admin/config-api/src/main/java/org/glassfish/config/support/ConfigConfigBeanListener.java b/nucleus/admin/config-api/src/main/java/org/glassfish/config/support/ConfigConfigBeanListener.java
index aca5c8c..369dd16 100644
--- a/nucleus/admin/config-api/src/main/java/org/glassfish/config/support/ConfigConfigBeanListener.java
+++ b/nucleus/admin/config-api/src/main/java/org/glassfish/config/support/ConfigConfigBeanListener.java
@@ -20,8 +20,8 @@
import java.util.logging.Level;
import java.util.logging.Logger;
-import javax.inject.Inject;
-import javax.inject.Named;
+import jakarta.inject.Inject;
+import jakarta.inject.Named;
import com.sun.enterprise.config.util.ConfigApiLoggerInfo;
import org.glassfish.api.StartupRunLevel;
diff --git a/nucleus/admin/config-api/src/main/java/org/glassfish/config/support/CrudResolver.java b/nucleus/admin/config-api/src/main/java/org/glassfish/config/support/CrudResolver.java
index 73b342a..c76606d 100644
--- a/nucleus/admin/config-api/src/main/java/org/glassfish/config/support/CrudResolver.java
+++ b/nucleus/admin/config-api/src/main/java/org/glassfish/config/support/CrudResolver.java
@@ -22,8 +22,8 @@
import org.jvnet.hk2.config.ConfigBeanProxy;
import org.glassfish.api.admin.AdminCommandContext;
-import javax.inject.Inject;
-import javax.inject.Named;
+import jakarta.inject.Inject;
+import jakarta.inject.Named;
import java.lang.annotation.Annotation;
/**
diff --git a/nucleus/admin/config-api/src/main/java/org/glassfish/config/support/DefaultConfigUpgrade.java b/nucleus/admin/config-api/src/main/java/org/glassfish/config/support/DefaultConfigUpgrade.java
index d4fa818..8a26f9f 100644
--- a/nucleus/admin/config-api/src/main/java/org/glassfish/config/support/DefaultConfigUpgrade.java
+++ b/nucleus/admin/config-api/src/main/java/org/glassfish/config/support/DefaultConfigUpgrade.java
@@ -22,7 +22,7 @@
import java.util.logging.Logger;
import java.util.List;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
import javax.xml.stream.XMLInputFactory;
import static javax.xml.stream.XMLStreamConstants.END_ELEMENT;
import static javax.xml.stream.XMLStreamConstants.START_ELEMENT;
diff --git a/nucleus/admin/config-api/src/main/java/org/glassfish/config/support/DomainXml.java b/nucleus/admin/config-api/src/main/java/org/glassfish/config/support/DomainXml.java
index da0ef68..4101674 100644
--- a/nucleus/admin/config-api/src/main/java/org/glassfish/config/support/DomainXml.java
+++ b/nucleus/admin/config-api/src/main/java/org/glassfish/config/support/DomainXml.java
@@ -37,7 +37,7 @@
import org.jvnet.hk2.config.DomDocument;
import org.jvnet.hk2.config.Populator;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
import javax.xml.stream.XMLInputFactory;
import javax.xml.stream.XMLResolver;
import javax.xml.stream.XMLStreamException;
diff --git a/nucleus/admin/config-api/src/main/java/org/glassfish/config/support/GenericCrudCommand.java b/nucleus/admin/config-api/src/main/java/org/glassfish/config/support/GenericCrudCommand.java
index db02172..b0992f6 100644
--- a/nucleus/admin/config-api/src/main/java/org/glassfish/config/support/GenericCrudCommand.java
+++ b/nucleus/admin/config-api/src/main/java/org/glassfish/config/support/GenericCrudCommand.java
@@ -55,7 +55,7 @@
import java.util.logging.Level;
import java.util.logging.Logger;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
import org.glassfish.api.admin.AdminCommandSecurity;
import org.glassfish.api.logging.LogHelper;
diff --git a/nucleus/admin/config-api/src/main/java/org/glassfish/config/support/GenericDeleteCommand.java b/nucleus/admin/config-api/src/main/java/org/glassfish/config/support/GenericDeleteCommand.java
index 5000282..09ac0c5 100644
--- a/nucleus/admin/config-api/src/main/java/org/glassfish/config/support/GenericDeleteCommand.java
+++ b/nucleus/admin/config-api/src/main/java/org/glassfish/config/support/GenericDeleteCommand.java
@@ -30,7 +30,7 @@
import org.jvnet.hk2.component.*;
import org.jvnet.hk2.config.*;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
import java.beans.PropertyVetoException;
import java.lang.reflect.Proxy;
diff --git a/nucleus/admin/config-api/src/main/java/org/glassfish/config/support/GrizzlyConfigSchemaMigrator.java b/nucleus/admin/config-api/src/main/java/org/glassfish/config/support/GrizzlyConfigSchemaMigrator.java
index 30570ac..53627d4 100644
--- a/nucleus/admin/config-api/src/main/java/org/glassfish/config/support/GrizzlyConfigSchemaMigrator.java
+++ b/nucleus/admin/config-api/src/main/java/org/glassfish/config/support/GrizzlyConfigSchemaMigrator.java
@@ -51,7 +51,7 @@
import org.jvnet.hk2.config.TransactionFailure;
import org.jvnet.hk2.config.types.Property;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
@SuppressWarnings({"deprecation"})
@Service(name="grizzlyconfigupgrade")
diff --git a/nucleus/admin/config-api/src/main/java/org/glassfish/config/support/HttpServicePropertiesUpgrade.java b/nucleus/admin/config-api/src/main/java/org/glassfish/config/support/HttpServicePropertiesUpgrade.java
index 455d909..9e33918 100644
--- a/nucleus/admin/config-api/src/main/java/org/glassfish/config/support/HttpServicePropertiesUpgrade.java
+++ b/nucleus/admin/config-api/src/main/java/org/glassfish/config/support/HttpServicePropertiesUpgrade.java
@@ -29,7 +29,7 @@
import org.jvnet.hk2.config.TransactionFailure;
import org.jvnet.hk2.config.types.Property;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
import java.util.Iterator;
import java.util.List;
diff --git a/nucleus/admin/config-api/src/main/java/org/glassfish/config/support/SystemPropertyUpgrade.java b/nucleus/admin/config-api/src/main/java/org/glassfish/config/support/SystemPropertyUpgrade.java
index 7d021af..b6c3270 100644
--- a/nucleus/admin/config-api/src/main/java/org/glassfish/config/support/SystemPropertyUpgrade.java
+++ b/nucleus/admin/config-api/src/main/java/org/glassfish/config/support/SystemPropertyUpgrade.java
@@ -30,8 +30,8 @@
import org.jvnet.hk2.config.TransactionFailure;
import org.jvnet.hk2.config.SingleConfigCode;
-import javax.inject.Inject;
-import javax.inject.Named;
+import jakarta.inject.Inject;
+import jakarta.inject.Named;
/**
* Upgrade service to add the new 3.1 system properties to the config elements
diff --git a/nucleus/admin/config-api/src/main/java/org/glassfish/config/support/TargetBasedResolver.java b/nucleus/admin/config-api/src/main/java/org/glassfish/config/support/TargetBasedResolver.java
index b10b7f0..40e2184 100644
--- a/nucleus/admin/config-api/src/main/java/org/glassfish/config/support/TargetBasedResolver.java
+++ b/nucleus/admin/config-api/src/main/java/org/glassfish/config/support/TargetBasedResolver.java
@@ -28,7 +28,7 @@
import org.jvnet.hk2.config.ConfigModel;
import org.jvnet.hk2.config.Dom;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
import java.util.Collection;
diff --git a/nucleus/admin/config-api/src/main/java/org/glassfish/config/support/TypeAndNameResolver.java b/nucleus/admin/config-api/src/main/java/org/glassfish/config/support/TypeAndNameResolver.java
index 7765d27..68deb9e 100644
--- a/nucleus/admin/config-api/src/main/java/org/glassfish/config/support/TypeAndNameResolver.java
+++ b/nucleus/admin/config-api/src/main/java/org/glassfish/config/support/TypeAndNameResolver.java
@@ -23,7 +23,7 @@
import org.jvnet.hk2.annotations.Service;
import org.jvnet.hk2.config.ConfigBeanProxy;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
/**
* Resolver based on type + name.
diff --git a/nucleus/admin/config-api/src/main/java/org/glassfish/config/support/TypeResolver.java b/nucleus/admin/config-api/src/main/java/org/glassfish/config/support/TypeResolver.java
index 688ef19..5c115a3 100644
--- a/nucleus/admin/config-api/src/main/java/org/glassfish/config/support/TypeResolver.java
+++ b/nucleus/admin/config-api/src/main/java/org/glassfish/config/support/TypeResolver.java
@@ -24,7 +24,7 @@
import org.jvnet.hk2.annotations.Service;
import org.jvnet.hk2.config.*;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
import java.beans.PropertyVetoException;
/**
diff --git a/nucleus/admin/config-api/src/test/java/com/sun/enterprise/configapi/tests/HttpListenerContainer.java b/nucleus/admin/config-api/src/test/java/com/sun/enterprise/configapi/tests/HttpListenerContainer.java
index 3bf08e5..025d0cf 100644
--- a/nucleus/admin/config-api/src/test/java/com/sun/enterprise/configapi/tests/HttpListenerContainer.java
+++ b/nucleus/admin/config-api/src/test/java/com/sun/enterprise/configapi/tests/HttpListenerContainer.java
@@ -27,8 +27,8 @@
import org.jvnet.hk2.config.ConfigListener;
import org.jvnet.hk2.config.UnprocessedChangeEvents;
-import javax.inject.Inject;
-import javax.inject.Named;
+import jakarta.inject.Inject;
+import jakarta.inject.Named;
/**
* Simple container code that is interested in getting notification of injected model changes
diff --git a/nucleus/admin/config-api/src/test/java/com/sun/enterprise/configapi/tests/NetworkListenersContainer.java b/nucleus/admin/config-api/src/test/java/com/sun/enterprise/configapi/tests/NetworkListenersContainer.java
index 1cb5811..d9030f1 100644
--- a/nucleus/admin/config-api/src/test/java/com/sun/enterprise/configapi/tests/NetworkListenersContainer.java
+++ b/nucleus/admin/config-api/src/test/java/com/sun/enterprise/configapi/tests/NetworkListenersContainer.java
@@ -28,7 +28,7 @@
import org.jvnet.hk2.config.NotProcessed;
import org.jvnet.hk2.config.UnprocessedChangeEvents;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
/**
* Fake container for http service configuration
diff --git a/nucleus/admin/monitor/src/main/java/org/glassfish/admin/monitor/MonitoringBootstrap.java b/nucleus/admin/monitor/src/main/java/org/glassfish/admin/monitor/MonitoringBootstrap.java
index cddb25a..9ae82fa 100644
--- a/nucleus/admin/monitor/src/main/java/org/glassfish/admin/monitor/MonitoringBootstrap.java
+++ b/nucleus/admin/monitor/src/main/java/org/glassfish/admin/monitor/MonitoringBootstrap.java
@@ -81,8 +81,8 @@
import org.glassfish.internal.api.LogManager;
import org.jvnet.hk2.config.Transactions;
-import javax.inject.Inject;
-import javax.inject.Named;
+import jakarta.inject.Inject;
+import jakarta.inject.Named;
import static org.glassfish.admin.monitor.MLogger.*;
diff --git a/nucleus/admin/monitor/src/main/java/org/glassfish/admin/monitor/StatsProviderManagerDelegateImpl.java b/nucleus/admin/monitor/src/main/java/org/glassfish/admin/monitor/StatsProviderManagerDelegateImpl.java
index 5c0d6c5..abe487b 100644
--- a/nucleus/admin/monitor/src/main/java/org/glassfish/admin/monitor/StatsProviderManagerDelegateImpl.java
+++ b/nucleus/admin/monitor/src/main/java/org/glassfish/admin/monitor/StatsProviderManagerDelegateImpl.java
@@ -55,7 +55,7 @@
import org.glassfish.flashlight.client.ProbeClientMediator;
import org.glassfish.flashlight.client.ProbeClientMethodHandle;
-import javax.inject.Singleton;
+import jakarta.inject.Singleton;
import org.jvnet.hk2.config.SingleConfigCode;
import org.jvnet.hk2.config.ConfigSupport;
import org.jvnet.hk2.config.TransactionFailure;
diff --git a/nucleus/admin/monitor/src/main/java/org/glassfish/admin/monitor/cli/Monitor.java b/nucleus/admin/monitor/src/main/java/org/glassfish/admin/monitor/cli/Monitor.java
index 81f6608..19db661 100644
--- a/nucleus/admin/monitor/src/main/java/org/glassfish/admin/monitor/cli/Monitor.java
+++ b/nucleus/admin/monitor/src/main/java/org/glassfish/admin/monitor/cli/Monitor.java
@@ -28,7 +28,7 @@
import com.sun.enterprise.util.LocalStringManagerImpl;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
import java.util.Iterator;
/**
diff --git a/nucleus/admin/monitor/src/main/java/org/glassfish/admin/monitor/jvm/statistics/JVMStatsImpl.java b/nucleus/admin/monitor/src/main/java/org/glassfish/admin/monitor/jvm/statistics/JVMStatsImpl.java
index 2249cbd..07dbf49 100644
--- a/nucleus/admin/monitor/src/main/java/org/glassfish/admin/monitor/jvm/statistics/JVMStatsImpl.java
+++ b/nucleus/admin/monitor/src/main/java/org/glassfish/admin/monitor/jvm/statistics/JVMStatsImpl.java
@@ -37,8 +37,8 @@
import org.glassfish.external.statistics.Statistic;
import org.glassfish.external.statistics.CountStatistic;
-import javax.inject.Inject;
-import javax.inject.Named;
+import jakarta.inject.Inject;
+import jakarta.inject.Named;
/**
*
diff --git a/nucleus/admin/monitor/src/main/java/org/glassfish/flashlight/impl/MonitoringRuntimeDataRegistryImpl.java b/nucleus/admin/monitor/src/main/java/org/glassfish/flashlight/impl/MonitoringRuntimeDataRegistryImpl.java
index e4d347e..3a7f352 100644
--- a/nucleus/admin/monitor/src/main/java/org/glassfish/flashlight/impl/MonitoringRuntimeDataRegistryImpl.java
+++ b/nucleus/admin/monitor/src/main/java/org/glassfish/flashlight/impl/MonitoringRuntimeDataRegistryImpl.java
@@ -27,7 +27,7 @@
import org.glassfish.flashlight.datatree.TreeNode;
import org.jvnet.hk2.annotations.Service;
-import javax.inject.Singleton;
+import jakarta.inject.Singleton;
/**
* @author Harpreet Singh
diff --git a/nucleus/admin/rest/gf-restadmin-connector/src/main/java/org/glassfish/admin/restconnector/ProxyRestCommandAdapter.java b/nucleus/admin/rest/gf-restadmin-connector/src/main/java/org/glassfish/admin/restconnector/ProxyRestCommandAdapter.java
index e19d2a4..a7032b1 100644
--- a/nucleus/admin/rest/gf-restadmin-connector/src/main/java/org/glassfish/admin/restconnector/ProxyRestCommandAdapter.java
+++ b/nucleus/admin/rest/gf-restadmin-connector/src/main/java/org/glassfish/admin/restconnector/ProxyRestCommandAdapter.java
@@ -17,8 +17,8 @@
package org.glassfish.admin.restconnector;
import com.sun.enterprise.config.serverbeans.Config;
-import javax.inject.Inject;
-import javax.inject.Named;
+import jakarta.inject.Inject;
+import jakarta.inject.Named;
import org.glassfish.api.admin.ServerEnvironment;
import org.glassfish.api.container.Adapter;
import org.jvnet.hk2.annotations.Service;
diff --git a/nucleus/admin/rest/gf-restadmin-connector/src/main/java/org/glassfish/admin/restconnector/ProxyRestManagementAdapter.java b/nucleus/admin/rest/gf-restadmin-connector/src/main/java/org/glassfish/admin/restconnector/ProxyRestManagementAdapter.java
index 9e0ca8d..d631d2c 100644
--- a/nucleus/admin/rest/gf-restadmin-connector/src/main/java/org/glassfish/admin/restconnector/ProxyRestManagementAdapter.java
+++ b/nucleus/admin/rest/gf-restadmin-connector/src/main/java/org/glassfish/admin/restconnector/ProxyRestManagementAdapter.java
@@ -22,8 +22,8 @@
import org.jvnet.hk2.annotations.Service;
import org.glassfish.hk2.api.ServiceLocator;
-import javax.inject.Inject;
-import javax.inject.Named;
+import jakarta.inject.Inject;
+import jakarta.inject.Named;
/**
* Implementation of {@link Adapter} for rest based management.
diff --git a/nucleus/admin/rest/gf-restadmin-connector/src/main/java/org/glassfish/admin/restconnector/ProxyRestMonitoringAdapter.java b/nucleus/admin/rest/gf-restadmin-connector/src/main/java/org/glassfish/admin/restconnector/ProxyRestMonitoringAdapter.java
index 5b0222a..a511dcb 100644
--- a/nucleus/admin/rest/gf-restadmin-connector/src/main/java/org/glassfish/admin/restconnector/ProxyRestMonitoringAdapter.java
+++ b/nucleus/admin/rest/gf-restadmin-connector/src/main/java/org/glassfish/admin/restconnector/ProxyRestMonitoringAdapter.java
@@ -22,8 +22,8 @@
import org.jvnet.hk2.annotations.Service;
import org.glassfish.hk2.api.ServiceLocator;
-import javax.inject.Inject;
-import javax.inject.Named;
+import jakarta.inject.Inject;
+import jakarta.inject.Named;
/**
* Implementation of {@link Adapter} for rest based monitoring.
diff --git a/nucleus/admin/rest/rest-service/src/main/java/org/glassfish/admin/rest/RestService.java b/nucleus/admin/rest/rest-service/src/main/java/org/glassfish/admin/rest/RestService.java
index 8e3a014..773e76e 100644
--- a/nucleus/admin/rest/rest-service/src/main/java/org/glassfish/admin/rest/RestService.java
+++ b/nucleus/admin/rest/rest-service/src/main/java/org/glassfish/admin/rest/RestService.java
@@ -17,7 +17,7 @@
package org.glassfish.admin.rest;
import com.sun.enterprise.util.LocalStringManagerImpl;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
import org.glassfish.hk2.api.PostConstruct;
import org.glassfish.hk2.api.PreDestroy;
import org.glassfish.hk2.api.ServiceLocator;
diff --git a/nucleus/admin/rest/rest-service/src/main/java/org/glassfish/admin/rest/adapter/JerseyContainerCommandService.java b/nucleus/admin/rest/rest-service/src/main/java/org/glassfish/admin/rest/adapter/JerseyContainerCommandService.java
index 3791143..8501e0a 100644
--- a/nucleus/admin/rest/rest-service/src/main/java/org/glassfish/admin/rest/adapter/JerseyContainerCommandService.java
+++ b/nucleus/admin/rest/rest-service/src/main/java/org/glassfish/admin/rest/adapter/JerseyContainerCommandService.java
@@ -27,7 +27,7 @@
import java.util.concurrent.Executors;
import java.util.concurrent.Future;
import java.util.logging.Level;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
import javax.security.auth.Subject;
import org.glassfish.admin.rest.RestLogging;
import org.glassfish.api.StartupRunLevel;
diff --git a/nucleus/admin/rest/rest-service/src/main/java/org/glassfish/admin/rest/adapter/LocatorBridge.java b/nucleus/admin/rest/rest-service/src/main/java/org/glassfish/admin/rest/adapter/LocatorBridge.java
index 22040bd..eee9e91 100644
--- a/nucleus/admin/rest/rest-service/src/main/java/org/glassfish/admin/rest/adapter/LocatorBridge.java
+++ b/nucleus/admin/rest/rest-service/src/main/java/org/glassfish/admin/rest/adapter/LocatorBridge.java
@@ -16,7 +16,7 @@
package org.glassfish.admin.rest.adapter;
-import javax.inject.Singleton;
+import jakarta.inject.Singleton;
import org.glassfish.hk2.api.ServiceLocator;
diff --git a/nucleus/admin/rest/rest-service/src/main/java/org/glassfish/admin/rest/adapter/RestAdapter.java b/nucleus/admin/rest/rest-service/src/main/java/org/glassfish/admin/rest/adapter/RestAdapter.java
index f57de58..1f7dd8e 100644
--- a/nucleus/admin/rest/rest-service/src/main/java/org/glassfish/admin/rest/adapter/RestAdapter.java
+++ b/nucleus/admin/rest/rest-service/src/main/java/org/glassfish/admin/rest/adapter/RestAdapter.java
@@ -28,9 +28,9 @@
import java.util.concurrent.CountDownLatch;
import java.util.concurrent.TimeUnit;
import java.util.logging.Level;
-import javax.inject.Inject;
-import javax.inject.Named;
-import javax.inject.Provider;
+import jakarta.inject.Inject;
+import jakarta.inject.Named;
+import jakarta.inject.Provider;
import javax.security.auth.Subject;
import javax.security.auth.login.LoginException;
diff --git a/nucleus/admin/rest/rest-service/src/main/java/org/glassfish/admin/rest/adapter/RestCommandAdapter.java b/nucleus/admin/rest/rest-service/src/main/java/org/glassfish/admin/rest/adapter/RestCommandAdapter.java
index d44331d..5113aa9 100644
--- a/nucleus/admin/rest/rest-service/src/main/java/org/glassfish/admin/rest/adapter/RestCommandAdapter.java
+++ b/nucleus/admin/rest/rest-service/src/main/java/org/glassfish/admin/rest/adapter/RestCommandAdapter.java
@@ -16,7 +16,7 @@
package org.glassfish.admin.rest.adapter;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
import org.glassfish.admin.restconnector.Constants;
import org.glassfish.api.container.EndpointRegistrationException;
import org.jvnet.hk2.annotations.Service;
diff --git a/nucleus/admin/rest/rest-service/src/main/java/org/glassfish/admin/rest/cli/GetGroupNamesCommand.java b/nucleus/admin/rest/rest-service/src/main/java/org/glassfish/admin/rest/cli/GetGroupNamesCommand.java
index 1fbe64d..37fdfab 100644
--- a/nucleus/admin/rest/rest-service/src/main/java/org/glassfish/admin/rest/cli/GetGroupNamesCommand.java
+++ b/nucleus/admin/rest/rest-service/src/main/java/org/glassfish/admin/rest/cli/GetGroupNamesCommand.java
@@ -44,8 +44,8 @@
import org.glassfish.hk2.api.PerLookup;
import org.jvnet.hk2.config.types.Property;
-import javax.inject.Inject;
-import javax.inject.Named;
+import jakarta.inject.Inject;
+import jakarta.inject.Named;
/**
diff --git a/nucleus/admin/rest/rest-service/src/main/java/org/glassfish/admin/rest/cli/GetRestConfig.java b/nucleus/admin/rest/rest-service/src/main/java/org/glassfish/admin/rest/cli/GetRestConfig.java
index 6ddf966..005bc4c 100644
--- a/nucleus/admin/rest/rest-service/src/main/java/org/glassfish/admin/rest/cli/GetRestConfig.java
+++ b/nucleus/admin/rest/rest-service/src/main/java/org/glassfish/admin/rest/cli/GetRestConfig.java
@@ -18,8 +18,8 @@
import com.sun.enterprise.config.serverbeans.Config;
import com.sun.enterprise.config.serverbeans.Domain;
-import javax.inject.Inject;
-import javax.inject.Named;
+import jakarta.inject.Inject;
+import jakarta.inject.Named;
import org.glassfish.admin.restconnector.RestConfig;
import org.glassfish.api.ActionReport;
import org.glassfish.api.admin.*;
diff --git a/nucleus/admin/rest/rest-service/src/main/java/org/glassfish/admin/rest/cli/GetTokensCommand.java b/nucleus/admin/rest/rest-service/src/main/java/org/glassfish/admin/rest/cli/GetTokensCommand.java
index 11ce8ea..d337328 100644
--- a/nucleus/admin/rest/rest-service/src/main/java/org/glassfish/admin/rest/cli/GetTokensCommand.java
+++ b/nucleus/admin/rest/rest-service/src/main/java/org/glassfish/admin/rest/cli/GetTokensCommand.java
@@ -36,7 +36,7 @@
import org.jvnet.hk2.annotations.Service;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
/**
*
diff --git a/nucleus/admin/rest/rest-service/src/main/java/org/glassfish/admin/rest/cli/IsAnonymousUserEnabledCommand.java b/nucleus/admin/rest/rest-service/src/main/java/org/glassfish/admin/rest/cli/IsAnonymousUserEnabledCommand.java
index c6905d8..f4e7089 100644
--- a/nucleus/admin/rest/rest-service/src/main/java/org/glassfish/admin/rest/cli/IsAnonymousUserEnabledCommand.java
+++ b/nucleus/admin/rest/rest-service/src/main/java/org/glassfish/admin/rest/cli/IsAnonymousUserEnabledCommand.java
@@ -29,7 +29,7 @@
import org.glassfish.hk2.api.PerLookup;
import org.glassfish.hk2.api.ServiceLocator;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
/**
*
diff --git a/nucleus/admin/rest/rest-service/src/main/java/org/glassfish/admin/rest/cli/PredefinedAuthRealmClassNamesCommand.java b/nucleus/admin/rest/rest-service/src/main/java/org/glassfish/admin/rest/cli/PredefinedAuthRealmClassNamesCommand.java
index 0145d0a..a5ff162 100644
--- a/nucleus/admin/rest/rest-service/src/main/java/org/glassfish/admin/rest/cli/PredefinedAuthRealmClassNamesCommand.java
+++ b/nucleus/admin/rest/rest-service/src/main/java/org/glassfish/admin/rest/cli/PredefinedAuthRealmClassNamesCommand.java
@@ -27,7 +27,7 @@
import org.glassfish.hk2.api.PerLookup;
import org.glassfish.api.admin.*;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
/**
* returns the list of targets
diff --git a/nucleus/admin/rest/rest-service/src/main/java/org/glassfish/admin/rest/cli/SetRestConfig.java b/nucleus/admin/rest/rest-service/src/main/java/org/glassfish/admin/rest/cli/SetRestConfig.java
index e11399f..76087f6 100644
--- a/nucleus/admin/rest/rest-service/src/main/java/org/glassfish/admin/rest/cli/SetRestConfig.java
+++ b/nucleus/admin/rest/rest-service/src/main/java/org/glassfish/admin/rest/cli/SetRestConfig.java
@@ -19,8 +19,8 @@
import com.sun.enterprise.config.serverbeans.Config;
import com.sun.enterprise.config.serverbeans.Domain;
import java.beans.PropertyVetoException;
-import javax.inject.Inject;
-import javax.inject.Named;
+import jakarta.inject.Inject;
+import jakarta.inject.Named;
import org.glassfish.admin.restconnector.RestConfig;
import org.glassfish.api.ActionReport;
import org.glassfish.api.Param;
diff --git a/nucleus/admin/rest/rest-service/src/main/java/org/glassfish/admin/rest/cli/SupportsUserManagementCommand.java b/nucleus/admin/rest/rest-service/src/main/java/org/glassfish/admin/rest/cli/SupportsUserManagementCommand.java
index 7271a6d..8d8eaf4 100644
--- a/nucleus/admin/rest/rest-service/src/main/java/org/glassfish/admin/rest/cli/SupportsUserManagementCommand.java
+++ b/nucleus/admin/rest/rest-service/src/main/java/org/glassfish/admin/rest/cli/SupportsUserManagementCommand.java
@@ -47,8 +47,8 @@
import org.glassfish.hk2.api.PerLookup;
import org.jvnet.hk2.config.types.Property;
-import javax.inject.Inject;
-import javax.inject.Named;
+import jakarta.inject.Inject;
+import jakarta.inject.Named;
/**
* returns the list of targets
diff --git a/nucleus/admin/rest/rest-service/src/main/java/org/glassfish/admin/rest/cli/SynchronizeRealmFromConfig.java b/nucleus/admin/rest/rest-service/src/main/java/org/glassfish/admin/rest/cli/SynchronizeRealmFromConfig.java
index 9e799f1..0fe04cc 100644
--- a/nucleus/admin/rest/rest-service/src/main/java/org/glassfish/admin/rest/cli/SynchronizeRealmFromConfig.java
+++ b/nucleus/admin/rest/rest-service/src/main/java/org/glassfish/admin/rest/cli/SynchronizeRealmFromConfig.java
@@ -50,8 +50,8 @@
import org.glassfish.hk2.api.PerLookup;
import org.jvnet.hk2.config.types.Property;
-import javax.inject.Inject;
-import javax.inject.Named;
+import jakarta.inject.Inject;
+import jakarta.inject.Named;
/**
* returns the list of targets
diff --git a/nucleus/admin/rest/rest-service/src/main/java/org/glassfish/admin/rest/composite/RestModelExtension.java b/nucleus/admin/rest/rest-service/src/main/java/org/glassfish/admin/rest/composite/RestModelExtension.java
index 745274d..da17df5 100644
--- a/nucleus/admin/rest/rest-service/src/main/java/org/glassfish/admin/rest/composite/RestModelExtension.java
+++ b/nucleus/admin/rest/rest-service/src/main/java/org/glassfish/admin/rest/composite/RestModelExtension.java
@@ -21,7 +21,7 @@
import java.lang.annotation.Retention;
import java.lang.annotation.RetentionPolicy;
import java.lang.annotation.Target;
-import javax.inject.Qualifier;
+import jakarta.inject.Qualifier;
import org.jvnet.hk2.annotations.Contract;
/**
diff --git a/nucleus/admin/rest/rest-service/src/main/java/org/glassfish/admin/rest/composite/metadata/AttributeReference.java b/nucleus/admin/rest/rest-service/src/main/java/org/glassfish/admin/rest/composite/metadata/AttributeReference.java
index 710f7ad..f721ab6 100644
--- a/nucleus/admin/rest/rest-service/src/main/java/org/glassfish/admin/rest/composite/metadata/AttributeReference.java
+++ b/nucleus/admin/rest/rest-service/src/main/java/org/glassfish/admin/rest/composite/metadata/AttributeReference.java
@@ -21,7 +21,7 @@
import java.lang.annotation.Retention;
import java.lang.annotation.RetentionPolicy;
import java.lang.annotation.Target;
-import javax.inject.Qualifier;
+import jakarta.inject.Qualifier;
/**
* Many, if not all, <code>RestModel</code> instances will expose properties that mirror similarly-named properties on
diff --git a/nucleus/admin/rest/rest-service/src/main/java/org/glassfish/admin/rest/composite/metadata/Confidential.java b/nucleus/admin/rest/rest-service/src/main/java/org/glassfish/admin/rest/composite/metadata/Confidential.java
index b26b671..40f403a 100644
--- a/nucleus/admin/rest/rest-service/src/main/java/org/glassfish/admin/rest/composite/metadata/Confidential.java
+++ b/nucleus/admin/rest/rest-service/src/main/java/org/glassfish/admin/rest/composite/metadata/Confidential.java
@@ -21,7 +21,7 @@
import java.lang.annotation.Retention;
import java.lang.annotation.RetentionPolicy;
import java.lang.annotation.Target;
-import javax.inject.Qualifier;
+import jakarta.inject.Qualifier;
/**
*
diff --git a/nucleus/admin/rest/rest-service/src/main/java/org/glassfish/admin/rest/composite/metadata/CreateOnly.java b/nucleus/admin/rest/rest-service/src/main/java/org/glassfish/admin/rest/composite/metadata/CreateOnly.java
index b29173e..4a13405 100644
--- a/nucleus/admin/rest/rest-service/src/main/java/org/glassfish/admin/rest/composite/metadata/CreateOnly.java
+++ b/nucleus/admin/rest/rest-service/src/main/java/org/glassfish/admin/rest/composite/metadata/CreateOnly.java
@@ -21,7 +21,7 @@
import java.lang.annotation.Retention;
import java.lang.annotation.RetentionPolicy;
import java.lang.annotation.Target;
-import javax.inject.Qualifier;
+import jakarta.inject.Qualifier;
/**
*
diff --git a/nucleus/admin/rest/rest-service/src/main/java/org/glassfish/admin/rest/composite/metadata/Default.java b/nucleus/admin/rest/rest-service/src/main/java/org/glassfish/admin/rest/composite/metadata/Default.java
index 2b88a42..ff4ea5a 100644
--- a/nucleus/admin/rest/rest-service/src/main/java/org/glassfish/admin/rest/composite/metadata/Default.java
+++ b/nucleus/admin/rest/rest-service/src/main/java/org/glassfish/admin/rest/composite/metadata/Default.java
@@ -21,7 +21,7 @@
import java.lang.annotation.Retention;
import java.lang.annotation.RetentionPolicy;
import java.lang.annotation.Target;
-import javax.inject.Qualifier;
+import jakarta.inject.Qualifier;
/**
*
diff --git a/nucleus/admin/rest/rest-service/src/main/java/org/glassfish/admin/rest/composite/metadata/DefaultBeanReference.java b/nucleus/admin/rest/rest-service/src/main/java/org/glassfish/admin/rest/composite/metadata/DefaultBeanReference.java
index 365138e..d3dae30 100644
--- a/nucleus/admin/rest/rest-service/src/main/java/org/glassfish/admin/rest/composite/metadata/DefaultBeanReference.java
+++ b/nucleus/admin/rest/rest-service/src/main/java/org/glassfish/admin/rest/composite/metadata/DefaultBeanReference.java
@@ -21,7 +21,7 @@
import java.lang.annotation.Retention;
import java.lang.annotation.RetentionPolicy;
import java.lang.annotation.Target;
-import javax.inject.Qualifier;
+import jakarta.inject.Qualifier;
/**
* Often a REST model mirrors/wraps an mbean, descriptor bean or config bean.
diff --git a/nucleus/admin/rest/rest-service/src/main/java/org/glassfish/admin/rest/composite/metadata/HelpText.java b/nucleus/admin/rest/rest-service/src/main/java/org/glassfish/admin/rest/composite/metadata/HelpText.java
index 9a84caa..abc3ca4 100644
--- a/nucleus/admin/rest/rest-service/src/main/java/org/glassfish/admin/rest/composite/metadata/HelpText.java
+++ b/nucleus/admin/rest/rest-service/src/main/java/org/glassfish/admin/rest/composite/metadata/HelpText.java
@@ -21,7 +21,7 @@
import java.lang.annotation.Retention;
import java.lang.annotation.RetentionPolicy;
import java.lang.annotation.Target;
-import javax.inject.Qualifier;
+import jakarta.inject.Qualifier;
import org.jvnet.hk2.annotations.Contract;
/**
diff --git a/nucleus/admin/rest/rest-service/src/main/java/org/glassfish/admin/rest/composite/metadata/Immutable.java b/nucleus/admin/rest/rest-service/src/main/java/org/glassfish/admin/rest/composite/metadata/Immutable.java
index 14b6d46..fa54aa4 100644
--- a/nucleus/admin/rest/rest-service/src/main/java/org/glassfish/admin/rest/composite/metadata/Immutable.java
+++ b/nucleus/admin/rest/rest-service/src/main/java/org/glassfish/admin/rest/composite/metadata/Immutable.java
@@ -21,7 +21,7 @@
import java.lang.annotation.Retention;
import java.lang.annotation.RetentionPolicy;
import java.lang.annotation.Target;
-import javax.inject.Qualifier;
+import jakarta.inject.Qualifier;
/**
*
diff --git a/nucleus/admin/rest/rest-service/src/main/java/org/glassfish/admin/rest/composite/metadata/LegalValues.java b/nucleus/admin/rest/rest-service/src/main/java/org/glassfish/admin/rest/composite/metadata/LegalValues.java
index 3ad289b..cd755e8 100644
--- a/nucleus/admin/rest/rest-service/src/main/java/org/glassfish/admin/rest/composite/metadata/LegalValues.java
+++ b/nucleus/admin/rest/rest-service/src/main/java/org/glassfish/admin/rest/composite/metadata/LegalValues.java
@@ -21,7 +21,7 @@
import java.lang.annotation.Retention;
import java.lang.annotation.RetentionPolicy;
import java.lang.annotation.Target;
-import javax.inject.Qualifier;
+import jakarta.inject.Qualifier;
/**
* Used to indicate that a String model property can only contain a specific list of strings.
diff --git a/nucleus/admin/rest/rest-service/src/main/java/org/glassfish/admin/rest/composite/metadata/ReadOnly.java b/nucleus/admin/rest/rest-service/src/main/java/org/glassfish/admin/rest/composite/metadata/ReadOnly.java
index 481d89d..5522563 100644
--- a/nucleus/admin/rest/rest-service/src/main/java/org/glassfish/admin/rest/composite/metadata/ReadOnly.java
+++ b/nucleus/admin/rest/rest-service/src/main/java/org/glassfish/admin/rest/composite/metadata/ReadOnly.java
@@ -21,7 +21,7 @@
import java.lang.annotation.Retention;
import java.lang.annotation.RetentionPolicy;
import java.lang.annotation.Target;
-import javax.inject.Qualifier;
+import jakarta.inject.Qualifier;
/**
* An attribute not intended to be updated/set by the client should be marked read only to indicate that any value
diff --git a/nucleus/admin/rest/rest-service/src/main/java/org/glassfish/admin/rest/composite/metadata/Units.java b/nucleus/admin/rest/rest-service/src/main/java/org/glassfish/admin/rest/composite/metadata/Units.java
index 74a65e9..dd806e6 100644
--- a/nucleus/admin/rest/rest-service/src/main/java/org/glassfish/admin/rest/composite/metadata/Units.java
+++ b/nucleus/admin/rest/rest-service/src/main/java/org/glassfish/admin/rest/composite/metadata/Units.java
@@ -21,7 +21,7 @@
import java.lang.annotation.Retention;
import java.lang.annotation.RetentionPolicy;
import java.lang.annotation.Target;
-import javax.inject.Qualifier;
+import jakarta.inject.Qualifier;
/**
* Used to indicate what units a scalar property has (e.g. that a long property holds bytes)
diff --git a/nucleus/admin/rest/rest-service/src/main/java/org/glassfish/admin/rest/generator/client/GenerateClientCommand.java b/nucleus/admin/rest/rest-service/src/main/java/org/glassfish/admin/rest/generator/client/GenerateClientCommand.java
index 994d0c4..f2806fc 100644
--- a/nucleus/admin/rest/rest-service/src/main/java/org/glassfish/admin/rest/generator/client/GenerateClientCommand.java
+++ b/nucleus/admin/rest/rest-service/src/main/java/org/glassfish/admin/rest/generator/client/GenerateClientCommand.java
@@ -46,7 +46,7 @@
import org.glassfish.hk2.api.PerLookup;
import org.glassfish.hk2.api.ServiceLocator;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
import org.glassfish.api.admin.AccessRequired;
/**
diff --git a/nucleus/admin/rest/rest-service/src/main/java/org/glassfish/admin/rest/provider/BaseProvider.java b/nucleus/admin/rest/rest-service/src/main/java/org/glassfish/admin/rest/provider/BaseProvider.java
index 81659e2..af1adeb 100644
--- a/nucleus/admin/rest/rest-service/src/main/java/org/glassfish/admin/rest/provider/BaseProvider.java
+++ b/nucleus/admin/rest/rest-service/src/main/java/org/glassfish/admin/rest/provider/BaseProvider.java
@@ -53,10 +53,10 @@
public static final String JSONP_CALLBACK = "jsoncallback";
@Context
- protected javax.inject.Provider<UriInfo> uriInfo;
+ protected jakarta.inject.Provider<UriInfo> uriInfo;
@Context
- protected javax.inject.Provider<HttpHeaders> requestHeaders;
+ protected jakarta.inject.Provider<HttpHeaders> requestHeaders;
@Context
protected ServiceLocator habitat;
diff --git a/nucleus/admin/rest/rest-service/src/main/java/org/glassfish/admin/rest/provider/FormWriter.java b/nucleus/admin/rest/rest-service/src/main/java/org/glassfish/admin/rest/provider/FormWriter.java
index c78ed8b..5501c8d 100644
--- a/nucleus/admin/rest/rest-service/src/main/java/org/glassfish/admin/rest/provider/FormWriter.java
+++ b/nucleus/admin/rest/rest-service/src/main/java/org/glassfish/admin/rest/provider/FormWriter.java
@@ -40,7 +40,7 @@
@Provider
public class FormWriter implements MessageBodyWriter<Dom> {
@Context
- protected javax.inject.Provider<UriInfo> uriInfo;
+ protected jakarta.inject.Provider<UriInfo> uriInfo;
@Override
public boolean isWriteable(Class<?> type, Type genericType, Annotation[] annotations, MediaType mediaType) {
diff --git a/nucleus/admin/rest/rest-service/src/main/java/org/glassfish/admin/rest/provider/JsonStringReaderWriter.java b/nucleus/admin/rest/rest-service/src/main/java/org/glassfish/admin/rest/provider/JsonStringReaderWriter.java
index 6e34d2f..b2c0d40 100644
--- a/nucleus/admin/rest/rest-service/src/main/java/org/glassfish/admin/rest/provider/JsonStringReaderWriter.java
+++ b/nucleus/admin/rest/rest-service/src/main/java/org/glassfish/admin/rest/provider/JsonStringReaderWriter.java
@@ -28,7 +28,7 @@
import jakarta.ws.rs.core.MultivaluedMap;
import jakarta.ws.rs.ext.Provider;
-import javax.inject.Singleton;
+import jakarta.inject.Singleton;
import org.glassfish.jersey.message.internal.AbstractMessageReaderWriterProvider;
diff --git a/nucleus/admin/rest/rest-service/src/main/java/org/glassfish/admin/rest/resources/AbstractResource.java b/nucleus/admin/rest/rest-service/src/main/java/org/glassfish/admin/rest/resources/AbstractResource.java
index 11ddb7e..241461b 100644
--- a/nucleus/admin/rest/rest-service/src/main/java/org/glassfish/admin/rest/resources/AbstractResource.java
+++ b/nucleus/admin/rest/rest-service/src/main/java/org/glassfish/admin/rest/resources/AbstractResource.java
@@ -18,7 +18,7 @@
import java.util.List;
import java.util.logging.Logger;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
import javax.security.auth.Subject;
import jakarta.ws.rs.core.Context;
import jakarta.ws.rs.core.HttpHeaders;
diff --git a/nucleus/admin/rest/rest-service/src/main/java/org/glassfish/admin/rest/resources/LeafResource.java b/nucleus/admin/rest/rest-service/src/main/java/org/glassfish/admin/rest/resources/LeafResource.java
index af7cb8f..592682b 100644
--- a/nucleus/admin/rest/rest-service/src/main/java/org/glassfish/admin/rest/resources/LeafResource.java
+++ b/nucleus/admin/rest/rest-service/src/main/java/org/glassfish/admin/rest/resources/LeafResource.java
@@ -20,7 +20,7 @@
import java.util.Map;
import java.util.TreeMap;
-import javax.inject.Provider;
+import jakarta.inject.Provider;
import jakarta.ws.rs.core.Context;
import jakarta.ws.rs.core.HttpHeaders;
import jakarta.ws.rs.core.MediaType;
diff --git a/nucleus/admin/rest/rest-service/src/main/java/org/glassfish/admin/rest/resources/SessionsResource.java b/nucleus/admin/rest/rest-service/src/main/java/org/glassfish/admin/rest/resources/SessionsResource.java
index 6443c99..e70ad03 100644
--- a/nucleus/admin/rest/rest-service/src/main/java/org/glassfish/admin/rest/resources/SessionsResource.java
+++ b/nucleus/admin/rest/rest-service/src/main/java/org/glassfish/admin/rest/resources/SessionsResource.java
@@ -17,7 +17,7 @@
package org.glassfish.admin.rest.resources;
import java.util.HashMap;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
import javax.security.auth.Subject;
import jakarta.ws.rs.Consumes;
import jakarta.ws.rs.POST;
diff --git a/nucleus/admin/rest/rest-service/src/main/java/org/glassfish/admin/rest/resources/admin/CommandResource.java b/nucleus/admin/rest/rest-service/src/main/java/org/glassfish/admin/rest/resources/admin/CommandResource.java
index dffa878..afc9617 100644
--- a/nucleus/admin/rest/rest-service/src/main/java/org/glassfish/admin/rest/resources/admin/CommandResource.java
+++ b/nucleus/admin/rest/rest-service/src/main/java/org/glassfish/admin/rest/resources/admin/CommandResource.java
@@ -33,7 +33,7 @@
import java.io.IOException;
import java.net.HttpURLConnection;
import java.util.logging.Level;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
import javax.security.auth.Subject;
import jakarta.ws.rs.*;
import jakarta.ws.rs.core.*;
diff --git a/nucleus/admin/rest/rest-service/src/main/java/org/glassfish/admin/rest/resources/custom/JmxServiceUrlsResource.java b/nucleus/admin/rest/rest-service/src/main/java/org/glassfish/admin/rest/resources/custom/JmxServiceUrlsResource.java
index d8d2b13..f20a0cf 100644
--- a/nucleus/admin/rest/rest-service/src/main/java/org/glassfish/admin/rest/resources/custom/JmxServiceUrlsResource.java
+++ b/nucleus/admin/rest/rest-service/src/main/java/org/glassfish/admin/rest/resources/custom/JmxServiceUrlsResource.java
@@ -19,7 +19,7 @@
import java.lang.management.ManagementFactory;
import java.util.ArrayList;
import java.util.List;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
import javax.management.JMException;
import javax.management.MBeanServer;
import javax.management.ObjectName;
diff --git a/nucleus/admin/server-mgmt/src/main/java/com/sun/enterprise/admin/servermgmt/V2ToV3ConfigUpgrade.java b/nucleus/admin/server-mgmt/src/main/java/com/sun/enterprise/admin/servermgmt/V2ToV3ConfigUpgrade.java
index 2ef7228..3a1192d 100644
--- a/nucleus/admin/server-mgmt/src/main/java/com/sun/enterprise/admin/servermgmt/V2ToV3ConfigUpgrade.java
+++ b/nucleus/admin/server-mgmt/src/main/java/com/sun/enterprise/admin/servermgmt/V2ToV3ConfigUpgrade.java
@@ -22,7 +22,7 @@
import java.beans.PropertyVetoException;
import java.util.*;
import java.util.logging.Level;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
import org.glassfish.api.admin.config.ConfigurationUpgrade;
import org.glassfish.hk2.api.PerLookup;
import org.glassfish.hk2.api.PostConstruct;
diff --git a/nucleus/admin/server-mgmt/src/main/java/com/sun/enterprise/admin/servermgmt/V2ToV3ConfigUpgradeTester.java b/nucleus/admin/server-mgmt/src/main/java/com/sun/enterprise/admin/servermgmt/V2ToV3ConfigUpgradeTester.java
index 0f3f742..1aeec26 100644
--- a/nucleus/admin/server-mgmt/src/main/java/com/sun/enterprise/admin/servermgmt/V2ToV3ConfigUpgradeTester.java
+++ b/nucleus/admin/server-mgmt/src/main/java/com/sun/enterprise/admin/servermgmt/V2ToV3ConfigUpgradeTester.java
@@ -33,7 +33,7 @@
import org.jvnet.hk2.annotations.Service;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
import org.glassfish.api.admin.AccessRequired.AccessCheck;
import org.glassfish.api.admin.AdminCommandSecurity;
diff --git a/nucleus/admin/server-mgmt/src/main/java/com/sun/enterprise/admin/servermgmt/cli/ChangeMasterPasswordCommand.java b/nucleus/admin/server-mgmt/src/main/java/com/sun/enterprise/admin/servermgmt/cli/ChangeMasterPasswordCommand.java
index 2a26f64..b1413c5 100644
--- a/nucleus/admin/server-mgmt/src/main/java/com/sun/enterprise/admin/servermgmt/cli/ChangeMasterPasswordCommand.java
+++ b/nucleus/admin/server-mgmt/src/main/java/com/sun/enterprise/admin/servermgmt/cli/ChangeMasterPasswordCommand.java
@@ -26,7 +26,7 @@
import org.glassfish.hk2.api.PerLookup;
import org.glassfish.hk2.api.ServiceLocator;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
import java.io.File;
import java.io.IOException;
import java.util.ArrayList;
diff --git a/nucleus/admin/server-mgmt/src/main/java/com/sun/enterprise/admin/servermgmt/cli/RestartDomainCommand.java b/nucleus/admin/server-mgmt/src/main/java/com/sun/enterprise/admin/servermgmt/cli/RestartDomainCommand.java
index 4fe8b05..4508bfb 100644
--- a/nucleus/admin/server-mgmt/src/main/java/com/sun/enterprise/admin/servermgmt/cli/RestartDomainCommand.java
+++ b/nucleus/admin/server-mgmt/src/main/java/com/sun/enterprise/admin/servermgmt/cli/RestartDomainCommand.java
@@ -29,7 +29,7 @@
import com.sun.enterprise.admin.cli.remote.*;
import com.sun.enterprise.universal.i18n.LocalStringsImpl;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
/**
* THe restart-domain command.
diff --git a/nucleus/admin/server-mgmt/src/main/java/com/sun/enterprise/admin/servermgmt/cli/StartDomainCommand.java b/nucleus/admin/server-mgmt/src/main/java/com/sun/enterprise/admin/servermgmt/cli/StartDomainCommand.java
index 5db3589..68e6015 100644
--- a/nucleus/admin/server-mgmt/src/main/java/com/sun/enterprise/admin/servermgmt/cli/StartDomainCommand.java
+++ b/nucleus/admin/server-mgmt/src/main/java/com/sun/enterprise/admin/servermgmt/cli/StartDomainCommand.java
@@ -21,7 +21,7 @@
import java.util.*;
import java.util.logging.*;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
import org.jvnet.hk2.annotations.*;
import org.glassfish.api.Param;
diff --git a/nucleus/admin/server-mgmt/src/main/java/com/sun/enterprise/admin/servermgmt/logging/UpgradeLogging.java b/nucleus/admin/server-mgmt/src/main/java/com/sun/enterprise/admin/servermgmt/logging/UpgradeLogging.java
index ea7ea7e..2f76e17 100644
--- a/nucleus/admin/server-mgmt/src/main/java/com/sun/enterprise/admin/servermgmt/logging/UpgradeLogging.java
+++ b/nucleus/admin/server-mgmt/src/main/java/com/sun/enterprise/admin/servermgmt/logging/UpgradeLogging.java
@@ -27,7 +27,7 @@
import java.util.HashMap;
import java.util.Map;
import java.util.logging.Level;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
import org.glassfish.api.admin.config.ConfigurationUpgrade;
import org.glassfish.hk2.api.PostConstruct;
import org.jvnet.hk2.annotations.Service;
diff --git a/nucleus/admin/util/src/main/java/com/sun/enterprise/admin/commands/CreateSsl.java b/nucleus/admin/util/src/main/java/com/sun/enterprise/admin/commands/CreateSsl.java
index d0dce31..b93b853 100644
--- a/nucleus/admin/util/src/main/java/com/sun/enterprise/admin/commands/CreateSsl.java
+++ b/nucleus/admin/util/src/main/java/com/sun/enterprise/admin/commands/CreateSsl.java
@@ -44,8 +44,8 @@
import org.jvnet.hk2.config.SingleConfigCode;
import org.jvnet.hk2.config.TransactionFailure;
-import javax.inject.Inject;
-import javax.inject.Named;
+import jakarta.inject.Inject;
+import jakarta.inject.Named;
/**
* Create Ssl Command
diff --git a/nucleus/admin/util/src/main/java/com/sun/enterprise/admin/commands/DeleteSsl.java b/nucleus/admin/util/src/main/java/com/sun/enterprise/admin/commands/DeleteSsl.java
index 4a4e757..757b33c 100644
--- a/nucleus/admin/util/src/main/java/com/sun/enterprise/admin/commands/DeleteSsl.java
+++ b/nucleus/admin/util/src/main/java/com/sun/enterprise/admin/commands/DeleteSsl.java
@@ -36,8 +36,8 @@
import org.jvnet.hk2.config.SingleConfigCode;
import org.jvnet.hk2.config.TransactionFailure;
-import javax.inject.Inject;
-import javax.inject.Named;
+import jakarta.inject.Inject;
+import jakarta.inject.Named;
import java.beans.PropertyVetoException;
/**
diff --git a/nucleus/admin/util/src/main/java/com/sun/enterprise/admin/util/AdminLoginModule.java b/nucleus/admin/util/src/main/java/com/sun/enterprise/admin/util/AdminLoginModule.java
index 287d631..f44c23c 100644
--- a/nucleus/admin/util/src/main/java/com/sun/enterprise/admin/util/AdminLoginModule.java
+++ b/nucleus/admin/util/src/main/java/com/sun/enterprise/admin/util/AdminLoginModule.java
@@ -26,7 +26,7 @@
import java.util.Map;
import java.util.logging.Level;
import java.util.logging.Logger;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
import javax.security.auth.Subject;
import javax.security.auth.callback.*;
import javax.security.auth.login.LoginException;
diff --git a/nucleus/admin/util/src/main/java/com/sun/enterprise/admin/util/CommandSecurityChecker.java b/nucleus/admin/util/src/main/java/com/sun/enterprise/admin/util/CommandSecurityChecker.java
index 08aca6c..f6f3242 100644
--- a/nucleus/admin/util/src/main/java/com/sun/enterprise/admin/util/CommandSecurityChecker.java
+++ b/nucleus/admin/util/src/main/java/com/sun/enterprise/admin/util/CommandSecurityChecker.java
@@ -27,8 +27,8 @@
import java.util.logging.Logger;
import java.util.regex.Matcher;
import java.util.regex.Pattern;
-import javax.inject.Inject;
-import javax.inject.Singleton;
+import jakarta.inject.Inject;
+import jakarta.inject.Singleton;
import javax.security.auth.Subject;
import org.glassfish.api.admin.*;
import org.glassfish.api.admin.AccessRequired.AccessCheck;
diff --git a/nucleus/admin/util/src/main/java/com/sun/enterprise/admin/util/CommandThreadPool.java b/nucleus/admin/util/src/main/java/com/sun/enterprise/admin/util/CommandThreadPool.java
index c787dfe..5919fc1 100644
--- a/nucleus/admin/util/src/main/java/com/sun/enterprise/admin/util/CommandThreadPool.java
+++ b/nucleus/admin/util/src/main/java/com/sun/enterprise/admin/util/CommandThreadPool.java
@@ -31,9 +31,9 @@
import org.glassfish.hk2.api.ServiceLocator;
import org.glassfish.hk2.runlevel.RunLevel;
-import javax.inject.Singleton;
+import jakarta.inject.Singleton;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
import java.util.List;
import java.util.concurrent.*;
import java.util.logging.Logger;
diff --git a/nucleus/admin/util/src/main/java/com/sun/enterprise/admin/util/GenericAdminAuthenticator.java b/nucleus/admin/util/src/main/java/com/sun/enterprise/admin/util/GenericAdminAuthenticator.java
index 3fc3a1b..0f3ec6f 100644
--- a/nucleus/admin/util/src/main/java/com/sun/enterprise/admin/util/GenericAdminAuthenticator.java
+++ b/nucleus/admin/util/src/main/java/com/sun/enterprise/admin/util/GenericAdminAuthenticator.java
@@ -43,8 +43,8 @@
import org.jvnet.hk2.annotations.Optional;
import org.jvnet.hk2.annotations.Service;
-import javax.inject.Inject;
-import javax.inject.Named;
+import jakarta.inject.Inject;
+import jakarta.inject.Named;
import javax.security.auth.login.LoginException;
import javax.security.auth.Subject;
import javax.management.remote.JMXAuthenticator;
diff --git a/nucleus/admin/util/src/main/java/com/sun/enterprise/admin/util/InstanceStateServiceImpl.java b/nucleus/admin/util/src/main/java/com/sun/enterprise/admin/util/InstanceStateServiceImpl.java
index 996154c..fff92f1 100644
--- a/nucleus/admin/util/src/main/java/com/sun/enterprise/admin/util/InstanceStateServiceImpl.java
+++ b/nucleus/admin/util/src/main/java/com/sun/enterprise/admin/util/InstanceStateServiceImpl.java
@@ -26,7 +26,7 @@
import java.util.concurrent.Future;
import java.util.logging.Level;
import java.util.logging.Logger;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
import org.glassfish.api.StartupRunLevel;
import org.glassfish.api.admin.*;
import org.glassfish.hk2.runlevel.RunLevel;
diff --git a/nucleus/admin/util/src/main/java/com/sun/enterprise/admin/util/NamedResourceManager.java b/nucleus/admin/util/src/main/java/com/sun/enterprise/admin/util/NamedResourceManager.java
index 23e05f5..52a5a5b 100644
--- a/nucleus/admin/util/src/main/java/com/sun/enterprise/admin/util/NamedResourceManager.java
+++ b/nucleus/admin/util/src/main/java/com/sun/enterprise/admin/util/NamedResourceManager.java
@@ -25,7 +25,7 @@
import java.util.logging.Level;
import java.util.logging.Logger;
import java.util.regex.Pattern;
-import javax.inject.Singleton;
+import jakarta.inject.Singleton;
import org.glassfish.api.admin.NamedResource;
import org.glassfish.logging.annotation.LogMessagesResourceBundle;
import org.glassfish.logging.annotation.LoggerInfo;
diff --git a/nucleus/admin/util/src/main/java/com/sun/enterprise/admin/util/cache/AdminCacheMemStore.java b/nucleus/admin/util/src/main/java/com/sun/enterprise/admin/util/cache/AdminCacheMemStore.java
index b2bc6e9..ab9589f 100644
--- a/nucleus/admin/util/src/main/java/com/sun/enterprise/admin/util/cache/AdminCacheMemStore.java
+++ b/nucleus/admin/util/src/main/java/com/sun/enterprise/admin/util/cache/AdminCacheMemStore.java
@@ -20,7 +20,7 @@
import java.util.Date;
import java.util.HashMap;
import java.util.Map;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
import org.jvnet.hk2.annotations.Service;
/** In memory {@link AdminCache} containing fixed amount of items. Rotation
diff --git a/nucleus/admin/util/src/main/java/org/glassfish/admin/cli/resources/CreateResourceRef.java b/nucleus/admin/util/src/main/java/org/glassfish/admin/cli/resources/CreateResourceRef.java
index e7c6b19..68a8b37 100644
--- a/nucleus/admin/util/src/main/java/org/glassfish/admin/cli/resources/CreateResourceRef.java
+++ b/nucleus/admin/util/src/main/java/org/glassfish/admin/cli/resources/CreateResourceRef.java
@@ -37,7 +37,7 @@
import org.glassfish.hk2.api.ServiceLocator;
import org.jvnet.hk2.config.TransactionFailure;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
import java.util.ArrayList;
import java.util.Collection;
diff --git a/nucleus/admin/util/src/main/java/org/glassfish/admin/cli/resources/DeleteResourceRef.java b/nucleus/admin/util/src/main/java/org/glassfish/admin/cli/resources/DeleteResourceRef.java
index 0a34ace..99de284 100644
--- a/nucleus/admin/util/src/main/java/org/glassfish/admin/cli/resources/DeleteResourceRef.java
+++ b/nucleus/admin/util/src/main/java/org/glassfish/admin/cli/resources/DeleteResourceRef.java
@@ -30,7 +30,7 @@
import org.glassfish.internal.api.Target;
import org.jvnet.hk2.annotations.Service;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
import java.util.List;
import org.jvnet.hk2.config.ConfigSupport;
diff --git a/nucleus/admin/util/src/main/java/org/glassfish/admin/cli/resources/ListResourceRefs.java b/nucleus/admin/util/src/main/java/org/glassfish/admin/cli/resources/ListResourceRefs.java
index 6b5b6fd..70a64ec 100644
--- a/nucleus/admin/util/src/main/java/org/glassfish/admin/cli/resources/ListResourceRefs.java
+++ b/nucleus/admin/util/src/main/java/org/glassfish/admin/cli/resources/ListResourceRefs.java
@@ -43,7 +43,7 @@
import org.glassfish.hk2.api.PerLookup;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
import org.glassfish.api.admin.AccessRequired.AccessCheck;
import org.glassfish.api.admin.AdminCommandSecurity;
diff --git a/nucleus/cluster/admin/src/main/java/com/sun/enterprise/v3/admin/cluster/BootstrapSecureAdminCommand.java b/nucleus/cluster/admin/src/main/java/com/sun/enterprise/v3/admin/cluster/BootstrapSecureAdminCommand.java
index cc380b1..d49793d 100644
--- a/nucleus/cluster/admin/src/main/java/com/sun/enterprise/v3/admin/cluster/BootstrapSecureAdminCommand.java
+++ b/nucleus/cluster/admin/src/main/java/com/sun/enterprise/v3/admin/cluster/BootstrapSecureAdminCommand.java
@@ -21,7 +21,7 @@
import java.io.IOException;
import org.glassfish.api.ActionReport;
import org.glassfish.api.admin.*;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
import org.jvnet.hk2.annotations.Service;
import org.glassfish.hk2.api.PerLookup;
diff --git a/nucleus/cluster/admin/src/main/java/com/sun/enterprise/v3/admin/cluster/CreateInstanceCommand.java b/nucleus/cluster/admin/src/main/java/com/sun/enterprise/v3/admin/cluster/CreateInstanceCommand.java
index ac4fb1d..97e3528 100644
--- a/nucleus/cluster/admin/src/main/java/com/sun/enterprise/v3/admin/cluster/CreateInstanceCommand.java
+++ b/nucleus/cluster/admin/src/main/java/com/sun/enterprise/v3/admin/cluster/CreateInstanceCommand.java
@@ -44,7 +44,7 @@
import org.jvnet.hk2.annotations.Service;
import org.jvnet.hk2.component.*;
import java.util.logging.Logger;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
/**
* Remote AdminCommand to create an instance. This command is run only on DAS.
diff --git a/nucleus/cluster/admin/src/main/java/com/sun/enterprise/v3/admin/cluster/CreateNodeConfigCommand.java b/nucleus/cluster/admin/src/main/java/com/sun/enterprise/v3/admin/cluster/CreateNodeConfigCommand.java
index 59b3de7..c9b2108 100644
--- a/nucleus/cluster/admin/src/main/java/com/sun/enterprise/v3/admin/cluster/CreateNodeConfigCommand.java
+++ b/nucleus/cluster/admin/src/main/java/com/sun/enterprise/v3/admin/cluster/CreateNodeConfigCommand.java
@@ -32,7 +32,7 @@
import java.util.HashMap;
import com.sun.enterprise.util.net.NetUtils;
import java.io.File;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
/**
* Remote AdminCommand to create a config node. This command is run only on DAS.
diff --git a/nucleus/cluster/admin/src/main/java/com/sun/enterprise/v3/admin/cluster/CreateNodeImplicitCommand.java b/nucleus/cluster/admin/src/main/java/com/sun/enterprise/v3/admin/cluster/CreateNodeImplicitCommand.java
index 4a19c96..d3b8069 100644
--- a/nucleus/cluster/admin/src/main/java/com/sun/enterprise/v3/admin/cluster/CreateNodeImplicitCommand.java
+++ b/nucleus/cluster/admin/src/main/java/com/sun/enterprise/v3/admin/cluster/CreateNodeImplicitCommand.java
@@ -25,7 +25,7 @@
import org.glassfish.api.admin.CommandRunner.CommandInvocation;
import org.glassfish.hk2.api.PerLookup;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
import org.jvnet.hk2.annotations.Service;
diff --git a/nucleus/cluster/admin/src/main/java/com/sun/enterprise/v3/admin/cluster/CreateNodeSshCommand.java b/nucleus/cluster/admin/src/main/java/com/sun/enterprise/v3/admin/cluster/CreateNodeSshCommand.java
index 3ebee32..e6a0cdc 100644
--- a/nucleus/cluster/admin/src/main/java/com/sun/enterprise/v3/admin/cluster/CreateNodeSshCommand.java
+++ b/nucleus/cluster/admin/src/main/java/com/sun/enterprise/v3/admin/cluster/CreateNodeSshCommand.java
@@ -24,7 +24,7 @@
import org.glassfish.api.I18n;
import org.glassfish.api.Param;
import org.glassfish.api.admin.*;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
import org.jvnet.hk2.annotations.Service;
diff --git a/nucleus/cluster/admin/src/main/java/com/sun/enterprise/v3/admin/cluster/CreateRemoteNodeCommand.java b/nucleus/cluster/admin/src/main/java/com/sun/enterprise/v3/admin/cluster/CreateRemoteNodeCommand.java
index 9733ad3..217d2b5 100644
--- a/nucleus/cluster/admin/src/main/java/com/sun/enterprise/v3/admin/cluster/CreateRemoteNodeCommand.java
+++ b/nucleus/cluster/admin/src/main/java/com/sun/enterprise/v3/admin/cluster/CreateRemoteNodeCommand.java
@@ -32,7 +32,7 @@
import org.glassfish.api.admin.CommandRunner.CommandInvocation;
import org.glassfish.hk2.api.ServiceLocator;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
import org.jvnet.hk2.annotations.Service;
import org.jvnet.hk2.component.*;
diff --git a/nucleus/cluster/admin/src/main/java/com/sun/enterprise/v3/admin/cluster/DeleteConfigCommand.java b/nucleus/cluster/admin/src/main/java/com/sun/enterprise/v3/admin/cluster/DeleteConfigCommand.java
index 1c7b94b..be70e5d 100644
--- a/nucleus/cluster/admin/src/main/java/com/sun/enterprise/v3/admin/cluster/DeleteConfigCommand.java
+++ b/nucleus/cluster/admin/src/main/java/com/sun/enterprise/v3/admin/cluster/DeleteConfigCommand.java
@@ -21,7 +21,7 @@
import java.beans.PropertyVetoException;
import java.util.List;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
import org.jvnet.hk2.annotations.Service;
diff --git a/nucleus/cluster/admin/src/main/java/com/sun/enterprise/v3/admin/cluster/DeleteInstanceCommand.java b/nucleus/cluster/admin/src/main/java/com/sun/enterprise/v3/admin/cluster/DeleteInstanceCommand.java
index f8e1540..3048c7b 100644
--- a/nucleus/cluster/admin/src/main/java/com/sun/enterprise/v3/admin/cluster/DeleteInstanceCommand.java
+++ b/nucleus/cluster/admin/src/main/java/com/sun/enterprise/v3/admin/cluster/DeleteInstanceCommand.java
@@ -27,7 +27,7 @@
import org.glassfish.hk2.api.PerLookup;
import org.glassfish.hk2.api.ServiceLocator;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
import org.jvnet.hk2.annotations.Service;
diff --git a/nucleus/cluster/admin/src/main/java/com/sun/enterprise/v3/admin/cluster/DeleteNodeConfigCommand.java b/nucleus/cluster/admin/src/main/java/com/sun/enterprise/v3/admin/cluster/DeleteNodeConfigCommand.java
index ba4a25a..aa70564 100644
--- a/nucleus/cluster/admin/src/main/java/com/sun/enterprise/v3/admin/cluster/DeleteNodeConfigCommand.java
+++ b/nucleus/cluster/admin/src/main/java/com/sun/enterprise/v3/admin/cluster/DeleteNodeConfigCommand.java
@@ -24,7 +24,7 @@
import org.glassfish.api.Param;
import org.glassfish.api.admin.*;
import org.glassfish.api.admin.CommandRunner.CommandInvocation;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
import org.glassfish.hk2.api.IterableProvider;
import org.glassfish.hk2.api.PerLookup;
diff --git a/nucleus/cluster/admin/src/main/java/com/sun/enterprise/v3/admin/cluster/DeleteNodeRemoteCommand.java b/nucleus/cluster/admin/src/main/java/com/sun/enterprise/v3/admin/cluster/DeleteNodeRemoteCommand.java
index f2d4c2c..c18c0d7 100644
--- a/nucleus/cluster/admin/src/main/java/com/sun/enterprise/v3/admin/cluster/DeleteNodeRemoteCommand.java
+++ b/nucleus/cluster/admin/src/main/java/com/sun/enterprise/v3/admin/cluster/DeleteNodeRemoteCommand.java
@@ -29,7 +29,7 @@
import org.glassfish.api.Param;
import org.glassfish.api.admin.*;
import org.glassfish.api.admin.CommandRunner.CommandInvocation;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
import org.glassfish.hk2.api.IterableProvider;
import org.glassfish.hk2.api.ServiceLocator;
diff --git a/nucleus/cluster/admin/src/main/java/com/sun/enterprise/v3/admin/cluster/DeleteNodeSshCommand.java b/nucleus/cluster/admin/src/main/java/com/sun/enterprise/v3/admin/cluster/DeleteNodeSshCommand.java
index b57802b..f19b5c0 100644
--- a/nucleus/cluster/admin/src/main/java/com/sun/enterprise/v3/admin/cluster/DeleteNodeSshCommand.java
+++ b/nucleus/cluster/admin/src/main/java/com/sun/enterprise/v3/admin/cluster/DeleteNodeSshCommand.java
@@ -23,7 +23,7 @@
import org.glassfish.api.admin.*;
import org.glassfish.hk2.api.PerLookup;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
import org.jvnet.hk2.annotations.Service;
diff --git a/nucleus/cluster/admin/src/main/java/com/sun/enterprise/v3/admin/cluster/ExportSyncBundle.java b/nucleus/cluster/admin/src/main/java/com/sun/enterprise/v3/admin/cluster/ExportSyncBundle.java
index c3ef92d..fab161b 100644
--- a/nucleus/cluster/admin/src/main/java/com/sun/enterprise/v3/admin/cluster/ExportSyncBundle.java
+++ b/nucleus/cluster/admin/src/main/java/com/sun/enterprise/v3/admin/cluster/ExportSyncBundle.java
@@ -23,7 +23,7 @@
import java.net.*;
import java.util.*;
import java.util.logging.*;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
import org.glassfish.admin.payload.PayloadImpl;
import org.glassfish.api.ActionReport;
import org.glassfish.api.ActionReport.ExitCode;
diff --git a/nucleus/cluster/admin/src/main/java/com/sun/enterprise/v3/admin/cluster/GetHealthCommand.java b/nucleus/cluster/admin/src/main/java/com/sun/enterprise/v3/admin/cluster/GetHealthCommand.java
index 25bd8c1..18c6098 100644
--- a/nucleus/cluster/admin/src/main/java/com/sun/enterprise/v3/admin/cluster/GetHealthCommand.java
+++ b/nucleus/cluster/admin/src/main/java/com/sun/enterprise/v3/admin/cluster/GetHealthCommand.java
@@ -28,7 +28,7 @@
import org.glassfish.gms.bootstrap.GMSAdapter;
import org.glassfish.gms.bootstrap.GMSAdapterService;
import org.glassfish.gms.bootstrap.HealthHistory;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
import org.jvnet.hk2.annotations.Service;
import org.glassfish.hk2.api.PerLookup;
diff --git a/nucleus/cluster/admin/src/main/java/com/sun/enterprise/v3/admin/cluster/GlassFishClusterExecutor.java b/nucleus/cluster/admin/src/main/java/com/sun/enterprise/v3/admin/cluster/GlassFishClusterExecutor.java
index 2a9694e..cd8bb0d 100755
--- a/nucleus/cluster/admin/src/main/java/com/sun/enterprise/v3/admin/cluster/GlassFishClusterExecutor.java
+++ b/nucleus/cluster/admin/src/main/java/com/sun/enterprise/v3/admin/cluster/GlassFishClusterExecutor.java
@@ -23,7 +23,7 @@
import com.sun.enterprise.util.LocalStringManagerImpl;
import java.util.*;
import java.util.concurrent.ExecutorService;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
import org.glassfish.api.ActionReport;
import org.glassfish.api.admin.*;
import org.glassfish.common.util.admin.CommandModelImpl;
diff --git a/nucleus/cluster/admin/src/main/java/com/sun/enterprise/v3/admin/cluster/InstanceRegisterInstanceCommand.java b/nucleus/cluster/admin/src/main/java/com/sun/enterprise/v3/admin/cluster/InstanceRegisterInstanceCommand.java
index acac543..daa8b26 100644
--- a/nucleus/cluster/admin/src/main/java/com/sun/enterprise/v3/admin/cluster/InstanceRegisterInstanceCommand.java
+++ b/nucleus/cluster/admin/src/main/java/com/sun/enterprise/v3/admin/cluster/InstanceRegisterInstanceCommand.java
@@ -24,8 +24,8 @@
import org.glassfish.api.admin.ServerEnvironment;
import org.glassfish.api.ActionReport;
import org.jvnet.hk2.annotations.Service;
-import javax.inject.Inject;
-import javax.inject.Named;
+import jakarta.inject.Inject;
+import jakarta.inject.Named;
import org.glassfish.hk2.api.PerLookup;
import org.jvnet.hk2.config.ConfigSupport;
diff --git a/nucleus/cluster/admin/src/main/java/com/sun/enterprise/v3/admin/cluster/ListClustersCommand.java b/nucleus/cluster/admin/src/main/java/com/sun/enterprise/v3/admin/cluster/ListClustersCommand.java
index 37811dd..bbf876b 100644
--- a/nucleus/cluster/admin/src/main/java/com/sun/enterprise/v3/admin/cluster/ListClustersCommand.java
+++ b/nucleus/cluster/admin/src/main/java/com/sun/enterprise/v3/admin/cluster/ListClustersCommand.java
@@ -28,7 +28,7 @@
import org.glassfish.api.admin.CommandLock;
import org.glassfish.api.admin.InstanceState;
import org.glassfish.api.admin.config.ReferenceContainer;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
import org.jvnet.hk2.annotations.Service;
import org.glassfish.hk2.api.PerLookup;
diff --git a/nucleus/cluster/admin/src/main/java/com/sun/enterprise/v3/admin/cluster/ListConfigsCommand.java b/nucleus/cluster/admin/src/main/java/com/sun/enterprise/v3/admin/cluster/ListConfigsCommand.java
index 5a4a352..eda0460 100644
--- a/nucleus/cluster/admin/src/main/java/com/sun/enterprise/v3/admin/cluster/ListConfigsCommand.java
+++ b/nucleus/cluster/admin/src/main/java/com/sun/enterprise/v3/admin/cluster/ListConfigsCommand.java
@@ -31,7 +31,7 @@
import org.glassfish.api.admin.config.ReferenceContainer;
import org.glassfish.config.support.TargetType;
import org.glassfish.config.support.CommandTarget;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
import org.jvnet.hk2.annotations.Service;
import org.glassfish.hk2.api.PerLookup;
diff --git a/nucleus/cluster/admin/src/main/java/com/sun/enterprise/v3/admin/cluster/ListInstancesCommand.java b/nucleus/cluster/admin/src/main/java/com/sun/enterprise/v3/admin/cluster/ListInstancesCommand.java
index 066d6aa..36c2e96 100644
--- a/nucleus/cluster/admin/src/main/java/com/sun/enterprise/v3/admin/cluster/ListInstancesCommand.java
+++ b/nucleus/cluster/admin/src/main/java/com/sun/enterprise/v3/admin/cluster/ListInstancesCommand.java
@@ -25,7 +25,7 @@
import static com.sun.enterprise.v3.admin.cluster.Constants.*;
import java.util.*;
import java.util.logging.*;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
import org.glassfish.api.ActionReport;
import org.glassfish.api.ActionReport.ExitCode;
import org.glassfish.api.I18n;
diff --git a/nucleus/cluster/admin/src/main/java/com/sun/enterprise/v3/admin/cluster/ListNodesCommand.java b/nucleus/cluster/admin/src/main/java/com/sun/enterprise/v3/admin/cluster/ListNodesCommand.java
index 6db6503..448c2fa 100644
--- a/nucleus/cluster/admin/src/main/java/com/sun/enterprise/v3/admin/cluster/ListNodesCommand.java
+++ b/nucleus/cluster/admin/src/main/java/com/sun/enterprise/v3/admin/cluster/ListNodesCommand.java
@@ -26,7 +26,7 @@
import org.glassfish.api.admin.AdminCommand;
import org.glassfish.api.admin.AdminCommandContext;
import org.glassfish.api.admin.CommandLock;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
import org.jvnet.hk2.annotations.Service;
diff --git a/nucleus/cluster/admin/src/main/java/com/sun/enterprise/v3/admin/cluster/ListNodesConfigCommand.java b/nucleus/cluster/admin/src/main/java/com/sun/enterprise/v3/admin/cluster/ListNodesConfigCommand.java
index dd5d832..f5fc3c9 100644
--- a/nucleus/cluster/admin/src/main/java/com/sun/enterprise/v3/admin/cluster/ListNodesConfigCommand.java
+++ b/nucleus/cluster/admin/src/main/java/com/sun/enterprise/v3/admin/cluster/ListNodesConfigCommand.java
@@ -26,7 +26,7 @@
import org.glassfish.api.admin.AdminCommand;
import org.glassfish.api.admin.AdminCommandContext;
import org.glassfish.api.admin.CommandLock;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
import org.jvnet.hk2.annotations.Service;
diff --git a/nucleus/cluster/admin/src/main/java/com/sun/enterprise/v3/admin/cluster/ListNodesSshCommand.java b/nucleus/cluster/admin/src/main/java/com/sun/enterprise/v3/admin/cluster/ListNodesSshCommand.java
index 7f69cc4..eb5146a 100644
--- a/nucleus/cluster/admin/src/main/java/com/sun/enterprise/v3/admin/cluster/ListNodesSshCommand.java
+++ b/nucleus/cluster/admin/src/main/java/com/sun/enterprise/v3/admin/cluster/ListNodesSshCommand.java
@@ -25,7 +25,7 @@
import org.glassfish.api.admin.AdminCommand;
import org.glassfish.api.admin.AdminCommandContext;
import org.glassfish.api.admin.CommandLock;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
import org.jvnet.hk2.annotations.Service;
diff --git a/nucleus/cluster/admin/src/main/java/com/sun/enterprise/v3/admin/cluster/NodeAgentConfigUpgrade.java b/nucleus/cluster/admin/src/main/java/com/sun/enterprise/v3/admin/cluster/NodeAgentConfigUpgrade.java
index 2387920..06623f9 100644
--- a/nucleus/cluster/admin/src/main/java/com/sun/enterprise/v3/admin/cluster/NodeAgentConfigUpgrade.java
+++ b/nucleus/cluster/admin/src/main/java/com/sun/enterprise/v3/admin/cluster/NodeAgentConfigUpgrade.java
@@ -29,8 +29,8 @@
import com.sun.enterprise.config.serverbeans.NodeAgents;
import com.sun.enterprise.config.serverbeans.JmxConnector;
import org.glassfish.api.admin.config.ConfigurationUpgrade;
-import javax.inject.Inject;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
+import jakarta.inject.Inject;
import org.jvnet.hk2.annotations.Service;
@@ -40,7 +40,7 @@
import org.jvnet.hk2.config.ConfigSupport;
import org.jvnet.hk2.config.SingleConfigCode;
import org.jvnet.hk2.config.TransactionFailure;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
import org.jvnet.hk2.component.*;
import org.jvnet.hk2.config.*;
diff --git a/nucleus/cluster/admin/src/main/java/com/sun/enterprise/v3/admin/cluster/PingNodeRemoteCommand.java b/nucleus/cluster/admin/src/main/java/com/sun/enterprise/v3/admin/cluster/PingNodeRemoteCommand.java
index 360de03..0c22edc 100644
--- a/nucleus/cluster/admin/src/main/java/com/sun/enterprise/v3/admin/cluster/PingNodeRemoteCommand.java
+++ b/nucleus/cluster/admin/src/main/java/com/sun/enterprise/v3/admin/cluster/PingNodeRemoteCommand.java
@@ -23,7 +23,7 @@
import org.glassfish.api.I18n;
import org.glassfish.api.Param;
import org.glassfish.api.admin.*;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
import java.util.logging.Logger;
import org.jvnet.hk2.annotations.Service;
diff --git a/nucleus/cluster/admin/src/main/java/com/sun/enterprise/v3/admin/cluster/PingNodeSshCommand.java b/nucleus/cluster/admin/src/main/java/com/sun/enterprise/v3/admin/cluster/PingNodeSshCommand.java
index 2375824..b0f7779 100644
--- a/nucleus/cluster/admin/src/main/java/com/sun/enterprise/v3/admin/cluster/PingNodeSshCommand.java
+++ b/nucleus/cluster/admin/src/main/java/com/sun/enterprise/v3/admin/cluster/PingNodeSshCommand.java
@@ -19,7 +19,7 @@
import com.sun.enterprise.config.serverbeans.Node;
import org.glassfish.api.I18n;
import org.glassfish.api.admin.*;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
import org.jvnet.hk2.annotations.Service;
diff --git a/nucleus/cluster/admin/src/main/java/com/sun/enterprise/v3/admin/cluster/PostRegisterInstanceCommand.java b/nucleus/cluster/admin/src/main/java/com/sun/enterprise/v3/admin/cluster/PostRegisterInstanceCommand.java
index 6832570..75a4fd1 100644
--- a/nucleus/cluster/admin/src/main/java/com/sun/enterprise/v3/admin/cluster/PostRegisterInstanceCommand.java
+++ b/nucleus/cluster/admin/src/main/java/com/sun/enterprise/v3/admin/cluster/PostRegisterInstanceCommand.java
@@ -28,7 +28,7 @@
import org.glassfish.api.admin.*;
import org.glassfish.internal.api.Target;
import org.glassfish.common.util.admin.ParameterMapExtractor;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
import org.jvnet.hk2.annotations.Service;
import org.glassfish.hk2.api.PerLookup;
diff --git a/nucleus/cluster/admin/src/main/java/com/sun/enterprise/v3/admin/cluster/PostUnregisterInstanceCommand.java b/nucleus/cluster/admin/src/main/java/com/sun/enterprise/v3/admin/cluster/PostUnregisterInstanceCommand.java
index 3744dd3..0d69e36 100644
--- a/nucleus/cluster/admin/src/main/java/com/sun/enterprise/v3/admin/cluster/PostUnregisterInstanceCommand.java
+++ b/nucleus/cluster/admin/src/main/java/com/sun/enterprise/v3/admin/cluster/PostUnregisterInstanceCommand.java
@@ -27,7 +27,7 @@
import org.glassfish.api.admin.*;
import org.glassfish.internal.api.Target;
import org.glassfish.common.util.admin.ParameterMapExtractor;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
import org.jvnet.hk2.annotations.Service;
import org.glassfish.hk2.api.PerLookup;
diff --git a/nucleus/cluster/admin/src/main/java/com/sun/enterprise/v3/admin/cluster/RestartInstanceCommand.java b/nucleus/cluster/admin/src/main/java/com/sun/enterprise/v3/admin/cluster/RestartInstanceCommand.java
index 2df937c..df91e01 100644
--- a/nucleus/cluster/admin/src/main/java/com/sun/enterprise/v3/admin/cluster/RestartInstanceCommand.java
+++ b/nucleus/cluster/admin/src/main/java/com/sun/enterprise/v3/admin/cluster/RestartInstanceCommand.java
@@ -34,8 +34,8 @@
import org.glassfish.hk2.api.PerLookup;
import org.glassfish.hk2.api.ServiceLocator;
-import javax.inject.Inject;
-import javax.inject.Named;
+import jakarta.inject.Inject;
+import jakarta.inject.Named;
/**
*
diff --git a/nucleus/cluster/admin/src/main/java/com/sun/enterprise/v3/admin/cluster/RestartInstanceInstanceCommand.java b/nucleus/cluster/admin/src/main/java/com/sun/enterprise/v3/admin/cluster/RestartInstanceInstanceCommand.java
index e1d75e4..a5bec33 100644
--- a/nucleus/cluster/admin/src/main/java/com/sun/enterprise/v3/admin/cluster/RestartInstanceInstanceCommand.java
+++ b/nucleus/cluster/admin/src/main/java/com/sun/enterprise/v3/admin/cluster/RestartInstanceInstanceCommand.java
@@ -19,7 +19,7 @@
import com.sun.enterprise.module.ModulesRegistry;
import org.glassfish.api.*;
import org.glassfish.api.admin.*;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
import com.sun.enterprise.v3.admin.RestartServer;
import com.sun.enterprise.v3.admin.RestartServer;
diff --git a/nucleus/cluster/admin/src/main/java/com/sun/enterprise/v3/admin/cluster/ServerSynchronizer.java b/nucleus/cluster/admin/src/main/java/com/sun/enterprise/v3/admin/cluster/ServerSynchronizer.java
index 3538030..6e625f8 100644
--- a/nucleus/cluster/admin/src/main/java/com/sun/enterprise/v3/admin/cluster/ServerSynchronizer.java
+++ b/nucleus/cluster/admin/src/main/java/com/sun/enterprise/v3/admin/cluster/ServerSynchronizer.java
@@ -23,7 +23,7 @@
import java.util.logging.Logger;
import java.util.logging.Level;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
import org.glassfish.api.admin.*;
import org.jvnet.hk2.annotations.Optional;
diff --git a/nucleus/cluster/admin/src/main/java/com/sun/enterprise/v3/admin/cluster/SetupSshCommand.java b/nucleus/cluster/admin/src/main/java/com/sun/enterprise/v3/admin/cluster/SetupSshCommand.java
index 45d5098..58577a2 100644
--- a/nucleus/cluster/admin/src/main/java/com/sun/enterprise/v3/admin/cluster/SetupSshCommand.java
+++ b/nucleus/cluster/admin/src/main/java/com/sun/enterprise/v3/admin/cluster/SetupSshCommand.java
@@ -29,7 +29,7 @@
import org.glassfish.api.admin.*;
import org.glassfish.cluster.ssh.launcher.SSHLauncher;
import org.glassfish.cluster.ssh.util.SSHUtil;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
import org.jvnet.hk2.annotations.Service;
import org.glassfish.hk2.api.PerLookup;
diff --git a/nucleus/cluster/admin/src/main/java/com/sun/enterprise/v3/admin/cluster/StartClusterCommand.java b/nucleus/cluster/admin/src/main/java/com/sun/enterprise/v3/admin/cluster/StartClusterCommand.java
index 4dc8c17..ce6287c 100644
--- a/nucleus/cluster/admin/src/main/java/com/sun/enterprise/v3/admin/cluster/StartClusterCommand.java
+++ b/nucleus/cluster/admin/src/main/java/com/sun/enterprise/v3/admin/cluster/StartClusterCommand.java
@@ -20,7 +20,7 @@
import java.util.logging.Logger;
import org.glassfish.api.admin.*;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
import org.jvnet.hk2.annotations.Service;
diff --git a/nucleus/cluster/admin/src/main/java/com/sun/enterprise/v3/admin/cluster/StartInstanceCommand.java b/nucleus/cluster/admin/src/main/java/com/sun/enterprise/v3/admin/cluster/StartInstanceCommand.java
index 4ebf82d..e0baf1e 100644
--- a/nucleus/cluster/admin/src/main/java/com/sun/enterprise/v3/admin/cluster/StartInstanceCommand.java
+++ b/nucleus/cluster/admin/src/main/java/com/sun/enterprise/v3/admin/cluster/StartInstanceCommand.java
@@ -26,7 +26,7 @@
import org.glassfish.api.I18n;
import org.glassfish.api.Param;
import org.glassfish.api.admin.*;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
import org.jvnet.hk2.annotations.Service;
diff --git a/nucleus/cluster/admin/src/main/java/com/sun/enterprise/v3/admin/cluster/StopClusterCommand.java b/nucleus/cluster/admin/src/main/java/com/sun/enterprise/v3/admin/cluster/StopClusterCommand.java
index e6cc3f6..c98c7ec 100644
--- a/nucleus/cluster/admin/src/main/java/com/sun/enterprise/v3/admin/cluster/StopClusterCommand.java
+++ b/nucleus/cluster/admin/src/main/java/com/sun/enterprise/v3/admin/cluster/StopClusterCommand.java
@@ -18,7 +18,7 @@
import com.sun.enterprise.config.serverbeans.Cluster;
import java.util.logging.Logger;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
import org.jvnet.hk2.annotations.Service;
diff --git a/nucleus/cluster/admin/src/main/java/com/sun/enterprise/v3/admin/cluster/StopInstanceCommand.java b/nucleus/cluster/admin/src/main/java/com/sun/enterprise/v3/admin/cluster/StopInstanceCommand.java
index 6cc34bf..44292b3 100644
--- a/nucleus/cluster/admin/src/main/java/com/sun/enterprise/v3/admin/cluster/StopInstanceCommand.java
+++ b/nucleus/cluster/admin/src/main/java/com/sun/enterprise/v3/admin/cluster/StopInstanceCommand.java
@@ -40,7 +40,7 @@
import org.glassfish.internal.api.ServerContext;
import org.jvnet.hk2.annotations.Service;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
import java.io.File;
import java.io.IOException;
import java.util.ArrayList;
diff --git a/nucleus/cluster/admin/src/main/java/com/sun/enterprise/v3/admin/cluster/StopInstanceInstanceCommand.java b/nucleus/cluster/admin/src/main/java/com/sun/enterprise/v3/admin/cluster/StopInstanceInstanceCommand.java
index 1df0827..3fa7e5b 100644
--- a/nucleus/cluster/admin/src/main/java/com/sun/enterprise/v3/admin/cluster/StopInstanceInstanceCommand.java
+++ b/nucleus/cluster/admin/src/main/java/com/sun/enterprise/v3/admin/cluster/StopInstanceInstanceCommand.java
@@ -22,7 +22,7 @@
import org.glassfish.api.Async;
import org.glassfish.api.Param;
import org.glassfish.api.admin.*;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
import org.jvnet.hk2.annotations.Service;
import org.glassfish.hk2.api.PerLookup;
diff --git a/nucleus/cluster/admin/src/main/java/com/sun/enterprise/v3/admin/cluster/SynchronizeFiles.java b/nucleus/cluster/admin/src/main/java/com/sun/enterprise/v3/admin/cluster/SynchronizeFiles.java
index 062edde..0725861 100644
--- a/nucleus/cluster/admin/src/main/java/com/sun/enterprise/v3/admin/cluster/SynchronizeFiles.java
+++ b/nucleus/cluster/admin/src/main/java/com/sun/enterprise/v3/admin/cluster/SynchronizeFiles.java
@@ -26,7 +26,7 @@
import org.jvnet.hk2.annotations.Optional;
import org.jvnet.hk2.annotations.Service;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
import org.glassfish.hk2.api.PerLookup;
import org.glassfish.api.I18n;
diff --git a/nucleus/cluster/admin/src/main/java/com/sun/enterprise/v3/admin/cluster/UpdateNodeCommand.java b/nucleus/cluster/admin/src/main/java/com/sun/enterprise/v3/admin/cluster/UpdateNodeCommand.java
index ec5f798..cb8e054 100644
--- a/nucleus/cluster/admin/src/main/java/com/sun/enterprise/v3/admin/cluster/UpdateNodeCommand.java
+++ b/nucleus/cluster/admin/src/main/java/com/sun/enterprise/v3/admin/cluster/UpdateNodeCommand.java
@@ -35,7 +35,7 @@
import org.glassfish.api.admin.*;
import org.glassfish.hk2.api.PerLookup;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
import org.jvnet.hk2.annotations.Service;
diff --git a/nucleus/cluster/admin/src/main/java/com/sun/enterprise/v3/admin/cluster/UpdateNodeConfigCommand.java b/nucleus/cluster/admin/src/main/java/com/sun/enterprise/v3/admin/cluster/UpdateNodeConfigCommand.java
index 44e0810..0e57a57 100644
--- a/nucleus/cluster/admin/src/main/java/com/sun/enterprise/v3/admin/cluster/UpdateNodeConfigCommand.java
+++ b/nucleus/cluster/admin/src/main/java/com/sun/enterprise/v3/admin/cluster/UpdateNodeConfigCommand.java
@@ -27,7 +27,7 @@
import org.glassfish.hk2.api.PerLookup;
import org.glassfish.hk2.api.ServiceLocator;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
import org.jvnet.hk2.annotations.Service;
diff --git a/nucleus/cluster/admin/src/main/java/com/sun/enterprise/v3/admin/cluster/UpdateNodeRemoteCommand.java b/nucleus/cluster/admin/src/main/java/com/sun/enterprise/v3/admin/cluster/UpdateNodeRemoteCommand.java
index 822ba44..106b0e5 100644
--- a/nucleus/cluster/admin/src/main/java/com/sun/enterprise/v3/admin/cluster/UpdateNodeRemoteCommand.java
+++ b/nucleus/cluster/admin/src/main/java/com/sun/enterprise/v3/admin/cluster/UpdateNodeRemoteCommand.java
@@ -31,7 +31,7 @@
import org.jvnet.hk2.annotations.Service;
import org.jvnet.hk2.component.*;
import java.util.logging.Logger;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
/**
* Remote AdminCommand to update a remote node. This command is run only on DAS.
diff --git a/nucleus/cluster/admin/src/main/java/com/sun/enterprise/v3/admin/cluster/UpdateNodeSshCommand.java b/nucleus/cluster/admin/src/main/java/com/sun/enterprise/v3/admin/cluster/UpdateNodeSshCommand.java
index 7838b6c..e7145c3 100644
--- a/nucleus/cluster/admin/src/main/java/com/sun/enterprise/v3/admin/cluster/UpdateNodeSshCommand.java
+++ b/nucleus/cluster/admin/src/main/java/com/sun/enterprise/v3/admin/cluster/UpdateNodeSshCommand.java
@@ -23,7 +23,7 @@
import org.glassfish.api.admin.*;
import org.glassfish.hk2.api.PerLookup;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
import org.jvnet.hk2.annotations.Service;
diff --git a/nucleus/cluster/admin/src/main/java/com/sun/enterprise/v3/admin/cluster/ValidateNodeCommand.java b/nucleus/cluster/admin/src/main/java/com/sun/enterprise/v3/admin/cluster/ValidateNodeCommand.java
index 18151ac..b37295f 100644
--- a/nucleus/cluster/admin/src/main/java/com/sun/enterprise/v3/admin/cluster/ValidateNodeCommand.java
+++ b/nucleus/cluster/admin/src/main/java/com/sun/enterprise/v3/admin/cluster/ValidateNodeCommand.java
@@ -29,7 +29,7 @@
import org.glassfish.api.admin.*;
import org.glassfish.hk2.api.PerLookup;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
import org.jvnet.hk2.annotations.Service;
diff --git a/nucleus/cluster/cli/src/main/java/com/sun/enterprise/admin/cli/cluster/CreateLocalInstanceFilesystemCommand.java b/nucleus/cluster/cli/src/main/java/com/sun/enterprise/admin/cli/cluster/CreateLocalInstanceFilesystemCommand.java
index 500e1db..3870f1c 100644
--- a/nucleus/cluster/cli/src/main/java/com/sun/enterprise/admin/cli/cluster/CreateLocalInstanceFilesystemCommand.java
+++ b/nucleus/cluster/cli/src/main/java/com/sun/enterprise/admin/cli/cluster/CreateLocalInstanceFilesystemCommand.java
@@ -22,7 +22,7 @@
import java.net.InetAddress;
import java.net.UnknownHostException;
import java.util.*;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
import org.jvnet.hk2.annotations.Service;
diff --git a/nucleus/cluster/cli/src/main/java/com/sun/enterprise/admin/cli/cluster/CreateNodeAgentCommand.java b/nucleus/cluster/cli/src/main/java/com/sun/enterprise/admin/cli/cluster/CreateNodeAgentCommand.java
index 6043421..823911d 100644
--- a/nucleus/cluster/cli/src/main/java/com/sun/enterprise/admin/cli/cluster/CreateNodeAgentCommand.java
+++ b/nucleus/cluster/cli/src/main/java/com/sun/enterprise/admin/cli/cluster/CreateNodeAgentCommand.java
@@ -19,7 +19,7 @@
import java.io.File;
import java.io.Console;
import java.util.*;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
import org.jvnet.hk2.component.*;
diff --git a/nucleus/cluster/cli/src/main/java/com/sun/enterprise/admin/cli/cluster/InstallNodeBaseCommand.java b/nucleus/cluster/cli/src/main/java/com/sun/enterprise/admin/cli/cluster/InstallNodeBaseCommand.java
index 3c401e5..a2df2d3 100644
--- a/nucleus/cluster/cli/src/main/java/com/sun/enterprise/admin/cli/cluster/InstallNodeBaseCommand.java
+++ b/nucleus/cluster/cli/src/main/java/com/sun/enterprise/admin/cli/cluster/InstallNodeBaseCommand.java
@@ -27,7 +27,7 @@
import java.net.*;
import org.glassfish.api.Param;
import org.glassfish.api.admin.CommandException;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
import org.jvnet.hk2.annotations.Service;
import org.glassfish.hk2.api.PerLookup;
diff --git a/nucleus/cluster/cli/src/main/java/com/sun/enterprise/admin/cli/cluster/InstallNodeSshCommand.java b/nucleus/cluster/cli/src/main/java/com/sun/enterprise/admin/cli/cluster/InstallNodeSshCommand.java
index 3465a1d..2387be6 100644
--- a/nucleus/cluster/cli/src/main/java/com/sun/enterprise/admin/cli/cluster/InstallNodeSshCommand.java
+++ b/nucleus/cluster/cli/src/main/java/com/sun/enterprise/admin/cli/cluster/InstallNodeSshCommand.java
@@ -27,7 +27,7 @@
import java.io.*;
import java.util.*;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
import org.glassfish.api.Param;
import org.glassfish.api.admin.CommandException;
diff --git a/nucleus/cluster/cli/src/main/java/com/sun/enterprise/admin/cli/cluster/RestartLocalInstanceCommand.java b/nucleus/cluster/cli/src/main/java/com/sun/enterprise/admin/cli/cluster/RestartLocalInstanceCommand.java
index d3e7e38..ac04434 100644
--- a/nucleus/cluster/cli/src/main/java/com/sun/enterprise/admin/cli/cluster/RestartLocalInstanceCommand.java
+++ b/nucleus/cluster/cli/src/main/java/com/sun/enterprise/admin/cli/cluster/RestartLocalInstanceCommand.java
@@ -19,7 +19,7 @@
import java.io.*;
import java.util.*;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
import org.glassfish.api.Param;
import org.glassfish.api.admin.CommandException;
diff --git a/nucleus/cluster/cli/src/main/java/com/sun/enterprise/admin/cli/cluster/SetupSshKey.java b/nucleus/cluster/cli/src/main/java/com/sun/enterprise/admin/cli/cluster/SetupSshKey.java
index 8612184..6c67811 100644
--- a/nucleus/cluster/cli/src/main/java/com/sun/enterprise/admin/cli/cluster/SetupSshKey.java
+++ b/nucleus/cluster/cli/src/main/java/com/sun/enterprise/admin/cli/cluster/SetupSshKey.java
@@ -20,7 +20,7 @@
import java.util.Arrays;
import java.util.logging.Level;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
import org.jvnet.hk2.annotations.Service;
diff --git a/nucleus/cluster/cli/src/main/java/com/sun/enterprise/admin/cli/cluster/UninstallNodeBaseCommand.java b/nucleus/cluster/cli/src/main/java/com/sun/enterprise/admin/cli/cluster/UninstallNodeBaseCommand.java
index 26c03b8..3a18c41 100644
--- a/nucleus/cluster/cli/src/main/java/com/sun/enterprise/admin/cli/cluster/UninstallNodeBaseCommand.java
+++ b/nucleus/cluster/cli/src/main/java/com/sun/enterprise/admin/cli/cluster/UninstallNodeBaseCommand.java
@@ -18,7 +18,7 @@
import org.glassfish.api.Param;
import org.glassfish.api.admin.CommandException;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
import org.jvnet.hk2.annotations.Service;
import org.glassfish.hk2.api.PerLookup;
diff --git a/nucleus/cluster/cli/src/main/java/com/sun/enterprise/admin/cli/cluster/UninstallNodeSshCommand.java b/nucleus/cluster/cli/src/main/java/com/sun/enterprise/admin/cli/cluster/UninstallNodeSshCommand.java
index 16de629..97f1f77 100644
--- a/nucleus/cluster/cli/src/main/java/com/sun/enterprise/admin/cli/cluster/UninstallNodeSshCommand.java
+++ b/nucleus/cluster/cli/src/main/java/com/sun/enterprise/admin/cli/cluster/UninstallNodeSshCommand.java
@@ -23,7 +23,7 @@
import org.glassfish.cluster.ssh.launcher.SSHLauncher;
import org.glassfish.cluster.ssh.sftp.SFTPClient;
import org.glassfish.cluster.ssh.util.SSHUtil;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
import org.jvnet.hk2.annotations.Service;
import org.glassfish.hk2.api.PerLookup;
diff --git a/nucleus/cluster/gms-adapter/src/main/java/org/glassfish/gms/GMSAdapterImpl.java b/nucleus/cluster/gms-adapter/src/main/java/org/glassfish/gms/GMSAdapterImpl.java
index 2d91da7..70f3fb2 100644
--- a/nucleus/cluster/gms-adapter/src/main/java/org/glassfish/gms/GMSAdapterImpl.java
+++ b/nucleus/cluster/gms-adapter/src/main/java/org/glassfish/gms/GMSAdapterImpl.java
@@ -28,8 +28,8 @@
import java.util.logging.Logger;
import org.glassfish.api.logging.LogLevel;
-import javax.inject.Inject;
-import javax.inject.Named;
+import jakarta.inject.Inject;
+import jakarta.inject.Named;
import org.glassfish.api.admin.ServerEnvironment;
import org.glassfish.api.event.EventListener;
diff --git a/nucleus/cluster/gms-adapter/src/main/java/org/glassfish/gms/GMSConfigUpgrade.java b/nucleus/cluster/gms-adapter/src/main/java/org/glassfish/gms/GMSConfigUpgrade.java
index b0cb1a1..ecb5c6a 100644
--- a/nucleus/cluster/gms-adapter/src/main/java/org/glassfish/gms/GMSConfigUpgrade.java
+++ b/nucleus/cluster/gms-adapter/src/main/java/org/glassfish/gms/GMSConfigUpgrade.java
@@ -20,7 +20,7 @@
import com.sun.enterprise.module.bootstrap.EarlyLogHandler;
import com.sun.enterprise.util.EarlyLogger;
import org.glassfish.api.admin.config.ConfigurationUpgrade;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
import org.jvnet.hk2.annotations.Service;
import org.glassfish.hk2.api.PostConstruct;
import org.jvnet.hk2.config.ConfigSupport;
diff --git a/nucleus/cluster/gms-adapter/src/main/java/org/glassfish/gms/admin/GMSAnnounceAfterStartClusterCommand.java b/nucleus/cluster/gms-adapter/src/main/java/org/glassfish/gms/admin/GMSAnnounceAfterStartClusterCommand.java
index 986e496..3a0d8a8 100644
--- a/nucleus/cluster/gms-adapter/src/main/java/org/glassfish/gms/admin/GMSAnnounceAfterStartClusterCommand.java
+++ b/nucleus/cluster/gms-adapter/src/main/java/org/glassfish/gms/admin/GMSAnnounceAfterStartClusterCommand.java
@@ -24,7 +24,7 @@
import org.glassfish.api.Param;
import org.glassfish.api.admin.*;
import org.glassfish.gms.bootstrap.GMSAdapterService;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
import org.glassfish.logging.annotation.LogMessageInfo;
import org.glassfish.logging.annotation.LogMessagesResourceBundle;
diff --git a/nucleus/cluster/gms-adapter/src/main/java/org/glassfish/gms/admin/GMSAnnounceBeforeStartClusterCommand.java b/nucleus/cluster/gms-adapter/src/main/java/org/glassfish/gms/admin/GMSAnnounceBeforeStartClusterCommand.java
index 6d2570c..aa87d4e 100644
--- a/nucleus/cluster/gms-adapter/src/main/java/org/glassfish/gms/admin/GMSAnnounceBeforeStartClusterCommand.java
+++ b/nucleus/cluster/gms-adapter/src/main/java/org/glassfish/gms/admin/GMSAnnounceBeforeStartClusterCommand.java
@@ -24,7 +24,7 @@
import org.glassfish.api.ActionReport;
import org.glassfish.api.Param;
import org.glassfish.api.admin.*;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
import org.glassfish.logging.annotation.LogMessageInfo;
import org.glassfish.logging.annotation.LogMessagesResourceBundle;
diff --git a/nucleus/cluster/gms-adapter/src/main/java/org/glassfish/gms/admin/GMSAnnounceBeforeStopClusterCommand.java b/nucleus/cluster/gms-adapter/src/main/java/org/glassfish/gms/admin/GMSAnnounceBeforeStopClusterCommand.java
index 0df0293..33e4fe3 100644
--- a/nucleus/cluster/gms-adapter/src/main/java/org/glassfish/gms/admin/GMSAnnounceBeforeStopClusterCommand.java
+++ b/nucleus/cluster/gms-adapter/src/main/java/org/glassfish/gms/admin/GMSAnnounceBeforeStopClusterCommand.java
@@ -24,7 +24,7 @@
import org.glassfish.api.ActionReport;
import org.glassfish.api.Param;
import org.glassfish.api.admin.*;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
import org.glassfish.logging.annotation.LogMessageInfo;
import org.glassfish.logging.annotation.LogMessagesResourceBundle;
diff --git a/nucleus/cluster/gms-bootstrap/src/main/java/org/glassfish/gms/bootstrap/GMSAdapterService.java b/nucleus/cluster/gms-bootstrap/src/main/java/org/glassfish/gms/bootstrap/GMSAdapterService.java
index 81a83d3..f23c4fa 100644
--- a/nucleus/cluster/gms-bootstrap/src/main/java/org/glassfish/gms/bootstrap/GMSAdapterService.java
+++ b/nucleus/cluster/gms-bootstrap/src/main/java/org/glassfish/gms/bootstrap/GMSAdapterService.java
@@ -24,9 +24,9 @@
import java.util.logging.Logger;
import org.glassfish.api.logging.LogLevel;
-import javax.inject.Inject;
-import javax.inject.Named;
-import javax.inject.Provider;
+import jakarta.inject.Inject;
+import jakarta.inject.Named;
+import jakarta.inject.Provider;
import org.glassfish.api.StartupRunLevel;
import org.glassfish.api.admin.ServerEnvironment;
diff --git a/nucleus/common/amx-core/src/main/java/org/glassfish/admin/amx/impl/AMXStartupService.java b/nucleus/common/amx-core/src/main/java/org/glassfish/admin/amx/impl/AMXStartupService.java
index 975f620..9ad7c08 100644
--- a/nucleus/common/amx-core/src/main/java/org/glassfish/admin/amx/impl/AMXStartupService.java
+++ b/nucleus/common/amx-core/src/main/java/org/glassfish/admin/amx/impl/AMXStartupService.java
@@ -46,7 +46,7 @@
import org.glassfish.hk2.api.ServiceLocator;
import org.jvnet.hk2.annotations.Service;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
import javax.management.*;
import javax.management.remote.JMXServiceURL;
import java.util.Collection;
diff --git a/nucleus/common/amx-core/src/main/java/org/glassfish/admin/amx/impl/config/AMXConfigStartupService.java b/nucleus/common/amx-core/src/main/java/org/glassfish/admin/amx/impl/config/AMXConfigStartupService.java
index c570336..a8b1215 100644
--- a/nucleus/common/amx-core/src/main/java/org/glassfish/admin/amx/impl/config/AMXConfigStartupService.java
+++ b/nucleus/common/amx-core/src/main/java/org/glassfish/admin/amx/impl/config/AMXConfigStartupService.java
@@ -25,7 +25,7 @@
import org.glassfish.admin.amx.util.TimingDelta;
import org.jvnet.hk2.annotations.Service;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
import javax.management.JMException;
import javax.management.MBeanServer;
import javax.management.ObjectName;
diff --git a/nucleus/common/amx-core/src/main/java/org/glassfish/admin/amx/impl/util/InjectedValues.java b/nucleus/common/amx-core/src/main/java/org/glassfish/admin/amx/impl/util/InjectedValues.java
index 649d659..730c88e 100644
--- a/nucleus/common/amx-core/src/main/java/org/glassfish/admin/amx/impl/util/InjectedValues.java
+++ b/nucleus/common/amx-core/src/main/java/org/glassfish/admin/amx/impl/util/InjectedValues.java
@@ -22,7 +22,7 @@
import org.glassfish.api.Async;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
import javax.management.MBeanServer;
import org.glassfish.server.ServerEnvironmentImpl;
diff --git a/nucleus/common/common-util/src/main/java/com/sun/appserv/server/util/VersionInfoImpl.java b/nucleus/common/common-util/src/main/java/com/sun/appserv/server/util/VersionInfoImpl.java
index 2da08c2..ed7cd35 100644
--- a/nucleus/common/common-util/src/main/java/com/sun/appserv/server/util/VersionInfoImpl.java
+++ b/nucleus/common/common-util/src/main/java/com/sun/appserv/server/util/VersionInfoImpl.java
@@ -16,7 +16,7 @@
package com.sun.appserv.server.util;
-import javax.inject.Singleton;
+import jakarta.inject.Singleton;
import org.glassfish.api.VersionInfo;
import org.jvnet.hk2.annotations.Service;
diff --git a/nucleus/common/common-util/src/main/java/com/sun/common/util/logging/LoggingConfigImpl.java b/nucleus/common/common-util/src/main/java/com/sun/common/util/logging/LoggingConfigImpl.java
index 2971aa2..b77bb3d 100644
--- a/nucleus/common/common-util/src/main/java/com/sun/common/util/logging/LoggingConfigImpl.java
+++ b/nucleus/common/common-util/src/main/java/com/sun/common/util/logging/LoggingConfigImpl.java
@@ -35,7 +35,7 @@
import java.util.zip.ZipEntry;
import java.util.zip.ZipOutputStream;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
import org.glassfish.api.admin.FileMonitoring;
import org.glassfish.hk2.api.PostConstruct;
diff --git a/nucleus/common/common-util/src/main/java/org/glassfish/common/util/admin/AuthTokenManager.java b/nucleus/common/common-util/src/main/java/org/glassfish/common/util/admin/AuthTokenManager.java
index 2d0c976..650560f 100644
--- a/nucleus/common/common-util/src/main/java/org/glassfish/common/util/admin/AuthTokenManager.java
+++ b/nucleus/common/common-util/src/main/java/org/glassfish/common/util/admin/AuthTokenManager.java
@@ -24,7 +24,7 @@
import java.util.Map;
import java.util.logging.Level;
import java.util.logging.Logger;
-import javax.inject.Singleton;
+import jakarta.inject.Singleton;
import javax.security.auth.Subject;
import org.jvnet.hk2.annotations.Service;
diff --git a/nucleus/common/common-util/src/main/java/org/glassfish/common/util/admin/GlassFishErrorServiceImpl.java b/nucleus/common/common-util/src/main/java/org/glassfish/common/util/admin/GlassFishErrorServiceImpl.java
index 63610be..d2d8181 100644
--- a/nucleus/common/common-util/src/main/java/org/glassfish/common/util/admin/GlassFishErrorServiceImpl.java
+++ b/nucleus/common/common-util/src/main/java/org/glassfish/common/util/admin/GlassFishErrorServiceImpl.java
@@ -16,7 +16,7 @@
package org.glassfish.common.util.admin;
-import javax.inject.Singleton;
+import jakarta.inject.Singleton;
import org.glassfish.hk2.api.ErrorInformation;
import org.glassfish.hk2.api.ErrorService;
diff --git a/nucleus/common/common-util/src/main/java/org/glassfish/common/util/admin/HK2BindTracingService.java b/nucleus/common/common-util/src/main/java/org/glassfish/common/util/admin/HK2BindTracingService.java
index 38f217a..1379044 100644
--- a/nucleus/common/common-util/src/main/java/org/glassfish/common/util/admin/HK2BindTracingService.java
+++ b/nucleus/common/common-util/src/main/java/org/glassfish/common/util/admin/HK2BindTracingService.java
@@ -18,7 +18,7 @@
import java.util.StringTokenizer;
-import javax.inject.Singleton;
+import jakarta.inject.Singleton;
import org.glassfish.hk2.api.ActiveDescriptor;
import org.glassfish.hk2.api.Descriptor;
diff --git a/nucleus/common/common-util/src/main/java/org/glassfish/common/util/admin/RestSessionManager.java b/nucleus/common/common-util/src/main/java/org/glassfish/common/util/admin/RestSessionManager.java
index caad73f..897e50d 100644
--- a/nucleus/common/common-util/src/main/java/org/glassfish/common/util/admin/RestSessionManager.java
+++ b/nucleus/common/common-util/src/main/java/org/glassfish/common/util/admin/RestSessionManager.java
@@ -23,7 +23,7 @@
import java.util.concurrent.ConcurrentHashMap;
import javax.security.auth.Subject;
import org.jvnet.hk2.annotations.Service;
-import javax.inject.Singleton;
+import jakarta.inject.Singleton;
/**
* Manages Rest Sessions.
diff --git a/nucleus/common/common-util/src/main/java/org/glassfish/server/ServerEnvironmentImpl.java b/nucleus/common/common-util/src/main/java/org/glassfish/server/ServerEnvironmentImpl.java
index 053def6..c767ef5 100644
--- a/nucleus/common/common-util/src/main/java/org/glassfish/server/ServerEnvironmentImpl.java
+++ b/nucleus/common/common-util/src/main/java/org/glassfish/server/ServerEnvironmentImpl.java
@@ -28,7 +28,7 @@
import org.glassfish.hk2.api.PostConstruct;
import org.glassfish.api.admin.ServerEnvironment;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
/**
* Defines various global configuration for the running GlassFish instance.
diff --git a/nucleus/common/common-util/src/test/java/org/glassfish/common/locator/ProxiableSingletonContext.java b/nucleus/common/common-util/src/test/java/org/glassfish/common/locator/ProxiableSingletonContext.java
index e38e3a7..7413079 100644
--- a/nucleus/common/common-util/src/test/java/org/glassfish/common/locator/ProxiableSingletonContext.java
+++ b/nucleus/common/common-util/src/test/java/org/glassfish/common/locator/ProxiableSingletonContext.java
@@ -18,7 +18,7 @@
import java.lang.annotation.Annotation;
-import javax.inject.Singleton;
+import jakarta.inject.Singleton;
import org.glassfish.hk2.api.ActiveDescriptor;
import org.glassfish.hk2.api.Context;
diff --git a/nucleus/common/common-util/src/test/java/org/glassfish/common/locator/ProxiableSingletonScope.java b/nucleus/common/common-util/src/test/java/org/glassfish/common/locator/ProxiableSingletonScope.java
index eee2928..4c8e8de 100644
--- a/nucleus/common/common-util/src/test/java/org/glassfish/common/locator/ProxiableSingletonScope.java
+++ b/nucleus/common/common-util/src/test/java/org/glassfish/common/locator/ProxiableSingletonScope.java
@@ -23,7 +23,7 @@
import java.lang.annotation.Retention;
import java.lang.annotation.Target;
-import javax.inject.Scope;
+import jakarta.inject.Scope;
import org.glassfish.hk2.api.Proxiable;
diff --git a/nucleus/common/common-util/src/test/java/org/glassfish/common/locator/SimpleInjectee.java b/nucleus/common/common-util/src/test/java/org/glassfish/common/locator/SimpleInjectee.java
index 68f15df..d4e8f5c 100644
--- a/nucleus/common/common-util/src/test/java/org/glassfish/common/locator/SimpleInjectee.java
+++ b/nucleus/common/common-util/src/test/java/org/glassfish/common/locator/SimpleInjectee.java
@@ -16,7 +16,7 @@
package org.glassfish.common.locator;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
/**
* @author jwells
diff --git a/nucleus/common/glassfish-api/src/main/java/org/glassfish/api/admin/AdminCommandLock.java b/nucleus/common/glassfish-api/src/main/java/org/glassfish/api/admin/AdminCommandLock.java
index 4f21252..e4654c9 100644
--- a/nucleus/common/glassfish-api/src/main/java/org/glassfish/api/admin/AdminCommandLock.java
+++ b/nucleus/common/glassfish-api/src/main/java/org/glassfish/api/admin/AdminCommandLock.java
@@ -29,9 +29,9 @@
import org.jvnet.hk2.annotations.Service;
-import javax.inject.Singleton;
+import jakarta.inject.Singleton;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
/**
* The implementation of the admin command lock.
diff --git a/nucleus/common/glassfish-api/src/main/java/org/glassfish/api/admin/ProcessEnvironment.java b/nucleus/common/glassfish-api/src/main/java/org/glassfish/api/admin/ProcessEnvironment.java
index 517154e..6055f4f 100644
--- a/nucleus/common/glassfish-api/src/main/java/org/glassfish/api/admin/ProcessEnvironment.java
+++ b/nucleus/common/glassfish-api/src/main/java/org/glassfish/api/admin/ProcessEnvironment.java
@@ -18,7 +18,7 @@
import org.jvnet.hk2.annotations.Service;
-import javax.inject.Singleton;
+import jakarta.inject.Singleton;
/**
* Process environment allow access to information related to the execution or process.
diff --git a/nucleus/common/glassfish-api/src/main/java/org/glassfish/api/admin/RestEndpoints.java b/nucleus/common/glassfish-api/src/main/java/org/glassfish/api/admin/RestEndpoints.java
index 19e3a58..9749b5c 100644
--- a/nucleus/common/glassfish-api/src/main/java/org/glassfish/api/admin/RestEndpoints.java
+++ b/nucleus/common/glassfish-api/src/main/java/org/glassfish/api/admin/RestEndpoints.java
@@ -19,7 +19,7 @@
import java.lang.annotation.Retention;
import java.lang.annotation.RetentionPolicy;
-import javax.inject.Qualifier;
+import jakarta.inject.Qualifier;
/**
*
diff --git a/nucleus/common/glassfish-api/src/main/java/org/glassfish/api/admin/Supplemental.java b/nucleus/common/glassfish-api/src/main/java/org/glassfish/api/admin/Supplemental.java
index 1da4c6a..f298f65 100755
--- a/nucleus/common/glassfish-api/src/main/java/org/glassfish/api/admin/Supplemental.java
+++ b/nucleus/common/glassfish-api/src/main/java/org/glassfish/api/admin/Supplemental.java
@@ -23,7 +23,7 @@
import java.lang.annotation.RetentionPolicy;
import java.lang.annotation.Target;
-import javax.inject.Qualifier;
+import jakarta.inject.Qualifier;
/**
* Annotation to define a supplemental command
diff --git a/nucleus/common/glassfish-api/src/main/java/org/glassfish/api/admin/TargetBasedExecutor.java b/nucleus/common/glassfish-api/src/main/java/org/glassfish/api/admin/TargetBasedExecutor.java
index 26e372d..5cefd23 100644
--- a/nucleus/common/glassfish-api/src/main/java/org/glassfish/api/admin/TargetBasedExecutor.java
+++ b/nucleus/common/glassfish-api/src/main/java/org/glassfish/api/admin/TargetBasedExecutor.java
@@ -16,8 +16,8 @@
package org.glassfish.api.admin;
-import javax.inject.Inject;
-import javax.inject.Named;
+import jakarta.inject.Inject;
+import jakarta.inject.Named;
import org.glassfish.api.ActionReport;
import org.jvnet.hk2.annotations.Service;
diff --git a/nucleus/common/glassfish-api/src/main/java/org/glassfish/api/admin/package-info.java b/nucleus/common/glassfish-api/src/main/java/org/glassfish/api/admin/package-info.java
index 391ee84..7cf7cfc 100755
--- a/nucleus/common/glassfish-api/src/main/java/org/glassfish/api/admin/package-info.java
+++ b/nucleus/common/glassfish-api/src/main/java/org/glassfish/api/admin/package-info.java
@@ -25,7 +25,7 @@
{@link org.jvnet.hk2.annotations.Service#name} attribute.
<p>Commands can be singleton or instantiated at each invocation depending on the {@link org.jvnet.hk2.annotations.Scope}
- annotation. Singleton commands will be injected once for all {@link javax.inject.Inject} dependencies but
+ annotation. Singleton commands will be injected once for all {@link jakarta.inject.Inject} dependencies but
will have all @{link org.glassfish.api.admin.Param} dependencies injected for each invocation.
<p>more to be added to describe the v3 behaviors.
diff --git a/nucleus/common/glassfish-api/src/main/java/org/glassfish/api/deployment/archive/ArchiveDetector.java b/nucleus/common/glassfish-api/src/main/java/org/glassfish/api/deployment/archive/ArchiveDetector.java
index b44781e..3a16dc4 100644
--- a/nucleus/common/glassfish-api/src/main/java/org/glassfish/api/deployment/archive/ArchiveDetector.java
+++ b/nucleus/common/glassfish-api/src/main/java/org/glassfish/api/deployment/archive/ArchiveDetector.java
@@ -18,7 +18,7 @@
import org.jvnet.hk2.annotations.Contract;
-import javax.inject.Singleton;
+import jakarta.inject.Singleton;
import java.io.IOException;
diff --git a/nucleus/common/glassfish-api/src/main/java/org/glassfish/api/deployment/archive/ArchiveType.java b/nucleus/common/glassfish-api/src/main/java/org/glassfish/api/deployment/archive/ArchiveType.java
index 5bfd9a1..278db63 100755
--- a/nucleus/common/glassfish-api/src/main/java/org/glassfish/api/deployment/archive/ArchiveType.java
+++ b/nucleus/common/glassfish-api/src/main/java/org/glassfish/api/deployment/archive/ArchiveType.java
@@ -35,7 +35,7 @@
* @author Sanjeeb Sahoo
*/
@Contract
-@javax.inject.Singleton
+@jakarta.inject.Singleton
public abstract class ArchiveType {
/**
* File extension for this type of archive. Empty string is used if there is no extension specified.
diff --git a/nucleus/common/glassfish-api/src/main/java/org/glassfish/api/invocation/InvocationManagerImpl.java b/nucleus/common/glassfish-api/src/main/java/org/glassfish/api/invocation/InvocationManagerImpl.java
index a0d3c81..d4e3748 100644
--- a/nucleus/common/glassfish-api/src/main/java/org/glassfish/api/invocation/InvocationManagerImpl.java
+++ b/nucleus/common/glassfish-api/src/main/java/org/glassfish/api/invocation/InvocationManagerImpl.java
@@ -27,11 +27,11 @@
import org.jvnet.hk2.annotations.Optional;
import org.jvnet.hk2.annotations.Service;
-import javax.inject.Singleton;
+import jakarta.inject.Singleton;
import org.glassfish.hk2.api.IterableProvider;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
@Service
@Singleton
diff --git a/nucleus/common/glassfish-api/src/main/java/org/glassfish/api/naming/NamespacePrefixes.java b/nucleus/common/glassfish-api/src/main/java/org/glassfish/api/naming/NamespacePrefixes.java
index 15e4f42..1955824 100644
--- a/nucleus/common/glassfish-api/src/main/java/org/glassfish/api/naming/NamespacePrefixes.java
+++ b/nucleus/common/glassfish-api/src/main/java/org/glassfish/api/naming/NamespacePrefixes.java
@@ -23,7 +23,7 @@
import java.lang.annotation.Retention;
import java.lang.annotation.Target;
-import javax.inject.Qualifier;
+import jakarta.inject.Qualifier;
import static java.lang.annotation.RetentionPolicy.RUNTIME;
diff --git a/nucleus/common/internal-api/src/main/java/org/glassfish/internal/api/Globals.java b/nucleus/common/internal-api/src/main/java/org/glassfish/internal/api/Globals.java
index 53fa596..762e160 100644
--- a/nucleus/common/internal-api/src/main/java/org/glassfish/internal/api/Globals.java
+++ b/nucleus/common/internal-api/src/main/java/org/glassfish/internal/api/Globals.java
@@ -24,8 +24,8 @@
import org.glassfish.hk2.api.ServiceLocator;
import org.glassfish.hk2.runlevel.RunLevel;
import com.sun.enterprise.config.serverbeans.ConfigBeansUtilities;
-import javax.inject.Inject;
-import javax.inject.Singleton;
+import jakarta.inject.Inject;
+import jakarta.inject.Singleton;
/**
* Very sensitive class, anything stored here cannot be garbage collected
diff --git a/nucleus/common/internal-api/src/main/java/org/glassfish/internal/api/Target.java b/nucleus/common/internal-api/src/main/java/org/glassfish/internal/api/Target.java
index 35199b3..5e32e40 100755
--- a/nucleus/common/internal-api/src/main/java/org/glassfish/internal/api/Target.java
+++ b/nucleus/common/internal-api/src/main/java/org/glassfish/internal/api/Target.java
@@ -22,7 +22,7 @@
import org.glassfish.hk2.api.ServiceLocator;
import org.jvnet.hk2.annotations.Service;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
import java.util.ArrayList;
import java.util.List;
diff --git a/nucleus/common/internal-api/src/main/java/org/glassfish/internal/config/UnprocessedConfigListener.java b/nucleus/common/internal-api/src/main/java/org/glassfish/internal/config/UnprocessedConfigListener.java
index 2fcb944..1b6d2aa 100644
--- a/nucleus/common/internal-api/src/main/java/org/glassfish/internal/config/UnprocessedConfigListener.java
+++ b/nucleus/common/internal-api/src/main/java/org/glassfish/internal/config/UnprocessedConfigListener.java
@@ -26,7 +26,7 @@
import org.glassfish.internal.api.*;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
import java.util.List;
import java.util.ArrayList;
import java.util.Collections;
diff --git a/nucleus/common/internal-api/src/main/java/org/glassfish/internal/data/ApplicationRegistry.java b/nucleus/common/internal-api/src/main/java/org/glassfish/internal/data/ApplicationRegistry.java
index b18dc37..b803da4 100644
--- a/nucleus/common/internal-api/src/main/java/org/glassfish/internal/data/ApplicationRegistry.java
+++ b/nucleus/common/internal-api/src/main/java/org/glassfish/internal/data/ApplicationRegistry.java
@@ -18,7 +18,7 @@
import org.jvnet.hk2.annotations.Service;
-import javax.inject.Singleton;
+import jakarta.inject.Singleton;
import java.util.HashMap;
import java.util.Map;
diff --git a/nucleus/common/internal-api/src/main/java/org/glassfish/internal/data/ContainerRegistry.java b/nucleus/common/internal-api/src/main/java/org/glassfish/internal/data/ContainerRegistry.java
index dae4664..a6630b9 100644
--- a/nucleus/common/internal-api/src/main/java/org/glassfish/internal/data/ContainerRegistry.java
+++ b/nucleus/common/internal-api/src/main/java/org/glassfish/internal/data/ContainerRegistry.java
@@ -20,9 +20,9 @@
import org.glassfish.hk2.api.ServiceLocator;
import org.jvnet.hk2.annotations.Service;
-import javax.inject.Singleton;
+import jakarta.inject.Singleton;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
import java.util.*;
/**
diff --git a/nucleus/common/internal-api/src/main/java/org/glassfish/internal/deployment/GenericHandler.java b/nucleus/common/internal-api/src/main/java/org/glassfish/internal/deployment/GenericHandler.java
index cf8a9da..3020267 100644
--- a/nucleus/common/internal-api/src/main/java/org/glassfish/internal/deployment/GenericHandler.java
+++ b/nucleus/common/internal-api/src/main/java/org/glassfish/internal/deployment/GenericHandler.java
@@ -39,7 +39,7 @@
import com.sun.enterprise.util.io.FileUtils;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
/**
* Pretty generic implementation of some ArchiveHandler methods
diff --git a/nucleus/common/internal-api/src/main/java/org/glassfish/internal/deployment/GenericSniffer.java b/nucleus/common/internal-api/src/main/java/org/glassfish/internal/deployment/GenericSniffer.java
index e4749ba..737e3e5 100644
--- a/nucleus/common/internal-api/src/main/java/org/glassfish/internal/deployment/GenericSniffer.java
+++ b/nucleus/common/internal-api/src/main/java/org/glassfish/internal/deployment/GenericSniffer.java
@@ -20,7 +20,7 @@
import com.sun.enterprise.module.ModuleDefinition;
import com.sun.enterprise.module.HK2Module;
import java.io.ByteArrayOutputStream;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
import javax.xml.stream.XMLEventReader;
import javax.xml.stream.XMLInputFactory;
import javax.xml.stream.XMLStreamException;
diff --git a/nucleus/common/internal-api/src/main/java/org/glassfish/internal/embedded/admin/AdminInfo.java b/nucleus/common/internal-api/src/main/java/org/glassfish/internal/embedded/admin/AdminInfo.java
index 09f80f3..7eb7847 100644
--- a/nucleus/common/internal-api/src/main/java/org/glassfish/internal/embedded/admin/AdminInfo.java
+++ b/nucleus/common/internal-api/src/main/java/org/glassfish/internal/embedded/admin/AdminInfo.java
@@ -20,7 +20,7 @@
import org.glassfish.internal.embedded.Server;
import org.jvnet.hk2.annotations.Service;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
/**
* So far, the admin container does not require much configuration but we
diff --git a/nucleus/common/mbeanserver/src/main/java/org/glassfish/admin/mbeanserver/JMXStartupService.java b/nucleus/common/mbeanserver/src/main/java/org/glassfish/admin/mbeanserver/JMXStartupService.java
index 82e8877..2630eda 100644
--- a/nucleus/common/mbeanserver/src/main/java/org/glassfish/admin/mbeanserver/JMXStartupService.java
+++ b/nucleus/common/mbeanserver/src/main/java/org/glassfish/admin/mbeanserver/JMXStartupService.java
@@ -18,8 +18,8 @@
import java.util.logging.Level;
import java.util.logging.Logger;
-import javax.inject.Inject;
-import javax.inject.Named;
+import jakarta.inject.Inject;
+import jakarta.inject.Named;
import javax.management.InstanceNotFoundException;
import javax.management.MBeanRegistrationException;
diff --git a/nucleus/common/mbeanserver/src/main/java/org/glassfish/admin/mbeanserver/PendingConfigBeans.java b/nucleus/common/mbeanserver/src/main/java/org/glassfish/admin/mbeanserver/PendingConfigBeans.java
index e288dec..35dd8ea 100644
--- a/nucleus/common/mbeanserver/src/main/java/org/glassfish/admin/mbeanserver/PendingConfigBeans.java
+++ b/nucleus/common/mbeanserver/src/main/java/org/glassfish/admin/mbeanserver/PendingConfigBeans.java
@@ -22,7 +22,7 @@
import java.util.concurrent.CountDownLatch;
import java.util.concurrent.LinkedBlockingQueue;
import java.util.logging.Level;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
import org.glassfish.config.support.ConfigBeanListener;
import org.glassfish.hk2.api.ActiveDescriptor;
import org.glassfish.hk2.api.PostConstruct;
diff --git a/nucleus/common/mbeanserver/src/main/java/org/glassfish/admin/mbeanserver/ssl/JMXMasterPasswordImpl.java b/nucleus/common/mbeanserver/src/main/java/org/glassfish/admin/mbeanserver/ssl/JMXMasterPasswordImpl.java
index 66e0c1e..357b839 100644
--- a/nucleus/common/mbeanserver/src/main/java/org/glassfish/admin/mbeanserver/ssl/JMXMasterPasswordImpl.java
+++ b/nucleus/common/mbeanserver/src/main/java/org/glassfish/admin/mbeanserver/ssl/JMXMasterPasswordImpl.java
@@ -22,8 +22,8 @@
import java.security.KeyStoreException;
import java.security.NoSuchAlgorithmException;
import java.security.cert.CertificateException;
-import javax.inject.Inject;
-import javax.inject.Singleton;
+import jakarta.inject.Inject;
+import jakarta.inject.Singleton;
import org.glassfish.security.common.MasterPassword;
import org.jvnet.hk2.annotations.Optional;
import org.jvnet.hk2.annotations.Service;
diff --git a/nucleus/core/bootstrap/src/main/java/com/sun/enterprise/glassfish/bootstrap/AppServer.java b/nucleus/core/bootstrap/src/main/java/com/sun/enterprise/glassfish/bootstrap/AppServer.java
index f5b7f0d..f83bb96 100644
--- a/nucleus/core/bootstrap/src/main/java/com/sun/enterprise/glassfish/bootstrap/AppServer.java
+++ b/nucleus/core/bootstrap/src/main/java/com/sun/enterprise/glassfish/bootstrap/AppServer.java
@@ -18,7 +18,7 @@
import org.glassfish.hk2.api.Proxiable;
-import javax.inject.Scope;
+import jakarta.inject.Scope;
import java.lang.annotation.Documented;
import java.lang.annotation.Retention;
import java.lang.annotation.Target;
diff --git a/nucleus/core/bootstrap/src/main/java/com/sun/enterprise/glassfish/bootstrap/EmbeddedInhabitantsParser.java b/nucleus/core/bootstrap/src/main/java/com/sun/enterprise/glassfish/bootstrap/EmbeddedInhabitantsParser.java
index 8fc2ec5..b10586b 100644
--- a/nucleus/core/bootstrap/src/main/java/com/sun/enterprise/glassfish/bootstrap/EmbeddedInhabitantsParser.java
+++ b/nucleus/core/bootstrap/src/main/java/com/sun/enterprise/glassfish/bootstrap/EmbeddedInhabitantsParser.java
@@ -20,7 +20,7 @@
import org.glassfish.hk2.api.ServiceLocator;
import org.glassfish.hk2.bootstrap.PopulatorPostProcessor;
import org.glassfish.hk2.utilities.DescriptorImpl;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
/**
* Kernel's decoration for embedded environment.
diff --git a/nucleus/core/kernel/src/main/java/com/sun/enterprise/v3/admin/AdminAdapter.java b/nucleus/core/kernel/src/main/java/com/sun/enterprise/v3/admin/AdminAdapter.java
index 012891c..5ef1847 100644
--- a/nucleus/core/kernel/src/main/java/com/sun/enterprise/v3/admin/AdminAdapter.java
+++ b/nucleus/core/kernel/src/main/java/com/sun/enterprise/v3/admin/AdminAdapter.java
@@ -35,8 +35,8 @@
import java.util.concurrent.TimeUnit;
import java.util.logging.Level;
import java.util.logging.Logger;
-import javax.inject.Inject;
-import javax.inject.Named;
+import jakarta.inject.Inject;
+import jakarta.inject.Named;
import javax.security.auth.Subject;
import javax.security.auth.login.LoginException;
import org.glassfish.admin.payload.PayloadImpl;
diff --git a/nucleus/core/kernel/src/main/java/com/sun/enterprise/v3/admin/AdminConsoleConfigUpgrade.java b/nucleus/core/kernel/src/main/java/com/sun/enterprise/v3/admin/AdminConsoleConfigUpgrade.java
index fbbcd73..0553fae 100644
--- a/nucleus/core/kernel/src/main/java/com/sun/enterprise/v3/admin/AdminConsoleConfigUpgrade.java
+++ b/nucleus/core/kernel/src/main/java/com/sun/enterprise/v3/admin/AdminConsoleConfigUpgrade.java
@@ -20,8 +20,8 @@
import com.sun.enterprise.module.bootstrap.EarlyLogHandler;
import org.glassfish.grizzly.config.dom.NetworkListener;
import org.glassfish.api.admin.config.ConfigurationUpgrade;
-import javax.inject.Inject;
-import javax.inject.Named;
+import jakarta.inject.Inject;
+import jakarta.inject.Named;
import org.jvnet.hk2.annotations.Optional;
import org.jvnet.hk2.annotations.Service;
diff --git a/nucleus/core/kernel/src/main/java/com/sun/enterprise/v3/admin/AdminRESTConfigUpgrade.java b/nucleus/core/kernel/src/main/java/com/sun/enterprise/v3/admin/AdminRESTConfigUpgrade.java
index 4af5b4a..6d1863f 100644
--- a/nucleus/core/kernel/src/main/java/com/sun/enterprise/v3/admin/AdminRESTConfigUpgrade.java
+++ b/nucleus/core/kernel/src/main/java/com/sun/enterprise/v3/admin/AdminRESTConfigUpgrade.java
@@ -23,8 +23,8 @@
import org.glassfish.grizzly.config.dom.Protocol;
import org.glassfish.grizzly.config.dom.Protocols;
import org.glassfish.api.admin.config.ConfigurationUpgrade;
-import javax.inject.Inject;
-import javax.inject.Named;
+import jakarta.inject.Inject;
+import jakarta.inject.Named;
import org.jvnet.hk2.annotations.Optional;
import org.jvnet.hk2.annotations.Service;
diff --git a/nucleus/core/kernel/src/main/java/com/sun/enterprise/v3/admin/CheckpointHelper.java b/nucleus/core/kernel/src/main/java/com/sun/enterprise/v3/admin/CheckpointHelper.java
index ce6c6f8..5b8ded8 100644
--- a/nucleus/core/kernel/src/main/java/com/sun/enterprise/v3/admin/CheckpointHelper.java
+++ b/nucleus/core/kernel/src/main/java/com/sun/enterprise/v3/admin/CheckpointHelper.java
@@ -31,7 +31,7 @@
import java.util.zip.ZipEntry;
import java.util.zip.ZipOutputStream;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
import javax.security.auth.Subject;
import javax.security.auth.login.LoginException;
diff --git a/nucleus/core/kernel/src/main/java/com/sun/enterprise/v3/admin/CommandRunnerImpl.java b/nucleus/core/kernel/src/main/java/com/sun/enterprise/v3/admin/CommandRunnerImpl.java
index a564dbd..597bc2b 100644
--- a/nucleus/core/kernel/src/main/java/com/sun/enterprise/v3/admin/CommandRunnerImpl.java
+++ b/nucleus/core/kernel/src/main/java/com/sun/enterprise/v3/admin/CommandRunnerImpl.java
@@ -39,10 +39,10 @@
import java.util.concurrent.locks.Lock;
import java.util.logging.Level;
import java.util.logging.Logger;
-import javax.inject.Inject;
-import javax.inject.Named;
-import javax.inject.Scope;
-import javax.inject.Singleton;
+import jakarta.inject.Inject;
+import jakarta.inject.Named;
+import jakarta.inject.Scope;
+import jakarta.inject.Singleton;
import javax.security.auth.Subject;
import jakarta.validation.*;
import org.glassfish.admin.payload.PayloadFilesManager;
diff --git a/nucleus/core/kernel/src/main/java/com/sun/enterprise/v3/admin/CreateProfiler.java b/nucleus/core/kernel/src/main/java/com/sun/enterprise/v3/admin/CreateProfiler.java
index dadf519..335f9ef 100644
--- a/nucleus/core/kernel/src/main/java/com/sun/enterprise/v3/admin/CreateProfiler.java
+++ b/nucleus/core/kernel/src/main/java/com/sun/enterprise/v3/admin/CreateProfiler.java
@@ -35,8 +35,8 @@
import org.glassfish.config.support.CommandTarget;
import org.glassfish.internal.api.Target;
-import javax.inject.Inject;
-import javax.inject.Named;
+import jakarta.inject.Inject;
+import jakarta.inject.Named;
import org.jvnet.hk2.annotations.Service;
diff --git a/nucleus/core/kernel/src/main/java/com/sun/enterprise/v3/admin/CreateSystemProperties.java b/nucleus/core/kernel/src/main/java/com/sun/enterprise/v3/admin/CreateSystemProperties.java
index 40c2410..51d5f81 100644
--- a/nucleus/core/kernel/src/main/java/com/sun/enterprise/v3/admin/CreateSystemProperties.java
+++ b/nucleus/core/kernel/src/main/java/com/sun/enterprise/v3/admin/CreateSystemProperties.java
@@ -25,7 +25,7 @@
import java.util.ArrayList;
import java.util.Collection;
import java.util.Properties;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
import org.glassfish.api.ActionReport;
import org.glassfish.api.I18n;
import org.glassfish.api.Param;
diff --git a/nucleus/core/kernel/src/main/java/com/sun/enterprise/v3/admin/DeleteProfiler.java b/nucleus/core/kernel/src/main/java/com/sun/enterprise/v3/admin/DeleteProfiler.java
index a111baa..1b787f6 100644
--- a/nucleus/core/kernel/src/main/java/com/sun/enterprise/v3/admin/DeleteProfiler.java
+++ b/nucleus/core/kernel/src/main/java/com/sun/enterprise/v3/admin/DeleteProfiler.java
@@ -31,8 +31,8 @@
import org.glassfish.api.ActionReport;
import org.jvnet.hk2.annotations.Service;
-import javax.inject.Inject;
-import javax.inject.Named;
+import jakarta.inject.Inject;
+import jakarta.inject.Named;
import org.glassfish.hk2.api.PerLookup;
import org.jvnet.hk2.config.ConfigSupport;
diff --git a/nucleus/core/kernel/src/main/java/com/sun/enterprise/v3/admin/DeleteSystemProperty.java b/nucleus/core/kernel/src/main/java/com/sun/enterprise/v3/admin/DeleteSystemProperty.java
index 8c9c6fa..e6e5fb8 100644
--- a/nucleus/core/kernel/src/main/java/com/sun/enterprise/v3/admin/DeleteSystemProperty.java
+++ b/nucleus/core/kernel/src/main/java/com/sun/enterprise/v3/admin/DeleteSystemProperty.java
@@ -28,7 +28,7 @@
import org.glassfish.api.admin.RuntimeType;
import org.glassfish.config.support.CommandTarget;
import org.glassfish.config.support.TargetType;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
import org.jvnet.hk2.annotations.Service;
import org.glassfish.hk2.api.PerLookup;
diff --git a/nucleus/core/kernel/src/main/java/com/sun/enterprise/v3/admin/DumpHK2Command.java b/nucleus/core/kernel/src/main/java/com/sun/enterprise/v3/admin/DumpHK2Command.java
index 3871f24..e1b115e 100644
--- a/nucleus/core/kernel/src/main/java/com/sun/enterprise/v3/admin/DumpHK2Command.java
+++ b/nucleus/core/kernel/src/main/java/com/sun/enterprise/v3/admin/DumpHK2Command.java
@@ -26,7 +26,7 @@
import org.glassfish.api.admin.AdminCommandContext;
import org.jvnet.hk2.annotations.Service;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
import java.io.ByteArrayOutputStream;
import java.io.PrintStream;
diff --git a/nucleus/core/kernel/src/main/java/com/sun/enterprise/v3/admin/GetCommand.java b/nucleus/core/kernel/src/main/java/com/sun/enterprise/v3/admin/GetCommand.java
index d7407f3..654b802 100644
--- a/nucleus/core/kernel/src/main/java/com/sun/enterprise/v3/admin/GetCommand.java
+++ b/nucleus/core/kernel/src/main/java/com/sun/enterprise/v3/admin/GetCommand.java
@@ -30,7 +30,7 @@
import org.glassfish.api.admin.*;
import org.glassfish.flashlight.MonitoringRuntimeDataRegistry;
import org.glassfish.internal.api.Target;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
import org.glassfish.api.admin.AccessRequired.AccessCheck;
import org.jvnet.hk2.annotations.Optional;
diff --git a/nucleus/core/kernel/src/main/java/com/sun/enterprise/v3/admin/GetHabitatInfo.java b/nucleus/core/kernel/src/main/java/com/sun/enterprise/v3/admin/GetHabitatInfo.java
index d2c8764..b2caab9 100644
--- a/nucleus/core/kernel/src/main/java/com/sun/enterprise/v3/admin/GetHabitatInfo.java
+++ b/nucleus/core/kernel/src/main/java/com/sun/enterprise/v3/admin/GetHabitatInfo.java
@@ -30,7 +30,7 @@
import java.util.SortedSet;
import java.util.TreeSet;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
import jakarta.validation.ConstraintValidator;
import jakarta.validation.ConstraintValidatorContext;
import jakarta.validation.Payload;
diff --git a/nucleus/core/kernel/src/main/java/com/sun/enterprise/v3/admin/GetRestartRequiredCommand.java b/nucleus/core/kernel/src/main/java/com/sun/enterprise/v3/admin/GetRestartRequiredCommand.java
index bd2a830..ef0ec3e 100644
--- a/nucleus/core/kernel/src/main/java/com/sun/enterprise/v3/admin/GetRestartRequiredCommand.java
+++ b/nucleus/core/kernel/src/main/java/com/sun/enterprise/v3/admin/GetRestartRequiredCommand.java
@@ -30,7 +30,7 @@
import org.glassfish.api.Param;
import org.glassfish.api.admin.*;
import org.jvnet.hk2.annotations.Service;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
import org.glassfish.hk2.api.PerLookup;
import org.jvnet.hk2.config.UnprocessedChangeEvent;
diff --git a/nucleus/core/kernel/src/main/java/com/sun/enterprise/v3/admin/IdmService.java b/nucleus/core/kernel/src/main/java/com/sun/enterprise/v3/admin/IdmService.java
index 8efadc8..ebfaef5 100644
--- a/nucleus/core/kernel/src/main/java/com/sun/enterprise/v3/admin/IdmService.java
+++ b/nucleus/core/kernel/src/main/java/com/sun/enterprise/v3/admin/IdmService.java
@@ -24,14 +24,14 @@
import org.glassfish.internal.api.InitRunLevel;
import org.glassfish.security.common.MasterPassword;
import org.glassfish.server.ServerEnvironmentImpl;
-import javax.inject.Inject;
-import javax.inject.Named;
+import jakarta.inject.Inject;
+import jakarta.inject.Named;
import org.jvnet.hk2.annotations.Optional;
import org.jvnet.hk2.annotations.Service;
import org.glassfish.hk2.api.PostConstruct;
-import javax.inject.Singleton;
+import jakarta.inject.Singleton;
import java.io.*;
import java.util.Arrays;
diff --git a/nucleus/core/kernel/src/main/java/com/sun/enterprise/v3/admin/InserverCommandRunnerHelper.java b/nucleus/core/kernel/src/main/java/com/sun/enterprise/v3/admin/InserverCommandRunnerHelper.java
index 4c6bddf..287b9c6 100644
--- a/nucleus/core/kernel/src/main/java/com/sun/enterprise/v3/admin/InserverCommandRunnerHelper.java
+++ b/nucleus/core/kernel/src/main/java/com/sun/enterprise/v3/admin/InserverCommandRunnerHelper.java
@@ -19,8 +19,8 @@
import com.sun.enterprise.util.LocalStringManagerImpl;
import java.util.logging.Level;
import java.util.logging.Logger;
-import javax.inject.Inject;
-import javax.inject.Singleton;
+import jakarta.inject.Inject;
+import jakarta.inject.Singleton;
import javax.security.auth.Subject;
import org.glassfish.api.ActionReport;
import org.glassfish.api.admin.AdminCommand;
diff --git a/nucleus/core/kernel/src/main/java/com/sun/enterprise/v3/admin/JobAuthorizationAttributeProcessor.java b/nucleus/core/kernel/src/main/java/com/sun/enterprise/v3/admin/JobAuthorizationAttributeProcessor.java
index 2176736..ef77863 100644
--- a/nucleus/core/kernel/src/main/java/com/sun/enterprise/v3/admin/JobAuthorizationAttributeProcessor.java
+++ b/nucleus/core/kernel/src/main/java/com/sun/enterprise/v3/admin/JobAuthorizationAttributeProcessor.java
@@ -19,8 +19,8 @@
import java.util.Map;
import java.util.regex.Matcher;
import java.util.regex.Pattern;
-import javax.inject.Inject;
-import javax.inject.Singleton;
+import jakarta.inject.Inject;
+import jakarta.inject.Singleton;
import javax.security.auth.Subject;
import org.glassfish.api.admin.AdminCommand;
import org.glassfish.api.admin.AuthorizationPreprocessor;
diff --git a/nucleus/core/kernel/src/main/java/com/sun/enterprise/v3/admin/JobCleanUpService.java b/nucleus/core/kernel/src/main/java/com/sun/enterprise/v3/admin/JobCleanUpService.java
index 3307e5e..ba953cc 100644
--- a/nucleus/core/kernel/src/main/java/com/sun/enterprise/v3/admin/JobCleanUpService.java
+++ b/nucleus/core/kernel/src/main/java/com/sun/enterprise/v3/admin/JobCleanUpService.java
@@ -33,7 +33,7 @@
import org.jvnet.hk2.config.ObservableBean;
import org.jvnet.hk2.config.UnprocessedChangeEvents;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
import java.beans.PropertyChangeEvent;
import java.io.File;
import java.util.*;
diff --git a/nucleus/core/kernel/src/main/java/com/sun/enterprise/v3/admin/JobCreatorService.java b/nucleus/core/kernel/src/main/java/com/sun/enterprise/v3/admin/JobCreatorService.java
index d895728..77c69a3 100644
--- a/nucleus/core/kernel/src/main/java/com/sun/enterprise/v3/admin/JobCreatorService.java
+++ b/nucleus/core/kernel/src/main/java/com/sun/enterprise/v3/admin/JobCreatorService.java
@@ -21,7 +21,7 @@
import org.glassfish.api.admin.ServerEnvironment;
import org.jvnet.hk2.annotations.Service;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
import javax.security.auth.Subject;
import java.io.File;
import org.glassfish.api.admin.ParameterMap;
diff --git a/nucleus/core/kernel/src/main/java/com/sun/enterprise/v3/admin/JobFileScanner.java b/nucleus/core/kernel/src/main/java/com/sun/enterprise/v3/admin/JobFileScanner.java
index c8c158f..9ceda24 100644
--- a/nucleus/core/kernel/src/main/java/com/sun/enterprise/v3/admin/JobFileScanner.java
+++ b/nucleus/core/kernel/src/main/java/com/sun/enterprise/v3/admin/JobFileScanner.java
@@ -17,12 +17,12 @@
package com.sun.enterprise.v3.admin;
import org.glassfish.api.admin.JobLocator;
-import javax.inject.Singleton;
+import jakarta.inject.Singleton;
import org.glassfish.hk2.api.PostConstruct;
import org.glassfish.hk2.api.ServiceLocator;
import org.jvnet.hk2.annotations.Service;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
import java.io.File;
import java.util.Collection;
import java.util.HashSet;
diff --git a/nucleus/core/kernel/src/main/java/com/sun/enterprise/v3/admin/JobManagerService.java b/nucleus/core/kernel/src/main/java/com/sun/enterprise/v3/admin/JobManagerService.java
index c552cac..fb89818 100644
--- a/nucleus/core/kernel/src/main/java/com/sun/enterprise/v3/admin/JobManagerService.java
+++ b/nucleus/core/kernel/src/main/java/com/sun/enterprise/v3/admin/JobManagerService.java
@@ -36,8 +36,8 @@
import java.util.concurrent.atomic.AtomicInteger;
import java.util.logging.Level;
import java.util.logging.Logger;
-import javax.inject.Inject;
-import javax.inject.Singleton;
+import jakarta.inject.Inject;
+import jakarta.inject.Singleton;
import jakarta.xml.bind.JAXBContext;
import jakarta.xml.bind.JAXBException;
import jakarta.xml.bind.Unmarshaller;
diff --git a/nucleus/core/kernel/src/main/java/com/sun/enterprise/v3/admin/JobPersistenceService.java b/nucleus/core/kernel/src/main/java/com/sun/enterprise/v3/admin/JobPersistenceService.java
index 5bc113d..736f7a4 100644
--- a/nucleus/core/kernel/src/main/java/com/sun/enterprise/v3/admin/JobPersistenceService.java
+++ b/nucleus/core/kernel/src/main/java/com/sun/enterprise/v3/admin/JobPersistenceService.java
@@ -20,7 +20,7 @@
import java.io.File;
import java.util.concurrent.CopyOnWriteArrayList;
import java.util.logging.Logger;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
import jakarta.xml.bind.JAXBContext;
import jakarta.xml.bind.JAXBException;
import jakarta.xml.bind.Marshaller;
diff --git a/nucleus/core/kernel/src/main/java/com/sun/enterprise/v3/admin/ListCommand.java b/nucleus/core/kernel/src/main/java/com/sun/enterprise/v3/admin/ListCommand.java
index 25996b6..77ac6c4 100644
--- a/nucleus/core/kernel/src/main/java/com/sun/enterprise/v3/admin/ListCommand.java
+++ b/nucleus/core/kernel/src/main/java/com/sun/enterprise/v3/admin/ListCommand.java
@@ -22,7 +22,7 @@
import org.glassfish.internal.api.Target;
import org.jvnet.hk2.annotations.Optional;
import org.jvnet.hk2.annotations.Service;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
import org.glassfish.hk2.api.PerLookup;
import org.glassfish.hk2.api.ServiceLocator;
diff --git a/nucleus/core/kernel/src/main/java/com/sun/enterprise/v3/admin/ListCommandDescriptorsCommand.java b/nucleus/core/kernel/src/main/java/com/sun/enterprise/v3/admin/ListCommandDescriptorsCommand.java
index aecb209..a07fa56 100644
--- a/nucleus/core/kernel/src/main/java/com/sun/enterprise/v3/admin/ListCommandDescriptorsCommand.java
+++ b/nucleus/core/kernel/src/main/java/com/sun/enterprise/v3/admin/ListCommandDescriptorsCommand.java
@@ -19,7 +19,7 @@
import com.sun.enterprise.universal.collections.ManifestUtils;
import java.lang.reflect.Field;
import java.util.*;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
import org.glassfish.api.ActionReport;
import org.glassfish.api.I18n;
import org.glassfish.api.Param;
diff --git a/nucleus/core/kernel/src/main/java/com/sun/enterprise/v3/admin/ListCommandsCommand.java b/nucleus/core/kernel/src/main/java/com/sun/enterprise/v3/admin/ListCommandsCommand.java
index 3ea199b..05d8fdd 100644
--- a/nucleus/core/kernel/src/main/java/com/sun/enterprise/v3/admin/ListCommandsCommand.java
+++ b/nucleus/core/kernel/src/main/java/com/sun/enterprise/v3/admin/ListCommandsCommand.java
@@ -22,8 +22,8 @@
import java.util.List;
import java.util.Map;
-import javax.inject.Inject;
-import javax.inject.Singleton;
+import jakarta.inject.Inject;
+import jakarta.inject.Singleton;
import org.glassfish.api.ActionReport;
import org.glassfish.api.admin.*;
import org.glassfish.hk2.api.ActiveDescriptor;
diff --git a/nucleus/core/kernel/src/main/java/com/sun/enterprise/v3/admin/ListContainersCommand.java b/nucleus/core/kernel/src/main/java/com/sun/enterprise/v3/admin/ListContainersCommand.java
index 8131287..22bd090 100644
--- a/nucleus/core/kernel/src/main/java/com/sun/enterprise/v3/admin/ListContainersCommand.java
+++ b/nucleus/core/kernel/src/main/java/com/sun/enterprise/v3/admin/ListContainersCommand.java
@@ -31,10 +31,10 @@
import org.glassfish.api.I18n;
import org.glassfish.api.admin.*;
import org.glassfish.api.container.Sniffer;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
import org.jvnet.hk2.annotations.Service;
-import javax.inject.Singleton;
+import jakarta.inject.Singleton;
/**
* This admin command list the containers currentely running within that
diff --git a/nucleus/core/kernel/src/main/java/com/sun/enterprise/v3/admin/ListModulesCommand.java b/nucleus/core/kernel/src/main/java/com/sun/enterprise/v3/admin/ListModulesCommand.java
index 5043e05..3879f27 100644
--- a/nucleus/core/kernel/src/main/java/com/sun/enterprise/v3/admin/ListModulesCommand.java
+++ b/nucleus/core/kernel/src/main/java/com/sun/enterprise/v3/admin/ListModulesCommand.java
@@ -18,9 +18,9 @@
import com.sun.enterprise.config.serverbeans.Domain;
import org.jvnet.hk2.annotations.Service;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
-import javax.inject.Singleton;
+import jakarta.inject.Singleton;
import org.glassfish.api.admin.AdminCommand;
import org.glassfish.api.admin.AdminCommandContext;
import org.glassfish.api.admin.CommandLock;
diff --git a/nucleus/core/kernel/src/main/java/com/sun/enterprise/v3/admin/ListSystemProperties.java b/nucleus/core/kernel/src/main/java/com/sun/enterprise/v3/admin/ListSystemProperties.java
index c5096f8..a7a270f 100644
--- a/nucleus/core/kernel/src/main/java/com/sun/enterprise/v3/admin/ListSystemProperties.java
+++ b/nucleus/core/kernel/src/main/java/com/sun/enterprise/v3/admin/ListSystemProperties.java
@@ -38,7 +38,7 @@
import org.jvnet.hk2.config.types.Property;
import org.jvnet.hk2.annotations.Service;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
import org.glassfish.hk2.api.PerLookup;
/**
diff --git a/nucleus/core/kernel/src/main/java/com/sun/enterprise/v3/admin/LocalPasswordImpl.java b/nucleus/core/kernel/src/main/java/com/sun/enterprise/v3/admin/LocalPasswordImpl.java
index 5bee18b..2f97706 100644
--- a/nucleus/core/kernel/src/main/java/com/sun/enterprise/v3/admin/LocalPasswordImpl.java
+++ b/nucleus/core/kernel/src/main/java/com/sun/enterprise/v3/admin/LocalPasswordImpl.java
@@ -19,7 +19,7 @@
import java.io.*;
import java.security.SecureRandom;
import java.util.logging.*;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
import org.glassfish.api.admin.ServerEnvironment;
import org.glassfish.hk2.api.PostConstruct;
diff --git a/nucleus/core/kernel/src/main/java/com/sun/enterprise/v3/admin/LocationsCommand.java b/nucleus/core/kernel/src/main/java/com/sun/enterprise/v3/admin/LocationsCommand.java
index 734796a..dc54b04 100644
--- a/nucleus/core/kernel/src/main/java/com/sun/enterprise/v3/admin/LocationsCommand.java
+++ b/nucleus/core/kernel/src/main/java/com/sun/enterprise/v3/admin/LocationsCommand.java
@@ -25,9 +25,9 @@
import org.glassfish.api.ActionReport;
import org.glassfish.api.I18n;
import org.jvnet.hk2.annotations.Service;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
-import javax.inject.Singleton;
+import jakarta.inject.Singleton;
import org.glassfish.server.ServerEnvironmentImpl;
import com.sun.enterprise.glassfish.bootstrap.StartupContextUtil;
diff --git a/nucleus/core/kernel/src/main/java/com/sun/enterprise/v3/admin/MbeanService.java b/nucleus/core/kernel/src/main/java/com/sun/enterprise/v3/admin/MbeanService.java
index c756daf..4296b92 100755
--- a/nucleus/core/kernel/src/main/java/com/sun/enterprise/v3/admin/MbeanService.java
+++ b/nucleus/core/kernel/src/main/java/com/sun/enterprise/v3/admin/MbeanService.java
@@ -19,7 +19,7 @@
import java.util.ArrayList;
import java.util.List;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
import javax.management.InstanceNotFoundException;
import org.glassfish.api.StartupRunLevel;
diff --git a/nucleus/core/kernel/src/main/java/com/sun/enterprise/v3/admin/MonitoringReporter.java b/nucleus/core/kernel/src/main/java/com/sun/enterprise/v3/admin/MonitoringReporter.java
index 9ca1e7c..e940507 100644
--- a/nucleus/core/kernel/src/main/java/com/sun/enterprise/v3/admin/MonitoringReporter.java
+++ b/nucleus/core/kernel/src/main/java/com/sun/enterprise/v3/admin/MonitoringReporter.java
@@ -42,7 +42,7 @@
import org.glassfish.hk2.api.PerLookup;
import org.glassfish.hk2.api.ServiceLocator;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
import static com.sun.enterprise.util.SystemPropertyConstants.MONDOT;
import static com.sun.enterprise.util.SystemPropertyConstants.SLASH;
diff --git a/nucleus/core/kernel/src/main/java/com/sun/enterprise/v3/admin/RestartDomainCommand.java b/nucleus/core/kernel/src/main/java/com/sun/enterprise/v3/admin/RestartDomainCommand.java
index c4d4d74..b1a1ab4 100644
--- a/nucleus/core/kernel/src/main/java/com/sun/enterprise/v3/admin/RestartDomainCommand.java
+++ b/nucleus/core/kernel/src/main/java/com/sun/enterprise/v3/admin/RestartDomainCommand.java
@@ -22,7 +22,7 @@
import org.glassfish.api.I18n;
import org.glassfish.api.Param;
import org.glassfish.api.admin.*;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
import org.jvnet.hk2.annotations.Service;
import org.glassfish.hk2.api.PerLookup;
diff --git a/nucleus/core/kernel/src/main/java/com/sun/enterprise/v3/admin/RestartServer.java b/nucleus/core/kernel/src/main/java/com/sun/enterprise/v3/admin/RestartServer.java
index 1d037a0..9053c1f 100644
--- a/nucleus/core/kernel/src/main/java/com/sun/enterprise/v3/admin/RestartServer.java
+++ b/nucleus/core/kernel/src/main/java/com/sun/enterprise/v3/admin/RestartServer.java
@@ -30,8 +30,8 @@
import java.util.*;
import java.util.logging.*;
-import javax.inject.Inject;
-import javax.inject.Provider;
+import jakarta.inject.Inject;
+import jakarta.inject.Provider;
/**
* For non-verbose mode:
diff --git a/nucleus/core/kernel/src/main/java/com/sun/enterprise/v3/admin/RuntimeInfo.java b/nucleus/core/kernel/src/main/java/com/sun/enterprise/v3/admin/RuntimeInfo.java
index ad1b287..5b6797d 100644
--- a/nucleus/core/kernel/src/main/java/com/sun/enterprise/v3/admin/RuntimeInfo.java
+++ b/nucleus/core/kernel/src/main/java/com/sun/enterprise/v3/admin/RuntimeInfo.java
@@ -45,8 +45,8 @@
import org.glassfish.config.support.*;
import org.jvnet.hk2.annotations.Service;
-import javax.inject.Inject;
-import javax.inject.Named;
+import jakarta.inject.Inject;
+import jakarta.inject.Named;
import org.glassfish.hk2.api.PerLookup;
import org.jvnet.hk2.config.types.Property;
diff --git a/nucleus/core/kernel/src/main/java/com/sun/enterprise/v3/admin/SetCommand.java b/nucleus/core/kernel/src/main/java/com/sun/enterprise/v3/admin/SetCommand.java
index 2014362..0fedb5a 100644
--- a/nucleus/core/kernel/src/main/java/com/sun/enterprise/v3/admin/SetCommand.java
+++ b/nucleus/core/kernel/src/main/java/com/sun/enterprise/v3/admin/SetCommand.java
@@ -50,7 +50,7 @@
import org.jvnet.hk2.config.types.Property;
import org.jvnet.tiger_types.Types;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
import java.beans.PropertyVetoException;
import java.lang.reflect.Field;
import java.lang.reflect.InvocationTargetException;
diff --git a/nucleus/core/kernel/src/main/java/com/sun/enterprise/v3/admin/StopDomainCommand.java b/nucleus/core/kernel/src/main/java/com/sun/enterprise/v3/admin/StopDomainCommand.java
index 70a38f7..ff3bb42 100644
--- a/nucleus/core/kernel/src/main/java/com/sun/enterprise/v3/admin/StopDomainCommand.java
+++ b/nucleus/core/kernel/src/main/java/com/sun/enterprise/v3/admin/StopDomainCommand.java
@@ -22,7 +22,7 @@
import org.glassfish.api.I18n;
import org.glassfish.api.Param;
import org.glassfish.api.admin.*;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
import org.jvnet.hk2.annotations.Service;
import org.glassfish.hk2.api.PerLookup;
diff --git a/nucleus/core/kernel/src/main/java/com/sun/enterprise/v3/admin/SupplementalCommandExecutorImpl.java b/nucleus/core/kernel/src/main/java/com/sun/enterprise/v3/admin/SupplementalCommandExecutorImpl.java
index bfe5479..ea0583a 100755
--- a/nucleus/core/kernel/src/main/java/com/sun/enterprise/v3/admin/SupplementalCommandExecutorImpl.java
+++ b/nucleus/core/kernel/src/main/java/com/sun/enterprise/v3/admin/SupplementalCommandExecutorImpl.java
@@ -22,7 +22,7 @@
import java.util.concurrent.ConcurrentHashMap;
import java.util.logging.Level;
import java.util.logging.Logger;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
import org.glassfish.api.ActionReport;
import org.glassfish.api.Param;
import org.glassfish.api.admin.*;
diff --git a/nucleus/core/kernel/src/main/java/com/sun/enterprise/v3/admin/UptimeCommand.java b/nucleus/core/kernel/src/main/java/com/sun/enterprise/v3/admin/UptimeCommand.java
index a5e09dd..b7c2f6f 100644
--- a/nucleus/core/kernel/src/main/java/com/sun/enterprise/v3/admin/UptimeCommand.java
+++ b/nucleus/core/kernel/src/main/java/com/sun/enterprise/v3/admin/UptimeCommand.java
@@ -33,7 +33,7 @@
import com.sun.enterprise.universal.Duration;
import org.glassfish.api.admin.*;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
/**
* uptime command
diff --git a/nucleus/core/kernel/src/main/java/com/sun/enterprise/v3/admin/adapter/AdminConsoleAdapter.java b/nucleus/core/kernel/src/main/java/com/sun/enterprise/v3/admin/adapter/AdminConsoleAdapter.java
index a31a85e..85a1c0a 100644
--- a/nucleus/core/kernel/src/main/java/com/sun/enterprise/v3/admin/adapter/AdminConsoleAdapter.java
+++ b/nucleus/core/kernel/src/main/java/com/sun/enterprise/v3/admin/adapter/AdminConsoleAdapter.java
@@ -37,8 +37,8 @@
import java.util.concurrent.TimeUnit;
import java.util.logging.Level;
import java.util.logging.Logger;
-import javax.inject.Inject;
-import javax.inject.Named;
+import jakarta.inject.Inject;
+import jakarta.inject.Named;
import org.glassfish.api.admin.ServerEnvironment;
import org.glassfish.api.container.Adapter;
import org.glassfish.api.event.EventListener;
diff --git a/nucleus/core/kernel/src/main/java/com/sun/enterprise/v3/admin/adapter/AdminConsoleStartupService.java b/nucleus/core/kernel/src/main/java/com/sun/enterprise/v3/admin/adapter/AdminConsoleStartupService.java
index cbf6765..7303194 100644
--- a/nucleus/core/kernel/src/main/java/com/sun/enterprise/v3/admin/adapter/AdminConsoleStartupService.java
+++ b/nucleus/core/kernel/src/main/java/com/sun/enterprise/v3/admin/adapter/AdminConsoleStartupService.java
@@ -23,7 +23,7 @@
import java.io.IOException;
import java.util.logging.Level;
import java.util.logging.Logger;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
import org.glassfish.hk2.api.PostConstruct;
import org.glassfish.hk2.runlevel.RunLevel;
import org.glassfish.internal.api.PostStartupRunLevel;
diff --git a/nucleus/core/kernel/src/main/java/com/sun/enterprise/v3/admin/commands/AttachCommand.java b/nucleus/core/kernel/src/main/java/com/sun/enterprise/v3/admin/commands/AttachCommand.java
index 0aebff9..14af8ba 100644
--- a/nucleus/core/kernel/src/main/java/com/sun/enterprise/v3/admin/commands/AttachCommand.java
+++ b/nucleus/core/kernel/src/main/java/com/sun/enterprise/v3/admin/commands/AttachCommand.java
@@ -18,7 +18,7 @@
import com.sun.enterprise.admin.remote.AdminCommandStateImpl;
import com.sun.enterprise.util.LocalStringManagerImpl;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
import com.sun.enterprise.v3.admin.JobManagerService;
import org.glassfish.api.ActionReport;
diff --git a/nucleus/core/kernel/src/main/java/com/sun/enterprise/v3/admin/commands/ConfigureManagedJobs.java b/nucleus/core/kernel/src/main/java/com/sun/enterprise/v3/admin/commands/ConfigureManagedJobs.java
index 8028cd3..724d64f 100644
--- a/nucleus/core/kernel/src/main/java/com/sun/enterprise/v3/admin/commands/ConfigureManagedJobs.java
+++ b/nucleus/core/kernel/src/main/java/com/sun/enterprise/v3/admin/commands/ConfigureManagedJobs.java
@@ -30,7 +30,7 @@
import org.jvnet.hk2.config.SingleConfigCode;
import org.jvnet.hk2.config.TransactionFailure;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
import java.beans.PropertyVetoException;
import java.util.logging.Logger;
import org.glassfish.kernel.KernelLoggerInfo;
diff --git a/nucleus/core/kernel/src/main/java/com/sun/enterprise/v3/admin/commands/CreateJvmOptions.java b/nucleus/core/kernel/src/main/java/com/sun/enterprise/v3/admin/commands/CreateJvmOptions.java
index 56ee05f..da6ee9c 100644
--- a/nucleus/core/kernel/src/main/java/com/sun/enterprise/v3/admin/commands/CreateJvmOptions.java
+++ b/nucleus/core/kernel/src/main/java/com/sun/enterprise/v3/admin/commands/CreateJvmOptions.java
@@ -26,8 +26,8 @@
import java.util.Iterator;
import java.util.List;
import java.util.regex.Pattern;
-import javax.inject.Inject;
-import javax.inject.Named;
+import jakarta.inject.Inject;
+import jakarta.inject.Named;
import org.glassfish.api.ActionReport;
import org.glassfish.api.I18n;
import org.glassfish.api.Param;
diff --git a/nucleus/core/kernel/src/main/java/com/sun/enterprise/v3/admin/commands/CreateThreadpool.java b/nucleus/core/kernel/src/main/java/com/sun/enterprise/v3/admin/commands/CreateThreadpool.java
index c452f7d..dcc0687 100644
--- a/nucleus/core/kernel/src/main/java/com/sun/enterprise/v3/admin/commands/CreateThreadpool.java
+++ b/nucleus/core/kernel/src/main/java/com/sun/enterprise/v3/admin/commands/CreateThreadpool.java
@@ -29,8 +29,8 @@
import org.glassfish.config.support.TargetType;
import org.jvnet.hk2.annotations.Service;
-import javax.inject.Inject;
-import javax.inject.Named;
+import jakarta.inject.Inject;
+import jakarta.inject.Named;
import org.glassfish.hk2.api.PerLookup;
import org.glassfish.hk2.api.ServiceLocator;
diff --git a/nucleus/core/kernel/src/main/java/com/sun/enterprise/v3/admin/commands/DeleteJvmOptions.java b/nucleus/core/kernel/src/main/java/com/sun/enterprise/v3/admin/commands/DeleteJvmOptions.java
index b113d00..d1eddc4 100644
--- a/nucleus/core/kernel/src/main/java/com/sun/enterprise/v3/admin/commands/DeleteJvmOptions.java
+++ b/nucleus/core/kernel/src/main/java/com/sun/enterprise/v3/admin/commands/DeleteJvmOptions.java
@@ -24,8 +24,8 @@
import java.beans.PropertyVetoException;
import java.util.ArrayList;
import java.util.List;
-import javax.inject.Inject;
-import javax.inject.Named;
+import jakarta.inject.Inject;
+import jakarta.inject.Named;
import org.glassfish.api.ActionReport;
import org.glassfish.api.I18n;
import org.glassfish.api.Param;
diff --git a/nucleus/core/kernel/src/main/java/com/sun/enterprise/v3/admin/commands/DeleteThreadpool.java b/nucleus/core/kernel/src/main/java/com/sun/enterprise/v3/admin/commands/DeleteThreadpool.java
index f0382e2..7bfa7a0 100644
--- a/nucleus/core/kernel/src/main/java/com/sun/enterprise/v3/admin/commands/DeleteThreadpool.java
+++ b/nucleus/core/kernel/src/main/java/com/sun/enterprise/v3/admin/commands/DeleteThreadpool.java
@@ -30,8 +30,8 @@
import org.glassfish.config.support.TargetType;
import org.jvnet.hk2.annotations.Service;
-import javax.inject.Inject;
-import javax.inject.Named;
+import jakarta.inject.Inject;
+import jakarta.inject.Named;
import org.glassfish.hk2.api.PerLookup;
import org.glassfish.hk2.api.ServiceLocator;
diff --git a/nucleus/core/kernel/src/main/java/com/sun/enterprise/v3/admin/commands/GetPayloadCommand.java b/nucleus/core/kernel/src/main/java/com/sun/enterprise/v3/admin/commands/GetPayloadCommand.java
index e88dd0d..1b4c65e 100644
--- a/nucleus/core/kernel/src/main/java/com/sun/enterprise/v3/admin/commands/GetPayloadCommand.java
+++ b/nucleus/core/kernel/src/main/java/com/sun/enterprise/v3/admin/commands/GetPayloadCommand.java
@@ -17,7 +17,7 @@
package com.sun.enterprise.v3.admin.commands;
import com.sun.enterprise.util.LocalStringManagerImpl;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
import org.glassfish.admin.payload.PayloadImpl;
import org.glassfish.api.ActionReport;
import org.glassfish.api.I18n;
diff --git a/nucleus/core/kernel/src/main/java/com/sun/enterprise/v3/admin/commands/ListJobsCommand.java b/nucleus/core/kernel/src/main/java/com/sun/enterprise/v3/admin/commands/ListJobsCommand.java
index b8015a4..4026a91 100644
--- a/nucleus/core/kernel/src/main/java/com/sun/enterprise/v3/admin/commands/ListJobsCommand.java
+++ b/nucleus/core/kernel/src/main/java/com/sun/enterprise/v3/admin/commands/ListJobsCommand.java
@@ -23,7 +23,7 @@
import java.util.*;
import java.util.Collection;
import java.util.Date;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
import com.sun.enterprise.v3.admin.JobManagerService;
import org.glassfish.api.ActionReport;
diff --git a/nucleus/core/kernel/src/main/java/com/sun/enterprise/v3/admin/commands/ListJvmOptions.java b/nucleus/core/kernel/src/main/java/com/sun/enterprise/v3/admin/commands/ListJvmOptions.java
index f42e20c..8a4e950 100644
--- a/nucleus/core/kernel/src/main/java/com/sun/enterprise/v3/admin/commands/ListJvmOptions.java
+++ b/nucleus/core/kernel/src/main/java/com/sun/enterprise/v3/admin/commands/ListJvmOptions.java
@@ -22,8 +22,8 @@
import com.sun.enterprise.util.SystemPropertyConstants;
import com.sun.enterprise.util.i18n.StringManager;
import java.util.List;
-import javax.inject.Inject;
-import javax.inject.Named;
+import jakarta.inject.Inject;
+import jakarta.inject.Named;
import org.glassfish.api.ActionReport;
import org.glassfish.api.I18n;
import org.glassfish.api.Param;
diff --git a/nucleus/core/kernel/src/main/java/com/sun/enterprise/v3/admin/commands/ListThreadpools.java b/nucleus/core/kernel/src/main/java/com/sun/enterprise/v3/admin/commands/ListThreadpools.java
index 3582a80..5ebe352 100644
--- a/nucleus/core/kernel/src/main/java/com/sun/enterprise/v3/admin/commands/ListThreadpools.java
+++ b/nucleus/core/kernel/src/main/java/com/sun/enterprise/v3/admin/commands/ListThreadpools.java
@@ -33,8 +33,8 @@
import org.glassfish.config.support.CommandTarget;
import org.glassfish.config.support.TargetType;
import org.glassfish.internal.api.Target;
-import javax.inject.Inject;
-import javax.inject.Named;
+import jakarta.inject.Inject;
+import jakarta.inject.Named;
import org.jvnet.hk2.annotations.Service;
diff --git a/nucleus/core/kernel/src/main/java/com/sun/enterprise/v3/admin/listener/CombinedJavaConfigSystemPropertyListener.java b/nucleus/core/kernel/src/main/java/com/sun/enterprise/v3/admin/listener/CombinedJavaConfigSystemPropertyListener.java
index 3661753..8f22653 100644
--- a/nucleus/core/kernel/src/main/java/com/sun/enterprise/v3/admin/listener/CombinedJavaConfigSystemPropertyListener.java
+++ b/nucleus/core/kernel/src/main/java/com/sun/enterprise/v3/admin/listener/CombinedJavaConfigSystemPropertyListener.java
@@ -33,7 +33,7 @@
import java.util.Set;
import java.util.logging.Level;
import java.util.logging.Logger;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
import org.glassfish.api.admin.ServerEnvironment;
import org.glassfish.config.support.TranslatedConfigView;
import org.glassfish.hk2.api.PostConstruct;
diff --git a/nucleus/core/kernel/src/main/java/com/sun/enterprise/v3/server/APIClassLoaderServiceImpl.java b/nucleus/core/kernel/src/main/java/com/sun/enterprise/v3/server/APIClassLoaderServiceImpl.java
index eff43b2..810c5cf 100644
--- a/nucleus/core/kernel/src/main/java/com/sun/enterprise/v3/server/APIClassLoaderServiceImpl.java
+++ b/nucleus/core/kernel/src/main/java/com/sun/enterprise/v3/server/APIClassLoaderServiceImpl.java
@@ -34,7 +34,7 @@
import java.util.Set;
import java.util.logging.Level;
import java.util.logging.Logger;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
import org.glassfish.hk2.api.PostConstruct;
import org.glassfish.kernel.KernelLoggerInfo;
import org.jvnet.hk2.annotations.Service;
diff --git a/nucleus/core/kernel/src/main/java/com/sun/enterprise/v3/server/AppLibClassLoaderServiceImpl.java b/nucleus/core/kernel/src/main/java/com/sun/enterprise/v3/server/AppLibClassLoaderServiceImpl.java
index 8f625db..7b5ac2e 100644
--- a/nucleus/core/kernel/src/main/java/com/sun/enterprise/v3/server/AppLibClassLoaderServiceImpl.java
+++ b/nucleus/core/kernel/src/main/java/com/sun/enterprise/v3/server/AppLibClassLoaderServiceImpl.java
@@ -19,10 +19,10 @@
import org.glassfish.hk2.api.ServiceLocator;
import org.glassfish.internal.api.DelegatingClassLoader;
import org.glassfish.internal.api.ClassLoaderHierarchy;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
import org.jvnet.hk2.annotations.Service;
-import javax.inject.Singleton;
+import jakarta.inject.Singleton;
import java.net.MalformedURLException;
import java.net.URI;
diff --git a/nucleus/core/kernel/src/main/java/com/sun/enterprise/v3/server/AppServerStartup.java b/nucleus/core/kernel/src/main/java/com/sun/enterprise/v3/server/AppServerStartup.java
index c3c8188..3f60e0d 100644
--- a/nucleus/core/kernel/src/main/java/com/sun/enterprise/v3/server/AppServerStartup.java
+++ b/nucleus/core/kernel/src/main/java/com/sun/enterprise/v3/server/AppServerStartup.java
@@ -36,9 +36,9 @@
import java.util.concurrent.TimeoutException;
import java.util.logging.Level;
import java.util.logging.Logger;
-import javax.inject.Inject;
-import javax.inject.Provider;
-import javax.inject.Singleton;
+import jakarta.inject.Inject;
+import jakarta.inject.Provider;
+import jakarta.inject.Singleton;
import org.glassfish.api.FutureProvider;
import org.glassfish.api.StartupRunLevel;
import org.glassfish.api.admin.CommandRunner;
diff --git a/nucleus/core/kernel/src/main/java/com/sun/enterprise/v3/server/ApplicationConfigListener.java b/nucleus/core/kernel/src/main/java/com/sun/enterprise/v3/server/ApplicationConfigListener.java
index 42e3d89..5326fe2 100644
--- a/nucleus/core/kernel/src/main/java/com/sun/enterprise/v3/server/ApplicationConfigListener.java
+++ b/nucleus/core/kernel/src/main/java/com/sun/enterprise/v3/server/ApplicationConfigListener.java
@@ -32,8 +32,8 @@
import java.util.Properties;
import java.util.logging.Level;
import java.util.logging.Logger;
-import javax.inject.Inject;
-import javax.inject.Named;
+import jakarta.inject.Inject;
+import jakarta.inject.Named;
import org.glassfish.api.ActionReport;
import org.glassfish.api.admin.ServerEnvironment;
import org.glassfish.api.deployment.UndeployCommandParameters;
diff --git a/nucleus/core/kernel/src/main/java/com/sun/enterprise/v3/server/ApplicationLifecycle.java b/nucleus/core/kernel/src/main/java/com/sun/enterprise/v3/server/ApplicationLifecycle.java
index fa04690..4168991 100644
--- a/nucleus/core/kernel/src/main/java/com/sun/enterprise/v3/server/ApplicationLifecycle.java
+++ b/nucleus/core/kernel/src/main/java/com/sun/enterprise/v3/server/ApplicationLifecycle.java
@@ -35,9 +35,9 @@
import java.util.logging.Logger;
import java.util.zip.ZipEntry;
import java.util.zip.ZipOutputStream;
-import javax.inject.Inject;
-import javax.inject.Named;
-import javax.inject.Singleton;
+import jakarta.inject.Inject;
+import jakarta.inject.Named;
+import jakarta.inject.Singleton;
import org.glassfish.api.*;
import org.glassfish.api.admin.ParameterMap;
import org.glassfish.api.admin.ServerEnvironment;
diff --git a/nucleus/core/kernel/src/main/java/com/sun/enterprise/v3/server/ApplicationLoaderService.java b/nucleus/core/kernel/src/main/java/com/sun/enterprise/v3/server/ApplicationLoaderService.java
index 11ab077..c6a1b35 100644
--- a/nucleus/core/kernel/src/main/java/com/sun/enterprise/v3/server/ApplicationLoaderService.java
+++ b/nucleus/core/kernel/src/main/java/com/sun/enterprise/v3/server/ApplicationLoaderService.java
@@ -27,9 +27,9 @@
import java.util.*;
import java.util.logging.Level;
import java.util.logging.Logger;
-import javax.inject.Inject;
-import javax.inject.Named;
-import javax.inject.Provider;
+import jakarta.inject.Inject;
+import jakarta.inject.Named;
+import jakarta.inject.Provider;
import org.glassfish.api.ActionReport;
import org.glassfish.api.StartupRunLevel;
import org.glassfish.api.admin.ServerEnvironment;
diff --git a/nucleus/core/kernel/src/main/java/com/sun/enterprise/v3/server/ClassLoaderHierarchyImpl.java b/nucleus/core/kernel/src/main/java/com/sun/enterprise/v3/server/ClassLoaderHierarchyImpl.java
index 46ab6c8..6dfeb90 100644
--- a/nucleus/core/kernel/src/main/java/com/sun/enterprise/v3/server/ClassLoaderHierarchyImpl.java
+++ b/nucleus/core/kernel/src/main/java/com/sun/enterprise/v3/server/ClassLoaderHierarchyImpl.java
@@ -17,7 +17,7 @@
package com.sun.enterprise.v3.server;
import org.glassfish.internal.api.ClassLoaderHierarchy;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
import org.jvnet.hk2.annotations.Optional;
import org.jvnet.hk2.annotations.Service;
diff --git a/nucleus/core/kernel/src/main/java/com/sun/enterprise/v3/server/CommonClassLoaderServiceImpl.java b/nucleus/core/kernel/src/main/java/com/sun/enterprise/v3/server/CommonClassLoaderServiceImpl.java
index ed7f318..57f9c45 100644
--- a/nucleus/core/kernel/src/main/java/com/sun/enterprise/v3/server/CommonClassLoaderServiceImpl.java
+++ b/nucleus/core/kernel/src/main/java/com/sun/enterprise/v3/server/CommonClassLoaderServiceImpl.java
@@ -33,7 +33,7 @@
import java.util.jar.Manifest;
import java.util.logging.Level;
import java.util.logging.Logger;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
import org.glassfish.api.admin.ServerEnvironment;
import org.glassfish.hk2.api.PostConstruct;
import org.glassfish.kernel.KernelLoggerInfo;
diff --git a/nucleus/core/kernel/src/main/java/com/sun/enterprise/v3/server/ContainerStarter.java b/nucleus/core/kernel/src/main/java/com/sun/enterprise/v3/server/ContainerStarter.java
index b4f30cc..5e66e56 100644
--- a/nucleus/core/kernel/src/main/java/com/sun/enterprise/v3/server/ContainerStarter.java
+++ b/nucleus/core/kernel/src/main/java/com/sun/enterprise/v3/server/ContainerStarter.java
@@ -25,7 +25,7 @@
import java.util.logging.Level;
import java.util.logging.Logger;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
import org.glassfish.api.container.Container;
import org.glassfish.api.container.Sniffer;
diff --git a/nucleus/core/kernel/src/main/java/com/sun/enterprise/v3/server/DomainCreationStartup.java b/nucleus/core/kernel/src/main/java/com/sun/enterprise/v3/server/DomainCreationStartup.java
index 4f2e368..00585aa 100644
--- a/nucleus/core/kernel/src/main/java/com/sun/enterprise/v3/server/DomainCreationStartup.java
+++ b/nucleus/core/kernel/src/main/java/com/sun/enterprise/v3/server/DomainCreationStartup.java
@@ -24,7 +24,7 @@
import org.glassfish.server.ServerEnvironmentImpl;
import org.jvnet.hk2.annotations.Service;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
import java.util.logging.Logger;
/**
diff --git a/nucleus/core/kernel/src/main/java/com/sun/enterprise/v3/server/DomainXmlPersistence.java b/nucleus/core/kernel/src/main/java/com/sun/enterprise/v3/server/DomainXmlPersistence.java
index 940f198..888afd2 100644
--- a/nucleus/core/kernel/src/main/java/com/sun/enterprise/v3/server/DomainXmlPersistence.java
+++ b/nucleus/core/kernel/src/main/java/com/sun/enterprise/v3/server/DomainXmlPersistence.java
@@ -24,8 +24,8 @@
import java.util.concurrent.locks.Lock;
import java.util.logging.Level;
import java.util.logging.Logger;
-import javax.inject.Inject;
-import javax.inject.Singleton;
+import jakarta.inject.Inject;
+import jakarta.inject.Singleton;
import javax.xml.stream.XMLOutputFactory;
import javax.xml.stream.XMLStreamException;
import javax.xml.stream.XMLStreamWriter;
diff --git a/nucleus/core/kernel/src/main/java/com/sun/enterprise/v3/server/DynamicReloadService.java b/nucleus/core/kernel/src/main/java/com/sun/enterprise/v3/server/DynamicReloadService.java
index 9a31831..b678672 100644
--- a/nucleus/core/kernel/src/main/java/com/sun/enterprise/v3/server/DynamicReloadService.java
+++ b/nucleus/core/kernel/src/main/java/com/sun/enterprise/v3/server/DynamicReloadService.java
@@ -29,7 +29,7 @@
import org.glassfish.hk2.runlevel.RunLevel;
import org.glassfish.internal.api.PostStartupRunLevel;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
import org.jvnet.hk2.annotations.Service;
import org.glassfish.hk2.api.PostConstruct;
diff --git a/nucleus/core/kernel/src/main/java/com/sun/enterprise/v3/server/FighterFishStartupService.java b/nucleus/core/kernel/src/main/java/com/sun/enterprise/v3/server/FighterFishStartupService.java
index feefef7..34a6838 100644
--- a/nucleus/core/kernel/src/main/java/com/sun/enterprise/v3/server/FighterFishStartupService.java
+++ b/nucleus/core/kernel/src/main/java/com/sun/enterprise/v3/server/FighterFishStartupService.java
@@ -21,7 +21,7 @@
import jakarta.annotation.PostConstruct;
import jakarta.annotation.PreDestroy;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
import org.glassfish.api.StartupRunLevel;
import org.glassfish.hk2.api.ServiceHandle;
diff --git a/nucleus/core/kernel/src/main/java/com/sun/enterprise/v3/server/LifecycleModuleService.java b/nucleus/core/kernel/src/main/java/com/sun/enterprise/v3/server/LifecycleModuleService.java
index 35f878c..e7108b1 100755
--- a/nucleus/core/kernel/src/main/java/com/sun/enterprise/v3/server/LifecycleModuleService.java
+++ b/nucleus/core/kernel/src/main/java/com/sun/enterprise/v3/server/LifecycleModuleService.java
@@ -25,8 +25,8 @@
import java.util.concurrent.Future;
import java.util.concurrent.TimeUnit;
-import javax.inject.Inject;
-import javax.inject.Named;
+import jakarta.inject.Inject;
+import jakarta.inject.Named;
import org.glassfish.api.FutureProvider;
import org.glassfish.api.StartupRunLevel;
diff --git a/nucleus/core/kernel/src/main/java/com/sun/enterprise/v3/server/ServerContextImpl.java b/nucleus/core/kernel/src/main/java/com/sun/enterprise/v3/server/ServerContextImpl.java
index a2e9363..2ee4d7a 100644
--- a/nucleus/core/kernel/src/main/java/com/sun/enterprise/v3/server/ServerContextImpl.java
+++ b/nucleus/core/kernel/src/main/java/com/sun/enterprise/v3/server/ServerContextImpl.java
@@ -23,13 +23,13 @@
import org.glassfish.internal.api.ServerContext;
import org.glassfish.api.invocation.InvocationManager;
import org.glassfish.api.naming.GlassfishNamingManager;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
import org.jvnet.hk2.annotations.Service;
import org.glassfish.hk2.api.PostConstruct;
import org.glassfish.hk2.api.ServiceLocator;
-import javax.inject.Singleton;
+import jakarta.inject.Singleton;
import javax.naming.InitialContext;
import java.io.File;
diff --git a/nucleus/core/kernel/src/main/java/com/sun/enterprise/v3/server/SnifferManagerImpl.java b/nucleus/core/kernel/src/main/java/com/sun/enterprise/v3/server/SnifferManagerImpl.java
index e11eb24..4e62a0c 100644
--- a/nucleus/core/kernel/src/main/java/com/sun/enterprise/v3/server/SnifferManagerImpl.java
+++ b/nucleus/core/kernel/src/main/java/com/sun/enterprise/v3/server/SnifferManagerImpl.java
@@ -18,7 +18,7 @@
import org.glassfish.hk2.api.ServiceLocator;
import org.glassfish.hk2.classmodel.reflect.*;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
import org.jvnet.hk2.annotations.Service;
import org.glassfish.api.deployment.DeploymentContext;
import org.glassfish.api.container.Sniffer;
diff --git a/nucleus/core/kernel/src/main/java/com/sun/enterprise/v3/server/StAXParserFactory.java b/nucleus/core/kernel/src/main/java/com/sun/enterprise/v3/server/StAXParserFactory.java
index 6567ff1..8d6946e 100644
--- a/nucleus/core/kernel/src/main/java/com/sun/enterprise/v3/server/StAXParserFactory.java
+++ b/nucleus/core/kernel/src/main/java/com/sun/enterprise/v3/server/StAXParserFactory.java
@@ -17,8 +17,8 @@
package com.sun.enterprise.v3.server;
import org.jvnet.hk2.annotations.Service;
-import javax.inject.Inject;
-import javax.inject.Singleton;
+import jakarta.inject.Inject;
+import jakarta.inject.Singleton;
import javax.xml.stream.XMLInputFactory;
diff --git a/nucleus/core/kernel/src/main/java/com/sun/enterprise/v3/server/SystemTasksImpl.java b/nucleus/core/kernel/src/main/java/com/sun/enterprise/v3/server/SystemTasksImpl.java
index 650ab28..4a0a866 100644
--- a/nucleus/core/kernel/src/main/java/com/sun/enterprise/v3/server/SystemTasksImpl.java
+++ b/nucleus/core/kernel/src/main/java/com/sun/enterprise/v3/server/SystemTasksImpl.java
@@ -39,8 +39,8 @@
import org.jvnet.hk2.annotations.Optional;
import org.glassfish.hk2.api.PostConstruct;
-import javax.inject.Inject;
-import javax.inject.Named;
+import jakarta.inject.Inject;
+import jakarta.inject.Named;
import org.jvnet.hk2.annotations.Service;
import org.glassfish.config.support.TranslatedConfigView;
diff --git a/nucleus/core/kernel/src/main/java/com/sun/enterprise/v3/server/UpgradeStartup.java b/nucleus/core/kernel/src/main/java/com/sun/enterprise/v3/server/UpgradeStartup.java
index 9482340..2faaf15 100644
--- a/nucleus/core/kernel/src/main/java/com/sun/enterprise/v3/server/UpgradeStartup.java
+++ b/nucleus/core/kernel/src/main/java/com/sun/enterprise/v3/server/UpgradeStartup.java
@@ -30,8 +30,8 @@
import org.glassfish.hk2.api.IterableProvider;
import org.jvnet.hk2.annotations.Optional;
import org.jvnet.hk2.annotations.Service;
-import javax.inject.Inject;
-import javax.inject.Named;
+import jakarta.inject.Inject;
+import jakarta.inject.Named;
import org.jvnet.hk2.config.*;
import org.glassfish.api.admin.CommandRunner;
diff --git a/nucleus/core/kernel/src/main/java/com/sun/enterprise/v3/services/impl/GrizzlyService.java b/nucleus/core/kernel/src/main/java/com/sun/enterprise/v3/services/impl/GrizzlyService.java
index 6dd80fd..a699a05 100644
--- a/nucleus/core/kernel/src/main/java/com/sun/enterprise/v3/services/impl/GrizzlyService.java
+++ b/nucleus/core/kernel/src/main/java/com/sun/enterprise/v3/services/impl/GrizzlyService.java
@@ -47,8 +47,8 @@
import java.util.concurrent.locks.ReentrantReadWriteLock;
import java.util.logging.Level;
import java.util.logging.Logger;
-import javax.inject.Inject;
-import javax.inject.Named;
+import jakarta.inject.Inject;
+import jakarta.inject.Named;
import org.glassfish.api.FutureProvider;
import org.glassfish.api.StartupRunLevel;
import org.glassfish.api.admin.ServerEnvironment;
diff --git a/nucleus/core/kernel/src/main/java/com/sun/enterprise/v3/services/impl/SnifferAdapter.java b/nucleus/core/kernel/src/main/java/com/sun/enterprise/v3/services/impl/SnifferAdapter.java
index 9518df2..a56e819 100644
--- a/nucleus/core/kernel/src/main/java/com/sun/enterprise/v3/services/impl/SnifferAdapter.java
+++ b/nucleus/core/kernel/src/main/java/com/sun/enterprise/v3/services/impl/SnifferAdapter.java
@@ -21,7 +21,7 @@
import java.util.Collection;
import java.util.logging.Level;
import java.util.logging.Logger;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
import org.glassfish.api.container.Sniffer;
import org.glassfish.grizzly.http.server.HttpHandler;
import org.glassfish.grizzly.http.server.Request;
diff --git a/nucleus/core/kernel/src/main/java/org/glassfish/kernel/FileMonitoringImpl.java b/nucleus/core/kernel/src/main/java/org/glassfish/kernel/FileMonitoringImpl.java
index ea6a1ff..3cb5160 100644
--- a/nucleus/core/kernel/src/main/java/org/glassfish/kernel/FileMonitoringImpl.java
+++ b/nucleus/core/kernel/src/main/java/org/glassfish/kernel/FileMonitoringImpl.java
@@ -19,7 +19,7 @@
import org.glassfish.api.event.EventTypes;
import org.glassfish.api.event.Events;
import org.jvnet.hk2.annotations.Service;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
import org.glassfish.hk2.api.PostConstruct;
import org.glassfish.api.admin.FileMonitoring;
diff --git a/nucleus/core/kernel/src/main/java/org/glassfish/kernel/bean_validator/BeanValidatorNamingProxy.java b/nucleus/core/kernel/src/main/java/org/glassfish/kernel/bean_validator/BeanValidatorNamingProxy.java
index 721cab6..e508991 100644
--- a/nucleus/core/kernel/src/main/java/org/glassfish/kernel/bean_validator/BeanValidatorNamingProxy.java
+++ b/nucleus/core/kernel/src/main/java/org/glassfish/kernel/bean_validator/BeanValidatorNamingProxy.java
@@ -16,8 +16,8 @@
package org.glassfish.kernel.bean_validator;
-import javax.inject.Inject;
-import javax.inject.Named;
+import jakarta.inject.Inject;
+import jakarta.inject.Named;
import javax.naming.NamingException;
import jakarta.validation.Validation;
import jakarta.validation.Validator;
diff --git a/nucleus/core/kernel/src/main/java/org/glassfish/kernel/config/DefaultConfigParser.java b/nucleus/core/kernel/src/main/java/org/glassfish/kernel/config/DefaultConfigParser.java
index 99a36a6..815e7f2 100644
--- a/nucleus/core/kernel/src/main/java/org/glassfish/kernel/config/DefaultConfigParser.java
+++ b/nucleus/core/kernel/src/main/java/org/glassfish/kernel/config/DefaultConfigParser.java
@@ -22,8 +22,8 @@
import java.net.URL;
import java.util.logging.Level;
import java.util.logging.Logger;
-import javax.inject.Inject;
-import javax.inject.Named;
+import jakarta.inject.Inject;
+import jakarta.inject.Named;
import javax.xml.stream.XMLStreamReader;
import org.glassfish.api.admin.ServerEnvironment;
import org.glassfish.api.admin.config.ConfigParser;
diff --git a/nucleus/core/kernel/src/main/java/org/glassfish/kernel/embedded/EmbeddedAdminCtrImpl.java b/nucleus/core/kernel/src/main/java/org/glassfish/kernel/embedded/EmbeddedAdminCtrImpl.java
index eb6d9b0..bea35c2 100644
--- a/nucleus/core/kernel/src/main/java/org/glassfish/kernel/embedded/EmbeddedAdminCtrImpl.java
+++ b/nucleus/core/kernel/src/main/java/org/glassfish/kernel/embedded/EmbeddedAdminCtrImpl.java
@@ -17,7 +17,7 @@
package org.glassfish.kernel.embedded;
import org.jvnet.hk2.annotations.Service;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
import org.glassfish.internal.embedded.LifecycleException;
import org.glassfish.internal.embedded.Port;
import org.glassfish.internal.embedded.admin.CommandExecution;
diff --git a/nucleus/core/kernel/src/main/java/org/glassfish/kernel/embedded/EmbeddedDeployerImpl.java b/nucleus/core/kernel/src/main/java/org/glassfish/kernel/embedded/EmbeddedDeployerImpl.java
index db7818a..7c3ac5f 100644
--- a/nucleus/core/kernel/src/main/java/org/glassfish/kernel/embedded/EmbeddedDeployerImpl.java
+++ b/nucleus/core/kernel/src/main/java/org/glassfish/kernel/embedded/EmbeddedDeployerImpl.java
@@ -26,7 +26,7 @@
import java.util.*;
import java.util.logging.Level;
import java.util.logging.Logger;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
import org.glassfish.api.ActionReport;
import org.glassfish.api.admin.CommandRunner;
import org.glassfish.api.admin.ServerEnvironment;
diff --git a/nucleus/core/kernel/src/main/java/org/glassfish/kernel/embedded/EmbeddedDomainPersistence.java b/nucleus/core/kernel/src/main/java/org/glassfish/kernel/embedded/EmbeddedDomainPersistence.java
index 83784df..3d78bec 100644
--- a/nucleus/core/kernel/src/main/java/org/glassfish/kernel/embedded/EmbeddedDomainPersistence.java
+++ b/nucleus/core/kernel/src/main/java/org/glassfish/kernel/embedded/EmbeddedDomainPersistence.java
@@ -19,7 +19,7 @@
import com.sun.enterprise.module.bootstrap.StartupContext;
import com.sun.enterprise.util.LocalStringManagerImpl;
import com.sun.enterprise.v3.server.DomainXmlPersistence;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
import org.jvnet.hk2.config.DomDocument;
import java.io.File;
diff --git a/nucleus/core/kernel/src/main/java/org/glassfish/kernel/embedded/EmbeddedDomainXml.java b/nucleus/core/kernel/src/main/java/org/glassfish/kernel/embedded/EmbeddedDomainXml.java
index 01066d8..2986c8d 100644
--- a/nucleus/core/kernel/src/main/java/org/glassfish/kernel/embedded/EmbeddedDomainXml.java
+++ b/nucleus/core/kernel/src/main/java/org/glassfish/kernel/embedded/EmbeddedDomainXml.java
@@ -19,7 +19,7 @@
import com.sun.enterprise.module.bootstrap.StartupContext;
import com.sun.enterprise.v3.server.GFDomainXml;
import org.glassfish.server.ServerEnvironmentImpl;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
import java.io.File;
import java.io.IOException;
diff --git a/nucleus/core/kernel/src/main/java/org/glassfish/kernel/embedded/EmbeddedInhabitantsParser.java b/nucleus/core/kernel/src/main/java/org/glassfish/kernel/embedded/EmbeddedInhabitantsParser.java
index 85dc2b0..da48a2a 100644
--- a/nucleus/core/kernel/src/main/java/org/glassfish/kernel/embedded/EmbeddedInhabitantsParser.java
+++ b/nucleus/core/kernel/src/main/java/org/glassfish/kernel/embedded/EmbeddedInhabitantsParser.java
@@ -27,7 +27,7 @@
import com.sun.enterprise.v3.server.DomainXmlPersistence;
import com.sun.enterprise.v3.server.GFDomainXml;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
/**
* Kernel's decoration for embedded environment.
diff --git a/nucleus/core/kernel/src/main/java/org/glassfish/kernel/embedded/PortImpl.java b/nucleus/core/kernel/src/main/java/org/glassfish/kernel/embedded/PortImpl.java
index c6a86b1..fee4ece 100644
--- a/nucleus/core/kernel/src/main/java/org/glassfish/kernel/embedded/PortImpl.java
+++ b/nucleus/core/kernel/src/main/java/org/glassfish/kernel/embedded/PortImpl.java
@@ -34,8 +34,8 @@
import org.glassfish.api.admin.CommandRunner;
import org.glassfish.api.admin.ServerEnvironment;
import org.glassfish.internal.embedded.Port;
-import javax.inject.Inject;
-import javax.inject.Named;
+import jakarta.inject.Inject;
+import jakarta.inject.Named;
import org.jvnet.hk2.annotations.Service;
diff --git a/nucleus/core/kernel/src/main/java/org/glassfish/kernel/embedded/PortsImpl.java b/nucleus/core/kernel/src/main/java/org/glassfish/kernel/embedded/PortsImpl.java
index 8f6c9a3..82a0691 100644
--- a/nucleus/core/kernel/src/main/java/org/glassfish/kernel/embedded/PortsImpl.java
+++ b/nucleus/core/kernel/src/main/java/org/glassfish/kernel/embedded/PortsImpl.java
@@ -17,8 +17,8 @@
package org.glassfish.kernel.embedded;
import org.jvnet.hk2.annotations.Service;
-import javax.inject.Inject;
-import javax.inject.Named;
+import jakarta.inject.Inject;
+import jakarta.inject.Named;
import org.glassfish.hk2.api.ServiceLocator;
import org.glassfish.internal.embedded.Port;
diff --git a/nucleus/core/kernel/src/main/java/org/glassfish/kernel/event/EventsImpl.java b/nucleus/core/kernel/src/main/java/org/glassfish/kernel/event/EventsImpl.java
index beebef1..7a38303 100644
--- a/nucleus/core/kernel/src/main/java/org/glassfish/kernel/event/EventsImpl.java
+++ b/nucleus/core/kernel/src/main/java/org/glassfish/kernel/event/EventsImpl.java
@@ -23,7 +23,7 @@
import java.util.concurrent.ExecutorService;
import java.util.logging.Level;
import java.util.logging.Logger;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
import org.glassfish.api.event.EventListener;
import org.glassfish.api.event.EventListener.Event;
import org.glassfish.api.event.EventTypes;
diff --git a/nucleus/core/kernel/src/test/java/com/sun/enterprise/v3/server/AppServerStartupTest.java b/nucleus/core/kernel/src/test/java/com/sun/enterprise/v3/server/AppServerStartupTest.java
index 5dcf885..625f759 100644
--- a/nucleus/core/kernel/src/test/java/com/sun/enterprise/v3/server/AppServerStartupTest.java
+++ b/nucleus/core/kernel/src/test/java/com/sun/enterprise/v3/server/AppServerStartupTest.java
@@ -55,9 +55,9 @@
import org.junit.Test;
import org.jvnet.hk2.annotations.Service;
-import javax.inject.Inject;
-import javax.inject.Named;
-import javax.inject.Singleton;
+import jakarta.inject.Inject;
+import jakarta.inject.Named;
+import jakarta.inject.Singleton;
import java.util.Collections;
import java.util.HashMap;
diff --git a/nucleus/core/kernel/src/test/java/org/glassfish/tests/kernel/admin/CommandRunnerTest.java b/nucleus/core/kernel/src/test/java/org/glassfish/tests/kernel/admin/CommandRunnerTest.java
index 2e964db..650ce4d 100644
--- a/nucleus/core/kernel/src/test/java/org/glassfish/tests/kernel/admin/CommandRunnerTest.java
+++ b/nucleus/core/kernel/src/test/java/org/glassfish/tests/kernel/admin/CommandRunnerTest.java
@@ -31,7 +31,7 @@
import org.junit.BeforeClass;
import org.junit.Ignore;
import org.junit.Test;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
import org.glassfish.internal.api.InternalSystemAdministrator;
import org.jvnet.hk2.testing.junit.HK2Runner;
diff --git a/nucleus/core/logging/src/main/java/com/sun/enterprise/server/logging/GFFileHandler.java b/nucleus/core/logging/src/main/java/com/sun/enterprise/server/logging/GFFileHandler.java
index 61d61f1..4d15fc9 100644
--- a/nucleus/core/logging/src/main/java/com/sun/enterprise/server/logging/GFFileHandler.java
+++ b/nucleus/core/logging/src/main/java/com/sun/enterprise/server/logging/GFFileHandler.java
@@ -42,8 +42,8 @@
import java.util.logging.LogRecord;
import java.util.logging.StreamHandler;
-import javax.inject.Inject;
-import javax.inject.Singleton;
+import jakarta.inject.Inject;
+import jakarta.inject.Singleton;
import org.glassfish.api.logging.Task;
import org.glassfish.config.support.TranslatedConfigView;
diff --git a/nucleus/core/logging/src/main/java/com/sun/enterprise/server/logging/LogManagerService.java b/nucleus/core/logging/src/main/java/com/sun/enterprise/server/logging/LogManagerService.java
index 8046e74..3e205d3 100644
--- a/nucleus/core/logging/src/main/java/com/sun/enterprise/server/logging/LogManagerService.java
+++ b/nucleus/core/logging/src/main/java/com/sun/enterprise/server/logging/LogManagerService.java
@@ -38,7 +38,7 @@
import org.glassfish.internal.api.InitRunLevel;
import org.glassfish.internal.config.UnprocessedConfigListener;
import org.glassfish.server.ServerEnvironmentImpl;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
import org.jvnet.hk2.annotations.Optional;
diff --git a/nucleus/core/logging/src/main/java/com/sun/enterprise/server/logging/LoggerInfoMetadataService.java b/nucleus/core/logging/src/main/java/com/sun/enterprise/server/logging/LoggerInfoMetadataService.java
index 7429055..ce9e57f 100644
--- a/nucleus/core/logging/src/main/java/com/sun/enterprise/server/logging/LoggerInfoMetadataService.java
+++ b/nucleus/core/logging/src/main/java/com/sun/enterprise/server/logging/LoggerInfoMetadataService.java
@@ -34,8 +34,8 @@
import java.net.URL;
import java.net.URLClassLoader;
-import javax.inject.Inject;
-import javax.inject.Singleton;
+import jakarta.inject.Inject;
+import jakarta.inject.Singleton;
//import org.glassfish.admin.mbeanserver.LogMessagesResourceBundle;
//import org.glassfish.admin.mbeanserver.LoggerInfo;
diff --git a/nucleus/core/logging/src/main/java/com/sun/enterprise/server/logging/SyslogHandler.java b/nucleus/core/logging/src/main/java/com/sun/enterprise/server/logging/SyslogHandler.java
index 51da369..02df4e4 100644
--- a/nucleus/core/logging/src/main/java/com/sun/enterprise/server/logging/SyslogHandler.java
+++ b/nucleus/core/logging/src/main/java/com/sun/enterprise/server/logging/SyslogHandler.java
@@ -19,7 +19,7 @@
import org.glassfish.config.support.TranslatedConfigView;
import org.glassfish.server.ServerEnvironmentImpl;
import org.jvnet.hk2.annotations.ContractsProvided;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
import org.jvnet.hk2.annotations.Service;
import org.glassfish.hk2.api.PostConstruct;
@@ -27,7 +27,7 @@
import com.sun.common.util.logging.BooleanLatch;
-import javax.inject.Singleton;
+import jakarta.inject.Singleton;
import java.text.SimpleDateFormat;
import java.util.concurrent.ArrayBlockingQueue;
diff --git a/nucleus/core/logging/src/main/java/com/sun/enterprise/server/logging/commands/CollectLogFiles.java b/nucleus/core/logging/src/main/java/com/sun/enterprise/server/logging/commands/CollectLogFiles.java
index 1dd778c..985b647 100644
--- a/nucleus/core/logging/src/main/java/com/sun/enterprise/server/logging/commands/CollectLogFiles.java
+++ b/nucleus/core/logging/src/main/java/com/sun/enterprise/server/logging/commands/CollectLogFiles.java
@@ -30,7 +30,7 @@
import org.glassfish.api.I18n;
import org.glassfish.api.Param;
import org.glassfish.api.admin.*;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
import org.jvnet.hk2.annotations.Service;
import org.glassfish.hk2.api.PerLookup;
diff --git a/nucleus/core/logging/src/main/java/com/sun/enterprise/server/logging/commands/DeleteLogLevel.java b/nucleus/core/logging/src/main/java/com/sun/enterprise/server/logging/commands/DeleteLogLevel.java
index 26ae072..db91731 100644
--- a/nucleus/core/logging/src/main/java/com/sun/enterprise/server/logging/commands/DeleteLogLevel.java
+++ b/nucleus/core/logging/src/main/java/com/sun/enterprise/server/logging/commands/DeleteLogLevel.java
@@ -29,7 +29,7 @@
import org.glassfish.api.admin.*;
import org.glassfish.config.support.CommandTarget;
import org.glassfish.config.support.TargetType;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
import org.jvnet.hk2.annotations.Service;
import org.glassfish.hk2.api.PerLookup;
diff --git a/nucleus/core/logging/src/main/java/com/sun/enterprise/server/logging/commands/InstanceGetLogFileCommand.java b/nucleus/core/logging/src/main/java/com/sun/enterprise/server/logging/commands/InstanceGetLogFileCommand.java
index 989c81c..37df3fa 100644
--- a/nucleus/core/logging/src/main/java/com/sun/enterprise/server/logging/commands/InstanceGetLogFileCommand.java
+++ b/nucleus/core/logging/src/main/java/com/sun/enterprise/server/logging/commands/InstanceGetLogFileCommand.java
@@ -22,7 +22,7 @@
import org.glassfish.api.ActionReport;
import org.glassfish.api.I18n;
import org.glassfish.api.admin.*;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
import org.jvnet.hk2.annotations.Service;
import org.glassfish.hk2.api.PerLookup;
diff --git a/nucleus/core/logging/src/main/java/com/sun/enterprise/server/logging/commands/ListLogAttributes.java b/nucleus/core/logging/src/main/java/com/sun/enterprise/server/logging/commands/ListLogAttributes.java
index 8cc989c..983b9d6 100644
--- a/nucleus/core/logging/src/main/java/com/sun/enterprise/server/logging/commands/ListLogAttributes.java
+++ b/nucleus/core/logging/src/main/java/com/sun/enterprise/server/logging/commands/ListLogAttributes.java
@@ -25,7 +25,7 @@
import java.util.Map;
import java.util.Properties;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
import org.glassfish.api.ActionReport;
import org.glassfish.api.I18n;
diff --git a/nucleus/core/logging/src/main/java/com/sun/enterprise/server/logging/commands/ListLoggerLevels.java b/nucleus/core/logging/src/main/java/com/sun/enterprise/server/logging/commands/ListLoggerLevels.java
index 8589f07..4e516bd 100644
--- a/nucleus/core/logging/src/main/java/com/sun/enterprise/server/logging/commands/ListLoggerLevels.java
+++ b/nucleus/core/logging/src/main/java/com/sun/enterprise/server/logging/commands/ListLoggerLevels.java
@@ -26,7 +26,7 @@
import org.glassfish.api.admin.*;
import org.glassfish.config.support.CommandTarget;
import org.glassfish.config.support.TargetType;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
import org.jvnet.hk2.annotations.Service;
import org.glassfish.hk2.api.PerLookup;
diff --git a/nucleus/core/logging/src/main/java/com/sun/enterprise/server/logging/commands/ListLoggers.java b/nucleus/core/logging/src/main/java/com/sun/enterprise/server/logging/commands/ListLoggers.java
index 51409e6..4e80d3c 100644
--- a/nucleus/core/logging/src/main/java/com/sun/enterprise/server/logging/commands/ListLoggers.java
+++ b/nucleus/core/logging/src/main/java/com/sun/enterprise/server/logging/commands/ListLoggers.java
@@ -27,7 +27,7 @@
import java.util.TreeMap;
import java.util.TreeSet;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
import org.glassfish.api.ActionReport;
import org.glassfish.api.I18n;
diff --git a/nucleus/core/logging/src/main/java/com/sun/enterprise/server/logging/commands/LoadDefaultLogAttributes.java b/nucleus/core/logging/src/main/java/com/sun/enterprise/server/logging/commands/LoadDefaultLogAttributes.java
index af2d5ce..9bb361a 100644
--- a/nucleus/core/logging/src/main/java/com/sun/enterprise/server/logging/commands/LoadDefaultLogAttributes.java
+++ b/nucleus/core/logging/src/main/java/com/sun/enterprise/server/logging/commands/LoadDefaultLogAttributes.java
@@ -22,7 +22,7 @@
import org.glassfish.api.ActionReport;
import org.glassfish.api.I18n;
import org.glassfish.api.admin.*;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
import org.jvnet.hk2.annotations.Service;
import org.glassfish.hk2.api.PerLookup;
diff --git a/nucleus/core/logging/src/main/java/com/sun/enterprise/server/logging/commands/LoadDefaultLogLevels.java b/nucleus/core/logging/src/main/java/com/sun/enterprise/server/logging/commands/LoadDefaultLogLevels.java
index 60ad29b..a00f1b8 100644
--- a/nucleus/core/logging/src/main/java/com/sun/enterprise/server/logging/commands/LoadDefaultLogLevels.java
+++ b/nucleus/core/logging/src/main/java/com/sun/enterprise/server/logging/commands/LoadDefaultLogLevels.java
@@ -22,7 +22,7 @@
import org.glassfish.api.ActionReport;
import org.glassfish.api.I18n;
import org.glassfish.api.admin.*;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
import org.jvnet.hk2.annotations.Service;
import org.glassfish.hk2.api.PerLookup;
diff --git a/nucleus/core/logging/src/main/java/com/sun/enterprise/server/logging/commands/RotateLog.java b/nucleus/core/logging/src/main/java/com/sun/enterprise/server/logging/commands/RotateLog.java
index d0e5816..5bad38c 100644
--- a/nucleus/core/logging/src/main/java/com/sun/enterprise/server/logging/commands/RotateLog.java
+++ b/nucleus/core/logging/src/main/java/com/sun/enterprise/server/logging/commands/RotateLog.java
@@ -26,7 +26,7 @@
import org.glassfish.api.admin.*;
import org.glassfish.config.support.CommandTarget;
import org.glassfish.config.support.TargetType;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
import org.jvnet.hk2.annotations.Service;
import org.glassfish.hk2.api.PerLookup;
diff --git a/nucleus/core/logging/src/main/java/com/sun/enterprise/server/logging/commands/SetLogAttributes.java b/nucleus/core/logging/src/main/java/com/sun/enterprise/server/logging/commands/SetLogAttributes.java
index a1e3d99..679ff3b 100644
--- a/nucleus/core/logging/src/main/java/com/sun/enterprise/server/logging/commands/SetLogAttributes.java
+++ b/nucleus/core/logging/src/main/java/com/sun/enterprise/server/logging/commands/SetLogAttributes.java
@@ -21,7 +21,7 @@
import java.util.Map;
import java.util.Properties;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
import org.glassfish.api.ActionReport;
import org.glassfish.api.I18n;
diff --git a/nucleus/core/logging/src/main/java/com/sun/enterprise/server/logging/commands/SetLogFileFormat.java b/nucleus/core/logging/src/main/java/com/sun/enterprise/server/logging/commands/SetLogFileFormat.java
index 5d3e713..d485325 100644
--- a/nucleus/core/logging/src/main/java/com/sun/enterprise/server/logging/commands/SetLogFileFormat.java
+++ b/nucleus/core/logging/src/main/java/com/sun/enterprise/server/logging/commands/SetLogFileFormat.java
@@ -20,7 +20,7 @@
import java.util.HashMap;
import java.util.Map;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
import org.glassfish.api.ActionReport;
import org.glassfish.api.I18n;
diff --git a/nucleus/core/logging/src/main/java/com/sun/enterprise/server/logging/commands/SetLogLevel.java b/nucleus/core/logging/src/main/java/com/sun/enterprise/server/logging/commands/SetLogLevel.java
index 2b6f8d6..e729e7f 100644
--- a/nucleus/core/logging/src/main/java/com/sun/enterprise/server/logging/commands/SetLogLevel.java
+++ b/nucleus/core/logging/src/main/java/com/sun/enterprise/server/logging/commands/SetLogLevel.java
@@ -21,7 +21,7 @@
import java.util.Map;
import java.util.Properties;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
import org.glassfish.api.ActionReport;
import org.glassfish.api.I18n;
diff --git a/nucleus/core/logging/src/main/java/com/sun/enterprise/server/logging/logviewer/backend/LogFilter.java b/nucleus/core/logging/src/main/java/com/sun/enterprise/server/logging/logviewer/backend/LogFilter.java
index a5efa03..4a149b4 100644
--- a/nucleus/core/logging/src/main/java/com/sun/enterprise/server/logging/logviewer/backend/LogFilter.java
+++ b/nucleus/core/logging/src/main/java/com/sun/enterprise/server/logging/logviewer/backend/LogFilter.java
@@ -30,7 +30,7 @@
import java.util.logging.Level;
import java.util.logging.Logger;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
import javax.management.Attribute;
import javax.management.AttributeList;
diff --git a/nucleus/deployment/admin/src/main/java/org/glassfish/deployment/admin/AddLibraryCommand.java b/nucleus/deployment/admin/src/main/java/org/glassfish/deployment/admin/AddLibraryCommand.java
index 01c2fb1..9e6ff64 100644
--- a/nucleus/deployment/admin/src/main/java/org/glassfish/deployment/admin/AddLibraryCommand.java
+++ b/nucleus/deployment/admin/src/main/java/org/glassfish/deployment/admin/AddLibraryCommand.java
@@ -34,7 +34,7 @@
import org.jvnet.hk2.annotations.Service;
import org.glassfish.hk2.api.PerLookup;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
import com.sun.enterprise.util.LocalStringManagerImpl;
import com.sun.enterprise.config.serverbeans.Domain;
import com.sun.enterprise.v3.server.DomainXmlPersistence;
diff --git a/nucleus/deployment/admin/src/main/java/org/glassfish/deployment/admin/CreateApplicationRefCommand.java b/nucleus/deployment/admin/src/main/java/org/glassfish/deployment/admin/CreateApplicationRefCommand.java
index 431863c..87dc117 100644
--- a/nucleus/deployment/admin/src/main/java/org/glassfish/deployment/admin/CreateApplicationRefCommand.java
+++ b/nucleus/deployment/admin/src/main/java/org/glassfish/deployment/admin/CreateApplicationRefCommand.java
@@ -42,8 +42,8 @@
import org.glassfish.api.I18n;
import org.glassfish.internal.deployment.Deployment;
import org.glassfish.internal.deployment.ExtendedDeploymentContext;
-import javax.inject.Inject;
-import javax.inject.Named;
+import jakarta.inject.Inject;
+import jakarta.inject.Named;
import org.jvnet.hk2.annotations.Service;
diff --git a/nucleus/deployment/admin/src/main/java/org/glassfish/deployment/admin/CreateLifecycleModuleCommand.java b/nucleus/deployment/admin/src/main/java/org/glassfish/deployment/admin/CreateLifecycleModuleCommand.java
index cf9c5dc..6c66135 100644
--- a/nucleus/deployment/admin/src/main/java/org/glassfish/deployment/admin/CreateLifecycleModuleCommand.java
+++ b/nucleus/deployment/admin/src/main/java/org/glassfish/deployment/admin/CreateLifecycleModuleCommand.java
@@ -34,7 +34,7 @@
import org.glassfish.deployment.common.DeploymentContextImpl;
import org.glassfish.config.support.TargetType;
import org.glassfish.config.support.CommandTarget;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
import org.jvnet.hk2.annotations.Service;
import org.glassfish.hk2.api.PerLookup;
diff --git a/nucleus/deployment/admin/src/main/java/org/glassfish/deployment/admin/DeleteApplicationRefCommand.java b/nucleus/deployment/admin/src/main/java/org/glassfish/deployment/admin/DeleteApplicationRefCommand.java
index b811945..22be071 100644
--- a/nucleus/deployment/admin/src/main/java/org/glassfish/deployment/admin/DeleteApplicationRefCommand.java
+++ b/nucleus/deployment/admin/src/main/java/org/glassfish/deployment/admin/DeleteApplicationRefCommand.java
@@ -43,8 +43,8 @@
import org.glassfish.api.I18n;
import org.glassfish.internal.deployment.Deployment;
import org.glassfish.internal.deployment.ExtendedDeploymentContext;
-import javax.inject.Inject;
-import javax.inject.Named;
+import jakarta.inject.Inject;
+import jakarta.inject.Named;
import org.jvnet.hk2.annotations.Service;
diff --git a/nucleus/deployment/admin/src/main/java/org/glassfish/deployment/admin/DeleteLifecycleModuleCommand.java b/nucleus/deployment/admin/src/main/java/org/glassfish/deployment/admin/DeleteLifecycleModuleCommand.java
index f9c19a3..2972ed7 100644
--- a/nucleus/deployment/admin/src/main/java/org/glassfish/deployment/admin/DeleteLifecycleModuleCommand.java
+++ b/nucleus/deployment/admin/src/main/java/org/glassfish/deployment/admin/DeleteLifecycleModuleCommand.java
@@ -32,7 +32,7 @@
import org.glassfish.common.util.admin.ParameterMapExtractor;
import org.glassfish.config.support.TargetType;
import org.glassfish.config.support.CommandTarget;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
import org.jvnet.hk2.annotations.Service;
import org.glassfish.hk2.api.PerLookup;
diff --git a/nucleus/deployment/admin/src/main/java/org/glassfish/deployment/admin/DeployCommand.java b/nucleus/deployment/admin/src/main/java/org/glassfish/deployment/admin/DeployCommand.java
index b9e3355..236f983 100644
--- a/nucleus/deployment/admin/src/main/java/org/glassfish/deployment/admin/DeployCommand.java
+++ b/nucleus/deployment/admin/src/main/java/org/glassfish/deployment/admin/DeployCommand.java
@@ -42,7 +42,7 @@
import org.glassfish.config.support.TargetType;
import org.glassfish.config.support.CommandTarget;
import org.jvnet.hk2.annotations.Contract;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
import org.jvnet.hk2.annotations.Service;
import org.glassfish.hk2.api.PerLookup;
diff --git a/nucleus/deployment/admin/src/main/java/org/glassfish/deployment/admin/DisableCommand.java b/nucleus/deployment/admin/src/main/java/org/glassfish/deployment/admin/DisableCommand.java
index 77301f9..1a8f716 100644
--- a/nucleus/deployment/admin/src/main/java/org/glassfish/deployment/admin/DisableCommand.java
+++ b/nucleus/deployment/admin/src/main/java/org/glassfish/deployment/admin/DisableCommand.java
@@ -41,8 +41,8 @@
import org.glassfish.config.support.CommandTarget;
import org.glassfish.common.util.admin.ParameterMapExtractor;
import org.glassfish.deployment.common.DeploymentUtils;
-import javax.inject.Inject;
-import javax.inject.Named;
+import jakarta.inject.Inject;
+import jakarta.inject.Named;
import org.jvnet.hk2.annotations.Service;
diff --git a/nucleus/deployment/admin/src/main/java/org/glassfish/deployment/admin/EnableCommand.java b/nucleus/deployment/admin/src/main/java/org/glassfish/deployment/admin/EnableCommand.java
index 6107e79..1541944 100644
--- a/nucleus/deployment/admin/src/main/java/org/glassfish/deployment/admin/EnableCommand.java
+++ b/nucleus/deployment/admin/src/main/java/org/glassfish/deployment/admin/EnableCommand.java
@@ -39,8 +39,8 @@
import org.glassfish.common.util.admin.ParameterMapExtractor;
import org.glassfish.internal.deployment.ExtendedDeploymentContext;
import org.glassfish.internal.deployment.DeploymentTargetResolver;
-import javax.inject.Inject;
-import javax.inject.Named;
+import jakarta.inject.Inject;
+import jakarta.inject.Named;
import org.jvnet.hk2.annotations.Service;
diff --git a/nucleus/deployment/admin/src/main/java/org/glassfish/deployment/admin/GetApplicationLaunchURLsCommand.java b/nucleus/deployment/admin/src/main/java/org/glassfish/deployment/admin/GetApplicationLaunchURLsCommand.java
index 407fa55..cef012b 100644
--- a/nucleus/deployment/admin/src/main/java/org/glassfish/deployment/admin/GetApplicationLaunchURLsCommand.java
+++ b/nucleus/deployment/admin/src/main/java/org/glassfish/deployment/admin/GetApplicationLaunchURLsCommand.java
@@ -29,7 +29,7 @@
import org.glassfish.deployment.common.DeploymentUtils;
import com.sun.enterprise.util.LocalStringManagerImpl;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
import org.glassfish.hk2.api.PerLookup;
import org.glassfish.config.support.PropertyResolver;
import com.sun.enterprise.util.StringUtils;
diff --git a/nucleus/deployment/admin/src/main/java/org/glassfish/deployment/admin/GetClientStubsCommand.java b/nucleus/deployment/admin/src/main/java/org/glassfish/deployment/admin/GetClientStubsCommand.java
index 61f8560..3762dfe 100644
--- a/nucleus/deployment/admin/src/main/java/org/glassfish/deployment/admin/GetClientStubsCommand.java
+++ b/nucleus/deployment/admin/src/main/java/org/glassfish/deployment/admin/GetClientStubsCommand.java
@@ -23,7 +23,7 @@
import java.util.Collection;
import java.util.logging.Logger;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
import org.glassfish.api.ActionReport;
import org.glassfish.api.I18n;
import org.glassfish.api.Param;
diff --git a/nucleus/deployment/admin/src/main/java/org/glassfish/deployment/admin/GetDeploymentConfigurationsCommand.java b/nucleus/deployment/admin/src/main/java/org/glassfish/deployment/admin/GetDeploymentConfigurationsCommand.java
index deb7b2a..6ed99c7 100644
--- a/nucleus/deployment/admin/src/main/java/org/glassfish/deployment/admin/GetDeploymentConfigurationsCommand.java
+++ b/nucleus/deployment/admin/src/main/java/org/glassfish/deployment/admin/GetDeploymentConfigurationsCommand.java
@@ -32,7 +32,7 @@
import org.glassfish.deployment.common.DeploymentProperties;
import com.sun.enterprise.util.LocalStringManagerImpl;
import org.glassfish.api.ActionReport;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
import org.jvnet.hk2.annotations.Service;
import org.glassfish.hk2.api.PerLookup;
diff --git a/nucleus/deployment/admin/src/main/java/org/glassfish/deployment/admin/GetHostAndPortCommand.java b/nucleus/deployment/admin/src/main/java/org/glassfish/deployment/admin/GetHostAndPortCommand.java
index 725284a..9253b0c 100644
--- a/nucleus/deployment/admin/src/main/java/org/glassfish/deployment/admin/GetHostAndPortCommand.java
+++ b/nucleus/deployment/admin/src/main/java/org/glassfish/deployment/admin/GetHostAndPortCommand.java
@@ -42,7 +42,7 @@
import org.glassfish.api.admin.RestEndpoint;
import org.glassfish.api.admin.RestEndpoints;
import org.glassfish.api.admin.RuntimeType;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
import org.glassfish.api.admin.AccessRequired;
import org.glassfish.api.admin.AccessRequired.AccessCheck;
import org.glassfish.api.admin.AdminCommandSecurity;
diff --git a/nucleus/deployment/admin/src/main/java/org/glassfish/deployment/admin/GetTargetsCommand.java b/nucleus/deployment/admin/src/main/java/org/glassfish/deployment/admin/GetTargetsCommand.java
index 889ea16..dbad05a 100644
--- a/nucleus/deployment/admin/src/main/java/org/glassfish/deployment/admin/GetTargetsCommand.java
+++ b/nucleus/deployment/admin/src/main/java/org/glassfish/deployment/admin/GetTargetsCommand.java
@@ -28,7 +28,7 @@
import org.glassfish.api.admin.RestEndpoint;
import org.glassfish.api.admin.RestEndpoints;
import org.glassfish.api.admin.RuntimeType;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
import org.glassfish.api.admin.AccessRequired;
import org.jvnet.hk2.annotations.Service;
diff --git a/nucleus/deployment/admin/src/main/java/org/glassfish/deployment/admin/InstanceDeployCommand.java b/nucleus/deployment/admin/src/main/java/org/glassfish/deployment/admin/InstanceDeployCommand.java
index 731c5cc..d8b32fb 100644
--- a/nucleus/deployment/admin/src/main/java/org/glassfish/deployment/admin/InstanceDeployCommand.java
+++ b/nucleus/deployment/admin/src/main/java/org/glassfish/deployment/admin/InstanceDeployCommand.java
@@ -43,8 +43,8 @@
import com.sun.enterprise.deployment.deploy.shared.Util;
import org.glassfish.deployment.versioning.VersioningUtils;
import org.jvnet.hk2.annotations.Service;
-import javax.inject.Inject;
-import javax.inject.Named;
+import jakarta.inject.Inject;
+import jakarta.inject.Named;
import org.glassfish.hk2.api.PerLookup;
diff --git a/nucleus/deployment/admin/src/main/java/org/glassfish/deployment/admin/InstanceLifecycleModuleCommand.java b/nucleus/deployment/admin/src/main/java/org/glassfish/deployment/admin/InstanceLifecycleModuleCommand.java
index eacc536..3dad73d 100644
--- a/nucleus/deployment/admin/src/main/java/org/glassfish/deployment/admin/InstanceLifecycleModuleCommand.java
+++ b/nucleus/deployment/admin/src/main/java/org/glassfish/deployment/admin/InstanceLifecycleModuleCommand.java
@@ -27,7 +27,7 @@
import org.glassfish.internal.deployment.ExtendedDeploymentContext;
import org.glassfish.deployment.common.DeploymentContextImpl;
import org.jvnet.hk2.annotations.Service;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
import org.glassfish.hk2.api.PerLookup;
import org.jvnet.hk2.config.Transaction;
diff --git a/nucleus/deployment/admin/src/main/java/org/glassfish/deployment/admin/IsSnifferUserVisibleCommand.java b/nucleus/deployment/admin/src/main/java/org/glassfish/deployment/admin/IsSnifferUserVisibleCommand.java
index 462c17c..1d89459 100644
--- a/nucleus/deployment/admin/src/main/java/org/glassfish/deployment/admin/IsSnifferUserVisibleCommand.java
+++ b/nucleus/deployment/admin/src/main/java/org/glassfish/deployment/admin/IsSnifferUserVisibleCommand.java
@@ -28,7 +28,7 @@
import org.glassfish.api.admin.RuntimeType;
import org.glassfish.api.container.Sniffer;
import org.glassfish.internal.deployment.SnifferManager;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
import org.glassfish.api.admin.AccessRequired;
import org.jvnet.hk2.annotations.Service;
diff --git a/nucleus/deployment/admin/src/main/java/org/glassfish/deployment/admin/ListAppRefsCommand.java b/nucleus/deployment/admin/src/main/java/org/glassfish/deployment/admin/ListAppRefsCommand.java
index 48a88ee..4a3db9d 100644
--- a/nucleus/deployment/admin/src/main/java/org/glassfish/deployment/admin/ListAppRefsCommand.java
+++ b/nucleus/deployment/admin/src/main/java/org/glassfish/deployment/admin/ListAppRefsCommand.java
@@ -34,7 +34,7 @@
import com.sun.enterprise.util.LocalStringManagerImpl;
import java.util.Collection;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
import org.glassfish.hk2.api.PerLookup;
import java.util.List;
import org.glassfish.api.admin.AccessRequired;
diff --git a/nucleus/deployment/admin/src/main/java/org/glassfish/deployment/admin/ListApplicationRefsCommand.java b/nucleus/deployment/admin/src/main/java/org/glassfish/deployment/admin/ListApplicationRefsCommand.java
index 9b674ba..9103ddb 100644
--- a/nucleus/deployment/admin/src/main/java/org/glassfish/deployment/admin/ListApplicationRefsCommand.java
+++ b/nucleus/deployment/admin/src/main/java/org/glassfish/deployment/admin/ListApplicationRefsCommand.java
@@ -36,7 +36,7 @@
import org.glassfish.api.I18n;
import org.glassfish.api.admin.RestEndpoint;
import org.glassfish.api.admin.RestEndpoints;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
import org.glassfish.api.admin.AccessRequired;
import org.glassfish.api.admin.AccessRequired.AccessCheck;
import org.glassfish.api.admin.AdminCommandSecurity;
diff --git a/nucleus/deployment/admin/src/main/java/org/glassfish/deployment/admin/ListComponentsCommand.java b/nucleus/deployment/admin/src/main/java/org/glassfish/deployment/admin/ListComponentsCommand.java
index 8040a15..f3ffd09 100644
--- a/nucleus/deployment/admin/src/main/java/org/glassfish/deployment/admin/ListComponentsCommand.java
+++ b/nucleus/deployment/admin/src/main/java/org/glassfish/deployment/admin/ListComponentsCommand.java
@@ -38,7 +38,7 @@
import com.sun.enterprise.config.serverbeans.*;
import com.sun.enterprise.util.LocalStringManagerImpl;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
import org.glassfish.hk2.api.PerLookup;
import com.sun.enterprise.config.serverbeans.Module;
diff --git a/nucleus/deployment/admin/src/main/java/org/glassfish/deployment/admin/ListLibrariesCommand.java b/nucleus/deployment/admin/src/main/java/org/glassfish/deployment/admin/ListLibrariesCommand.java
index 759c1f8..b8cd6b1 100644
--- a/nucleus/deployment/admin/src/main/java/org/glassfish/deployment/admin/ListLibrariesCommand.java
+++ b/nucleus/deployment/admin/src/main/java/org/glassfish/deployment/admin/ListLibrariesCommand.java
@@ -31,7 +31,7 @@
import org.jvnet.hk2.annotations.Service;
import org.glassfish.hk2.api.PerLookup;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
import com.sun.enterprise.util.LocalStringManagerImpl;
import com.sun.enterprise.util.io.FileUtils;
import com.sun.enterprise.config.serverbeans.Domain;
diff --git a/nucleus/deployment/admin/src/main/java/org/glassfish/deployment/admin/ListLifecycleModulesCommand.java b/nucleus/deployment/admin/src/main/java/org/glassfish/deployment/admin/ListLifecycleModulesCommand.java
index 1d49766..9e183fb 100644
--- a/nucleus/deployment/admin/src/main/java/org/glassfish/deployment/admin/ListLifecycleModulesCommand.java
+++ b/nucleus/deployment/admin/src/main/java/org/glassfish/deployment/admin/ListLifecycleModulesCommand.java
@@ -39,7 +39,7 @@
import org.glassfish.config.support.CommandTarget;
import org.jvnet.hk2.annotations.Service;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
import org.glassfish.api.admin.AccessRequired;
import org.glassfish.hk2.api.PerLookup;
diff --git a/nucleus/deployment/admin/src/main/java/org/glassfish/deployment/admin/MTDeployCommand.java b/nucleus/deployment/admin/src/main/java/org/glassfish/deployment/admin/MTDeployCommand.java
index d72edfa..4edfa54 100644
--- a/nucleus/deployment/admin/src/main/java/org/glassfish/deployment/admin/MTDeployCommand.java
+++ b/nucleus/deployment/admin/src/main/java/org/glassfish/deployment/admin/MTDeployCommand.java
@@ -27,7 +27,7 @@
import org.glassfish.deployment.common.DeploymentUtils;
import org.glassfish.deployment.common.DeploymentProperties;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
import org.jvnet.hk2.annotations.Service;
import org.glassfish.hk2.api.PerLookup;
diff --git a/nucleus/deployment/admin/src/main/java/org/glassfish/deployment/admin/MTProvisionCommand.java b/nucleus/deployment/admin/src/main/java/org/glassfish/deployment/admin/MTProvisionCommand.java
index 7f7f190..04f8e5c 100644
--- a/nucleus/deployment/admin/src/main/java/org/glassfish/deployment/admin/MTProvisionCommand.java
+++ b/nucleus/deployment/admin/src/main/java/org/glassfish/deployment/admin/MTProvisionCommand.java
@@ -35,7 +35,7 @@
import org.glassfish.internal.deployment.ExtendedDeploymentContext;
import org.glassfish.deployment.common.DeploymentUtils;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
import org.jvnet.hk2.annotations.Service;
import org.glassfish.hk2.api.PerLookup;
diff --git a/nucleus/deployment/admin/src/main/java/org/glassfish/deployment/admin/MTUndeployCommand.java b/nucleus/deployment/admin/src/main/java/org/glassfish/deployment/admin/MTUndeployCommand.java
index b5073db..554aa93 100644
--- a/nucleus/deployment/admin/src/main/java/org/glassfish/deployment/admin/MTUndeployCommand.java
+++ b/nucleus/deployment/admin/src/main/java/org/glassfish/deployment/admin/MTUndeployCommand.java
@@ -32,7 +32,7 @@
import com.sun.enterprise.config.serverbeans.AppTenant;
import java.util.ArrayList;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
import org.jvnet.hk2.annotations.Service;
import org.glassfish.hk2.api.PerLookup;
diff --git a/nucleus/deployment/admin/src/main/java/org/glassfish/deployment/admin/MTUnprovisionCommand.java b/nucleus/deployment/admin/src/main/java/org/glassfish/deployment/admin/MTUnprovisionCommand.java
index ce170af..b89d199 100644
--- a/nucleus/deployment/admin/src/main/java/org/glassfish/deployment/admin/MTUnprovisionCommand.java
+++ b/nucleus/deployment/admin/src/main/java/org/glassfish/deployment/admin/MTUnprovisionCommand.java
@@ -40,7 +40,7 @@
import org.glassfish.internal.deployment.ExtendedDeploymentContext;
import org.glassfish.deployment.common.DeploymentUtils;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
import org.jvnet.hk2.annotations.Service;
import org.glassfish.hk2.api.PerLookup;
diff --git a/nucleus/deployment/admin/src/main/java/org/glassfish/deployment/admin/PostDeployCommand.java b/nucleus/deployment/admin/src/main/java/org/glassfish/deployment/admin/PostDeployCommand.java
index 9fa72c1..be14424 100644
--- a/nucleus/deployment/admin/src/main/java/org/glassfish/deployment/admin/PostDeployCommand.java
+++ b/nucleus/deployment/admin/src/main/java/org/glassfish/deployment/admin/PostDeployCommand.java
@@ -36,7 +36,7 @@
import org.glassfish.deployment.common.DeploymentUtils;
import org.glassfish.internal.deployment.Deployment;
import org.glassfish.internal.deployment.ExtendedDeploymentContext.Phase;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
import org.glassfish.api.admin.AccessRequired;
import org.jvnet.hk2.annotations.Service;
diff --git a/nucleus/deployment/admin/src/main/java/org/glassfish/deployment/admin/PostStateCommand.java b/nucleus/deployment/admin/src/main/java/org/glassfish/deployment/admin/PostStateCommand.java
index fca6483..8cbb32e 100644
--- a/nucleus/deployment/admin/src/main/java/org/glassfish/deployment/admin/PostStateCommand.java
+++ b/nucleus/deployment/admin/src/main/java/org/glassfish/deployment/admin/PostStateCommand.java
@@ -26,7 +26,7 @@
import org.glassfish.hk2.api.ServiceLocator;
import org.glassfish.internal.deployment.ApplicationLifecycleInterceptor;
import org.glassfish.internal.deployment.ExtendedDeploymentContext;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
import org.glassfish.api.admin.AccessRequired.AccessCheck;
import org.glassfish.api.admin.AdminCommandSecurity;
diff --git a/nucleus/deployment/admin/src/main/java/org/glassfish/deployment/admin/PostUndeployCommand.java b/nucleus/deployment/admin/src/main/java/org/glassfish/deployment/admin/PostUndeployCommand.java
index 374238a..8140823 100644
--- a/nucleus/deployment/admin/src/main/java/org/glassfish/deployment/admin/PostUndeployCommand.java
+++ b/nucleus/deployment/admin/src/main/java/org/glassfish/deployment/admin/PostUndeployCommand.java
@@ -29,7 +29,7 @@
import org.glassfish.hk2.api.PerLookup;
import org.glassfish.hk2.api.ServiceLocator;
import org.glassfish.internal.deployment.ExtendedDeploymentContext;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
import org.glassfish.api.admin.AccessRequired;
import org.jvnet.hk2.annotations.Service;
diff --git a/nucleus/deployment/admin/src/main/java/org/glassfish/deployment/admin/ReDeployCommand.java b/nucleus/deployment/admin/src/main/java/org/glassfish/deployment/admin/ReDeployCommand.java
index 43ec711..20f112a 100644
--- a/nucleus/deployment/admin/src/main/java/org/glassfish/deployment/admin/ReDeployCommand.java
+++ b/nucleus/deployment/admin/src/main/java/org/glassfish/deployment/admin/ReDeployCommand.java
@@ -33,7 +33,7 @@
import com.sun.enterprise.util.LocalStringManagerImpl;
import com.sun.enterprise.config.serverbeans.ConfigBeansUtilities;
import org.jvnet.hk2.annotations.Service;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
import org.glassfish.hk2.api.PerLookup;
import java.util.Properties;
diff --git a/nucleus/deployment/admin/src/main/java/org/glassfish/deployment/admin/RemoveLibraryCommand.java b/nucleus/deployment/admin/src/main/java/org/glassfish/deployment/admin/RemoveLibraryCommand.java
index e090189..dca7bb2 100644
--- a/nucleus/deployment/admin/src/main/java/org/glassfish/deployment/admin/RemoveLibraryCommand.java
+++ b/nucleus/deployment/admin/src/main/java/org/glassfish/deployment/admin/RemoveLibraryCommand.java
@@ -34,7 +34,7 @@
import org.jvnet.hk2.annotations.Service;
import org.glassfish.hk2.api.PerLookup;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
import com.sun.enterprise.util.LocalStringManagerImpl;
import com.sun.enterprise.util.io.FileUtils;
import com.sun.enterprise.config.serverbeans.Domain;
diff --git a/nucleus/deployment/admin/src/main/java/org/glassfish/deployment/admin/ShowComponentStatusCommand.java b/nucleus/deployment/admin/src/main/java/org/glassfish/deployment/admin/ShowComponentStatusCommand.java
index 7bf877f..312661c 100644
--- a/nucleus/deployment/admin/src/main/java/org/glassfish/deployment/admin/ShowComponentStatusCommand.java
+++ b/nucleus/deployment/admin/src/main/java/org/glassfish/deployment/admin/ShowComponentStatusCommand.java
@@ -46,7 +46,7 @@
import org.glassfish.deployment.versioning.VersioningService;
import org.glassfish.hk2.api.PerLookup;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
import org.glassfish.api.admin.AccessRequired;
import org.glassfish.api.admin.AccessRequired.AccessCheck;
import org.glassfish.api.admin.AdminCommandSecurity;
diff --git a/nucleus/deployment/admin/src/main/java/org/glassfish/deployment/admin/UndeployCommand.java b/nucleus/deployment/admin/src/main/java/org/glassfish/deployment/admin/UndeployCommand.java
index 4e7268c..8d95657 100644
--- a/nucleus/deployment/admin/src/main/java/org/glassfish/deployment/admin/UndeployCommand.java
+++ b/nucleus/deployment/admin/src/main/java/org/glassfish/deployment/admin/UndeployCommand.java
@@ -37,7 +37,7 @@
import org.glassfish.config.support.TargetType;
import org.glassfish.config.support.CommandTarget;
import org.glassfish.common.util.admin.ParameterMapExtractor;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
import org.jvnet.hk2.annotations.Service;
import org.glassfish.hk2.api.PerLookup;
diff --git a/nucleus/deployment/admin/src/main/java/org/glassfish/deployment/admin/ValidateRemoteDirDeploymentCommand.java b/nucleus/deployment/admin/src/main/java/org/glassfish/deployment/admin/ValidateRemoteDirDeploymentCommand.java
index 9b249b2..5791265 100644
--- a/nucleus/deployment/admin/src/main/java/org/glassfish/deployment/admin/ValidateRemoteDirDeploymentCommand.java
+++ b/nucleus/deployment/admin/src/main/java/org/glassfish/deployment/admin/ValidateRemoteDirDeploymentCommand.java
@@ -39,7 +39,7 @@
import org.glassfish.api.deployment.archive.ReadableArchive;
import org.glassfish.internal.deployment.Deployment;
import org.glassfish.deployment.common.DeploymentUtils;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
import org.glassfish.api.admin.AccessRequired;
import org.jvnet.hk2.annotations.Service;
diff --git a/nucleus/deployment/autodeploy/src/main/java/org/glassfish/deployment/autodeploy/AutoDeployService.java b/nucleus/deployment/autodeploy/src/main/java/org/glassfish/deployment/autodeploy/AutoDeployService.java
index 060fa6f..ed5ce77 100644
--- a/nucleus/deployment/autodeploy/src/main/java/org/glassfish/deployment/autodeploy/AutoDeployService.java
+++ b/nucleus/deployment/autodeploy/src/main/java/org/glassfish/deployment/autodeploy/AutoDeployService.java
@@ -33,14 +33,14 @@
import org.glassfish.deployment.common.DeploymentUtils;
import org.glassfish.hk2.runlevel.RunLevel;
import org.glassfish.internal.api.PostStartupRunLevel;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
import org.jvnet.hk2.annotations.Service;
import org.glassfish.hk2.api.PostConstruct;
import org.glassfish.hk2.api.PreDestroy;
import org.glassfish.hk2.api.ServiceLocator;
-import javax.inject.Singleton;
+import jakarta.inject.Singleton;
import org.jvnet.hk2.config.ConfigListener;
import org.jvnet.hk2.config.UnprocessedChangeEvent;
import org.jvnet.hk2.config.UnprocessedChangeEvents;
diff --git a/nucleus/deployment/autodeploy/src/main/java/org/glassfish/deployment/autodeploy/AutoDeploymentOperation.java b/nucleus/deployment/autodeploy/src/main/java/org/glassfish/deployment/autodeploy/AutoDeploymentOperation.java
index 2c84f13..60d84e9 100644
--- a/nucleus/deployment/autodeploy/src/main/java/org/glassfish/deployment/autodeploy/AutoDeploymentOperation.java
+++ b/nucleus/deployment/autodeploy/src/main/java/org/glassfish/deployment/autodeploy/AutoDeploymentOperation.java
@@ -24,8 +24,8 @@
import org.glassfish.api.admin.AdminCommand;
import org.glassfish.deployment.autodeploy.AutoDeployer.AutodeploymentStatus;
import org.glassfish.deployment.common.DeploymentProperties;
-import javax.inject.Inject;
-import javax.inject.Named;
+import jakarta.inject.Inject;
+import jakarta.inject.Named;
import org.jvnet.hk2.annotations.Service;
diff --git a/nucleus/deployment/autodeploy/src/main/java/org/glassfish/deployment/autodeploy/AutoOperation.java b/nucleus/deployment/autodeploy/src/main/java/org/glassfish/deployment/autodeploy/AutoOperation.java
index 5a360e3..cd116cc 100644
--- a/nucleus/deployment/autodeploy/src/main/java/org/glassfish/deployment/autodeploy/AutoOperation.java
+++ b/nucleus/deployment/autodeploy/src/main/java/org/glassfish/deployment/autodeploy/AutoOperation.java
@@ -28,7 +28,7 @@
import org.glassfish.api.admin.ParameterMap;
import org.glassfish.deployment.autodeploy.AutoDeployer.AutodeploymentStatus;
import org.glassfish.deployment.common.DeploymentUtils;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
import org.jvnet.hk2.annotations.Service;
import org.glassfish.hk2.api.PerLookup;
diff --git a/nucleus/deployment/autodeploy/src/main/java/org/glassfish/deployment/autodeploy/AutoUndeploymentOperation.java b/nucleus/deployment/autodeploy/src/main/java/org/glassfish/deployment/autodeploy/AutoUndeploymentOperation.java
index 23859c6..f7f5e5a 100644
--- a/nucleus/deployment/autodeploy/src/main/java/org/glassfish/deployment/autodeploy/AutoUndeploymentOperation.java
+++ b/nucleus/deployment/autodeploy/src/main/java/org/glassfish/deployment/autodeploy/AutoUndeploymentOperation.java
@@ -26,8 +26,8 @@
import org.glassfish.api.admin.AdminCommand;
import org.glassfish.deployment.autodeploy.AutoDeployer.AutodeploymentStatus;
import org.glassfish.deployment.common.DeploymentProperties;
-import javax.inject.Inject;
-import javax.inject.Named;
+import jakarta.inject.Inject;
+import jakarta.inject.Named;
import org.jvnet.hk2.annotations.Service;
diff --git a/nucleus/deployment/autodeploy/src/main/java/org/glassfish/deployment/autodeploy/AutodeployRetryManager.java b/nucleus/deployment/autodeploy/src/main/java/org/glassfish/deployment/autodeploy/AutodeployRetryManager.java
index 26960f9..b54695b 100644
--- a/nucleus/deployment/autodeploy/src/main/java/org/glassfish/deployment/autodeploy/AutodeployRetryManager.java
+++ b/nucleus/deployment/autodeploy/src/main/java/org/glassfish/deployment/autodeploy/AutodeployRetryManager.java
@@ -28,11 +28,11 @@
import org.glassfish.api.Async;
import org.glassfish.deployment.autodeploy.AutoDeployer.AutodeploymentStatus;
import org.glassfish.deployment.common.DeploymentUtils;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
import org.jvnet.hk2.annotations.Service;
import org.glassfish.hk2.api.PostConstruct;
-import javax.inject.Singleton;
+import jakarta.inject.Singleton;
import org.glassfish.logging.annotation.LogMessageInfo;
diff --git a/nucleus/deployment/common/src/main/java/com/sun/enterprise/deploy/shared/ArchiveFactory.java b/nucleus/deployment/common/src/main/java/com/sun/enterprise/deploy/shared/ArchiveFactory.java
index 9c9fa6f..0e5f73d 100644
--- a/nucleus/deployment/common/src/main/java/com/sun/enterprise/deploy/shared/ArchiveFactory.java
+++ b/nucleus/deployment/common/src/main/java/com/sun/enterprise/deploy/shared/ArchiveFactory.java
@@ -24,10 +24,10 @@
import org.glassfish.hk2.api.MultiException;
import org.glassfish.hk2.api.ServiceLocator;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
import org.jvnet.hk2.annotations.Service;
-import javax.inject.Singleton;
+import jakarta.inject.Singleton;
import java.io.File;
import java.io.FileNotFoundException;
diff --git a/nucleus/deployment/common/src/main/java/com/sun/enterprise/deploy/shared/FileArchive.java b/nucleus/deployment/common/src/main/java/com/sun/enterprise/deploy/shared/FileArchive.java
index d5c3585..8140fa1 100644
--- a/nucleus/deployment/common/src/main/java/com/sun/enterprise/deploy/shared/FileArchive.java
+++ b/nucleus/deployment/common/src/main/java/com/sun/enterprise/deploy/shared/FileArchive.java
@@ -26,7 +26,7 @@
import org.glassfish.api.deployment.archive.ReadableArchive;
import org.glassfish.api.deployment.archive.WritableArchive;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
import org.jvnet.hk2.annotations.Service;
import org.glassfish.hk2.api.PerLookup;
diff --git a/nucleus/deployment/common/src/main/java/com/sun/enterprise/deployment/deploy/shared/MultiReadableArchive.java b/nucleus/deployment/common/src/main/java/com/sun/enterprise/deployment/deploy/shared/MultiReadableArchive.java
index f667c06..6692b7d 100644
--- a/nucleus/deployment/common/src/main/java/com/sun/enterprise/deployment/deploy/shared/MultiReadableArchive.java
+++ b/nucleus/deployment/common/src/main/java/com/sun/enterprise/deployment/deploy/shared/MultiReadableArchive.java
@@ -30,7 +30,7 @@
import java.util.List;
import java.util.jar.Manifest;
import org.glassfish.api.deployment.archive.ReadableArchive;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
import org.jvnet.hk2.annotations.Service;
import org.glassfish.hk2.api.PerLookup;
diff --git a/nucleus/deployment/common/src/main/java/org/glassfish/deployment/versioning/VersioningService.java b/nucleus/deployment/common/src/main/java/org/glassfish/deployment/versioning/VersioningService.java
index dad21b3..a526075 100644
--- a/nucleus/deployment/common/src/main/java/org/glassfish/deployment/versioning/VersioningService.java
+++ b/nucleus/deployment/common/src/main/java/org/glassfish/deployment/versioning/VersioningService.java
@@ -33,7 +33,7 @@
import org.glassfish.api.admin.CommandRunner;
import org.glassfish.api.admin.ParameterMap;
import org.glassfish.deployment.common.DeploymentUtils;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
import org.jvnet.hk2.annotations.Service;
import org.glassfish.hk2.api.PerLookup;
diff --git a/nucleus/diagnostics/context/src/test/java/org/glassfish/diagnostics/context/impl/ContextImplIntegrationTest.java b/nucleus/diagnostics/context/src/test/java/org/glassfish/diagnostics/context/impl/ContextImplIntegrationTest.java
index cd7f323..23945d0 100644
--- a/nucleus/diagnostics/context/src/test/java/org/glassfish/diagnostics/context/impl/ContextImplIntegrationTest.java
+++ b/nucleus/diagnostics/context/src/test/java/org/glassfish/diagnostics/context/impl/ContextImplIntegrationTest.java
@@ -21,7 +21,7 @@
import org.junit.Test;
import org.junit.Ignore;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
public class ContextImplIntegrationTest
extends org.jvnet.hk2.testing.junit.HK2Runner
diff --git a/nucleus/distributions/nucleus-common/src/main/resources/config/osgi.properties b/nucleus/distributions/nucleus-common/src/main/resources/config/osgi.properties
index 1461027..97e0f79 100755
--- a/nucleus/distributions/nucleus-common/src/main/resources/config/osgi.properties
+++ b/nucleus/distributions/nucleus-common/src/main/resources/config/osgi.properties
@@ -170,7 +170,7 @@
hk2.bundles=\
${com.sun.aas.installRootURI}modules/hk2-api.jar \
${com.sun.aas.installRootURI}modules/hk2-utils.jar \
- ${com.sun.aas.installRootURI}modules/jakarta.inject.jar \
+ ${com.sun.aas.installRootURI}modules/jakarta.inject-api.jar \
${com.sun.aas.installRootURI}modules/osgi-resource-locator.jar \
${com.sun.aas.installRootURI}modules/hk2-locator.jar \
${com.sun.aas.installRootURI}modules/hk2-runlevel.jar \
diff --git a/nucleus/featuresets/atomic/pom.xml b/nucleus/featuresets/atomic/pom.xml
index 04bf7b1..25788ca 100644
--- a/nucleus/featuresets/atomic/pom.xml
+++ b/nucleus/featuresets/atomic/pom.xml
@@ -361,8 +361,8 @@
</exclusions>
</dependency>
<dependency>
- <groupId>org.glassfish.hk2.external</groupId>
- <artifactId>jakarta.inject</artifactId>
+ <groupId>jakarta.inject</groupId>
+ <artifactId>jakarta.inject-api</artifactId>
<exclusions>
<exclusion>
<groupId>*</groupId>
diff --git a/nucleus/flashlight/framework/src/main/java/org/glassfish/flashlight/cli/DisableMonitoring.java b/nucleus/flashlight/framework/src/main/java/org/glassfish/flashlight/cli/DisableMonitoring.java
index 8828be4..3677be6 100644
--- a/nucleus/flashlight/framework/src/main/java/org/glassfish/flashlight/cli/DisableMonitoring.java
+++ b/nucleus/flashlight/framework/src/main/java/org/glassfish/flashlight/cli/DisableMonitoring.java
@@ -34,7 +34,7 @@
import org.glassfish.api.monitoring.ContainerMonitoring;
import org.glassfish.hk2.api.PerLookup;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
/**
* @author Sreenivas Munnangi (3.0)
diff --git a/nucleus/flashlight/framework/src/main/java/org/glassfish/flashlight/cli/EnableMonitoring.java b/nucleus/flashlight/framework/src/main/java/org/glassfish/flashlight/cli/EnableMonitoring.java
index 4bc9d7c..9c11966 100644
--- a/nucleus/flashlight/framework/src/main/java/org/glassfish/flashlight/cli/EnableMonitoring.java
+++ b/nucleus/flashlight/framework/src/main/java/org/glassfish/flashlight/cli/EnableMonitoring.java
@@ -35,7 +35,7 @@
import java.io.File;
import com.sun.enterprise.config.serverbeans.MonitoringService;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
/**
* @author Sreenivas Munnangi (3.0)
diff --git a/nucleus/flashlight/framework/src/main/java/org/glassfish/flashlight/impl/core/ProbeFactory.java b/nucleus/flashlight/framework/src/main/java/org/glassfish/flashlight/impl/core/ProbeFactory.java
index 3d215dc..858a01c 100644
--- a/nucleus/flashlight/framework/src/main/java/org/glassfish/flashlight/impl/core/ProbeFactory.java
+++ b/nucleus/flashlight/framework/src/main/java/org/glassfish/flashlight/impl/core/ProbeFactory.java
@@ -20,7 +20,7 @@
import org.glassfish.flashlight.provider.ProbeRegistry;
import org.jvnet.hk2.annotations.Service;
-import javax.inject.Singleton;
+import jakarta.inject.Singleton;
import java.util.concurrent.atomic.AtomicInteger;
diff --git a/nucleus/flashlight/framework/src/main/java/org/glassfish/flashlight/impl/provider/FlashlightProbeProviderFactory.java b/nucleus/flashlight/framework/src/main/java/org/glassfish/flashlight/impl/provider/FlashlightProbeProviderFactory.java
index 5db0ac5..ffd2f2d 100644
--- a/nucleus/flashlight/framework/src/main/java/org/glassfish/flashlight/impl/provider/FlashlightProbeProviderFactory.java
+++ b/nucleus/flashlight/framework/src/main/java/org/glassfish/flashlight/impl/provider/FlashlightProbeProviderFactory.java
@@ -44,7 +44,7 @@
import org.glassfish.hk2.api.PostConstruct;
import org.glassfish.hk2.api.ServiceLocator;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
/**
* @author Mahesh Kannan
diff --git a/nucleus/flashlight/framework/src/main/java/org/glassfish/flashlight/provider/ProbeRegistry.java b/nucleus/flashlight/framework/src/main/java/org/glassfish/flashlight/provider/ProbeRegistry.java
index 19fd7f4..a58fcc4 100644
--- a/nucleus/flashlight/framework/src/main/java/org/glassfish/flashlight/provider/ProbeRegistry.java
+++ b/nucleus/flashlight/framework/src/main/java/org/glassfish/flashlight/provider/ProbeRegistry.java
@@ -23,7 +23,7 @@
import org.glassfish.flashlight.impl.core.*;
import org.jvnet.hk2.annotations.Service;
-import javax.inject.Singleton;
+import jakarta.inject.Singleton;
import java.util.concurrent.ConcurrentHashMap;
diff --git a/nucleus/grizzly/config/src/main/java/org/glassfish/grizzly/config/SSLConfigurator.java b/nucleus/grizzly/config/src/main/java/org/glassfish/grizzly/config/SSLConfigurator.java
index e76dd77..6fc3b28 100644
--- a/nucleus/grizzly/config/src/main/java/org/glassfish/grizzly/config/SSLConfigurator.java
+++ b/nucleus/grizzly/config/src/main/java/org/glassfish/grizzly/config/SSLConfigurator.java
@@ -29,7 +29,7 @@
import java.util.logging.Level;
import java.util.logging.Logger;
-import javax.inject.Provider;
+import jakarta.inject.Provider;
import javax.net.ssl.SSLContext;
import javax.net.ssl.SSLServerSocketFactory;
import org.glassfish.grizzly.config.dom.NetworkListener;
diff --git a/nucleus/hk2/config-types/src/main/java/org/jvnet/hk2/config/types/HK2DomConfigTypesUtilities.java b/nucleus/hk2/config-types/src/main/java/org/jvnet/hk2/config/types/HK2DomConfigTypesUtilities.java
index e2885d4..c129161 100644
--- a/nucleus/hk2/config-types/src/main/java/org/jvnet/hk2/config/types/HK2DomConfigTypesUtilities.java
+++ b/nucleus/hk2/config-types/src/main/java/org/jvnet/hk2/config/types/HK2DomConfigTypesUtilities.java
@@ -18,8 +18,8 @@
import java.util.LinkedList;
-import javax.inject.Named;
-import javax.inject.Singleton;
+import jakarta.inject.Named;
+import jakarta.inject.Singleton;
import org.glassfish.hk2.api.HK2Loader;
import org.glassfish.hk2.api.ServiceLocator;
diff --git a/nucleus/hk2/config-types/src/main/java/org/jvnet/hk2/config/types/PropertyBagCustomizerImpl.java b/nucleus/hk2/config-types/src/main/java/org/jvnet/hk2/config/types/PropertyBagCustomizerImpl.java
index 3b83d98..97fb70a 100644
--- a/nucleus/hk2/config-types/src/main/java/org/jvnet/hk2/config/types/PropertyBagCustomizerImpl.java
+++ b/nucleus/hk2/config-types/src/main/java/org/jvnet/hk2/config/types/PropertyBagCustomizerImpl.java
@@ -16,8 +16,8 @@
package org.jvnet.hk2.config.types;
-import javax.inject.Named;
-import javax.inject.Singleton;
+import jakarta.inject.Named;
+import jakarta.inject.Singleton;
import org.jvnet.hk2.annotations.Contract;
diff --git a/nucleus/hk2/hk2-config/src/main/java/org/jvnet/hk2/config/ConfigSupport.java b/nucleus/hk2/hk2-config/src/main/java/org/jvnet/hk2/config/ConfigSupport.java
index 162f2a4..54f74f8 100644
--- a/nucleus/hk2/hk2-config/src/main/java/org/jvnet/hk2/config/ConfigSupport.java
+++ b/nucleus/hk2/hk2-config/src/main/java/org/jvnet/hk2/config/ConfigSupport.java
@@ -22,7 +22,7 @@
import org.jvnet.hk2.annotations.Service;
import org.jvnet.hk2.config.api.ConfigurationUtilities;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
import java.beans.PropertyVetoException;
import java.beans.PropertyChangeEvent;
diff --git a/nucleus/hk2/hk2-config/src/main/java/org/jvnet/hk2/config/Dom.java b/nucleus/hk2/hk2-config/src/main/java/org/jvnet/hk2/config/Dom.java
index 2d5d05d..8b73aad 100644
--- a/nucleus/hk2/hk2-config/src/main/java/org/jvnet/hk2/config/Dom.java
+++ b/nucleus/hk2/hk2-config/src/main/java/org/jvnet/hk2/config/Dom.java
@@ -28,7 +28,7 @@
import org.jvnet.hk2.config.provider.internal.Creator;
import org.jvnet.hk2.config.provider.internal.CreatorImpl;
-import javax.inject.Singleton;
+import jakarta.inject.Singleton;
import jakarta.validation.constraints.NotNull;
import javax.xml.stream.Location;
import javax.xml.stream.XMLStreamException;
diff --git a/nucleus/hk2/hk2-config/src/main/java/org/jvnet/hk2/config/HK2DomConfigUtilities.java b/nucleus/hk2/hk2-config/src/main/java/org/jvnet/hk2/config/HK2DomConfigUtilities.java
index f36c941..acd13c8 100644
--- a/nucleus/hk2/hk2-config/src/main/java/org/jvnet/hk2/config/HK2DomConfigUtilities.java
+++ b/nucleus/hk2/hk2-config/src/main/java/org/jvnet/hk2/config/HK2DomConfigUtilities.java
@@ -16,7 +16,7 @@
package org.jvnet.hk2.config;
-import javax.inject.Singleton;
+import jakarta.inject.Singleton;
import org.glassfish.hk2.api.DynamicConfiguration;
import org.glassfish.hk2.api.DynamicConfigurationService;
diff --git a/nucleus/hk2/hk2-config/src/main/java/org/jvnet/hk2/config/InjectionTarget.java b/nucleus/hk2/hk2-config/src/main/java/org/jvnet/hk2/config/InjectionTarget.java
index ca3adc0..83d77ed 100644
--- a/nucleus/hk2/hk2-config/src/main/java/org/jvnet/hk2/config/InjectionTarget.java
+++ b/nucleus/hk2/hk2-config/src/main/java/org/jvnet/hk2/config/InjectionTarget.java
@@ -18,7 +18,7 @@
import org.jvnet.hk2.annotations.Contract;
-import javax.inject.Qualifier;
+import jakarta.inject.Qualifier;
import static java.lang.annotation.ElementType.TYPE;
import java.lang.annotation.Retention;
diff --git a/nucleus/hk2/hk2-config/src/main/java/org/jvnet/hk2/config/Transactions.java b/nucleus/hk2/hk2-config/src/main/java/org/jvnet/hk2/config/Transactions.java
index 712ff9b..ad258b0 100644
--- a/nucleus/hk2/hk2-config/src/main/java/org/jvnet/hk2/config/Transactions.java
+++ b/nucleus/hk2/hk2-config/src/main/java/org/jvnet/hk2/config/Transactions.java
@@ -26,9 +26,9 @@
import org.jvnet.hk2.annotations.Optional;
import org.jvnet.hk2.annotations.Service;
-import javax.inject.Inject;
-import javax.inject.Named;
-import javax.inject.Provider;
+import jakarta.inject.Inject;
+import jakarta.inject.Named;
+import jakarta.inject.Provider;
import org.glassfish.hk2.api.PostConstruct;
import org.glassfish.hk2.api.PreDestroy;
diff --git a/nucleus/hk2/hk2-config/src/main/java/org/jvnet/hk2/config/provider/internal/ConfigInstanceListener.java b/nucleus/hk2/hk2-config/src/main/java/org/jvnet/hk2/config/provider/internal/ConfigInstanceListener.java
index b899451..1b5901e 100644
--- a/nucleus/hk2/hk2-config/src/main/java/org/jvnet/hk2/config/provider/internal/ConfigInstanceListener.java
+++ b/nucleus/hk2/hk2-config/src/main/java/org/jvnet/hk2/config/provider/internal/ConfigInstanceListener.java
@@ -18,7 +18,7 @@
import java.util.Map;
-import javax.inject.Singleton;
+import jakarta.inject.Singleton;
import org.glassfish.hk2.api.Filter;
import org.glassfish.hk2.api.Injectee;
diff --git a/nucleus/hk2/hk2-config/src/test/java/org/jvnet/hk2/config/test/ConfigErrorService.java b/nucleus/hk2/hk2-config/src/test/java/org/jvnet/hk2/config/test/ConfigErrorService.java
index 3e79965..990a98b 100644
--- a/nucleus/hk2/hk2-config/src/test/java/org/jvnet/hk2/config/test/ConfigErrorService.java
+++ b/nucleus/hk2/hk2-config/src/test/java/org/jvnet/hk2/config/test/ConfigErrorService.java
@@ -16,7 +16,7 @@
package org.jvnet.hk2.config.test;
-import javax.inject.Singleton;
+import jakarta.inject.Singleton;
import org.glassfish.hk2.api.ErrorInformation;
import org.glassfish.hk2.api.ErrorService;
diff --git a/nucleus/hk2/hk2-config/src/test/java/org/jvnet/hk2/config/test/ConfigModule.java b/nucleus/hk2/hk2-config/src/test/java/org/jvnet/hk2/config/test/ConfigModule.java
index 5f7ff7d..98c5479 100644
--- a/nucleus/hk2/hk2-config/src/test/java/org/jvnet/hk2/config/test/ConfigModule.java
+++ b/nucleus/hk2/hk2-config/src/test/java/org/jvnet/hk2/config/test/ConfigModule.java
@@ -16,7 +16,7 @@
package org.jvnet.hk2.config.test;
-import javax.inject.Singleton;
+import jakarta.inject.Singleton;
import org.glassfish.hk2.api.ActiveDescriptor;
import org.glassfish.hk2.api.DynamicConfiguration;
diff --git a/nucleus/osgi-platforms/felix/src/main/resources/config/osgi.properties b/nucleus/osgi-platforms/felix/src/main/resources/config/osgi.properties
index 82fa93b..eb4ef0e 100755
--- a/nucleus/osgi-platforms/felix/src/main/resources/config/osgi.properties
+++ b/nucleus/osgi-platforms/felix/src/main/resources/config/osgi.properties
@@ -169,7 +169,7 @@
hk2.bundles=\
${com.sun.aas.installRootURI}modules/hk2-api.jar \
${com.sun.aas.installRootURI}modules/hk2-utils.jar \
- ${com.sun.aas.installRootURI}modules/jakarta.inject.jar \
+ ${com.sun.aas.installRootURI}modules/jakarta.inject-api.jar \
${com.sun.aas.installRootURI}modules/osgi-resource-locator.jar \
${com.sun.aas.installRootURI}modules/hk2-locator.jar \
${com.sun.aas.installRootURI}modules/hk2-runlevel.jar \
diff --git a/nucleus/osgi-platforms/osgi-cli-interactive/src/main/java/org/glassfish/osgi/cli/interactive/LocalOSGiShellCommand.java b/nucleus/osgi-platforms/osgi-cli-interactive/src/main/java/org/glassfish/osgi/cli/interactive/LocalOSGiShellCommand.java
index 25f6c2e..33e45a0 100644
--- a/nucleus/osgi-platforms/osgi-cli-interactive/src/main/java/org/glassfish/osgi/cli/interactive/LocalOSGiShellCommand.java
+++ b/nucleus/osgi-platforms/osgi-cli-interactive/src/main/java/org/glassfish/osgi/cli/interactive/LocalOSGiShellCommand.java
@@ -35,7 +35,7 @@
import java.util.LinkedHashSet;
import java.util.List;
import java.util.Set;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
import jline.console.ConsoleReader;
import jline.console.completer.Completer;
import jline.console.completer.NullCompleter;
diff --git a/nucleus/osgi-platforms/osgi-cli-remote/src/main/java/org/glassfish/osgi/cli/remote/OSGiShellCommand.java b/nucleus/osgi-platforms/osgi-cli-remote/src/main/java/org/glassfish/osgi/cli/remote/OSGiShellCommand.java
index 3d1c249..2ae1711 100644
--- a/nucleus/osgi-platforms/osgi-cli-remote/src/main/java/org/glassfish/osgi/cli/remote/OSGiShellCommand.java
+++ b/nucleus/osgi-platforms/osgi-cli-remote/src/main/java/org/glassfish/osgi/cli/remote/OSGiShellCommand.java
@@ -29,7 +29,7 @@
import java.util.concurrent.ConcurrentHashMap;
import java.util.logging.Level;
import java.util.logging.Logger;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
import org.apache.felix.service.command.CommandProcessor;
import org.apache.felix.service.command.CommandSession;
import org.apache.felix.service.command.Result;
diff --git a/nucleus/osgi-platforms/osgi-container/src/main/java/org/glassfish/extras/osgicontainer/OSGiArchiveDetector.java b/nucleus/osgi-platforms/osgi-container/src/main/java/org/glassfish/extras/osgicontainer/OSGiArchiveDetector.java
index cc61c76..7c3b698 100644
--- a/nucleus/osgi-platforms/osgi-container/src/main/java/org/glassfish/extras/osgicontainer/OSGiArchiveDetector.java
+++ b/nucleus/osgi-platforms/osgi-container/src/main/java/org/glassfish/extras/osgicontainer/OSGiArchiveDetector.java
@@ -23,9 +23,9 @@
import org.glassfish.hk2.api.ServiceLocator;
import org.jvnet.hk2.annotations.Service;
-import javax.inject.Singleton;
+import jakarta.inject.Singleton;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
import java.io.IOException;
import java.util.logging.Logger;
diff --git a/nucleus/osgi-platforms/osgi-container/src/main/java/org/glassfish/extras/osgicontainer/OSGiArchiveHandler.java b/nucleus/osgi-platforms/osgi-container/src/main/java/org/glassfish/extras/osgicontainer/OSGiArchiveHandler.java
index 601c8e9..43e120d 100644
--- a/nucleus/osgi-platforms/osgi-container/src/main/java/org/glassfish/extras/osgicontainer/OSGiArchiveHandler.java
+++ b/nucleus/osgi-platforms/osgi-container/src/main/java/org/glassfish/extras/osgicontainer/OSGiArchiveHandler.java
@@ -25,8 +25,8 @@
import org.glassfish.internal.deployment.GenericHandler;
import org.jvnet.hk2.annotations.Service;
-import javax.inject.Inject;
-import javax.inject.Singleton;
+import jakarta.inject.Inject;
+import jakarta.inject.Singleton;
import java.io.*;
import java.net.*;
import java.util.Enumeration;
diff --git a/nucleus/osgi-platforms/osgi-container/src/main/java/org/glassfish/extras/osgicontainer/OSGiArchiveType.java b/nucleus/osgi-platforms/osgi-container/src/main/java/org/glassfish/extras/osgicontainer/OSGiArchiveType.java
index c86e0f2..23cc053 100644
--- a/nucleus/osgi-platforms/osgi-container/src/main/java/org/glassfish/extras/osgicontainer/OSGiArchiveType.java
+++ b/nucleus/osgi-platforms/osgi-container/src/main/java/org/glassfish/extras/osgicontainer/OSGiArchiveType.java
@@ -26,7 +26,7 @@
* @author sanjeeb.sahoo@oracle.com
*/
@Service(name = OSGiArchiveType.ARCHIVE_TYPE)
-@javax.inject.Singleton
+@jakarta.inject.Singleton
public class OSGiArchiveType extends ArchiveType {
/**
* String value of this module type. This is what is accepted in --type argument of deploy command.
diff --git a/nucleus/osgi-platforms/osgi-container/src/main/java/org/glassfish/extras/osgicontainer/OSGiContainer.java b/nucleus/osgi-platforms/osgi-container/src/main/java/org/glassfish/extras/osgicontainer/OSGiContainer.java
index c13d728..245ceb1 100644
--- a/nucleus/osgi-platforms/osgi-container/src/main/java/org/glassfish/extras/osgicontainer/OSGiContainer.java
+++ b/nucleus/osgi-platforms/osgi-container/src/main/java/org/glassfish/extras/osgicontainer/OSGiContainer.java
@@ -20,7 +20,7 @@
import org.glassfish.api.deployment.Deployer;
import org.jvnet.hk2.annotations.Service;
-import javax.inject.Singleton;
+import jakarta.inject.Singleton;
/**
* OSGi container, will just be used to manage OSGi bundles through deployment
diff --git a/nucleus/osgi-platforms/osgi-container/src/main/java/org/glassfish/extras/osgicontainer/OSGiSniffer.java b/nucleus/osgi-platforms/osgi-container/src/main/java/org/glassfish/extras/osgicontainer/OSGiSniffer.java
index c6f4c1a..4694262 100644
--- a/nucleus/osgi-platforms/osgi-container/src/main/java/org/glassfish/extras/osgicontainer/OSGiSniffer.java
+++ b/nucleus/osgi-platforms/osgi-container/src/main/java/org/glassfish/extras/osgicontainer/OSGiSniffer.java
@@ -22,7 +22,7 @@
import org.glassfish.internal.deployment.GenericSniffer;
import org.jvnet.hk2.annotations.Service;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
/**
* Sniffer for OSGi bundles
diff --git a/nucleus/parent/pom.xml b/nucleus/parent/pom.xml
index 97c15ff..5dc69f7 100644
--- a/nucleus/parent/pom.xml
+++ b/nucleus/parent/pom.xml
@@ -93,8 +93,9 @@
<javassist.version>3.26.0-GA</javassist.version>
<jakarta.el.version>4.0.0-RC1</jakarta.el.version>
<jakarta.el-api.version>3.0.2</jakarta.el-api.version>
- <hk2.version>2.6.1</hk2.version>
- <hk2.plugin.version>2.5.0</hk2.plugin.version>
+ <jakarta.inject-api.version>2.0.0-RC3</jakarta.inject-api.version>
+ <hk2.version>3.0.0-M1</hk2.version>
+ <hk2.plugin.version>3.0.0-M1</hk2.plugin.version>
<jboss.logging.version>3.4.1.Final</jboss.logging.version>
<fasterxml.classmate.version>1.5.1</fasterxml.classmate.version>
<jsch.version>0.1.56</jsch.version>
@@ -608,6 +609,11 @@
<dependencyManagement>
<dependencies>
<dependency>
+ <groupId>jakarta.inject</groupId>
+ <artifactId>jakarta.inject-api</artifactId>
+ <version>${jakarta.inject-api.version}</version>
+ </dependency>
+ <dependency>
<groupId>org.glassfish.hk2</groupId>
<artifactId>hk2-bom</artifactId>
<version>${hk2.version}</version>
diff --git a/nucleus/resources/src/main/java/org/glassfish/resourcebase/resources/admin/cli/ResourceUtil.java b/nucleus/resources/src/main/java/org/glassfish/resourcebase/resources/admin/cli/ResourceUtil.java
index 5c4e697..694b92e 100644
--- a/nucleus/resources/src/main/java/org/glassfish/resourcebase/resources/admin/cli/ResourceUtil.java
+++ b/nucleus/resources/src/main/java/org/glassfish/resourcebase/resources/admin/cli/ResourceUtil.java
@@ -22,8 +22,8 @@
import org.jvnet.hk2.annotations.Service;
import org.jvnet.hk2.config.TransactionFailure;
-import javax.inject.Inject;
-import javax.inject.Provider;
+import jakarta.inject.Inject;
+import jakarta.inject.Provider;
import java.util.HashSet;
import java.util.List;
import java.util.Set;
diff --git a/nucleus/resources/src/main/java/org/glassfish/resourcebase/resources/api/DefaultResourceDeployerValidator.java b/nucleus/resources/src/main/java/org/glassfish/resourcebase/resources/api/DefaultResourceDeployerValidator.java
index 5743a37..8a8c2fe 100644
--- a/nucleus/resources/src/main/java/org/glassfish/resourcebase/resources/api/DefaultResourceDeployerValidator.java
+++ b/nucleus/resources/src/main/java/org/glassfish/resourcebase/resources/api/DefaultResourceDeployerValidator.java
@@ -19,7 +19,7 @@
import com.sun.enterprise.config.serverbeans.Resource;
import org.jvnet.hk2.annotations.Service;
-import javax.inject.Singleton;
+import jakarta.inject.Singleton;
@Service
@Singleton
diff --git a/nucleus/resources/src/main/java/org/glassfish/resourcebase/resources/api/ResourceDeployerInfo.java b/nucleus/resources/src/main/java/org/glassfish/resourcebase/resources/api/ResourceDeployerInfo.java
index 5dd2433..2c8814a 100644
--- a/nucleus/resources/src/main/java/org/glassfish/resourcebase/resources/api/ResourceDeployerInfo.java
+++ b/nucleus/resources/src/main/java/org/glassfish/resourcebase/resources/api/ResourceDeployerInfo.java
@@ -18,7 +18,7 @@
import org.glassfish.hk2.api.Metadata;
-import javax.inject.Qualifier;
+import jakarta.inject.Qualifier;
import java.lang.annotation.ElementType;
import java.lang.annotation.Retention;
import java.lang.annotation.Target;
diff --git a/nucleus/resources/src/main/java/org/glassfish/resourcebase/resources/api/ResourceProxy.java b/nucleus/resources/src/main/java/org/glassfish/resourcebase/resources/api/ResourceProxy.java
index 718fb7a..8d20793 100644
--- a/nucleus/resources/src/main/java/org/glassfish/resourcebase/resources/api/ResourceProxy.java
+++ b/nucleus/resources/src/main/java/org/glassfish/resourcebase/resources/api/ResourceProxy.java
@@ -21,8 +21,8 @@
import org.glassfish.hk2.api.PerLookup;
import org.jvnet.hk2.annotations.Service;
-import javax.inject.Inject;
-import javax.inject.Provider;
+import jakarta.inject.Inject;
+import jakarta.inject.Provider;
import javax.naming.Context;
import javax.naming.NamingException;
diff --git a/nucleus/resources/src/main/java/org/glassfish/resourcebase/resources/api/ResourcesBinder.java b/nucleus/resources/src/main/java/org/glassfish/resourcebase/resources/api/ResourcesBinder.java
index 9ff250c..b4246e1 100644
--- a/nucleus/resources/src/main/java/org/glassfish/resourcebase/resources/api/ResourcesBinder.java
+++ b/nucleus/resources/src/main/java/org/glassfish/resourcebase/resources/api/ResourcesBinder.java
@@ -20,8 +20,8 @@
import org.glassfish.api.naming.GlassfishNamingManager;
import org.jvnet.hk2.annotations.Service;
-import javax.inject.Inject;
-import javax.inject.Provider;
+import jakarta.inject.Inject;
+import jakarta.inject.Provider;
import javax.naming.NamingException;
import java.util.logging.Level;
import java.util.logging.Logger;
diff --git a/nucleus/resources/src/main/java/org/glassfish/resourcebase/resources/listener/ResourceManager.java b/nucleus/resources/src/main/java/org/glassfish/resourcebase/resources/listener/ResourceManager.java
index c763b4b..e00c052 100644
--- a/nucleus/resources/src/main/java/org/glassfish/resourcebase/resources/listener/ResourceManager.java
+++ b/nucleus/resources/src/main/java/org/glassfish/resourcebase/resources/listener/ResourceManager.java
@@ -36,8 +36,8 @@
import org.jvnet.hk2.config.*;
import org.jvnet.hk2.config.types.Property;
-import javax.inject.Inject;
-import javax.inject.Provider;
+import jakarta.inject.Inject;
+import jakarta.inject.Provider;
import java.beans.PropertyChangeEvent;
import java.util.ArrayList;
import java.util.Collection;
diff --git a/nucleus/resources/src/main/java/org/glassfish/resourcebase/resources/naming/ResourceNamingService.java b/nucleus/resources/src/main/java/org/glassfish/resourcebase/resources/naming/ResourceNamingService.java
index 6deb89a..2c5e5d6 100644
--- a/nucleus/resources/src/main/java/org/glassfish/resourcebase/resources/naming/ResourceNamingService.java
+++ b/nucleus/resources/src/main/java/org/glassfish/resourcebase/resources/naming/ResourceNamingService.java
@@ -25,7 +25,7 @@
import org.glassfish.resourcebase.resources.api.ResourceInfo;
import org.jvnet.hk2.annotations.Service;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
import javax.naming.InitialContext;
import javax.naming.NameNotFoundException;
import javax.naming.NamingException;
diff --git a/nucleus/resources/src/main/java/org/glassfish/resourcebase/resources/util/BindableResourcesHelper.java b/nucleus/resources/src/main/java/org/glassfish/resourcebase/resources/util/BindableResourcesHelper.java
index eae91c5..aa8ca73 100644
--- a/nucleus/resources/src/main/java/org/glassfish/resourcebase/resources/util/BindableResourcesHelper.java
+++ b/nucleus/resources/src/main/java/org/glassfish/resourcebase/resources/util/BindableResourcesHelper.java
@@ -23,7 +23,7 @@
import org.glassfish.resourcebase.resources.api.ResourceStatus;
import org.jvnet.hk2.annotations.Service;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
import java.lang.reflect.Proxy;
import java.util.logging.Level;
import java.util.logging.Logger;
diff --git a/nucleus/resources/src/main/java/org/glassfish/resourcebase/resources/util/ResourceManagerFactory.java b/nucleus/resources/src/main/java/org/glassfish/resourcebase/resources/util/ResourceManagerFactory.java
index bfd0a8f..49198c0 100644
--- a/nucleus/resources/src/main/java/org/glassfish/resourcebase/resources/util/ResourceManagerFactory.java
+++ b/nucleus/resources/src/main/java/org/glassfish/resourcebase/resources/util/ResourceManagerFactory.java
@@ -23,8 +23,8 @@
import org.glassfish.resourcebase.resources.api.ResourceDeployerInfo;
import org.jvnet.hk2.annotations.Service;
-import javax.inject.Inject;
-import javax.inject.Singleton;
+import jakarta.inject.Inject;
+import jakarta.inject.Singleton;
import java.lang.reflect.Proxy;
import java.util.List;
diff --git a/nucleus/security/core/src/main/java/com/sun/enterprise/security/AppCNonceCacheMap.java b/nucleus/security/core/src/main/java/com/sun/enterprise/security/AppCNonceCacheMap.java
index bff3b3f..7b6d120 100644
--- a/nucleus/security/core/src/main/java/com/sun/enterprise/security/AppCNonceCacheMap.java
+++ b/nucleus/security/core/src/main/java/com/sun/enterprise/security/AppCNonceCacheMap.java
@@ -21,7 +21,7 @@
import java.util.Map;
import org.jvnet.hk2.annotations.Service;
-import javax.inject.Singleton;
+import jakarta.inject.Singleton;
diff --git a/nucleus/security/core/src/main/java/com/sun/enterprise/security/PolicyLoader.java b/nucleus/security/core/src/main/java/com/sun/enterprise/security/PolicyLoader.java
index 0c0ccd0..ef7e96b 100644
--- a/nucleus/security/core/src/main/java/com/sun/enterprise/security/PolicyLoader.java
+++ b/nucleus/security/core/src/main/java/com/sun/enterprise/security/PolicyLoader.java
@@ -28,12 +28,12 @@
import com.sun.enterprise.util.i18n.StringManager;
import java.util.List;
import org.glassfish.api.admin.ServerEnvironment;
-import javax.inject.Inject;
-import javax.inject.Named;
+import jakarta.inject.Inject;
+import jakarta.inject.Named;
import org.jvnet.hk2.annotations.Service;
-import javax.inject.Singleton;
+import jakarta.inject.Singleton;
/**
* Loads the Default Policy File into the system.
diff --git a/nucleus/security/core/src/main/java/com/sun/enterprise/security/SecurityConfigListener.java b/nucleus/security/core/src/main/java/com/sun/enterprise/security/SecurityConfigListener.java
index 036fb60..874e09b 100644
--- a/nucleus/security/core/src/main/java/com/sun/enterprise/security/SecurityConfigListener.java
+++ b/nucleus/security/core/src/main/java/com/sun/enterprise/security/SecurityConfigListener.java
@@ -20,9 +20,9 @@
import org.jvnet.hk2.config.*;
import org.jvnet.hk2.config.types.Property;
-import javax.inject.Singleton;
+import jakarta.inject.Singleton;
import org.jvnet.hk2.annotations.Service;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
import com.sun.enterprise.config.serverbeans.SecurityService;
import com.sun.enterprise.config.serverbeans.AuthRealm;
@@ -38,7 +38,7 @@
import java.util.List;
import java.util.Properties;
import java.util.logging.Logger;
-import javax.inject.Named;
+import jakarta.inject.Named;
import javax.security.auth.login.Configuration;
import org.glassfish.api.admin.ServerEnvironment;
import org.glassfish.hk2.api.PostConstruct;
diff --git a/nucleus/security/core/src/main/java/com/sun/enterprise/security/SecurityLifecycle.java b/nucleus/security/core/src/main/java/com/sun/enterprise/security/SecurityLifecycle.java
index 66683f6..115d230 100644
--- a/nucleus/security/core/src/main/java/com/sun/enterprise/security/SecurityLifecycle.java
+++ b/nucleus/security/core/src/main/java/com/sun/enterprise/security/SecurityLifecycle.java
@@ -33,10 +33,10 @@
import org.glassfish.api.event.EventListener;
import org.glassfish.api.event.EventTypes;
import org.glassfish.api.event.Events;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
import org.jvnet.hk2.annotations.Service;
-import javax.inject.Singleton;
+import jakarta.inject.Singleton;
import org.jvnet.hk2.config.ConfigListener;
/**
diff --git a/nucleus/security/core/src/main/java/com/sun/enterprise/security/SecurityServicesUtil.java b/nucleus/security/core/src/main/java/com/sun/enterprise/security/SecurityServicesUtil.java
index de774c5..3037b36 100644
--- a/nucleus/security/core/src/main/java/com/sun/enterprise/security/SecurityServicesUtil.java
+++ b/nucleus/security/core/src/main/java/com/sun/enterprise/security/SecurityServicesUtil.java
@@ -27,8 +27,8 @@
import javax.security.auth.callback.CallbackHandler;
import org.jvnet.hk2.annotations.Service;
-import javax.inject.Inject;
-import javax.inject.Singleton;
+import jakarta.inject.Inject;
+import jakarta.inject.Singleton;
import org.glassfish.api.admin.ProcessEnvironment;
import org.glassfish.api.admin.ProcessEnvironment.ProcessType;
diff --git a/nucleus/security/core/src/main/java/com/sun/enterprise/security/SecurityUpgradeService.java b/nucleus/security/core/src/main/java/com/sun/enterprise/security/SecurityUpgradeService.java
index 9f3fd92..b684bde 100644
--- a/nucleus/security/core/src/main/java/com/sun/enterprise/security/SecurityUpgradeService.java
+++ b/nucleus/security/core/src/main/java/com/sun/enterprise/security/SecurityUpgradeService.java
@@ -24,7 +24,7 @@
import java.util.logging.Logger;
import org.glassfish.api.admin.ServerEnvironment;
import org.glassfish.api.admin.config.ConfigurationUpgrade;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
import org.jvnet.hk2.annotations.Service;
import org.glassfish.hk2.api.PostConstruct;
import org.jvnet.hk2.config.ConfigSupport;
diff --git a/nucleus/security/core/src/main/java/com/sun/enterprise/security/admin/cli/EnableSecureAdminCommand.java b/nucleus/security/core/src/main/java/com/sun/enterprise/security/admin/cli/EnableSecureAdminCommand.java
index c663af5..6f4da89 100644
--- a/nucleus/security/core/src/main/java/com/sun/enterprise/security/admin/cli/EnableSecureAdminCommand.java
+++ b/nucleus/security/core/src/main/java/com/sun/enterprise/security/admin/cli/EnableSecureAdminCommand.java
@@ -37,7 +37,7 @@
import org.glassfish.api.admin.RestEndpoint;
import org.glassfish.api.admin.RestEndpoints;
import org.glassfish.api.admin.RuntimeType;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
import org.glassfish.api.admin.AccessRequired;
import org.jvnet.hk2.annotations.Service;
diff --git a/nucleus/security/core/src/main/java/com/sun/enterprise/security/admin/cli/SecureAdminCommand.java b/nucleus/security/core/src/main/java/com/sun/enterprise/security/admin/cli/SecureAdminCommand.java
index c8efef7..77f2ca1 100644
--- a/nucleus/security/core/src/main/java/com/sun/enterprise/security/admin/cli/SecureAdminCommand.java
+++ b/nucleus/security/core/src/main/java/com/sun/enterprise/security/admin/cli/SecureAdminCommand.java
@@ -44,7 +44,7 @@
import org.glassfish.api.ActionReport;
import org.glassfish.api.admin.AdminCommand;
import org.glassfish.api.admin.AdminCommandContext;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
import org.jvnet.hk2.config.ConfigSupport;
import org.jvnet.hk2.config.SingleConfigCode;
import org.jvnet.hk2.config.Transaction;
diff --git a/nucleus/security/core/src/main/java/com/sun/enterprise/security/admin/cli/SecureAdminConfigMonitor.java b/nucleus/security/core/src/main/java/com/sun/enterprise/security/admin/cli/SecureAdminConfigMonitor.java
index 0766b3e..4bdc6a2 100644
--- a/nucleus/security/core/src/main/java/com/sun/enterprise/security/admin/cli/SecureAdminConfigMonitor.java
+++ b/nucleus/security/core/src/main/java/com/sun/enterprise/security/admin/cli/SecureAdminConfigMonitor.java
@@ -24,7 +24,7 @@
import org.glassfish.hk2.runlevel.RunLevel;
import org.glassfish.internal.api.PostStartupRunLevel;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
import org.jvnet.hk2.annotations.Service;
import org.jvnet.hk2.config.Changed;
diff --git a/nucleus/security/core/src/main/java/com/sun/enterprise/security/admin/cli/SecureAdminConfigUpgrade.java b/nucleus/security/core/src/main/java/com/sun/enterprise/security/admin/cli/SecureAdminConfigUpgrade.java
index bea48d7..20f42ac 100644
--- a/nucleus/security/core/src/main/java/com/sun/enterprise/security/admin/cli/SecureAdminConfigUpgrade.java
+++ b/nucleus/security/core/src/main/java/com/sun/enterprise/security/admin/cli/SecureAdminConfigUpgrade.java
@@ -52,7 +52,7 @@
import org.glassfish.api.admin.ServerEnvironment;
import org.glassfish.api.admin.config.ConfigurationUpgrade;
import org.glassfish.config.support.GrizzlyConfigSchemaMigrator;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
import org.jvnet.hk2.annotations.Service;
import org.glassfish.hk2.api.PostConstruct;
import org.glassfish.internal.api.Globals;
diff --git a/nucleus/security/core/src/main/java/com/sun/enterprise/security/admin/cli/SecureAdminHelperImpl.java b/nucleus/security/core/src/main/java/com/sun/enterprise/security/admin/cli/SecureAdminHelperImpl.java
index 637f619..feac0ce 100644
--- a/nucleus/security/core/src/main/java/com/sun/enterprise/security/admin/cli/SecureAdminHelperImpl.java
+++ b/nucleus/security/core/src/main/java/com/sun/enterprise/security/admin/cli/SecureAdminHelperImpl.java
@@ -35,8 +35,8 @@
import java.security.cert.X509Certificate;
import java.util.Enumeration;
import org.glassfish.api.admin.ServerEnvironment;
-import javax.inject.Inject;
-import javax.inject.Named;
+import jakarta.inject.Inject;
+import jakarta.inject.Named;
import org.jvnet.hk2.annotations.Service;
diff --git a/nucleus/security/core/src/main/java/com/sun/enterprise/security/admin/cli/SecureAdminUpgradeHelper.java b/nucleus/security/core/src/main/java/com/sun/enterprise/security/admin/cli/SecureAdminUpgradeHelper.java
index cddd9b5..ac7d406 100644
--- a/nucleus/security/core/src/main/java/com/sun/enterprise/security/admin/cli/SecureAdminUpgradeHelper.java
+++ b/nucleus/security/core/src/main/java/com/sun/enterprise/security/admin/cli/SecureAdminUpgradeHelper.java
@@ -33,7 +33,7 @@
import java.util.UUID;
import org.glassfish.grizzly.config.dom.NetworkConfig;
import org.glassfish.grizzly.config.dom.Protocol;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
import org.jvnet.hk2.annotations.Service;
import org.glassfish.hk2.api.PerLookup;
diff --git a/nucleus/security/core/src/main/java/com/sun/enterprise/security/audit/BaseAuditManager.java b/nucleus/security/core/src/main/java/com/sun/enterprise/security/audit/BaseAuditManager.java
index 4beac3d..53a8ba1 100644
--- a/nucleus/security/core/src/main/java/com/sun/enterprise/security/audit/BaseAuditManager.java
+++ b/nucleus/security/core/src/main/java/com/sun/enterprise/security/audit/BaseAuditManager.java
@@ -46,10 +46,10 @@
import com.sun.enterprise.util.LocalStringManagerImpl;
import java.util.List;
import org.glassfish.api.admin.ServerEnvironment;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
import org.jvnet.hk2.annotations.Service;
-import javax.inject.Singleton;
+import jakarta.inject.Singleton;
/**
* Basic implementation of audit manager.
diff --git a/nucleus/security/core/src/main/java/com/sun/enterprise/security/auth/realm/RealmsManager.java b/nucleus/security/core/src/main/java/com/sun/enterprise/security/auth/realm/RealmsManager.java
index 4fef3a4..959004e 100644
--- a/nucleus/security/core/src/main/java/com/sun/enterprise/security/auth/realm/RealmsManager.java
+++ b/nucleus/security/core/src/main/java/com/sun/enterprise/security/auth/realm/RealmsManager.java
@@ -27,9 +27,9 @@
import java.util.logging.Level;
import java.util.logging.Logger;
-import javax.inject.Inject;
-import javax.inject.Named;
-import javax.inject.Singleton;
+import jakarta.inject.Inject;
+import jakarta.inject.Named;
+import jakarta.inject.Singleton;
import org.glassfish.api.admin.ServerEnvironment;
import org.glassfish.hk2.api.ActiveDescriptor;
diff --git a/nucleus/security/core/src/main/java/com/sun/enterprise/security/cli/ChangeAdminPassword.java b/nucleus/security/core/src/main/java/com/sun/enterprise/security/cli/ChangeAdminPassword.java
index 670cac3..b139c51 100644
--- a/nucleus/security/core/src/main/java/com/sun/enterprise/security/cli/ChangeAdminPassword.java
+++ b/nucleus/security/core/src/main/java/com/sun/enterprise/security/cli/ChangeAdminPassword.java
@@ -27,7 +27,7 @@
import org.glassfish.api.ActionReport;
import org.jvnet.hk2.annotations.Service;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
import org.glassfish.hk2.api.PerLookup;
import com.sun.enterprise.config.serverbeans.Config;
import com.sun.enterprise.util.LocalStringManagerImpl;
diff --git a/nucleus/security/core/src/main/java/com/sun/enterprise/security/cli/CreateAuditModule.java b/nucleus/security/core/src/main/java/com/sun/enterprise/security/cli/CreateAuditModule.java
index 0dd1d96..79bedf7 100644
--- a/nucleus/security/core/src/main/java/com/sun/enterprise/security/cli/CreateAuditModule.java
+++ b/nucleus/security/core/src/main/java/com/sun/enterprise/security/cli/CreateAuditModule.java
@@ -26,8 +26,8 @@
import org.glassfish.api.ActionReport;
import org.jvnet.hk2.annotations.Service;
-import javax.inject.Inject;
-import javax.inject.Named;
+import jakarta.inject.Inject;
+import jakarta.inject.Named;
import org.glassfish.hk2.api.PerLookup;
import org.jvnet.hk2.config.ConfigSupport;
diff --git a/nucleus/security/core/src/main/java/com/sun/enterprise/security/cli/CreateAuthRealm.java b/nucleus/security/core/src/main/java/com/sun/enterprise/security/cli/CreateAuthRealm.java
index 367577c..2e7a061 100644
--- a/nucleus/security/core/src/main/java/com/sun/enterprise/security/cli/CreateAuthRealm.java
+++ b/nucleus/security/core/src/main/java/com/sun/enterprise/security/cli/CreateAuthRealm.java
@@ -26,8 +26,8 @@
import org.glassfish.api.ActionReport;
import org.jvnet.hk2.annotations.Service;
-import javax.inject.Inject;
-import javax.inject.Named;
+import jakarta.inject.Inject;
+import jakarta.inject.Named;
import org.glassfish.hk2.api.PerLookup;
import org.jvnet.hk2.config.ConfigSupport;
diff --git a/nucleus/security/core/src/main/java/com/sun/enterprise/security/cli/CreateFileUser.java b/nucleus/security/core/src/main/java/com/sun/enterprise/security/cli/CreateFileUser.java
index 6fcb5bd..9424f16 100644
--- a/nucleus/security/core/src/main/java/com/sun/enterprise/security/cli/CreateFileUser.java
+++ b/nucleus/security/core/src/main/java/com/sun/enterprise/security/cli/CreateFileUser.java
@@ -26,8 +26,8 @@
import org.glassfish.api.ActionReport;
import org.jvnet.hk2.annotations.Service;
-import javax.inject.Inject;
-import javax.inject.Named;
+import jakarta.inject.Inject;
+import jakarta.inject.Named;
import org.glassfish.hk2.api.PerLookup;
import org.jvnet.hk2.config.types.Property;
diff --git a/nucleus/security/core/src/main/java/com/sun/enterprise/security/cli/CreateJACCProvider.java b/nucleus/security/core/src/main/java/com/sun/enterprise/security/cli/CreateJACCProvider.java
index c90d6f3..427a331 100644
--- a/nucleus/security/core/src/main/java/com/sun/enterprise/security/cli/CreateJACCProvider.java
+++ b/nucleus/security/core/src/main/java/com/sun/enterprise/security/cli/CreateJACCProvider.java
@@ -34,8 +34,8 @@
import org.glassfish.api.admin.ServerEnvironment;
import org.glassfish.config.support.CommandTarget;
import org.glassfish.config.support.TargetType;
-import javax.inject.Inject;
-import javax.inject.Named;
+import jakarta.inject.Inject;
+import jakarta.inject.Named;
import org.glassfish.api.admin.AccessRequired;
import org.glassfish.api.admin.AdminCommandSecurity;
diff --git a/nucleus/security/core/src/main/java/com/sun/enterprise/security/cli/CreateMessageSecurityProvider.java b/nucleus/security/core/src/main/java/com/sun/enterprise/security/cli/CreateMessageSecurityProvider.java
index 9b5cb91..2f4c4ba 100644
--- a/nucleus/security/core/src/main/java/com/sun/enterprise/security/cli/CreateMessageSecurityProvider.java
+++ b/nucleus/security/core/src/main/java/com/sun/enterprise/security/cli/CreateMessageSecurityProvider.java
@@ -28,8 +28,8 @@
import org.glassfish.api.ActionReport;
import org.jvnet.hk2.annotations.Service;
-import javax.inject.Inject;
-import javax.inject.Named;
+import jakarta.inject.Inject;
+import jakarta.inject.Named;
import org.glassfish.hk2.api.PerLookup;
import org.jvnet.hk2.config.ConfigSupport;
diff --git a/nucleus/security/core/src/main/java/com/sun/enterprise/security/cli/CreatePasswordAlias.java b/nucleus/security/core/src/main/java/com/sun/enterprise/security/cli/CreatePasswordAlias.java
index 77ea5db..108da09 100644
--- a/nucleus/security/core/src/main/java/com/sun/enterprise/security/cli/CreatePasswordAlias.java
+++ b/nucleus/security/core/src/main/java/com/sun/enterprise/security/cli/CreatePasswordAlias.java
@@ -30,7 +30,7 @@
import org.glassfish.api.admin.*;
import org.glassfish.config.support.CommandTarget;
import org.glassfish.config.support.TargetType;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
/**
* Create Password Alias Command
diff --git a/nucleus/security/core/src/main/java/com/sun/enterprise/security/cli/DeleteAuditModule.java b/nucleus/security/core/src/main/java/com/sun/enterprise/security/cli/DeleteAuditModule.java
index a9aa9f7..4d64fe3 100644
--- a/nucleus/security/core/src/main/java/com/sun/enterprise/security/cli/DeleteAuditModule.java
+++ b/nucleus/security/core/src/main/java/com/sun/enterprise/security/cli/DeleteAuditModule.java
@@ -27,8 +27,8 @@
import org.glassfish.api.ActionReport;
import org.jvnet.hk2.annotations.Service;
-import javax.inject.Inject;
-import javax.inject.Named;
+import jakarta.inject.Inject;
+import jakarta.inject.Named;
import org.glassfish.hk2.api.PerLookup;
import org.jvnet.hk2.config.ConfigSupport;
diff --git a/nucleus/security/core/src/main/java/com/sun/enterprise/security/cli/DeleteAuthRealm.java b/nucleus/security/core/src/main/java/com/sun/enterprise/security/cli/DeleteAuthRealm.java
index d0a0279..14cae78 100644
--- a/nucleus/security/core/src/main/java/com/sun/enterprise/security/cli/DeleteAuthRealm.java
+++ b/nucleus/security/core/src/main/java/com/sun/enterprise/security/cli/DeleteAuthRealm.java
@@ -26,8 +26,8 @@
import org.glassfish.api.ActionReport;
import org.jvnet.hk2.annotations.Service;
-import javax.inject.Inject;
-import javax.inject.Named;
+import jakarta.inject.Inject;
+import jakarta.inject.Named;
import org.glassfish.hk2.api.PerLookup;
import org.jvnet.hk2.config.ConfigSupport;
diff --git a/nucleus/security/core/src/main/java/com/sun/enterprise/security/cli/DeleteFileUser.java b/nucleus/security/core/src/main/java/com/sun/enterprise/security/cli/DeleteFileUser.java
index 2bec084..7827ebb 100644
--- a/nucleus/security/core/src/main/java/com/sun/enterprise/security/cli/DeleteFileUser.java
+++ b/nucleus/security/core/src/main/java/com/sun/enterprise/security/cli/DeleteFileUser.java
@@ -24,8 +24,8 @@
import org.glassfish.api.ActionReport;
import org.jvnet.hk2.annotations.Service;
-import javax.inject.Inject;
-import javax.inject.Named;
+import jakarta.inject.Inject;
+import jakarta.inject.Named;
import org.glassfish.hk2.api.PerLookup;
import com.sun.enterprise.config.serverbeans.Config;
diff --git a/nucleus/security/core/src/main/java/com/sun/enterprise/security/cli/DeleteJaccProvider.java b/nucleus/security/core/src/main/java/com/sun/enterprise/security/cli/DeleteJaccProvider.java
index 54fc455..7823d67 100644
--- a/nucleus/security/core/src/main/java/com/sun/enterprise/security/cli/DeleteJaccProvider.java
+++ b/nucleus/security/core/src/main/java/com/sun/enterprise/security/cli/DeleteJaccProvider.java
@@ -34,8 +34,8 @@
import org.glassfish.api.admin.ServerEnvironment;
import org.glassfish.config.support.CommandTarget;
import org.glassfish.config.support.TargetType;
-import javax.inject.Inject;
-import javax.inject.Named;
+import jakarta.inject.Inject;
+import jakarta.inject.Named;
import org.glassfish.api.admin.AccessRequired;
import org.glassfish.api.admin.AdminCommandSecurity;
diff --git a/nucleus/security/core/src/main/java/com/sun/enterprise/security/cli/DeleteMessageSecurityProvider.java b/nucleus/security/core/src/main/java/com/sun/enterprise/security/cli/DeleteMessageSecurityProvider.java
index ac20b97..cd526dc 100644
--- a/nucleus/security/core/src/main/java/com/sun/enterprise/security/cli/DeleteMessageSecurityProvider.java
+++ b/nucleus/security/core/src/main/java/com/sun/enterprise/security/cli/DeleteMessageSecurityProvider.java
@@ -25,8 +25,8 @@
import org.glassfish.api.ActionReport;
import org.jvnet.hk2.annotations.Service;
-import javax.inject.Inject;
-import javax.inject.Named;
+import jakarta.inject.Inject;
+import jakarta.inject.Named;
import org.glassfish.hk2.api.PerLookup;
import org.jvnet.hk2.config.ConfigSupport;
diff --git a/nucleus/security/core/src/main/java/com/sun/enterprise/security/cli/DeletePasswordAlias.java b/nucleus/security/core/src/main/java/com/sun/enterprise/security/cli/DeletePasswordAlias.java
index bdd02bd..9d54095 100644
--- a/nucleus/security/core/src/main/java/com/sun/enterprise/security/cli/DeletePasswordAlias.java
+++ b/nucleus/security/core/src/main/java/com/sun/enterprise/security/cli/DeletePasswordAlias.java
@@ -25,7 +25,7 @@
import org.glassfish.api.admin.*;
import org.glassfish.config.support.CommandTarget;
import org.glassfish.config.support.TargetType;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
import org.jvnet.hk2.annotations.Service;
diff --git a/nucleus/security/core/src/main/java/com/sun/enterprise/security/cli/ListAuditModule.java b/nucleus/security/core/src/main/java/com/sun/enterprise/security/cli/ListAuditModule.java
index 897b840..ebfc8ec 100644
--- a/nucleus/security/core/src/main/java/com/sun/enterprise/security/cli/ListAuditModule.java
+++ b/nucleus/security/core/src/main/java/com/sun/enterprise/security/cli/ListAuditModule.java
@@ -25,8 +25,8 @@
import org.glassfish.api.ActionReport;
import org.jvnet.hk2.annotations.Service;
-import javax.inject.Inject;
-import javax.inject.Named;
+import jakarta.inject.Inject;
+import jakarta.inject.Named;
import org.glassfish.hk2.api.PerLookup;
import com.sun.enterprise.config.serverbeans.Config;
diff --git a/nucleus/security/core/src/main/java/com/sun/enterprise/security/cli/ListAuthRealm.java b/nucleus/security/core/src/main/java/com/sun/enterprise/security/cli/ListAuthRealm.java
index 56e834b..29a57fb 100644
--- a/nucleus/security/core/src/main/java/com/sun/enterprise/security/cli/ListAuthRealm.java
+++ b/nucleus/security/core/src/main/java/com/sun/enterprise/security/cli/ListAuthRealm.java
@@ -28,8 +28,8 @@
import org.glassfish.api.ActionReport;
import org.jvnet.hk2.annotations.Service;
-import javax.inject.Inject;
-import javax.inject.Named;
+import jakarta.inject.Inject;
+import jakarta.inject.Named;
import org.glassfish.hk2.api.PerLookup;
import com.sun.enterprise.config.serverbeans.Config;
diff --git a/nucleus/security/core/src/main/java/com/sun/enterprise/security/cli/ListFileGroup.java b/nucleus/security/core/src/main/java/com/sun/enterprise/security/cli/ListFileGroup.java
index 70af683..b47c9fd 100644
--- a/nucleus/security/core/src/main/java/com/sun/enterprise/security/cli/ListFileGroup.java
+++ b/nucleus/security/core/src/main/java/com/sun/enterprise/security/cli/ListFileGroup.java
@@ -26,8 +26,8 @@
import org.glassfish.api.ActionReport;
import org.jvnet.hk2.annotations.Service;
-import javax.inject.Inject;
-import javax.inject.Named;
+import jakarta.inject.Inject;
+import jakarta.inject.Named;
import org.glassfish.hk2.api.PerLookup;
import org.jvnet.hk2.config.types.Property;
diff --git a/nucleus/security/core/src/main/java/com/sun/enterprise/security/cli/ListFileUser.java b/nucleus/security/core/src/main/java/com/sun/enterprise/security/cli/ListFileUser.java
index bf34baa..9e560fa 100644
--- a/nucleus/security/core/src/main/java/com/sun/enterprise/security/cli/ListFileUser.java
+++ b/nucleus/security/core/src/main/java/com/sun/enterprise/security/cli/ListFileUser.java
@@ -27,8 +27,8 @@
import org.glassfish.api.ActionReport;
import org.jvnet.hk2.annotations.Service;
-import javax.inject.Inject;
-import javax.inject.Named;
+import jakarta.inject.Inject;
+import jakarta.inject.Named;
import org.glassfish.hk2.api.PerLookup;
import org.jvnet.hk2.config.types.Property;
diff --git a/nucleus/security/core/src/main/java/com/sun/enterprise/security/cli/ListJaccProviders.java b/nucleus/security/core/src/main/java/com/sun/enterprise/security/cli/ListJaccProviders.java
index 8e26d15..2e9b751 100644
--- a/nucleus/security/core/src/main/java/com/sun/enterprise/security/cli/ListJaccProviders.java
+++ b/nucleus/security/core/src/main/java/com/sun/enterprise/security/cli/ListJaccProviders.java
@@ -31,8 +31,8 @@
import org.glassfish.api.admin.*;
import org.glassfish.config.support.CommandTarget;
import org.glassfish.config.support.TargetType;
-import javax.inject.Inject;
-import javax.inject.Named;
+import jakarta.inject.Inject;
+import jakarta.inject.Named;
import org.jvnet.hk2.annotations.Service;
diff --git a/nucleus/security/core/src/main/java/com/sun/enterprise/security/cli/ListMessageSecurityProvider.java b/nucleus/security/core/src/main/java/com/sun/enterprise/security/cli/ListMessageSecurityProvider.java
index 3ebbf47..b2cf6a1 100644
--- a/nucleus/security/core/src/main/java/com/sun/enterprise/security/cli/ListMessageSecurityProvider.java
+++ b/nucleus/security/core/src/main/java/com/sun/enterprise/security/cli/ListMessageSecurityProvider.java
@@ -25,8 +25,8 @@
import org.glassfish.api.ActionReport;
import org.jvnet.hk2.annotations.Service;
-import javax.inject.Inject;
-import javax.inject.Named;
+import jakarta.inject.Inject;
+import jakarta.inject.Named;
import org.glassfish.hk2.api.PerLookup;
import com.sun.enterprise.config.serverbeans.Config;
diff --git a/nucleus/security/core/src/main/java/com/sun/enterprise/security/cli/ListPasswordAlias.java b/nucleus/security/core/src/main/java/com/sun/enterprise/security/cli/ListPasswordAlias.java
index 5e42c4d..4d72cbf 100644
--- a/nucleus/security/core/src/main/java/com/sun/enterprise/security/cli/ListPasswordAlias.java
+++ b/nucleus/security/core/src/main/java/com/sun/enterprise/security/cli/ListPasswordAlias.java
@@ -33,7 +33,7 @@
import org.glassfish.api.admin.*;
import org.glassfish.config.support.CommandTarget;
import org.glassfish.config.support.TargetType;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
/**
* List Password Aliases Command
diff --git a/nucleus/security/core/src/main/java/com/sun/enterprise/security/cli/ListSupportedCipherSuites.java b/nucleus/security/core/src/main/java/com/sun/enterprise/security/cli/ListSupportedCipherSuites.java
index 51d59bc..786a862 100644
--- a/nucleus/security/core/src/main/java/com/sun/enterprise/security/cli/ListSupportedCipherSuites.java
+++ b/nucleus/security/core/src/main/java/com/sun/enterprise/security/cli/ListSupportedCipherSuites.java
@@ -26,7 +26,7 @@
import org.glassfish.api.admin.*;
import org.glassfish.config.support.CommandTarget;
import org.glassfish.config.support.TargetType;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
import org.jvnet.hk2.annotations.Service;
import org.glassfish.hk2.api.PerLookup;
diff --git a/nucleus/security/core/src/main/java/com/sun/enterprise/security/cli/UpdateFileUser.java b/nucleus/security/core/src/main/java/com/sun/enterprise/security/cli/UpdateFileUser.java
index b7db42d..7e87636 100644
--- a/nucleus/security/core/src/main/java/com/sun/enterprise/security/cli/UpdateFileUser.java
+++ b/nucleus/security/core/src/main/java/com/sun/enterprise/security/cli/UpdateFileUser.java
@@ -26,8 +26,8 @@
import org.glassfish.api.ActionReport;
import org.jvnet.hk2.annotations.Service;
-import javax.inject.Inject;
-import javax.inject.Named;
+import jakarta.inject.Inject;
+import jakarta.inject.Named;
import org.glassfish.hk2.api.PerLookup;
import org.jvnet.hk2.config.types.Property;
diff --git a/nucleus/security/core/src/main/java/com/sun/enterprise/security/cli/UpdatePasswordAlias.java b/nucleus/security/core/src/main/java/com/sun/enterprise/security/cli/UpdatePasswordAlias.java
index 99264a2..819a859 100644
--- a/nucleus/security/core/src/main/java/com/sun/enterprise/security/cli/UpdatePasswordAlias.java
+++ b/nucleus/security/core/src/main/java/com/sun/enterprise/security/cli/UpdatePasswordAlias.java
@@ -30,7 +30,7 @@
import org.glassfish.api.admin.*;
import org.glassfish.config.support.CommandTarget;
import org.glassfish.config.support.TargetType;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
/**
* Update Password Alias Command
diff --git a/nucleus/security/core/src/main/java/com/sun/enterprise/security/common/EmbeddedSecurityLifeCycle.java b/nucleus/security/core/src/main/java/com/sun/enterprise/security/common/EmbeddedSecurityLifeCycle.java
index 58f3096..e299a7c 100644
--- a/nucleus/security/core/src/main/java/com/sun/enterprise/security/common/EmbeddedSecurityLifeCycle.java
+++ b/nucleus/security/core/src/main/java/com/sun/enterprise/security/common/EmbeddedSecurityLifeCycle.java
@@ -30,8 +30,8 @@
import org.glassfish.internal.embedded.EmbeddedFileSystem;
import org.glassfish.internal.embedded.EmbeddedLifecycle;
import org.glassfish.internal.embedded.Server;
-import javax.inject.Inject;
-import javax.inject.Named;
+import jakarta.inject.Inject;
+import jakarta.inject.Named;
import org.jvnet.hk2.annotations.Service;
diff --git a/nucleus/security/core/src/main/java/com/sun/enterprise/security/common/Util.java b/nucleus/security/core/src/main/java/com/sun/enterprise/security/common/Util.java
index 631f7f5..563c80e 100644
--- a/nucleus/security/core/src/main/java/com/sun/enterprise/security/common/Util.java
+++ b/nucleus/security/core/src/main/java/com/sun/enterprise/security/common/Util.java
@@ -27,11 +27,11 @@
import org.glassfish.hk2.api.ServiceLocator;
import org.glassfish.internal.api.Globals;
import org.glassfish.internal.embedded.Server;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
import org.jvnet.hk2.annotations.Service;
-import javax.inject.Singleton;
+import jakarta.inject.Singleton;
/**
*
diff --git a/nucleus/security/core/src/main/java/com/sun/enterprise/security/embedded/EmbeddedSecurityUtil.java b/nucleus/security/core/src/main/java/com/sun/enterprise/security/embedded/EmbeddedSecurityUtil.java
index 28a1f75..bebded4 100644
--- a/nucleus/security/core/src/main/java/com/sun/enterprise/security/embedded/EmbeddedSecurityUtil.java
+++ b/nucleus/security/core/src/main/java/com/sun/enterprise/security/embedded/EmbeddedSecurityUtil.java
@@ -39,7 +39,7 @@
import org.glassfish.server.ServerEnvironmentImpl;
import org.jvnet.hk2.annotations.Service;
-import javax.inject.Singleton;
+import jakarta.inject.Singleton;
import org.jvnet.hk2.config.types.Property;
/**
diff --git a/nucleus/security/core/src/main/java/com/sun/enterprise/security/ssl/SSLUtils.java b/nucleus/security/core/src/main/java/com/sun/enterprise/security/ssl/SSLUtils.java
index c3c71d8..d4b47d2 100644
--- a/nucleus/security/core/src/main/java/com/sun/enterprise/security/ssl/SSLUtils.java
+++ b/nucleus/security/core/src/main/java/com/sun/enterprise/security/ssl/SSLUtils.java
@@ -48,10 +48,10 @@
import java.util.PropertyPermission;
import javax.net.ssl.SSLSocketFactory;
import org.jvnet.hk2.annotations.Service;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
import org.glassfish.hk2.api.PostConstruct;
-import javax.inject.Singleton;
+import jakarta.inject.Singleton;
/**
* Handy class containing static functions.
diff --git a/nucleus/security/services/src/main/java/org/glassfish/security/services/api/authentication/AbstractInternalSystemAdministrator.java b/nucleus/security/services/src/main/java/org/glassfish/security/services/api/authentication/AbstractInternalSystemAdministrator.java
index ff0b1df..5cf3acb 100644
--- a/nucleus/security/services/src/main/java/org/glassfish/security/services/api/authentication/AbstractInternalSystemAdministrator.java
+++ b/nucleus/security/services/src/main/java/org/glassfish/security/services/api/authentication/AbstractInternalSystemAdministrator.java
@@ -16,7 +16,7 @@
package org.glassfish.security.services.api.authentication;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
import javax.security.auth.Subject;
import javax.security.auth.login.LoginException;
import org.glassfish.hk2.api.PostConstruct;
diff --git a/nucleus/security/services/src/main/java/org/glassfish/security/services/commands/CreateLoginModuleConfig.java b/nucleus/security/services/src/main/java/org/glassfish/security/services/commands/CreateLoginModuleConfig.java
index ad427e9..4b3f97f 100644
--- a/nucleus/security/services/src/main/java/org/glassfish/security/services/commands/CreateLoginModuleConfig.java
+++ b/nucleus/security/services/src/main/java/org/glassfish/security/services/commands/CreateLoginModuleConfig.java
@@ -19,7 +19,7 @@
import java.beans.PropertyVetoException;
import java.util.Properties;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
import org.glassfish.security.services.config.SecurityConfiguration;
diff --git a/nucleus/security/services/src/main/java/org/glassfish/security/services/commands/CreateSecurityProvider.java b/nucleus/security/services/src/main/java/org/glassfish/security/services/commands/CreateSecurityProvider.java
index 481bfe3..815287c 100644
--- a/nucleus/security/services/src/main/java/org/glassfish/security/services/commands/CreateSecurityProvider.java
+++ b/nucleus/security/services/src/main/java/org/glassfish/security/services/commands/CreateSecurityProvider.java
@@ -18,7 +18,7 @@
import java.beans.PropertyVetoException;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
import org.glassfish.security.services.config.SecurityConfiguration;
diff --git a/nucleus/security/services/src/main/java/org/glassfish/security/services/commands/CreateSecurityService.java b/nucleus/security/services/src/main/java/org/glassfish/security/services/commands/CreateSecurityService.java
index 0c9bf64..d618b67 100644
--- a/nucleus/security/services/src/main/java/org/glassfish/security/services/commands/CreateSecurityService.java
+++ b/nucleus/security/services/src/main/java/org/glassfish/security/services/commands/CreateSecurityService.java
@@ -19,7 +19,7 @@
import java.beans.PropertyVetoException;
import java.util.Properties;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
import org.glassfish.security.services.config.SecurityConfiguration;
diff --git a/nucleus/security/services/src/main/java/org/glassfish/security/services/commands/LDAPAdminAccessConfigurator.java b/nucleus/security/services/src/main/java/org/glassfish/security/services/commands/LDAPAdminAccessConfigurator.java
index 4b7452d..d370c87 100644
--- a/nucleus/security/services/src/main/java/org/glassfish/security/services/commands/LDAPAdminAccessConfigurator.java
+++ b/nucleus/security/services/src/main/java/org/glassfish/security/services/commands/LDAPAdminAccessConfigurator.java
@@ -30,7 +30,7 @@
import org.glassfish.api.admin.AdminCommand;
import org.glassfish.api.admin.AdminCommandContext;
import org.glassfish.internal.api.Target;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
import org.jvnet.hk2.annotations.Service;
import org.jvnet.hk2.config.ConfigSupport;
import org.jvnet.hk2.config.SingleConfigCode;
diff --git a/nucleus/security/services/src/main/java/org/glassfish/security/services/common/Secure.java b/nucleus/security/services/src/main/java/org/glassfish/security/services/common/Secure.java
index 609d74c..22d783f 100644
--- a/nucleus/security/services/src/main/java/org/glassfish/security/services/common/Secure.java
+++ b/nucleus/security/services/src/main/java/org/glassfish/security/services/common/Secure.java
@@ -22,7 +22,7 @@
import java.lang.annotation.Retention;
import java.lang.annotation.Target;
-import javax.inject.Qualifier;
+import jakarta.inject.Qualifier;
import org.glassfish.hk2.api.Metadata;
/**
diff --git a/nucleus/security/services/src/main/java/org/glassfish/security/services/common/SecurityAccessValidationService.java b/nucleus/security/services/src/main/java/org/glassfish/security/services/common/SecurityAccessValidationService.java
index b27f6a8..e91cd34 100644
--- a/nucleus/security/services/src/main/java/org/glassfish/security/services/common/SecurityAccessValidationService.java
+++ b/nucleus/security/services/src/main/java/org/glassfish/security/services/common/SecurityAccessValidationService.java
@@ -18,7 +18,7 @@
import java.util.logging.Logger;
-import javax.inject.Singleton;
+import jakarta.inject.Singleton;
import org.glassfish.hk2.api.Filter;
import org.glassfish.hk2.api.ValidationService;
diff --git a/nucleus/security/services/src/main/java/org/glassfish/security/services/common/SecurityScope.java b/nucleus/security/services/src/main/java/org/glassfish/security/services/common/SecurityScope.java
index df67c82..1a81945 100644
--- a/nucleus/security/services/src/main/java/org/glassfish/security/services/common/SecurityScope.java
+++ b/nucleus/security/services/src/main/java/org/glassfish/security/services/common/SecurityScope.java
@@ -21,7 +21,7 @@
import static java.lang.annotation.RetentionPolicy.RUNTIME;
import java.lang.annotation.Retention;
import java.lang.annotation.Target;
-import javax.inject.Scope;
+import jakarta.inject.Scope;
import org.glassfish.hk2.api.Proxiable;
diff --git a/nucleus/security/services/src/main/java/org/glassfish/security/services/common/SecurityScopeContext.java b/nucleus/security/services/src/main/java/org/glassfish/security/services/common/SecurityScopeContext.java
index 722ec14..c68864a 100644
--- a/nucleus/security/services/src/main/java/org/glassfish/security/services/common/SecurityScopeContext.java
+++ b/nucleus/security/services/src/main/java/org/glassfish/security/services/common/SecurityScopeContext.java
@@ -19,8 +19,8 @@
import java.lang.annotation.Annotation;
import java.util.HashMap;
-import javax.inject.Inject;
-import javax.inject.Singleton;
+import jakarta.inject.Inject;
+import jakarta.inject.Singleton;
import org.glassfish.hk2.api.ActiveDescriptor;
import org.glassfish.hk2.api.Context;
diff --git a/nucleus/security/services/src/main/java/org/glassfish/security/services/common/StateManager.java b/nucleus/security/services/src/main/java/org/glassfish/security/services/common/StateManager.java
index 7f11326..a0d5dfa 100644
--- a/nucleus/security/services/src/main/java/org/glassfish/security/services/common/StateManager.java
+++ b/nucleus/security/services/src/main/java/org/glassfish/security/services/common/StateManager.java
@@ -16,7 +16,7 @@
package org.glassfish.security.services.common;
-import javax.inject.Singleton;
+import jakarta.inject.Singleton;
import org.jvnet.hk2.annotations.Service;
diff --git a/nucleus/security/services/src/main/java/org/glassfish/security/services/config/SecurityConfigUpgradeService.java b/nucleus/security/services/src/main/java/org/glassfish/security/services/config/SecurityConfigUpgradeService.java
index 0ebd0c5..471d975 100644
--- a/nucleus/security/services/src/main/java/org/glassfish/security/services/config/SecurityConfigUpgradeService.java
+++ b/nucleus/security/services/src/main/java/org/glassfish/security/services/config/SecurityConfigUpgradeService.java
@@ -27,7 +27,7 @@
import org.jvnet.hk2.config.TransactionFailure;
import org.jvnet.hk2.config.types.Property;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
import java.beans.PropertyVetoException;
import java.util.logging.Level;
import java.util.logging.Logger;
diff --git a/nucleus/security/services/src/main/java/org/glassfish/security/services/impl/AuthenticationServiceFactory.java b/nucleus/security/services/src/main/java/org/glassfish/security/services/impl/AuthenticationServiceFactory.java
index c8de27b..11066dd 100644
--- a/nucleus/security/services/src/main/java/org/glassfish/security/services/impl/AuthenticationServiceFactory.java
+++ b/nucleus/security/services/src/main/java/org/glassfish/security/services/impl/AuthenticationServiceFactory.java
@@ -18,8 +18,8 @@
import java.security.AccessController;
-import javax.inject.Inject;
-import javax.inject.Singleton;
+import jakarta.inject.Inject;
+import jakarta.inject.Singleton;
import org.glassfish.hk2.api.Factory;
import org.glassfish.hk2.api.ServiceLocator;
diff --git a/nucleus/security/services/src/main/java/org/glassfish/security/services/impl/AuthenticationServiceImpl.java b/nucleus/security/services/src/main/java/org/glassfish/security/services/impl/AuthenticationServiceImpl.java
index b5ea778..c4964a6 100644
--- a/nucleus/security/services/src/main/java/org/glassfish/security/services/impl/AuthenticationServiceImpl.java
+++ b/nucleus/security/services/src/main/java/org/glassfish/security/services/impl/AuthenticationServiceImpl.java
@@ -23,8 +23,8 @@
import java.util.Map;
import java.util.logging.Logger;
-import javax.inject.Inject;
-import javax.inject.Singleton;
+import jakarta.inject.Inject;
+import jakarta.inject.Singleton;
import javax.security.auth.Subject;
import javax.security.auth.callback.Callback;
import javax.security.auth.callback.CallbackHandler;
diff --git a/nucleus/security/services/src/main/java/org/glassfish/security/services/impl/ImpersonationServiceImpl.java b/nucleus/security/services/src/main/java/org/glassfish/security/services/impl/ImpersonationServiceImpl.java
index ca61211..5a0aea4 100644
--- a/nucleus/security/services/src/main/java/org/glassfish/security/services/impl/ImpersonationServiceImpl.java
+++ b/nucleus/security/services/src/main/java/org/glassfish/security/services/impl/ImpersonationServiceImpl.java
@@ -20,7 +20,7 @@
import java.util.Set;
import java.util.logging.Logger;
-import javax.inject.Singleton;
+import jakarta.inject.Singleton;
import javax.security.auth.Subject;
import javax.security.auth.login.LoginException;
diff --git a/nucleus/security/services/src/main/java/org/glassfish/security/services/impl/JCEKSDomainPasswordAliasStore.java b/nucleus/security/services/src/main/java/org/glassfish/security/services/impl/JCEKSDomainPasswordAliasStore.java
index e8e0b35..3444388 100644
--- a/nucleus/security/services/src/main/java/org/glassfish/security/services/impl/JCEKSDomainPasswordAliasStore.java
+++ b/nucleus/security/services/src/main/java/org/glassfish/security/services/impl/JCEKSDomainPasswordAliasStore.java
@@ -21,8 +21,8 @@
import com.sun.enterprise.util.SystemPropertyConstants;
import java.io.File;
import jakarta.annotation.PostConstruct;
-import javax.inject.Inject;
-import javax.inject.Named;
+import jakarta.inject.Inject;
+import jakarta.inject.Named;
import org.glassfish.hk2.api.PerLookup;
import org.glassfish.security.services.common.Secure;
import org.jvnet.hk2.annotations.Optional;
diff --git a/nucleus/security/services/src/main/java/org/glassfish/security/services/impl/NucleusInternalSystemAdministrator.java b/nucleus/security/services/src/main/java/org/glassfish/security/services/impl/NucleusInternalSystemAdministrator.java
index 0907598..670f4f1 100644
--- a/nucleus/security/services/src/main/java/org/glassfish/security/services/impl/NucleusInternalSystemAdministrator.java
+++ b/nucleus/security/services/src/main/java/org/glassfish/security/services/impl/NucleusInternalSystemAdministrator.java
@@ -16,7 +16,7 @@
package org.glassfish.security.services.impl;
-import javax.inject.Singleton;
+import jakarta.inject.Singleton;
import org.glassfish.security.services.api.authentication.AbstractInternalSystemAdministrator;
import org.glassfish.security.services.api.authorization.AuthorizationAdminConstants;
import org.jvnet.hk2.annotations.Service;
diff --git a/nucleus/security/services/src/main/java/org/glassfish/security/services/impl/authorization/AuthorizationServiceImpl.java b/nucleus/security/services/src/main/java/org/glassfish/security/services/impl/authorization/AuthorizationServiceImpl.java
index 38ee6ff..4939380 100644
--- a/nucleus/security/services/src/main/java/org/glassfish/security/services/impl/authorization/AuthorizationServiceImpl.java
+++ b/nucleus/security/services/src/main/java/org/glassfish/security/services/impl/authorization/AuthorizationServiceImpl.java
@@ -42,8 +42,8 @@
import org.glassfish.security.services.impl.ServiceFactory;
import org.glassfish.security.services.impl.ServiceLogging;
-import javax.inject.Inject;
-import javax.inject.Singleton;
+import jakarta.inject.Inject;
+import jakarta.inject.Singleton;
import org.jvnet.hk2.annotations.Service;
import org.glassfish.hk2.api.PostConstruct;
import org.glassfish.hk2.api.ServiceLocator;
diff --git a/nucleus/security/services/src/main/java/org/glassfish/security/services/impl/authorization/RoleMappingServiceImpl.java b/nucleus/security/services/src/main/java/org/glassfish/security/services/impl/authorization/RoleMappingServiceImpl.java
index dda6d48..1b9dbf1 100644
--- a/nucleus/security/services/src/main/java/org/glassfish/security/services/impl/authorization/RoleMappingServiceImpl.java
+++ b/nucleus/security/services/src/main/java/org/glassfish/security/services/impl/authorization/RoleMappingServiceImpl.java
@@ -24,8 +24,8 @@
import java.util.logging.Logger;
import javax.security.auth.Subject;
-import javax.inject.Inject;
-import javax.inject.Singleton;
+import jakarta.inject.Inject;
+import jakarta.inject.Singleton;
import org.jvnet.hk2.annotations.Service;
import org.glassfish.hk2.api.PostConstruct;
diff --git a/nucleus/security/services/src/main/java/org/glassfish/security/services/impl/context/SecurityContextServiceImpl.java b/nucleus/security/services/src/main/java/org/glassfish/security/services/impl/context/SecurityContextServiceImpl.java
index e0f863a..7c70e72 100755
--- a/nucleus/security/services/src/main/java/org/glassfish/security/services/impl/context/SecurityContextServiceImpl.java
+++ b/nucleus/security/services/src/main/java/org/glassfish/security/services/impl/context/SecurityContextServiceImpl.java
@@ -21,7 +21,7 @@
import org.glassfish.security.services.api.context.SecurityContextService;
import org.glassfish.security.services.impl.common.AttributesImpl;
-import javax.inject.Singleton;
+import jakarta.inject.Singleton;
import org.jvnet.hk2.annotations.Service;
@Service
diff --git a/nucleus/security/services/src/main/java/org/glassfish/security/services/provider/authorization/SimpleAuthorizationProviderImpl.java b/nucleus/security/services/src/main/java/org/glassfish/security/services/provider/authorization/SimpleAuthorizationProviderImpl.java
index df1d0c4..73c4398 100644
--- a/nucleus/security/services/src/main/java/org/glassfish/security/services/provider/authorization/SimpleAuthorizationProviderImpl.java
+++ b/nucleus/security/services/src/main/java/org/glassfish/security/services/provider/authorization/SimpleAuthorizationProviderImpl.java
@@ -26,7 +26,7 @@
import java.util.Set;
import java.util.logging.Level;
import java.util.logging.Logger;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
import org.glassfish.api.admin.ServerEnvironment;
import org.glassfish.logging.annotation.LogMessageInfo;
diff --git a/nucleus/security/ssl-impl/src/main/java/com/sun/enterprise/security/ssl/impl/MasterPasswordImpl.java b/nucleus/security/ssl-impl/src/main/java/com/sun/enterprise/security/ssl/impl/MasterPasswordImpl.java
index 184fa9f..9563b11 100644
--- a/nucleus/security/ssl-impl/src/main/java/com/sun/enterprise/security/ssl/impl/MasterPasswordImpl.java
+++ b/nucleus/security/ssl-impl/src/main/java/com/sun/enterprise/security/ssl/impl/MasterPasswordImpl.java
@@ -22,8 +22,8 @@
import java.security.KeyStoreException;
import java.security.NoSuchAlgorithmException;
import java.security.cert.CertificateException;
-import javax.inject.Inject;
-import javax.inject.Singleton;
+import jakarta.inject.Inject;
+import jakarta.inject.Singleton;
import org.glassfish.security.common.MasterPassword;
import org.jvnet.hk2.annotations.Optional;
import org.jvnet.hk2.annotations.Service;
diff --git a/nucleus/security/ssl-impl/src/main/java/com/sun/enterprise/security/ssl/impl/SecuritySupportImpl.java b/nucleus/security/ssl-impl/src/main/java/com/sun/enterprise/security/ssl/impl/SecuritySupportImpl.java
index 8044706..ac72860 100644
--- a/nucleus/security/ssl-impl/src/main/java/com/sun/enterprise/security/ssl/impl/SecuritySupportImpl.java
+++ b/nucleus/security/ssl-impl/src/main/java/com/sun/enterprise/security/ssl/impl/SecuritySupportImpl.java
@@ -60,10 +60,10 @@
import org.glassfish.logging.annotation.LogMessagesResourceBundle;
import org.glassfish.logging.annotation.LoggerInfo;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
import org.jvnet.hk2.annotations.Service;
-import javax.inject.Singleton;
+import jakarta.inject.Singleton;
/**
* This implements SecuritySupport used in PluggableFeatureFactory.
diff --git a/nucleus/tests/admin/src/addon/modules/test-progress-status-commands/src/main/java/com/sun/enterprise/tests/progress/ProgressExecOtherCommand.java b/nucleus/tests/admin/src/addon/modules/test-progress-status-commands/src/main/java/com/sun/enterprise/tests/progress/ProgressExecOtherCommand.java
index e4df4b8..9cd5dcf 100644
--- a/nucleus/tests/admin/src/addon/modules/test-progress-status-commands/src/main/java/com/sun/enterprise/tests/progress/ProgressExecOtherCommand.java
+++ b/nucleus/tests/admin/src/addon/modules/test-progress-status-commands/src/main/java/com/sun/enterprise/tests/progress/ProgressExecOtherCommand.java
@@ -16,7 +16,7 @@
package com.sun.enterprise.tests.progress;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
import org.glassfish.api.I18n;
import org.glassfish.api.admin.AdminCommand;
