Jakarta Inject API namespace transition
Signed-off-by: Gaurav Gupta <gaurav.gupta@payara.fish>
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;
