commit 3f03b9b3691902b86b263276336d17a99dcfb669
author Gaurav Gupta <gaurav.gupta@payara.fish> Fri May 01 03:26:05 2020 +0530
committer Gaurav Gupta <gaurav.gupta@payara.fish> Fri May 01 04:00:04 2020 +0530
tree e283c08f8331f89ec35a1356ef3264bf8239c790
parent ed57bec5e827f951a8840363c4164e6cc2022e9a

jakarta.faces namespace transition

Signed-off-by: Gaurav Gupta <gaurav.gupta@payara.fish>

appserver/admingui/common/src/main/java/org/glassfish/admingui/common/factories/NavNodeContainerFactory.java

diff --git a/appserver/admingui/common/src/main/java/org/glassfish/admingui/common/factories/NavNodeContainerFactory.java b/appserver/admingui/common/src/main/java/org/glassfish/admingui/common/factories/NavNodeContainerFactory.java
index 9f165a5..4e0d36d 100644
--- a/appserver/admingui/common/src/main/java/org/glassfish/admingui/common/factories/NavNodeContainerFactory.java
+++ b/appserver/admingui/common/src/main/java/org/glassfish/admingui/common/factories/NavNodeContainerFactory.java
@@ -23,8 +23,8 @@
 import com.sun.jsftemplating.annotation.UIComponentFactory;
 import com.sun.jsftemplating.component.factory.ComponentFactoryBase;
 import com.sun.jsftemplating.layout.descriptors.LayoutComponent;
-import javax.faces.component.UIComponent;
-import javax.faces.context.FacesContext;
+import jakarta.faces.component.UIComponent;
+import jakarta.faces.context.FacesContext;
 
 /**
  * The NavigationFactory provides an abstraction layer for the Woodstock tree

appserver/admingui/common/src/main/java/org/glassfish/admingui/common/factories/NavigationNodeFactory.java

diff --git a/appserver/admingui/common/src/main/java/org/glassfish/admingui/common/factories/NavigationNodeFactory.java b/appserver/admingui/common/src/main/java/org/glassfish/admingui/common/factories/NavigationNodeFactory.java
index f848228..a9d3ea3 100644
--- a/appserver/admingui/common/src/main/java/org/glassfish/admingui/common/factories/NavigationNodeFactory.java
+++ b/appserver/admingui/common/src/main/java/org/glassfish/admingui/common/factories/NavigationNodeFactory.java
@@ -19,8 +19,8 @@
 import com.sun.jsftemplating.annotation.UIComponentFactory;
 import com.sun.jsftemplating.component.factory.ComponentFactoryBase;
 import com.sun.jsftemplating.layout.descriptors.LayoutComponent;
-import javax.faces.component.UIComponent;
-import javax.faces.context.FacesContext;
+import jakarta.faces.component.UIComponent;
+import jakarta.faces.context.FacesContext;
 
 /**
  *  <p>	The <code>NavigationNodeFactory</code> provides an abstraction layer

appserver/admingui/common/src/main/java/org/glassfish/admingui/common/handlers/CommonHandlers.java

diff --git a/appserver/admingui/common/src/main/java/org/glassfish/admingui/common/handlers/CommonHandlers.java b/appserver/admingui/common/src/main/java/org/glassfish/admingui/common/handlers/CommonHandlers.java
index c019f5d..775d526 100644
--- a/appserver/admingui/common/src/main/java/org/glassfish/admingui/common/handlers/CommonHandlers.java
+++ b/appserver/admingui/common/src/main/java/org/glassfish/admingui/common/handlers/CommonHandlers.java
@@ -47,10 +47,10 @@
 import java.text.SimpleDateFormat;
 import java.util.ArrayList;
 
-import javax.faces.component.UIComponent;
-import javax.faces.component.UIInput;
-import javax.faces.component.UIViewRoot;
-import javax.faces.context.FacesContext;
+import jakarta.faces.component.UIComponent;
+import jakarta.faces.component.UIInput;
+import jakarta.faces.component.UIViewRoot;
+import jakarta.faces.context.FacesContext;
 import jakarta.servlet.http.HttpServletResponse;
 import org.glassfish.admingui.common.tree.FilterTreeEvent;
 

appserver/admingui/common/src/main/java/org/glassfish/admingui/common/handlers/PluginHandlers.java

diff --git a/appserver/admingui/common/src/main/java/org/glassfish/admingui/common/handlers/PluginHandlers.java b/appserver/admingui/common/src/main/java/org/glassfish/admingui/common/handlers/PluginHandlers.java
index 61cbb3a..cd29c17 100644
--- a/appserver/admingui/common/src/main/java/org/glassfish/admingui/common/handlers/PluginHandlers.java
+++ b/appserver/admingui/common/src/main/java/org/glassfish/admingui/common/handlers/PluginHandlers.java
@@ -39,8 +39,8 @@
 import java.util.Set;
 import java.util.TreeSet;
 import java.util.logging.Level;
-import javax.faces.component.UIComponent;
-import javax.faces.context.FacesContext;
+import jakarta.faces.component.UIComponent;
+import jakarta.faces.context.FacesContext;
 import jakarta.servlet.ServletContext;
 
 import org.glassfish.admingui.common.factories.NavigationNodeFactory;

appserver/admingui/common/src/main/java/org/glassfish/admingui/common/handlers/UtilHandlers.java

diff --git a/appserver/admingui/common/src/main/java/org/glassfish/admingui/common/handlers/UtilHandlers.java b/appserver/admingui/common/src/main/java/org/glassfish/admingui/common/handlers/UtilHandlers.java
index 894d1a8..a391df0 100644
--- a/appserver/admingui/common/src/main/java/org/glassfish/admingui/common/handlers/UtilHandlers.java
+++ b/appserver/admingui/common/src/main/java/org/glassfish/admingui/common/handlers/UtilHandlers.java
@@ -58,7 +58,7 @@
 import java.util.Map;
 import java.util.logging.Level;
 
-import javax.faces.component.UIViewRoot;
+import jakarta.faces.component.UIViewRoot;
 
 /**
  *

appserver/admingui/common/src/main/java/org/glassfish/admingui/common/help/HelpTreeAdaptor.java

diff --git a/appserver/admingui/common/src/main/java/org/glassfish/admingui/common/help/HelpTreeAdaptor.java b/appserver/admingui/common/src/main/java/org/glassfish/admingui/common/help/HelpTreeAdaptor.java
index 19d6969..f89d494 100644
--- a/appserver/admingui/common/src/main/java/org/glassfish/admingui/common/help/HelpTreeAdaptor.java
+++ b/appserver/admingui/common/src/main/java/org/glassfish/admingui/common/help/HelpTreeAdaptor.java
@@ -27,8 +27,8 @@
 import java.util.List;
 import java.util.Map;
 import java.io.Serializable;
-import javax.faces.component.UIComponent;
-import javax.faces.context.FacesContext;
+import jakarta.faces.component.UIComponent;
+import jakarta.faces.context.FacesContext;
 
 import org.glassfish.admingui.connector.TOC;
 import org.glassfish.admingui.connector.TOCItem;

appserver/admingui/common/src/main/java/org/glassfish/admingui/common/help/HelpTreeIndexAdaptor.java

diff --git a/appserver/admingui/common/src/main/java/org/glassfish/admingui/common/help/HelpTreeIndexAdaptor.java b/appserver/admingui/common/src/main/java/org/glassfish/admingui/common/help/HelpTreeIndexAdaptor.java
index 322fb15..5b808e7 100644
--- a/appserver/admingui/common/src/main/java/org/glassfish/admingui/common/help/HelpTreeIndexAdaptor.java
+++ b/appserver/admingui/common/src/main/java/org/glassfish/admingui/common/help/HelpTreeIndexAdaptor.java
@@ -27,8 +27,8 @@
 import java.util.List;
 import java.util.Map;
 import java.io.Serializable;
-import javax.faces.component.UIComponent;
-import javax.faces.context.FacesContext;
+import jakarta.faces.component.UIComponent;
+import jakarta.faces.context.FacesContext;
 import org.glassfish.admingui.connector.Index;
 import org.glassfish.admingui.connector.IndexItem;
 

appserver/admingui/common/src/main/java/org/glassfish/admingui/common/plugin/ConsoleClassLoader.java

diff --git a/appserver/admingui/common/src/main/java/org/glassfish/admingui/common/plugin/ConsoleClassLoader.java b/appserver/admingui/common/src/main/java/org/glassfish/admingui/common/plugin/ConsoleClassLoader.java
index 342b352..566af96 100644
--- a/appserver/admingui/common/src/main/java/org/glassfish/admingui/common/plugin/ConsoleClassLoader.java
+++ b/appserver/admingui/common/src/main/java/org/glassfish/admingui/common/plugin/ConsoleClassLoader.java
@@ -19,7 +19,7 @@
 import java.net.URL;
 import java.net.URLClassLoader;
 
-import javax.faces.context.FacesContext;
+import jakarta.faces.context.FacesContext;
 import jakarta.servlet.ServletContext;
 
 //import static com.sun.enterprise.web.Constants.HABITAT_ATTRIBUTE;

appserver/admingui/common/src/main/java/org/glassfish/admingui/common/tree/FilterTreeEvent.java

diff --git a/appserver/admingui/common/src/main/java/org/glassfish/admingui/common/tree/FilterTreeEvent.java b/appserver/admingui/common/src/main/java/org/glassfish/admingui/common/tree/FilterTreeEvent.java
index 04a64d2..c8001ff 100644
--- a/appserver/admingui/common/src/main/java/org/glassfish/admingui/common/tree/FilterTreeEvent.java
+++ b/appserver/admingui/common/src/main/java/org/glassfish/admingui/common/tree/FilterTreeEvent.java
@@ -20,7 +20,7 @@
 import com.sun.jsftemplating.layout.event.EventObjectBase;
 import com.sun.jsftemplating.layout.event.UIComponentHolder;
 import java.util.List;
-import javax.faces.component.UIComponent;
+import jakarta.faces.component.UIComponent;
 
 /**
  *

appserver/admingui/common/src/main/java/org/glassfish/admingui/common/tree/ListTreeAdaptor.java

diff --git a/appserver/admingui/common/src/main/java/org/glassfish/admingui/common/tree/ListTreeAdaptor.java b/appserver/admingui/common/src/main/java/org/glassfish/admingui/common/tree/ListTreeAdaptor.java
index 9996078..d208ba9 100644
--- a/appserver/admingui/common/src/main/java/org/glassfish/admingui/common/tree/ListTreeAdaptor.java
+++ b/appserver/admingui/common/src/main/java/org/glassfish/admingui/common/tree/ListTreeAdaptor.java
@@ -27,9 +27,9 @@
 import java.util.List;
 import java.util.Map;
 import java.util.Properties;
-import javax.faces.component.ActionSource;
-import javax.faces.component.UIComponent;
-import javax.faces.context.FacesContext;
+import jakarta.faces.component.ActionSource;
+import jakarta.faces.component.UIComponent;
+import jakarta.faces.context.FacesContext;
 import org.glassfish.admingui.common.util.GuiUtil;
 
 

appserver/admingui/common/src/main/java/org/glassfish/admingui/common/util/GuiUtil.java

diff --git a/appserver/admingui/common/src/main/java/org/glassfish/admingui/common/util/GuiUtil.java b/appserver/admingui/common/src/main/java/org/glassfish/admingui/common/util/GuiUtil.java
index 97da4ed..316184d 100644
--- a/appserver/admingui/common/src/main/java/org/glassfish/admingui/common/util/GuiUtil.java
+++ b/appserver/admingui/common/src/main/java/org/glassfish/admingui/common/util/GuiUtil.java
@@ -26,7 +26,7 @@
 
 import com.sun.jsftemplating.resource.ResourceBundleManager;
 
-import javax.faces.context.FacesContext;
+import jakarta.faces.context.FacesContext;
 // FIXME: 7-31-08 -- FIX by importing woodstock api's:
 //import com.sun.webui.jsf.model.Option;
 
@@ -48,7 +48,7 @@
 import java.io.File;
 
 import java.io.UnsupportedEncodingException;
-import javax.faces.context.ExternalContext;
+import jakarta.faces.context.ExternalContext;
 import jakarta.servlet.ServletContext;
 import jakarta.servlet.ServletRequest;
 import jakarta.servlet.http.HttpServletRequest;

appserver/admingui/common/src/main/java/org/glassfish/admingui/common/util/MiscUtil.java

diff --git a/appserver/admingui/common/src/main/java/org/glassfish/admingui/common/util/MiscUtil.java b/appserver/admingui/common/src/main/java/org/glassfish/admingui/common/util/MiscUtil.java
index 5efdda7..eaed92a 100644
--- a/appserver/admingui/common/src/main/java/org/glassfish/admingui/common/util/MiscUtil.java
+++ b/appserver/admingui/common/src/main/java/org/glassfish/admingui/common/util/MiscUtil.java
@@ -17,8 +17,8 @@
 package org.glassfish.admingui.common.util;
 
 import java.io.ByteArrayInputStream;
-import javax.el.ValueExpression;
-import javax.faces.context.FacesContext;
+import jakarta.el.ValueExpression;
+import jakarta.faces.context.FacesContext;
 import javax.xml.XMLConstants;
 import javax.xml.parsers.DocumentBuilder;
 import javax.xml.parsers.DocumentBuilderFactory;

appserver/admingui/common/src/main/java/org/glassfish/admingui/common/util/RestUtil.java

diff --git a/appserver/admingui/common/src/main/java/org/glassfish/admingui/common/util/RestUtil.java b/appserver/admingui/common/src/main/java/org/glassfish/admingui/common/util/RestUtil.java
index e88796d..fe34768 100644
--- a/appserver/admingui/common/src/main/java/org/glassfish/admingui/common/util/RestUtil.java
+++ b/appserver/admingui/common/src/main/java/org/glassfish/admingui/common/util/RestUtil.java
@@ -44,7 +44,7 @@
 import jakarta.ws.rs.core.MultivaluedMap;
 import jakarta.ws.rs.core.Response;
 
-import javax.faces.context.FacesContext;
+import jakarta.faces.context.FacesContext;
 import javax.net.ssl.HostnameVerifier;
 import javax.net.ssl.SSLContext;
 import javax.net.ssl.SSLSession;

appserver/admingui/common/src/main/java/org/glassfish/admingui/common/util/RestUtil2.java

diff --git a/appserver/admingui/common/src/main/java/org/glassfish/admingui/common/util/RestUtil2.java b/appserver/admingui/common/src/main/java/org/glassfish/admingui/common/util/RestUtil2.java
index 005e0ac..6a1335b 100644
--- a/appserver/admingui/common/src/main/java/org/glassfish/admingui/common/util/RestUtil2.java
+++ b/appserver/admingui/common/src/main/java/org/glassfish/admingui/common/util/RestUtil2.java
@@ -27,7 +27,7 @@
 import jakarta.ws.rs.core.Cookie;
 import jakarta.ws.rs.core.MediaType;
 
-import javax.faces.context.FacesContext;
+import jakarta.faces.context.FacesContext;
 
 import com.sun.jsftemplating.annotation.Handler;
 import com.sun.jsftemplating.annotation.HandlerInput;

appserver/admingui/common/src/main/resources/appServer/restart-2.jsf

diff --git a/appserver/admingui/common/src/main/resources/appServer/restart-2.jsf b/appserver/admingui/common/src/main/resources/appServer/restart-2.jsf
index fc73467..87f6fbb 100644
--- a/appserver/admingui/common/src/main/resources/appServer/restart-2.jsf
+++ b/appserver/admingui/common/src/main/resources/appServer/restart-2.jsf
@@ -27,7 +27,7 @@
 <sun:html id="html1">
 <sun:head title="$resource{i18n.restart.pageTitle}" parseOnLoad="false">
     <sun:link url="/resource/css/css_ns6up.css" />
-    <h:outputScript name="jsf.js" library="javax.faces" target="body" />
+    <h:outputScript name="jsf.js" library="jakarta.faces" target="body" />
     <sun:script>
 	<f:verbatim>
 	    function triggerRestart() {

appserver/admingui/common/src/main/resources/appServer/shutdown.jsf

diff --git a/appserver/admingui/common/src/main/resources/appServer/shutdown.jsf b/appserver/admingui/common/src/main/resources/appServer/shutdown.jsf
index eae02dc..69ce1a6 100644
--- a/appserver/admingui/common/src/main/resources/appServer/shutdown.jsf
+++ b/appserver/admingui/common/src/main/resources/appServer/shutdown.jsf
@@ -25,7 +25,7 @@
 <sun:html id="html1">
 <sun:head title="$resource{i18n.shutdown.pageTitle}" parseOnLoad="false">
     <sun:link url="/resource/css/css_ns6up.css" />
-    <h:outputScript name="jsf.js" library="javax.faces" target="body" />
+    <h:outputScript name="jsf.js" library="jakarta.faces" target="body" />
     <sun:script>
 	<f:verbatim>
 	    function triggerShutdown() {

appserver/admingui/common/src/main/resources/help/help.jsf

diff --git a/appserver/admingui/common/src/main/resources/help/help.jsf b/appserver/admingui/common/src/main/resources/help/help.jsf
index c0b93ab..843c15c 100644
--- a/appserver/admingui/common/src/main/resources/help/help.jsf
+++ b/appserver/admingui/common/src/main/resources/help/help.jsf
@@ -32,7 +32,7 @@
     <sun:head title="$resource{i18n.helpWindowTitle}" debug="false" parseOnLoad="false">
 	<sun:link url="/resource/common/help/help.css" />
 	<sun:script url="/resource/common/js/adminjsf.js" />
-	<h:outputScript name="jsf.js" library="javax.faces" target="head" />
+	<h:outputScript name="jsf.js" library="jakarta.faces" target="head" />
     </sun:head>
     <sun:body id="bodyTag" style="display:none;" onLoad="admingui.help.fixTreeOnclick(document.getElementById('tocTree')); admingui.help.fixTreeOnclick(document.getElementById('indexTree')); admingui.help.loadHelpPageFromContextRef('#{pageSession.contextRef}', 'helpContent'); document.getElementById('bodyTag').style.display='block';">
 	"<div id="menuContent" class="helpMenuBox">

appserver/admingui/common/src/main/resources/js/adminjsf.js

diff --git a/appserver/admingui/common/src/main/resources/js/adminjsf.js b/appserver/admingui/common/src/main/resources/js/adminjsf.js
index 316383f..b1bc341 100644
--- a/appserver/admingui/common/src/main/resources/js/adminjsf.js
+++ b/appserver/admingui/common/src/main/resources/js/adminjsf.js
@@ -2288,7 +2288,7 @@
      *	This function handles JSF2 Ajax responses.  It is expected that the
      *	response will replace the innerHTML of an element rather than the whole
      *	page.  If the content contains JSF2 markup, it will attempt to use the
-     *	content defined in the javax.faces.ViewRoot "update" element.  It will
+     *	content defined in the jakarta.faces.ViewRoot "update" element.  It will
      *	also attempt to update the ViewState.  If this is not found in the
      *	response, it will try to use the entire response for the value of
      *	innerHTML.
@@ -2311,17 +2311,17 @@
         var testString = result.substring(0, len);
         var viewState = null;
         if (testString.indexOf("<changes>") > 0) {
-            // We have a JSF response... if id="javax.faces.ViewRoot", handle it
-            var idx = testString.indexOf('id="javax.faces.ViewRoot"');
+            // We have a JSF response... if id="jakarta.faces.ViewRoot", handle it
+            var idx = testString.indexOf('id="jakarta.faces.ViewRoot"');
             if (idx > 0) {
                 try {
                     var nodes = this.xmlReq.responseXML.getElementsByTagName("partial-response")[0].childNodes[0].childNodes;
                     for (var cnt=0; cnt<nodes.length; cnt++) {
                         var node = nodes[cnt];
-                        if (node.getAttribute('id') === 'javax.faces.ViewRoot') {
+                        if (node.getAttribute('id') === 'jakarta.faces.ViewRoot') {
                             result = node.textContent;
                         }
-                        if (node.getAttribute('id') === 'javax.faces.ViewState') {
+                        if (node.getAttribute('id') === 'jakarta.faces.ViewState') {
                             // NOTE: see jsf.ajax.doUpdate for more info....
                             viewState = node.firstChild;
                         }
@@ -2338,12 +2338,12 @@
                 admingui.util.log("***** Unable to find form! " + this.context.formid);
                 return;
             }
-            var field = form.elements['javax.faces.ViewState'];
+            var field = form.elements['jakarta.faces.ViewState'];
             if (typeof(field) === 'undefined') {
                 field = document.createElement("input");
                 field.type = "hidden";
-                field.name = "javax.faces.ViewState";
-                field.id = "javax.faces.ViewState";
+                field.name = "jakarta.faces.ViewState";
+                field.id = "jakarta.faces.ViewState";
                 form.appendChild(field);
             }
             field.value = viewState.nodeValue;

appserver/admingui/core/src/main/java/org/glassfish/admingui/handlers/ThemeHandlers.java

diff --git a/appserver/admingui/core/src/main/java/org/glassfish/admingui/handlers/ThemeHandlers.java b/appserver/admingui/core/src/main/java/org/glassfish/admingui/handlers/ThemeHandlers.java
index 7bc8914..844060c 100644
--- a/appserver/admingui/core/src/main/java/org/glassfish/admingui/handlers/ThemeHandlers.java
+++ b/appserver/admingui/core/src/main/java/org/glassfish/admingui/handlers/ThemeHandlers.java
@@ -26,7 +26,7 @@
 import java.util.Iterator;
 import java.util.List;
 import java.util.Properties;
-import javax.faces.context.FacesContext;
+import jakarta.faces.context.FacesContext;
 import org.glassfish.admingui.common.handlers.PluginHandlers;
 import org.glassfish.admingui.common.plugin.ConsoleClassLoader;
 import org.glassfish.admingui.connector.IntegrationPoint;

appserver/admingui/core/src/main/java/org/glassfish/admingui/handlers/WoodstockHandler.java

diff --git a/appserver/admingui/core/src/main/java/org/glassfish/admingui/handlers/WoodstockHandler.java b/appserver/admingui/core/src/main/java/org/glassfish/admingui/handlers/WoodstockHandler.java
index bb71f08..03b7672 100644
--- a/appserver/admingui/core/src/main/java/org/glassfish/admingui/handlers/WoodstockHandler.java
+++ b/appserver/admingui/core/src/main/java/org/glassfish/admingui/handlers/WoodstockHandler.java
@@ -33,9 +33,9 @@
 import com.sun.webui.jsf.model.UploadedFile;
 import com.sun.webui.jsf.component.Hyperlink;
 
-import javax.faces.context.ExternalContext;
-import javax.faces.context.FacesContext;
-import javax.faces.model.SelectItem;
+import jakarta.faces.context.ExternalContext;
+import jakarta.faces.context.FacesContext;
+import jakarta.faces.model.SelectItem;
 import com.sun.webui.jsf.model.Option;
 import com.sun.webui.jsf.model.OptionGroup;
 import com.sun.webui.jsf.component.DropDown;

appserver/admingui/core/src/main/java/org/glassfish/admingui/theme/AdminguiThemeContext.java

diff --git a/appserver/admingui/core/src/main/java/org/glassfish/admingui/theme/AdminguiThemeContext.java b/appserver/admingui/core/src/main/java/org/glassfish/admingui/theme/AdminguiThemeContext.java
index d8c104b..a5fb12a 100644
--- a/appserver/admingui/core/src/main/java/org/glassfish/admingui/theme/AdminguiThemeContext.java
+++ b/appserver/admingui/core/src/main/java/org/glassfish/admingui/theme/AdminguiThemeContext.java
@@ -27,7 +27,7 @@
 import java.util.Properties;
 import java.util.Enumeration;
 
-import javax.faces.context.FacesContext;
+import jakarta.faces.context.FacesContext;
 
 
 /**

appserver/admingui/core/src/main/java/org/glassfish/admingui/util/SunOptionUtil.java

diff --git a/appserver/admingui/core/src/main/java/org/glassfish/admingui/util/SunOptionUtil.java b/appserver/admingui/core/src/main/java/org/glassfish/admingui/util/SunOptionUtil.java
index 8957ec6..638ed57 100644
--- a/appserver/admingui/core/src/main/java/org/glassfish/admingui/util/SunOptionUtil.java
+++ b/appserver/admingui/core/src/main/java/org/glassfish/admingui/util/SunOptionUtil.java
@@ -22,7 +22,7 @@
 package org.glassfish.admingui.util;
 
 import com.sun.webui.jsf.model.Option;
-import javax.faces.model.SelectItem;
+import jakarta.faces.model.SelectItem;
 import java.lang.reflect.Array;
 import java.lang.reflect.Constructor;
 

appserver/admingui/core/src/main/resources/templates/baseLayout.xhtml

diff --git a/appserver/admingui/core/src/main/resources/templates/baseLayout.xhtml b/appserver/admingui/core/src/main/resources/templates/baseLayout.xhtml
index 5013abf..06a5673 100644
--- a/appserver/admingui/core/src/main/resources/templates/baseLayout.xhtml
+++ b/appserver/admingui/core/src/main/resources/templates/baseLayout.xhtml
@@ -41,7 +41,7 @@
             getPreference(default="#{false}", root="glassfish/layout", key="hideRight", value="#{sessionScope.hideRight}");
         </ui:event>
         <sun:head id="head" title="#{guiTitle}" javaScript="true" debug="false" parseOnLoad="false">
-            <h:outputScript name="jsf.js" library="javax.faces" target="head" />
+            <h:outputScript name="jsf.js" library="jakarta.faces" target="head" />
         <f:verbatim>
             <link rel="stylesheet" type="text/css" href="#{request.contextPath}/resources/yui/reset-fonts-grids.css"/>
             <link rel="stylesheet" type="text/css" href="#{request.contextPath}/resources/yui/assets/skins/sam/resize.css"/>

appserver/admingui/core/src/main/resources/templates/iframe.layout

diff --git a/appserver/admingui/core/src/main/resources/templates/iframe.layout b/appserver/admingui/core/src/main/resources/templates/iframe.layout
index fd95bc9..146c79d 100644
--- a/appserver/admingui/core/src/main/resources/templates/iframe.layout
+++ b/appserver/admingui/core/src/main/resources/templates/iframe.layout
@@ -26,7 +26,7 @@
 	    setPartialRequest("false");
 	</ui:event>
 	<sun:head title="#{guiTitle}" javaScript="true" debug="false" parseOnLoad="false">
-	    <h:outputScript name="jsf.js" library="javax.faces" target="head" />
+	    <h:outputScript name="jsf.js" library="jakarta.faces" target="head" />
 	    <sun:script url="/resource/common/js/adminjsf.js" />
 	    <!insert name="guiTemplateExtraHead" />
 	    <!insert name="guiExtraHead" />

appserver/admingui/war/src/main/webapp/WEB-INF/web.xml

diff --git a/appserver/admingui/war/src/main/webapp/WEB-INF/web.xml b/appserver/admingui/war/src/main/webapp/WEB-INF/web.xml
index 57e0638..7531aa5 100644
--- a/appserver/admingui/war/src/main/webapp/WEB-INF/web.xml
+++ b/appserver/admingui/war/src/main/webapp/WEB-INF/web.xml
@@ -43,11 +43,11 @@
         <param-value>true</param-value>
     </context-param>
     <context-param>
-        <param-name>javax.faces.VALIDATE_EMPTY_FIELDS</param-name>
+        <param-name>jakarta.faces.VALIDATE_EMPTY_FIELDS</param-name>
         <param-value>false</param-value>
     </context-param>
     <context-param>
-        <param-name>javax.faces.validator.DISABLE_DEFAULT_BEAN_VALIDATOR</param-name>
+        <param-name>jakarta.faces.validator.DISABLE_DEFAULT_BEAN_VALIDATOR</param-name>
         <param-value>true</param-value>
     </context-param>
 
@@ -65,7 +65,7 @@
     </filter-mapping>
     <servlet>
         <servlet-name>FacesServlet</servlet-name>
-        <servlet-class>javax.faces.webapp.FacesServlet</servlet-class>
+        <servlet-class>jakarta.faces.webapp.FacesServlet</servlet-class>
         <load-on-startup>1</load-on-startup>
     </servlet>
     <servlet>
@@ -129,7 +129,7 @@
         <welcome-file>/index.jsf</welcome-file>
     </welcome-file-list>
     <error-page>
-        <exception-type>javax.faces.application.ViewExpiredException</exception-type>
+        <exception-type>jakarta.faces.application.ViewExpiredException</exception-type>
         <location>/</location>
     </error-page>
 

appserver/core/api-exporter-fragment/pom.xml

diff --git a/appserver/core/api-exporter-fragment/pom.xml b/appserver/core/api-exporter-fragment/pom.xml
index a6f7945..25e3562 100755
--- a/appserver/core/api-exporter-fragment/pom.xml
+++ b/appserver/core/api-exporter-fragment/pom.xml
@@ -110,29 +110,29 @@
 javax.enterprise.inject.spi; \
 javax.enterprise.inject.spi.configurator; \
 javax.enterprise.util; \
-javax.faces; \
-javax.faces.annotation; \
-javax.faces.application; \
-javax.faces.bean; \
-javax.faces.component; \
-javax.faces.component.behavior; \
-javax.faces.component.html; \
-javax.faces.component.search; \
-javax.faces.component.visit; \
-javax.faces.context; \
-javax.faces.convert; \
-javax.faces.el; \
-javax.faces.event ; \
-javax.faces.flow; \
-javax.faces.flow.builder; \
-javax.faces.lifecycle; \
-javax.faces.model; \
-javax.faces.push; \
-javax.faces.render; \
-javax.faces.validator; \
-javax.faces.view; \
-javax.faces.view.facelets; \
-javax.faces.webapp; \
+jakarta.faces; \
+jakarta.faces.annotation; \
+jakarta.faces.application; \
+jakarta.faces.bean; \
+jakarta.faces.component; \
+jakarta.faces.component.behavior; \
+jakarta.faces.component.html; \
+jakarta.faces.component.search; \
+jakarta.faces.component.visit; \
+jakarta.faces.context; \
+jakarta.faces.convert; \
+jakarta.faces.el; \
+jakarta.faces.event ; \
+jakarta.faces.flow; \
+jakarta.faces.flow.builder; \
+jakarta.faces.lifecycle; \
+jakarta.faces.model; \
+jakarta.faces.push; \
+jakarta.faces.render; \
+jakarta.faces.validator; \
+jakarta.faces.view; \
+jakarta.faces.view.facelets; \
+jakarta.faces.webapp; \
 javax.inject; \
 javax.imageio; \
 javax.imageio.event; \

appserver/extras/embedded/all/pom.xml

diff --git a/appserver/extras/embedded/all/pom.xml b/appserver/extras/embedded/all/pom.xml
index 32170bc..76538e4 100644
--- a/appserver/extras/embedded/all/pom.xml
+++ b/appserver/extras/embedded/all/pom.xml
@@ -403,8 +403,8 @@
          <optional>true</optional>
      </dependency>
      <dependency>
-         <groupId>org.eclipse.persistence</groupId>
-         <artifactId>jakarta.persistence</artifactId>
+         <groupId>jakarta.persistence</groupId>
+         <artifactId>jakarta.persistence-api</artifactId>
          <optional>true</optional>
      </dependency>
      <dependency>

appserver/extras/embedded/web/pom.xml

diff --git a/appserver/extras/embedded/web/pom.xml b/appserver/extras/embedded/web/pom.xml
index 8e56e52..17a0ae9 100644
--- a/appserver/extras/embedded/web/pom.xml
+++ b/appserver/extras/embedded/web/pom.xml
@@ -723,8 +723,8 @@
         <optional>true</optional>
     </dependency>
     <dependency>
-        <groupId>org.eclipse.persistence</groupId>
-        <artifactId>jakarta.persistence</artifactId>
+        <groupId>jakarta.persistence</groupId>
+        <artifactId>jakarta.persistence-api</artifactId>
         <optional>true</optional>
     </dependency>
     <dependency>

appserver/featuresets/web/pom.xml

diff --git a/appserver/featuresets/web/pom.xml b/appserver/featuresets/web/pom.xml
index d91dbcf..d01fcee 100644
--- a/appserver/featuresets/web/pom.xml
+++ b/appserver/featuresets/web/pom.xml
@@ -632,8 +632,8 @@
             </exclusions>
         </dependency>
         <dependency>
-            <groupId>org.eclipse.persistence</groupId>
-            <artifactId>jakarta.persistence</artifactId>
+            <groupId>jakarta.persistence</groupId>
+            <artifactId>jakarta.persistence-api</artifactId>
             <exclusions>
                 <exclusion>
                     <groupId>*</groupId>

appserver/pom.xml

diff --git a/appserver/pom.xml b/appserver/pom.xml
index 9024805..ab52b4d 100644
--- a/appserver/pom.xml
+++ b/appserver/pom.xml
@@ -213,7 +213,7 @@
                             <jarType>impl</jarType>
                             <specVersion>2.2</specVersion>
                             <implVersion>${mojarra.version}</implVersion>
-                            <apiPackage>javax.faces</apiPackage>
+                            <apiPackage>jakarta.faces</apiPackage>
                             <implNamespace>org.glassfish</implNamespace>
                         </spec>
                         <spec>
@@ -536,11 +536,6 @@
             </dependency>
             <dependency>
                 <groupId>org.eclipse.persistence</groupId>
-                <artifactId>jakarta.persistence</artifactId>
-                <version>${jakarta-persistence-api.version}</version>
-            </dependency>
-            <dependency>
-                <groupId>org.eclipse.persistence</groupId>
                 <artifactId>org.eclipse.persistence.core</artifactId>
                 <version>${eclipselink.version}</version>
             </dependency>

appserver/tests/appserv-tests/devtests/jms/injection/jmsContext/basic/jsfRequestScoped/descriptor/web.xml

diff --git a/appserver/tests/appserv-tests/devtests/jms/injection/jmsContext/basic/jsfRequestScoped/descriptor/web.xml b/appserver/tests/appserv-tests/devtests/jms/injection/jmsContext/basic/jsfRequestScoped/descriptor/web.xml
index 6598982..df8dc6d 100644
--- a/appserver/tests/appserv-tests/devtests/jms/injection/jmsContext/basic/jsfRequestScoped/descriptor/web.xml
+++ b/appserver/tests/appserv-tests/devtests/jms/injection/jmsContext/basic/jsfRequestScoped/descriptor/web.xml
@@ -20,12 +20,12 @@
 <web-app version="2.5" xmlns="http://java.sun.com/xml/ns/javaee" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-app_2_5.xsd">
 
     <context-param>
-        <param-name>javax.faces.jms.injection</param-name>
+        <param-name>jakarta.faces.jms.injection</param-name>
         <param-value>Development</param-value>
     </context-param>
     <servlet>
         <servlet-name>Faces Servlet</servlet-name>
-        <servlet-class>javax.faces.webapp.FacesServlet</servlet-class>
+        <servlet-class>jakarta.faces.webapp.FacesServlet</servlet-class>
         <load-on-startup>1</load-on-startup>
     </servlet>
     <servlet-mapping>

appserver/tests/appserv-tests/devtests/jms/injection/jmsContext/basic/jsfRequestScoped/servlet/com/oracle/jms/test/NewJSFManagedBean.java

diff --git a/appserver/tests/appserv-tests/devtests/jms/injection/jmsContext/basic/jsfRequestScoped/servlet/com/oracle/jms/test/NewJSFManagedBean.java b/appserver/tests/appserv-tests/devtests/jms/injection/jmsContext/basic/jsfRequestScoped/servlet/com/oracle/jms/test/NewJSFManagedBean.java
index 42b90c8..2ee5333 100644
--- a/appserver/tests/appserv-tests/devtests/jms/injection/jmsContext/basic/jsfRequestScoped/servlet/com/oracle/jms/test/NewJSFManagedBean.java
+++ b/appserver/tests/appserv-tests/devtests/jms/injection/jmsContext/basic/jsfRequestScoped/servlet/com/oracle/jms/test/NewJSFManagedBean.java
@@ -21,8 +21,8 @@
 package com.oracle.jms.test;
 
 import jakarta.annotation.Resource;
-import javax.faces.bean.ManagedBean;
-import javax.faces.bean.ViewScoped;
+import jakarta.faces.bean.ManagedBean;
+import jakarta.faces.bean.ViewScoped;
 import javax.inject.Inject;
 import jakarta.jms.*;
 

appserver/tests/appserv-tests/devtests/jms/injection/jmsContext/basic/jsfTransactionScoped/descriptor/web.xml

diff --git a/appserver/tests/appserv-tests/devtests/jms/injection/jmsContext/basic/jsfTransactionScoped/descriptor/web.xml b/appserver/tests/appserv-tests/devtests/jms/injection/jmsContext/basic/jsfTransactionScoped/descriptor/web.xml
index 8917c22..099cf1b 100644
--- a/appserver/tests/appserv-tests/devtests/jms/injection/jmsContext/basic/jsfTransactionScoped/descriptor/web.xml
+++ b/appserver/tests/appserv-tests/devtests/jms/injection/jmsContext/basic/jsfTransactionScoped/descriptor/web.xml
@@ -20,12 +20,12 @@
 <web-app version="2.5" xmlns="http://java.sun.com/xml/ns/javaee" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-app_2_5.xsd">
 
     <context-param>
-        <param-name>javax.faces.jms.injection</param-name>
+        <param-name>jakarta.faces.jms.injection</param-name>
         <param-value>Development</param-value>
     </context-param>
     <servlet>
         <servlet-name>Faces Servlet</servlet-name>
-        <servlet-class>javax.faces.webapp.FacesServlet</servlet-class>
+        <servlet-class>jakarta.faces.webapp.FacesServlet</servlet-class>
         <load-on-startup>1</load-on-startup>
     </servlet>
     <servlet-mapping>

appserver/tests/appserv-tests/devtests/jms/injection/jmsContext/basic/jsfTransactionScoped/servlet/com/oracle/jms/test/NewJSFManagedBean.java

diff --git a/appserver/tests/appserv-tests/devtests/jms/injection/jmsContext/basic/jsfTransactionScoped/servlet/com/oracle/jms/test/NewJSFManagedBean.java b/appserver/tests/appserv-tests/devtests/jms/injection/jmsContext/basic/jsfTransactionScoped/servlet/com/oracle/jms/test/NewJSFManagedBean.java
index a787c67..ffc0d38 100644
--- a/appserver/tests/appserv-tests/devtests/jms/injection/jmsContext/basic/jsfTransactionScoped/servlet/com/oracle/jms/test/NewJSFManagedBean.java
+++ b/appserver/tests/appserv-tests/devtests/jms/injection/jmsContext/basic/jsfTransactionScoped/servlet/com/oracle/jms/test/NewJSFManagedBean.java
@@ -21,8 +21,8 @@
 package com.oracle.jms.test;
 
 import jakarta.annotation.Resource;
-import javax.faces.bean.ManagedBean;
-import javax.faces.bean.ViewScoped;
+import jakarta.faces.bean.ManagedBean;
+import jakarta.faces.bean.ViewScoped;
 import javax.inject.Inject;
 import jakarta.jms.*;
 import javax.ejb.*;

appserver/tests/appserv-tests/devtests/jms/injection/jmsContext/basic/jspRequestScoped/descriptor/web.xml

diff --git a/appserver/tests/appserv-tests/devtests/jms/injection/jmsContext/basic/jspRequestScoped/descriptor/web.xml b/appserver/tests/appserv-tests/devtests/jms/injection/jmsContext/basic/jspRequestScoped/descriptor/web.xml
index 6598982..df8dc6d 100644
--- a/appserver/tests/appserv-tests/devtests/jms/injection/jmsContext/basic/jspRequestScoped/descriptor/web.xml
+++ b/appserver/tests/appserv-tests/devtests/jms/injection/jmsContext/basic/jspRequestScoped/descriptor/web.xml
@@ -20,12 +20,12 @@
 <web-app version="2.5" xmlns="http://java.sun.com/xml/ns/javaee" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-app_2_5.xsd">
 
     <context-param>
-        <param-name>javax.faces.jms.injection</param-name>
+        <param-name>jakarta.faces.jms.injection</param-name>
         <param-value>Development</param-value>
     </context-param>
     <servlet>
         <servlet-name>Faces Servlet</servlet-name>
-        <servlet-class>javax.faces.webapp.FacesServlet</servlet-class>
+        <servlet-class>jakarta.faces.webapp.FacesServlet</servlet-class>
         <load-on-startup>1</load-on-startup>
     </servlet>
     <servlet-mapping>

appserver/tests/appserv-tests/devtests/jms/injection/jmsContext/basic/jspTransactionScoped/descriptor/web.xml

diff --git a/appserver/tests/appserv-tests/devtests/jms/injection/jmsContext/basic/jspTransactionScoped/descriptor/web.xml b/appserver/tests/appserv-tests/devtests/jms/injection/jmsContext/basic/jspTransactionScoped/descriptor/web.xml
index 6598982..df8dc6d 100644
--- a/appserver/tests/appserv-tests/devtests/jms/injection/jmsContext/basic/jspTransactionScoped/descriptor/web.xml
+++ b/appserver/tests/appserv-tests/devtests/jms/injection/jmsContext/basic/jspTransactionScoped/descriptor/web.xml
@@ -20,12 +20,12 @@
 <web-app version="2.5" xmlns="http://java.sun.com/xml/ns/javaee" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-app_2_5.xsd">
 
     <context-param>
-        <param-name>javax.faces.jms.injection</param-name>
+        <param-name>jakarta.faces.jms.injection</param-name>
         <param-value>Development</param-value>
     </context-param>
     <servlet>
         <servlet-name>Faces Servlet</servlet-name>
-        <servlet-class>javax.faces.webapp.FacesServlet</servlet-class>
+        <servlet-class>jakarta.faces.webapp.FacesServlet</servlet-class>
         <load-on-startup>1</load-on-startup>
     </servlet>
     <servlet-mapping>

appserver/tests/appserv-tests/devtests/jms/injection/jmsContext/basic/wsRequestScoped/descriptor/web.xml

diff --git a/appserver/tests/appserv-tests/devtests/jms/injection/jmsContext/basic/wsRequestScoped/descriptor/web.xml b/appserver/tests/appserv-tests/devtests/jms/injection/jmsContext/basic/wsRequestScoped/descriptor/web.xml
index 6598982..df8dc6d 100644
--- a/appserver/tests/appserv-tests/devtests/jms/injection/jmsContext/basic/wsRequestScoped/descriptor/web.xml
+++ b/appserver/tests/appserv-tests/devtests/jms/injection/jmsContext/basic/wsRequestScoped/descriptor/web.xml
@@ -20,12 +20,12 @@
 <web-app version="2.5" xmlns="http://java.sun.com/xml/ns/javaee" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-app_2_5.xsd">
 
     <context-param>
-        <param-name>javax.faces.jms.injection</param-name>
+        <param-name>jakarta.faces.jms.injection</param-name>
         <param-value>Development</param-value>
     </context-param>
     <servlet>
         <servlet-name>Faces Servlet</servlet-name>
-        <servlet-class>javax.faces.webapp.FacesServlet</servlet-class>
+        <servlet-class>jakarta.faces.webapp.FacesServlet</servlet-class>
         <load-on-startup>1</load-on-startup>
     </servlet>
     <servlet-mapping>

appserver/tests/appserv-tests/devtests/jms/injection/jmsContext/basic/wsTransactionScoped/descriptor/web.xml

diff --git a/appserver/tests/appserv-tests/devtests/jms/injection/jmsContext/basic/wsTransactionScoped/descriptor/web.xml b/appserver/tests/appserv-tests/devtests/jms/injection/jmsContext/basic/wsTransactionScoped/descriptor/web.xml
index 6598982..df8dc6d 100644
--- a/appserver/tests/appserv-tests/devtests/jms/injection/jmsContext/basic/wsTransactionScoped/descriptor/web.xml
+++ b/appserver/tests/appserv-tests/devtests/jms/injection/jmsContext/basic/wsTransactionScoped/descriptor/web.xml
@@ -20,12 +20,12 @@
 <web-app version="2.5" xmlns="http://java.sun.com/xml/ns/javaee" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-app_2_5.xsd">
 
     <context-param>
-        <param-name>javax.faces.jms.injection</param-name>
+        <param-name>jakarta.faces.jms.injection</param-name>
         <param-value>Development</param-value>
     </context-param>
     <servlet>
         <servlet-name>Faces Servlet</servlet-name>
-        <servlet-class>javax.faces.webapp.FacesServlet</servlet-class>
+        <servlet-class>jakarta.faces.webapp.FacesServlet</servlet-class>
         <load-on-startup>1</load-on-startup>
     </servlet>
     <servlet-mapping>

appserver/tests/appserv-tests/devtests/web/jsfWithBundledOneDotOneJarFiles/descriptor/web.xml

diff --git a/appserver/tests/appserv-tests/devtests/web/jsfWithBundledOneDotOneJarFiles/descriptor/web.xml b/appserver/tests/appserv-tests/devtests/web/jsfWithBundledOneDotOneJarFiles/descriptor/web.xml
index 2790c38..ccc6672 100644
--- a/appserver/tests/appserv-tests/devtests/web/jsfWithBundledOneDotOneJarFiles/descriptor/web.xml
+++ b/appserver/tests/appserv-tests/devtests/web/jsfWithBundledOneDotOneJarFiles/descriptor/web.xml
@@ -26,7 +26,7 @@
     <!-- Faces Servlet -->
     <servlet>
         <servlet-name>Faces Servlet</servlet-name>
-        <servlet-class>javax.faces.webapp.FacesServlet</servlet-class>
+        <servlet-class>jakarta.faces.webapp.FacesServlet</servlet-class>
         <load-on-startup> 1 </load-on-startup>
     </servlet>
 

appserver/tests/appserv-tests/devtests/web/servlet-3.0/servletContainerInitializer/jsfManagedBeanAnnotation/descriptor/web.xml

diff --git a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/servletContainerInitializer/jsfManagedBeanAnnotation/descriptor/web.xml b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/servletContainerInitializer/jsfManagedBeanAnnotation/descriptor/web.xml
index 0cc8b10..caaf070 100644
--- a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/servletContainerInitializer/jsfManagedBeanAnnotation/descriptor/web.xml
+++ b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/servletContainerInitializer/jsfManagedBeanAnnotation/descriptor/web.xml
@@ -21,7 +21,7 @@
 
   <servlet>
     <servlet-name>Faces Servlet</servlet-name>
-    <servlet-class>javax.faces.webapp.FacesServlet</servlet-class>
+    <servlet-class>jakarta.faces.webapp.FacesServlet</servlet-class>
     <load-on-startup>1</load-on-startup>
   </servlet>
 

appserver/tests/appserv-tests/devtests/web/servlet-3.0/servletContainerInitializer/jsfManagedBeanAnnotation/servlet/test/MyBackingBean.java

diff --git a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/servletContainerInitializer/jsfManagedBeanAnnotation/servlet/test/MyBackingBean.java b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/servletContainerInitializer/jsfManagedBeanAnnotation/servlet/test/MyBackingBean.java
index 316ff8f..79d80e5 100644
--- a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/servletContainerInitializer/jsfManagedBeanAnnotation/servlet/test/MyBackingBean.java
+++ b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/servletContainerInitializer/jsfManagedBeanAnnotation/servlet/test/MyBackingBean.java
@@ -16,8 +16,8 @@
 
 package test;
 
-import javax.faces.bean.ManagedBean;
-import javax.faces.bean.SessionScoped;
+import jakarta.faces.bean.ManagedBean;
+import jakarta.faces.bean.SessionScoped;
 
 @ManagedBean(name="my")
 @SessionScoped

appserver/tests/appserv-tests/devtests/web/servlet-3.0/webFragmentWithFileUpload/WebTest.java

diff --git a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/webFragmentWithFileUpload/WebTest.java b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/webFragmentWithFileUpload/WebTest.java
index a673226..ffd0eb1 100644
--- a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/webFragmentWithFileUpload/WebTest.java
+++ b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/webFragmentWithFileUpload/WebTest.java
@@ -80,8 +80,8 @@
                     sessionId = line.split(";")[0].split("=")[1];
                     continue;
                 }
-                if(line.contains("javax.faces.ViewState:0")) {
-                    String[] results = line.split("javax.faces.ViewState:0");
+                if(line.contains("jakarta.faces.ViewState:0")) {
+                    String[] results = line.split("jakarta.faces.ViewState:0");
                     viewId = results[1].trim().split(" ")[1].trim().split("\"")[1];
                     break;
                 }
@@ -109,7 +109,7 @@
             ba.write("--AaB03x\r\n".getBytes());
             ba.write("Content-Disposition: form-data; name=\"form:j_idt5\"\r\n\r\n".getBytes());
             ba.write("\r\n--AaB03x\r\n".getBytes());
-            ba.write("Content-Disposition: form-data; name=\"javax.faces.ViewState\"\r\n\r\n".getBytes());
+            ba.write("Content-Disposition: form-data; name=\"jakarta.faces.ViewState\"\r\n\r\n".getBytes());
             ba.write((viewId + "\r\n").getBytes());
             // Write boundary end
             ba.write("--AaB03x--\r\n".getBytes());

appserver/tests/appserv-tests/devtests/web/servlet-3.0/webFragmentWithFileUpload/descriptor/web-fragment.xml

diff --git a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/webFragmentWithFileUpload/descriptor/web-fragment.xml b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/webFragmentWithFileUpload/descriptor/web-fragment.xml
index 1d358e7..7d8733d 100755
--- a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/webFragmentWithFileUpload/descriptor/web-fragment.xml
+++ b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/webFragmentWithFileUpload/descriptor/web-fragment.xml
@@ -21,7 +21,7 @@
  <display-name>File upload test</display-name>
 	<servlet>
 		<servlet-name>Faces Servlet</servlet-name>
-		<servlet-class>javax.faces.webapp.FacesServlet</servlet-class>
+		<servlet-class>jakarta.faces.webapp.FacesServlet</servlet-class>
 		<load-on-startup>1</load-on-startup>
 	</servlet>
  	<!-- Map these files with JSF -->

appserver/tests/appserv-tests/devtests/web/servlet-3.0/webFragmentWithFileUpload/servlet/Bean.java

diff --git a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/webFragmentWithFileUpload/servlet/Bean.java b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/webFragmentWithFileUpload/servlet/Bean.java
index 87ce8bc..819e674 100755
--- a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/webFragmentWithFileUpload/servlet/Bean.java
+++ b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/webFragmentWithFileUpload/servlet/Bean.java
@@ -18,7 +18,7 @@
 
 import java.io.IOException;
 import java.util.Scanner;
-import javax.faces.bean.ManagedBean;
+import jakarta.faces.bean.ManagedBean;
 import javax.servlet.http.Part;
 
 @ManagedBean

appserver/tests/appserv-tests/devtests/web/servletRequestGetPathInfoGetPathTranslated/descriptor/web.xml

diff --git a/appserver/tests/appserv-tests/devtests/web/servletRequestGetPathInfoGetPathTranslated/descriptor/web.xml b/appserver/tests/appserv-tests/devtests/web/servletRequestGetPathInfoGetPathTranslated/descriptor/web.xml
index b400b18..3920cdb 100644
--- a/appserver/tests/appserv-tests/devtests/web/servletRequestGetPathInfoGetPathTranslated/descriptor/web.xml
+++ b/appserver/tests/appserv-tests/devtests/web/servletRequestGetPathInfoGetPathTranslated/descriptor/web.xml
@@ -31,7 +31,7 @@
 
   <servlet>
     <servlet-name>Faces Servlet</servlet-name>
-    <servlet-class>javax.faces.webapp.FacesServlet</servlet-class>
+    <servlet-class>jakarta.faces.webapp.FacesServlet</servlet-class>
     <load-on-startup>1</load-on-startup>
   </servlet>
 

appserver/tests/appserv-tests/devtests/web/weldJsfFormLoginHttpSessionListener/descriptor/web.xml

diff --git a/appserver/tests/appserv-tests/devtests/web/weldJsfFormLoginHttpSessionListener/descriptor/web.xml b/appserver/tests/appserv-tests/devtests/web/weldJsfFormLoginHttpSessionListener/descriptor/web.xml
index 2dcd431..a277891 100644
--- a/appserver/tests/appserv-tests/devtests/web/weldJsfFormLoginHttpSessionListener/descriptor/web.xml
+++ b/appserver/tests/appserv-tests/devtests/web/weldJsfFormLoginHttpSessionListener/descriptor/web.xml
@@ -19,12 +19,12 @@
 
 <web-app version="3.0" xmlns="http://java.sun.com/xml/ns/javaee" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-app_3_0.xsd">
   <context-param>
-    <param-name>javax.faces.PROJECT_STAGE</param-name>
+    <param-name>jakarta.faces.PROJECT_STAGE</param-name>
     <param-value>Development</param-value>
   </context-param>
   <servlet>
     <servlet-name>Faces Servlet</servlet-name>
-    <servlet-class>javax.faces.webapp.FacesServlet</servlet-class>
+    <servlet-class>jakarta.faces.webapp.FacesServlet</servlet-class>
   </servlet>
   <servlet-mapping>
     <servlet-name>Faces Servlet</servlet-name>

appserver/tests/appserv-tests/devtests/web/weldJsfFormLoginHttpSessionListener/src/test/TestMessage.java

diff --git a/appserver/tests/appserv-tests/devtests/web/weldJsfFormLoginHttpSessionListener/src/test/TestMessage.java b/appserver/tests/appserv-tests/devtests/web/weldJsfFormLoginHttpSessionListener/src/test/TestMessage.java
index 5e0efe0..e4e2c91 100644
--- a/appserver/tests/appserv-tests/devtests/web/weldJsfFormLoginHttpSessionListener/src/test/TestMessage.java
+++ b/appserver/tests/appserv-tests/devtests/web/weldJsfFormLoginHttpSessionListener/src/test/TestMessage.java
@@ -19,7 +19,7 @@
 import java.io.Serializable;
 
 import javax.enterprise.context.SessionScoped;
-//import javax.faces.bean.ManagedBean;
+//import jakarta.faces.bean.ManagedBean;
 import javax.inject.Named;
 
 @Named

appserver/tests/appserv-tests/devtests/web/weldJsfLoginPage/descriptor/web.xml

diff --git a/appserver/tests/appserv-tests/devtests/web/weldJsfLoginPage/descriptor/web.xml b/appserver/tests/appserv-tests/devtests/web/weldJsfLoginPage/descriptor/web.xml
index 2a4ed72..4badc45 100644
--- a/appserver/tests/appserv-tests/devtests/web/weldJsfLoginPage/descriptor/web.xml
+++ b/appserver/tests/appserv-tests/devtests/web/weldJsfLoginPage/descriptor/web.xml
@@ -19,12 +19,12 @@
 
 <web-app version="3.0" xmlns="http://java.sun.com/xml/ns/javaee" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-app_3_0.xsd">
     <context-param>
-        <param-name>javax.faces.PROJECT_STAGE</param-name>
+        <param-name>jakarta.faces.PROJECT_STAGE</param-name>
         <param-value>Development</param-value>
     </context-param>
     <servlet>
         <servlet-name>Faces Servlet</servlet-name>
-        <servlet-class>javax.faces.webapp.FacesServlet</servlet-class>
+        <servlet-class>jakarta.faces.webapp.FacesServlet</servlet-class>
         <load-on-startup>1</load-on-startup>
     </servlet>
     <servlet-mapping>

appserver/tests/appserv-tests/devtests/web/weldJsfServerAuthModuleRedirect/descriptor/web.xml

diff --git a/appserver/tests/appserv-tests/devtests/web/weldJsfServerAuthModuleRedirect/descriptor/web.xml b/appserver/tests/appserv-tests/devtests/web/weldJsfServerAuthModuleRedirect/descriptor/web.xml
index 1e02781..40c6f63 100644
--- a/appserver/tests/appserv-tests/devtests/web/weldJsfServerAuthModuleRedirect/descriptor/web.xml
+++ b/appserver/tests/appserv-tests/devtests/web/weldJsfServerAuthModuleRedirect/descriptor/web.xml
@@ -24,7 +24,7 @@
          version="2.4">
   <servlet>
     <servlet-name>Faces Servlet</servlet-name>
-    <servlet-class>javax.faces.webapp.FacesServlet</servlet-class>
+    <servlet-class>jakarta.faces.webapp.FacesServlet</servlet-class>
   </servlet>
   <servlet-mapping>
     <servlet-name>Faces Servlet</servlet-name>

appserver/tests/appserv-tests/devtests/web/weldJsfServerAuthModuleRedirect/src/test/TestMessage.java

diff --git a/appserver/tests/appserv-tests/devtests/web/weldJsfServerAuthModuleRedirect/src/test/TestMessage.java b/appserver/tests/appserv-tests/devtests/web/weldJsfServerAuthModuleRedirect/src/test/TestMessage.java
index 5e0efe0..e4e2c91 100644
--- a/appserver/tests/appserv-tests/devtests/web/weldJsfServerAuthModuleRedirect/src/test/TestMessage.java
+++ b/appserver/tests/appserv-tests/devtests/web/weldJsfServerAuthModuleRedirect/src/test/TestMessage.java
@@ -19,7 +19,7 @@
 import java.io.Serializable;
 
 import javax.enterprise.context.SessionScoped;
-//import javax.faces.bean.ManagedBean;
+//import jakarta.faces.bean.ManagedBean;
 import javax.inject.Named;
 
 @Named

appserver/tests/community/web/jsfastrologer/metadata/web.xml

diff --git a/appserver/tests/community/web/jsfastrologer/metadata/web.xml b/appserver/tests/community/web/jsfastrologer/metadata/web.xml
index f3520d2..67504d6 100644
--- a/appserver/tests/community/web/jsfastrologer/metadata/web.xml
+++ b/appserver/tests/community/web/jsfastrologer/metadata/web.xml
@@ -27,12 +27,12 @@
         <param-value>false</param-value>
     </context-param>
     <context-param>
-        <param-name>javax.faces.STATE_SAVING_METHOD</param-name>
+        <param-name>jakarta.faces.STATE_SAVING_METHOD</param-name>
         <param-value>client</param-value>
     </context-param>
     <servlet>
         <servlet-name>Faces Servlet</servlet-name>
-        <servlet-class>javax.faces.webapp.FacesServlet</servlet-class>
+        <servlet-class>jakarta.faces.webapp.FacesServlet</servlet-class>
         <load-on-startup>1</load-on-startup>
         </servlet>
     <servlet-mapping>

appserver/tests/community/web/jsfinjection/metadata/web.xml

diff --git a/appserver/tests/community/web/jsfinjection/metadata/web.xml b/appserver/tests/community/web/jsfinjection/metadata/web.xml
index f0a0101..0275b4c 100644
--- a/appserver/tests/community/web/jsfinjection/metadata/web.xml
+++ b/appserver/tests/community/web/jsfinjection/metadata/web.xml
@@ -37,7 +37,7 @@
 
     <servlet>
         <servlet-name>Faces Servlet</servlet-name>
-        <servlet-class>javax.faces.webapp.FacesServlet</servlet-class>
+        <servlet-class>jakarta.faces.webapp.FacesServlet</servlet-class>
         <load-on-startup>1</load-on-startup>
     </servlet>
     <servlet-mapping>

appserver/tests/embedded/maven-plugin/jsftest/src/main/java/org/glassfish/tests/embedded/jsftest/JSFTestBean.java

diff --git a/appserver/tests/embedded/maven-plugin/jsftest/src/main/java/org/glassfish/tests/embedded/jsftest/JSFTestBean.java b/appserver/tests/embedded/maven-plugin/jsftest/src/main/java/org/glassfish/tests/embedded/jsftest/JSFTestBean.java
index d37232e..48efd0b 100644
--- a/appserver/tests/embedded/maven-plugin/jsftest/src/main/java/org/glassfish/tests/embedded/jsftest/JSFTestBean.java
+++ b/appserver/tests/embedded/maven-plugin/jsftest/src/main/java/org/glassfish/tests/embedded/jsftest/JSFTestBean.java
@@ -16,7 +16,7 @@
 
 package org.glassfish.tests.embedded.jsftest;
 
-import javax.faces.bean.ManagedBean;
+import jakarta.faces.bean.ManagedBean;
 
 /**
  * @author bhavanishankar@java.net

appserver/tests/embedded/maven-plugin/jsftest/src/main/java/org/glassfish/tests/embedded/jsftest/JSFTestServlet.java

diff --git a/appserver/tests/embedded/maven-plugin/jsftest/src/main/java/org/glassfish/tests/embedded/jsftest/JSFTestServlet.java b/appserver/tests/embedded/maven-plugin/jsftest/src/main/java/org/glassfish/tests/embedded/jsftest/JSFTestServlet.java
index d759242..d49b833 100644
--- a/appserver/tests/embedded/maven-plugin/jsftest/src/main/java/org/glassfish/tests/embedded/jsftest/JSFTestServlet.java
+++ b/appserver/tests/embedded/maven-plugin/jsftest/src/main/java/org/glassfish/tests/embedded/jsftest/JSFTestServlet.java
@@ -16,13 +16,13 @@
 
 package org.glassfish.tests.embedded.jsftest;
 
-import javax.faces.FactoryFinder;
-import javax.faces.application.Application;
-import javax.faces.application.ViewHandler;
-import javax.faces.component.UIViewRoot;
-import javax.faces.context.FacesContext;
-import javax.faces.context.FacesContextFactory;
-import javax.faces.lifecycle.LifecycleFactory;
+import jakarta.faces.FactoryFinder;
+import jakarta.faces.application.Application;
+import jakarta.faces.application.ViewHandler;
+import jakarta.faces.component.UIViewRoot;
+import jakarta.faces.context.FacesContext;
+import jakarta.faces.context.FacesContextFactory;
+import jakarta.faces.lifecycle.LifecycleFactory;
 import javax.servlet.ServletContext;
 import javax.servlet.ServletException;
 import javax.servlet.http.HttpServlet;

appserver/tests/embedded/maven-plugin/jsftest/src/main/webapp/WEB-INF/web.xml

diff --git a/appserver/tests/embedded/maven-plugin/jsftest/src/main/webapp/WEB-INF/web.xml b/appserver/tests/embedded/maven-plugin/jsftest/src/main/webapp/WEB-INF/web.xml
index 7e35f53..7eeff73 100644
--- a/appserver/tests/embedded/maven-plugin/jsftest/src/main/webapp/WEB-INF/web.xml
+++ b/appserver/tests/embedded/maven-plugin/jsftest/src/main/webapp/WEB-INF/web.xml
@@ -19,12 +19,12 @@
 
 <web-app version="3.0" xmlns="http://java.sun.com/xml/ns/javaee" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-app_3_0.xsd">
     <context-param>
-        <param-name>javax.faces.PROJECT_STAGE</param-name>
+        <param-name>jakarta.faces.PROJECT_STAGE</param-name>
         <param-value>Development</param-value>
     </context-param>
     <servlet>
         <servlet-name>Faces Servlet</servlet-name>
-        <servlet-class>javax.faces.webapp.FacesServlet</servlet-class>
+        <servlet-class>jakarta.faces.webapp.FacesServlet</servlet-class>
         <load-on-startup>1</load-on-startup>
     </servlet>
     <servlet>

appserver/tests/paas/basic-jpa/src/main/webapp/WEB-INF/web.xml

diff --git a/appserver/tests/paas/basic-jpa/src/main/webapp/WEB-INF/web.xml b/appserver/tests/paas/basic-jpa/src/main/webapp/WEB-INF/web.xml
index 80f1961..7beb8b0 100644
--- a/appserver/tests/paas/basic-jpa/src/main/webapp/WEB-INF/web.xml
+++ b/appserver/tests/paas/basic-jpa/src/main/webapp/WEB-INF/web.xml
@@ -19,12 +19,12 @@
 
 <web-app version="3.0" xmlns="http://java.sun.com/xml/ns/javaee" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-app_3_0.xsd">
     <context-param>
-        <param-name>javax.faces.PROJECT_STAGE</param-name>
+        <param-name>jakarta.faces.PROJECT_STAGE</param-name>
         <param-value>Development</param-value>
     </context-param>
     <servlet>
         <servlet-name>Faces Servlet</servlet-name>
-        <servlet-class>javax.faces.webapp.FacesServlet</servlet-class>
+        <servlet-class>jakarta.faces.webapp.FacesServlet</servlet-class>
         <load-on-startup>1</load-on-startup>
     </servlet>
     <servlet>

appserver/tests/paas/basic-shared-service-test/src/main/webapp/WEB-INF/web.xml

diff --git a/appserver/tests/paas/basic-shared-service-test/src/main/webapp/WEB-INF/web.xml b/appserver/tests/paas/basic-shared-service-test/src/main/webapp/WEB-INF/web.xml
index 80f1961..7beb8b0 100644
--- a/appserver/tests/paas/basic-shared-service-test/src/main/webapp/WEB-INF/web.xml
+++ b/appserver/tests/paas/basic-shared-service-test/src/main/webapp/WEB-INF/web.xml
@@ -19,12 +19,12 @@
 
 <web-app version="3.0" xmlns="http://java.sun.com/xml/ns/javaee" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-app_3_0.xsd">
     <context-param>
-        <param-name>javax.faces.PROJECT_STAGE</param-name>
+        <param-name>jakarta.faces.PROJECT_STAGE</param-name>
         <param-value>Development</param-value>
     </context-param>
     <servlet>
         <servlet-name>Faces Servlet</servlet-name>
-        <servlet-class>javax.faces.webapp.FacesServlet</servlet-class>
+        <servlet-class>jakarta.faces.webapp.FacesServlet</servlet-class>
         <load-on-startup>1</load-on-startup>
     </servlet>
     <servlet>

appserver/tests/paas/ext-shared-service-enable-disable-test/src/main/webapp/WEB-INF/web.xml

diff --git a/appserver/tests/paas/ext-shared-service-enable-disable-test/src/main/webapp/WEB-INF/web.xml b/appserver/tests/paas/ext-shared-service-enable-disable-test/src/main/webapp/WEB-INF/web.xml
index 8a3d429..4af4bb8 100644
--- a/appserver/tests/paas/ext-shared-service-enable-disable-test/src/main/webapp/WEB-INF/web.xml
+++ b/appserver/tests/paas/ext-shared-service-enable-disable-test/src/main/webapp/WEB-INF/web.xml
@@ -19,12 +19,12 @@
 
 <web-app version="3.0" xmlns="http://java.sun.com/xml/ns/javaee" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-app_3_0.xsd">
     <context-param>
-        <param-name>javax.faces.PROJECT_STAGE</param-name>
+        <param-name>jakarta.faces.PROJECT_STAGE</param-name>
         <param-value>Development</param-value>
     </context-param>
     <servlet>
         <servlet-name>Faces Servlet</servlet-name>
-        <servlet-class>javax.faces.webapp.FacesServlet</servlet-class>
+        <servlet-class>jakarta.faces.webapp.FacesServlet</servlet-class>
         <load-on-startup>1</load-on-startup>
     </servlet>
     <servlet>

appserver/tests/paas/external-and-shared-service/src/main/webapp/WEB-INF/web.xml

diff --git a/appserver/tests/paas/external-and-shared-service/src/main/webapp/WEB-INF/web.xml b/appserver/tests/paas/external-and-shared-service/src/main/webapp/WEB-INF/web.xml
index 6e47f81..9b91c0e 100644
--- a/appserver/tests/paas/external-and-shared-service/src/main/webapp/WEB-INF/web.xml
+++ b/appserver/tests/paas/external-and-shared-service/src/main/webapp/WEB-INF/web.xml
@@ -19,12 +19,12 @@
 
 <web-app version="3.0" xmlns="http://java.sun.com/xml/ns/javaee" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-app_3_0.xsd">
     <context-param>
-        <param-name>javax.faces.PROJECT_STAGE</param-name>
+        <param-name>jakarta.faces.PROJECT_STAGE</param-name>
         <param-value>Development</param-value>
     </context-param>
     <servlet>
         <servlet-name>Faces Servlet</servlet-name>
-        <servlet-class>javax.faces.webapp.FacesServlet</servlet-class>
+        <servlet-class>jakarta.faces.webapp.FacesServlet</servlet-class>
         <load-on-startup>1</load-on-startup>
     </servlet>
     <servlet>

appserver/tests/paas/multiple-spe-test/spetest/src/main/webapp/WEB-INF/web.xml

diff --git a/appserver/tests/paas/multiple-spe-test/spetest/src/main/webapp/WEB-INF/web.xml b/appserver/tests/paas/multiple-spe-test/spetest/src/main/webapp/WEB-INF/web.xml
index e5bae54..fcc40ca 100644
--- a/appserver/tests/paas/multiple-spe-test/spetest/src/main/webapp/WEB-INF/web.xml
+++ b/appserver/tests/paas/multiple-spe-test/spetest/src/main/webapp/WEB-INF/web.xml
@@ -19,12 +19,12 @@
 
 <web-app version="3.0" xmlns="http://java.sun.com/xml/ns/javaee" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-app_3_0.xsd">
     <context-param>
-        <param-name>javax.faces.PROJECT_STAGE</param-name>
+        <param-name>jakarta.faces.PROJECT_STAGE</param-name>
         <param-value>Development</param-value>
     </context-param>
     <servlet>
         <servlet-name>Faces Servlet</servlet-name>
-        <servlet-class>javax.faces.webapp.FacesServlet</servlet-class>
+        <servlet-class>jakarta.faces.webapp.FacesServlet</servlet-class>
         <load-on-startup>1</load-on-startup>
     </servlet>
     <servlet>

appserver/tests/quicklook/classloader/hellojsf/metadata/web.xml

diff --git a/appserver/tests/quicklook/classloader/hellojsf/metadata/web.xml b/appserver/tests/quicklook/classloader/hellojsf/metadata/web.xml
index d1ea75a..090d60d 100644
--- a/appserver/tests/quicklook/classloader/hellojsf/metadata/web.xml
+++ b/appserver/tests/quicklook/classloader/hellojsf/metadata/web.xml
@@ -31,10 +31,10 @@
 -->
   <servlet>
     <servlet-name>FacesServlet</servlet-name>
-    <servlet-class>javax.faces.webapp.FacesServlet</servlet-class>
+    <servlet-class>jakarta.faces.webapp.FacesServlet</servlet-class>
     <!-- For Dynamic Faces: -->
     <init-param>
-	<param-name>javax.faces.LIFECYCLE_ID</param-name>
+	<param-name>jakarta.faces.LIFECYCLE_ID</param-name>
 	<param-value>com.sun.faces.lifecycle.PARTIAL</param-value>
     </init-param>
     <load-on-startup>1</load-on-startup>

appserver/tests/quicklook/web/jsfastrologer/metadata/web.xml

diff --git a/appserver/tests/quicklook/web/jsfastrologer/metadata/web.xml b/appserver/tests/quicklook/web/jsfastrologer/metadata/web.xml
index f3520d2..67504d6 100644
--- a/appserver/tests/quicklook/web/jsfastrologer/metadata/web.xml
+++ b/appserver/tests/quicklook/web/jsfastrologer/metadata/web.xml
@@ -27,12 +27,12 @@
         <param-value>false</param-value>
     </context-param>
     <context-param>
-        <param-name>javax.faces.STATE_SAVING_METHOD</param-name>
+        <param-name>jakarta.faces.STATE_SAVING_METHOD</param-name>
         <param-value>client</param-value>
     </context-param>
     <servlet>
         <servlet-name>Faces Servlet</servlet-name>
-        <servlet-class>javax.faces.webapp.FacesServlet</servlet-class>
+        <servlet-class>jakarta.faces.webapp.FacesServlet</servlet-class>
         <load-on-startup>1</load-on-startup>
         </servlet>
     <servlet-mapping>

appserver/tests/quicklook/web/jsfinjection/metadata/web.xml

diff --git a/appserver/tests/quicklook/web/jsfinjection/metadata/web.xml b/appserver/tests/quicklook/web/jsfinjection/metadata/web.xml
index f0a0101..0275b4c 100644
--- a/appserver/tests/quicklook/web/jsfinjection/metadata/web.xml
+++ b/appserver/tests/quicklook/web/jsfinjection/metadata/web.xml
@@ -37,7 +37,7 @@
 
     <servlet>
         <servlet-name>Faces Servlet</servlet-name>
-        <servlet-class>javax.faces.webapp.FacesServlet</servlet-class>
+        <servlet-class>jakarta.faces.webapp.FacesServlet</servlet-class>
         <load-on-startup>1</load-on-startup>
     </servlet>
     <servlet-mapping>

appserver/tests/quicklook/weld/numberguess/metadata/web.xml

diff --git a/appserver/tests/quicklook/weld/numberguess/metadata/web.xml b/appserver/tests/quicklook/weld/numberguess/metadata/web.xml
index 0a6fc0c..7425723 100644
--- a/appserver/tests/quicklook/weld/numberguess/metadata/web.xml
+++ b/appserver/tests/quicklook/weld/numberguess/metadata/web.xml
@@ -28,7 +28,7 @@
 
    <servlet>
       <servlet-name>Faces Servlet</servlet-name>
-      <servlet-class>javax.faces.webapp.FacesServlet</servlet-class>
+      <servlet-class>jakarta.faces.webapp.FacesServlet</servlet-class>
    </servlet>
 
    <servlet-mapping>

appserver/tests/quicklook/weld/numberguess/src/java/numberguess/Game.java

diff --git a/appserver/tests/quicklook/weld/numberguess/src/java/numberguess/Game.java b/appserver/tests/quicklook/weld/numberguess/src/java/numberguess/Game.java
index 452f7cf..f6c824c 100644
--- a/appserver/tests/quicklook/weld/numberguess/src/java/numberguess/Game.java
+++ b/appserver/tests/quicklook/weld/numberguess/src/java/numberguess/Game.java
@@ -24,10 +24,10 @@
 import javax.enterprise.inject.Instance;
 import javax.inject.Inject;
 import javax.inject.Named;
-import javax.faces.application.FacesMessage;
-import javax.faces.component.UIComponent;
-import javax.faces.component.UIInput;
-import javax.faces.context.FacesContext;
+import jakarta.faces.application.FacesMessage;
+import jakarta.faces.component.UIComponent;
+import jakarta.faces.component.UIInput;
+import jakarta.faces.context.FacesContext;
 import javax.enterprise.context.ApplicationScoped;
 
 @Named

appserver/tests/quicklook/weld/osgiweld/metadata/weld-osgi.properties

diff --git a/appserver/tests/quicklook/weld/osgiweld/metadata/weld-osgi.properties b/appserver/tests/quicklook/weld/osgiweld/metadata/weld-osgi.properties
index 442557e..766e108 100644
--- a/appserver/tests/quicklook/weld/osgiweld/metadata/weld-osgi.properties
+++ b/appserver/tests/quicklook/weld/osgiweld/metadata/weld-osgi.properties
@@ -63,4 +63,4 @@
 #exports = javax.inject;version="1.0",javax.decorator;uses:="javax.enterprise.inject";version="1.0",javax.enterprise.inject;uses:="javax.inject,javax.enterprise.util,javax.enterprise.context";version="1.0",javax.enterprise.inject.spi;uses:="javax.enterprise.context.spi,javax.el,javax.enterprise.inject,javax.interceptor,javax.enterprise.event";version="1.0",javax.enterprise.context.spi;version="1.0",javax.enterprise.context;uses:="javax.inject";version="1.0",javax.enterprise.util;version="1.0",javax.enterprise.event;uses:="javax.enterprise.util";version="1.0",org.jboss.weld.context;uses:="org.jboss.weld.bootstrap.api,org.jboss.weld,org.jboss.weld.context.api,org.jboss.weld.serialization.spi,javax.enterprise.context.spi,javax.enterprise.context,org.jboss.weld.manager,org.jboss.weld.event,javax.enterprise.inject,org.jboss.weld.injection.spi,org.jboss.weld.construction.api,org.jboss.weld.util,org.jboss.weld.serialization.spi.helpers,javax.enterprise.inject.spi";version="1.0",org.jboss.weld.ejb;uses:="org.jboss.weld.manager,org.jboss.weld.event,org.jboss.weld.context,javax.enterprise.inject,javax.interceptor,org.jboss.weld.bootstrap.api,javax.enterprise.inject.spi,org.jboss.weld.util,org.jboss.weld.resources.spi,org.jboss.weld.bean,org.jboss.weld.ejb.spi,org.jboss.weld.ejb.spi.helpers,org.jboss.weld.injection,org.jboss.weld";version="1.0",org.jboss.weld.bean;uses:="org.jboss.weld.bootstrap.api,javax.enterprise.inject.spi,org.jboss.weld.manager,javax.enterprise.context,org.jboss.weld.bootstrap,javax.enterprise.inject,javax.inject,org.jboss.weld.interceptor.spi.model,org.jboss.weld.util,javax.enterprise.context.spi,org.jboss.weld.injection,javax.enterprise.event,org.jboss.weld.interceptor.spi.metadata,javax.interceptor,org.jboss.weld.context,org.jboss.weld.ejb,org.jboss.weld.bean.proxy,org.jboss.weld.ejb.spi,org.jboss.weld.ejb.api,javax.decorator";version="1.0",org.jboss.weld.bean.builtin;uses:="javax.enterprise.context,javax.enterprise.inject,org.jboss.weld.bootstrap.api,javax.enterprise.inject.spi,org.jboss.weld.bootstrap,org.jboss.weld.manager,org.jboss.weld.bean,org.jboss.weld.context,org.jboss.weld.injection,javax.enterprise.context.spi,org.jboss.weld.util,org.jboss.weld.bean.proxy,org.jboss.weld,javax.enterprise.util,org.jboss.weld.event,javax.enterprise.event,org.jboss.weld.bootstrap.spi,org.jboss.weld.ejb";version="1.0",org.jboss.weld.bean.proxy;uses:="javax.enterprise.inject.spi,org.jboss.weld.util,org.jboss.weld,org.jboss.weld.bootstrap.api,org.jboss.weld.serialization.spi,javax.enterprise.context.spi,javax.enterprise.context,org.jboss.weld.manager,org.jboss.weld.context,org.jboss.weld.injection,org.jboss.weld.serialization.spi.helpers,javax.inject,org.jboss.weld.bean,org.jboss.weld.ejb,org.jboss.weld.ejb.api";version="1.0",org.jboss.weld.servlet.api;uses:="javax.servlet,javax.servlet.http";version="1.0",org.jboss.weld.bootstrap.api;uses:="org.jboss.weld.bootstrap.spi,javax.enterprise.inject.spi,org.jboss.weld.manager.api,org.jboss.weld.ejb.spi,org.jboss.weld.transaction.spi,org.jboss.weld.injection.spi,org.jboss.weld.security.spi,org.jboss.weld.resources.spi,org.jboss.weld.bootstrap.api.helpers";version="1.0",org.jboss.weld.context.api;uses:="javax.enterprise.context.spi";version="1.0",org.jboss.weld.servlet.api.helpers;uses:="org.jboss.weld.servlet.api,javax.servlet,javax.servlet.http";version="1.0",org.jboss.weld.bootstrap.api.helpers;uses:="org.jboss.weld.bootstrap.api,org.jboss.weld.bootstrap.spi,org.jboss.weld.manager.api";version="1.0",org.jboss.weld.ejb.api;version="1.0",org.jboss.weld.manager.api;uses:="org.jboss.weld.bootstrap.api,javax.enterprise.inject.spi,org.jboss.weld.ejb.spi,javax.enterprise.inject,org.jboss.weld.construction.api,javax.enterprise.context.spi";version="1.0",org.jboss.weld.construction.api;uses:="javax.enterprise.inject.spi,javax.enterprise.context.spi";version="1.0",org.jboss.weld.interceptor.spi.model;uses:="org.jboss.weld.interceptor.spi.metadata,javax.enterprise.inject.spi";version="1.0",org.jboss.weld.ejb.spi.helpers;uses:="org.jboss.weld.ejb.spi,org.jboss.weld.ejb.api";version="1.0",org.jboss.weld.validation.spi;uses:="org.jboss.weld.bootstrap.api,jakarta.validation";version="1.0",org.jboss.weld.serialization.spi;uses:="org.jboss.weld.bootstrap.api,org.jboss.weld.serialization.spi.helpers,javax.enterprise.context.spi";version="1.0",org.jboss.weld.interceptor.spi.context;uses:="javax.interceptor";version="1.0",org.jboss.weld.interceptor.spi.metadata;uses:="org.jboss.weld.manager,javax.enterprise.context.spi,org.jboss.weld.interceptor.spi.model";version="1.0",org.jboss.weld.transaction.spi;uses:="org.jboss.weld.bootstrap.api,javax.transaction";version="1.0",org.jboss.weld.injection.spi.helpers;uses:="javax.enterprise.inject.spi,org.jboss.weld.injection.spi,javax.annotation,javax.naming,org.jboss.weld.bootstrap.api,javax.persistence";version="1.0",org.jboss.weld.serialization.spi.helpers;uses:="javax.enterprise.context.spi,org.jboss.weld.context.api";version="1.0",org.jboss.weld.bootstrap.spi;uses:="org.jboss.weld.ejb.spi,org.jboss.weld.bootstrap.api,javax.enterprise.inject.spi";version="1.0",org.jboss.weld.injection.spi;uses:="org.jboss.weld.bootstrap.api,javax.enterprise.inject.spi,javax.persistence";version="1.0",org.jboss.weld.resources.spi;uses:="org.jboss.weld.bootstrap.api";version="1.0",org.jboss.weld.interceptor.spi.instance;uses:="org.jboss.weld.interceptor.spi.metadata";version="1.0",org.jboss.weld.resources.spi.helpers;uses:="org.jboss.weld.resources.spi";version="1.0",org.jboss.weld.bootstrap.spi.helpers;uses:="org.jboss.weld.bootstrap.spi,org.jboss.weld.resources.spi,org.jboss.weld.ejb.spi";version="1.0",org.jboss.weld.ejb.spi;uses:="org.jboss.weld.bootstrap.api,org.jboss.weld.ejb.api,javax.enterprise.inject.spi";version="1.0",org.jboss.weld.security.spi;uses:="org.jboss.weld.bootstrap.api";version="1.0",org.jboss.weld;uses:="org.jboss.weld.bootstrap.spi,org.jboss.weld.bootstrap.api,org.jboss.weld.bootstrap,org.jboss.weld.manager,org.jboss.weld.bean.builtin,javax.enterprise.inject.spi,javax.enterprise.util,javax.enterprise.inject";version="1.0",org.jboss.weld.bootstrap;uses:="org.jboss.weld.bootstrap.api,org.jboss.weld.manager,org.jboss.weld.util,javax.enterprise.inject,org.jboss.weld.bean.builtin,org.jboss.weld,javax.enterprise.inject.spi,org.jboss.weld.event,org.jboss.weld.ejb,org.jboss.weld.bean,org.jboss.weld.interceptor.spi.model,javax.annotation,javax.interceptor,org.jboss.weld.ejb.spi,javax.decorator,org.jboss.weld.resources.spi,javax.enterprise.event,org.jboss.weld.bootstrap.spi,org.jboss.weld.transaction.spi,org.jboss.weld.bootstrap.api.helpers,javax.enterprise.context.spi,org.jboss.weld.security.spi,org.jboss.weld.manager.api,org.jboss.weld.interceptor.spi.metadata,javax.enterprise.context,javax.inject,org.jboss.weld.serialization.spi,org.jboss.weld.bootstrap.spi.helpers,org.jboss.weld.injection,org.jboss.weld.context";version="1.0",org.jboss.weld.event;uses:="org.jboss.weld.injection,javax.enterprise.inject.spi,org.jboss.weld,org.jboss.weld.manager,org.jboss.weld.context,javax.enterprise.inject,org.jboss.weld.bean.builtin,javax.enterprise.util,javax.enterprise.event,javax.enterprise.context.spi,org.jboss.weld.util,org.jboss.weld.bean,org.jboss.weld.bootstrap.api,javax.enterprise.context,javax.inject,org.jboss.weld.transaction.spi,javax.transaction";version="1.0",org.jboss.weld.injection;uses:="javax.enterprise.inject.spi,org.jboss.weld.manager,org.jboss.weld.util,org.jboss.weld.context,org.jboss.weld.injection.spi,javax.enterprise.context.spi,org.jboss.weld.construction.api,javax.enterprise.inject,org.jboss.weld,org.jboss.weld.bootstrap.api,org.jboss.weld.bean.proxy,javax.enterprise.event,javax.inject,org.jboss.weld.ejb";version="1.0",org.jboss.weld.manager;uses:="org.jboss.weld.bootstrap.api,javax.enterprise.inject.spi,org.jboss.weld.bean,javax.enterprise.util,org.jboss.weld.interceptor.spi.model,org.jboss.weld.bean.proxy,org.jboss.weld.bootstrap,org.jboss.weld.util,javax.enterprise.inject,org.jboss.weld.injection,org.jboss.weld.ejb.spi,org.jboss.weld.bean.builtin,javax.el,org.jboss.weld,org.jboss.weld.interceptor.spi.metadata,org.jboss.weld.event,org.jboss.weld.context,org.jboss.weld.ejb,org.jboss.weld.serialization.spi,javax.enterprise.context.spi,org.jboss.weld.el,org.jboss.weld.manager.api,org.jboss.weld.construction.api,org.jboss.weld.bootstrap.spi,org.jboss.weld.injection.spi,javax.decorator";version="1.0",org.jboss.weld.servlet;uses:="org.jboss.weld.manager,org.jboss.weld.context,org.jboss.weld.event,javax.enterprise.inject,javax.servlet.http,javax.servlet,javax.inject,javax.enterprise.context,javax.faces.context,org.jboss.weld.jsf,org.jboss.weld,javax.enterprise.context.spi,org.jboss.weld.bootstrap.api,javax.enterprise.inject.spi,org.jboss.weld.bean.builtin,org.jboss.weld.servlet.api.helpers";version="1.0",org.jboss.weld.util;uses:="javax.enterprise.inject.spi,org.jboss.weld.resources.spi,javax.annotation,org.jboss.weld.manager,javax.enterprise.event,javax.enterprise.inject,org.jboss.weld.injection,javax.inject,org.jboss.weld.bootstrap,org.jboss.weld.interceptor.spi.model,org.jboss.weld.bootstrap.api,javax.interceptor,org.jboss.weld.ejb.spi,org.jboss.weld,javax.enterprise.context.spi,javax.decorator,org.jboss.weld.bean,org.jboss.weld.serialization.spi,org.jboss.weld.bean.proxy,org.jboss.weld.bootstrap.spi,javax.el,org.jboss.weld.event";version="1.0",org.jboss.weld.el;uses:="javax.el,javax.enterprise.inject.spi,org.jboss.weld.manager,org.jboss.weld.context,javax.enterprise.context.spi,javax.enterprise.context,org.jboss.weld.bean.proxy";version="1.0",org.jboss.weld.jsf;uses:="javax.enterprise.context,org.jboss.weld,javax.faces.application,javax.faces.context,org.jboss.weld.manager,org.jboss.weld.context,javax.enterprise.inject,org.jboss.weld.bootstrap.api,org.jboss.weld.util,org.jboss.weld.resources.spi";version="1.0"
 
 #exports for 2.2.9.Final:
-exports = org.jboss.weld.bootstrap.api.helpers;uses:="org.jboss.weld.bootstrap.api,org.jboss.weld.bootstrap.spi,org.jboss.weld.manager.api";version="2.2.9.Final",org.jboss.weld.servlet.api.helpers;uses:="javax.servlet,javax.servlet.http,org.jboss.weld.servlet.api";version="2.2.9.Final",org.jboss.weld.context.api;uses:="javax.enterprise.context.spi";version="2.2.9.Final",org.jboss.weld.construction.api;uses:="javax.enterprise.inject.spi,javax.enterprise.context.spi";version="2.2.9.Final",org.jboss.weld.ejb.api;version="2.2.9.Final",org.jboss.weld.bootstrap.api;uses:="javax.enterprise.inject.spi,org.jboss.weld.bootstrap.spi,org.jboss.weld.manager.api,org.jboss.weld.transaction.spi,org.jboss.weld.resources.spi,org.jboss.weld.security.spi,org.jboss.weld.injection.spi,org.jboss.weld.bootstrap.api.helpers";version="2.2.9.Final",org.jboss.weld.servlet.api;uses:="javax.servlet,javax.servlet.http";version="2.2.9.Final",org.jboss.weld.manager.api;uses:="org.jboss.weld.bootstrap.api,javax.enterprise.inject.spi,org.jboss.weld.serialization.spi,javax.enterprise.inject,org.jboss.weld.construction.api,org.jboss.weld.ejb.spi,javax.enterprise.context.spi";version="2.2.9.Final",org.jboss.weld.ejb.spi;uses:="org.jboss.weld.bootstrap.api,org.jboss.weld.ejb.api,javax.enterprise.inject.spi";version="2.2.9.Final",org.jboss.weld.serialization.spi.helpers;uses:="javax.enterprise.context.spi,org.jboss.weld.context.api";version="2.2.9.Final",org.jboss.weld.injection.spi.helpers;uses:="javax.enterprise.inject.spi,org.jboss.weld.injection.spi,javax.annotation,org.jboss.weld.bootstrap.api,javax.naming,javax.persistence";version="2.2.9.Final",org.jboss.weld.servlet.spi;uses:="org.jboss.weld.bootstrap.api,javax.servlet.http";version="2.2.9.Final",org.jboss.weld.security.spi;uses:="org.jboss.weld.bootstrap.api";version="2.2.9.Final",org.jboss.weld.interceptor.spi.metadata;uses:="org.jboss.weld.manager,javax.enterprise.context.spi,org.jboss.weld.interceptor.spi.model";version="2.2.9.Final",org.jboss.weld.bootstrap.spi;uses:="org.jboss.weld.bootstrap.api,org.jboss.weld.ejb.spi,javax.enterprise.inject.spi";version="2.2.9.Final",org.jboss.weld.interceptor.spi.model;uses:="org.jboss.weld.interceptor.spi.metadata,javax.enterprise.inject.spi";version="2.2.9.Final",org.jboss.weld.injection.spi;uses:="org.jboss.weld.bootstrap.api,javax.enterprise.inject.spi,javax.persistence";version="2.2.9.Final",org.jboss.weld.transaction.spi;uses:="org.jboss.weld.bootstrap.api,javax.transaction";version="2.2.9.Final",org.jboss.weld.ejb.spi.helpers;uses:="org.jboss.weld.ejb.spi,org.jboss.weld.ejb.api";version="2.2.9.Final",org.jboss.weld.servlet.spi.helpers;uses:="javax.servlet.http,org.jboss.weld.servlet.spi";version="2.2.9.Final",org.jboss.weld.bootstrap.spi.helpers;uses:="org.jboss.weld.bootstrap.spi,org.jboss.weld.resources.spi,org.jboss.weld.ejb.spi";version="2.2.9.Final",org.jboss.weld.serialization.spi;uses:="org.jboss.weld.serialization.spi.helpers,org.jboss.weld.bootstrap.api,javax.enterprise.context.spi";version="2.2.9.Final",org.jboss.weld.resources.spi;uses:="org.jboss.weld.bootstrap.api";version="2.2.9.Final",org.jboss.weld.resources.spi.helpers;uses:="org.jboss.weld.resources.spi";version="2.2.9.Final",org.jboss.weld.validation.spi;uses:="org.jboss.weld.bootstrap.api,jakarta.validation";version="2.2.9.Final",org.jboss.weld;uses:="javax.enterprise.inject.spi,javax.enterprise.util,javax.enterprise.inject,org.jboss.weld.manager,org.jboss.weld.bean.builtin,com.google.common.collect,org.jboss.weld.bootstrap,org.jboss.weld.bootstrap.api,org.jboss.weld.bootstrap.spi,org.jboss.weld.bootstrap.api.helpers,com.google.common.cache";version="2.2.9.Final",org.jboss.weld.bean;uses:="javax.enterprise.inject.spi,org.jboss.weld.manager,javax.enterprise.inject,org.jboss.weld.bootstrap,org.jboss.weld.serialization.spi,org.jboss.weld.bootstrap.api,javax.enterprise.context,javax.inject,org.jboss.weld.interceptor.spi.model,org.jboss.weld.util,com.google.common.base,javax.enterprise.context.spi,org.jboss.weld.injection,org.jboss.weld.ejb.spi,javax.enterprise.event,javax.interceptor,org.jboss.weld.interceptor.spi.metadata,org.jboss.weld.context,org.jboss.weld.ejb,org.jboss.weld.ejb.api,javax.decorator,org.jboss.weld.bean.proxy";version="2.2.9.Final",org.jboss.weld.bean.builtin;uses:="javax.enterprise.inject,javax.enterprise.context,com.google.common.collect,org.jboss.weld.bootstrap,org.jboss.weld.serialization.spi,org.jboss.weld.bean,javax.enterprise.inject.spi,org.jboss.weld.manager,org.jboss.weld.bootstrap.api,org.jboss.weld.context,javax.enterprise.context.spi,org.jboss.weld.injection,org.jboss.weld.util,org.jboss.weld.bean.proxy,org.jboss.weld.bootstrap.spi,org.jboss.weld.construction.api,org.jboss.weld.ejb.spi,org.jboss.weld.manager.api,org.jboss.weld,javax.enterprise.util,org.jboss.weld.event,javax.enterprise.event,org.jboss.weld.ejb,com.google.common.base";version="2.2.9.Final",org.jboss.weld.bean.proxy;uses:="javax.enterprise.inject.spi,org.jboss.weld.util,javax.enterprise.context,com.google.common.collect,javax.enterprise.context.spi,org.jboss.weld.serialization.spi,org.jboss.weld.bootstrap.api,org.jboss.weld,com.google.common.cache,org.jboss.weld.manager,org.jboss.weld.injection,org.jboss.weld.context,org.jboss.weld.serialization.spi.helpers,org.jboss.weld.bean,javax.inject,org.jboss.weld.ejb,org.jboss.weld.ejb.api,org.jboss.weld.resources.spi,org.jboss.weld.bootstrap.api.helpers";version="2.2.9.Final",org.jboss.weld.bootstrap;uses:="org.jboss.weld.ejb,javax.enterprise.inject.spi,org.jboss.weld.manager,javax.enterprise.inject,org.jboss.weld.bootstrap.api,org.jboss.weld.util,org.jboss.weld.event,org.jboss.weld.bean,org.jboss.weld.bean.builtin,javax.annotation,org.jboss.weld.bootstrap.spi,org.jboss.weld.resources.spi,javax.interceptor,org.jboss.weld.interceptor.spi.model,javax.decorator,org.jboss.weld.ejb.spi,com.google.common.cache,org.jboss.weld,com.google.common.collect,javax.enterprise.event,com.google.common.base,org.jboss.weld.security.spi,javax.enterprise.context.spi,org.jboss.weld.transaction.spi,org.jboss.weld.servlet,org.jboss.weld.bootstrap.api.helpers,org.jboss.weld.manager.api,org.jboss.weld.interceptor.spi.metadata,javax.enterprise.context,javax.inject,org.jboss.weld.context,org.jboss.weld.servlet.spi.helpers,org.jboss.weld.bootstrap.spi.helpers,org.jboss.weld.servlet.spi,org.jboss.weld.serialization.spi,org.jboss.weld.injection,org.jboss.weld.bean.proxy";version="2.2.9.Final",org.jboss.weld.context;uses:="org.jboss.weld.bean,org.jboss.weld.context.api,javax.enterprise.context.spi,org.jboss.weld.serialization.spi,org.jboss.weld.bootstrap.api,javax.enterprise.context,org.jboss.weld,org.jboss.weld.manager,org.jboss.weld.event,org.jboss.weld.injection.spi,org.jboss.weld.construction.api,org.jboss.weld.serialization.spi.helpers,org.jboss.weld.util,javax.enterprise.inject.spi";version="2.2.9.Final",org.jboss.weld.ejb;uses:="javax.interceptor,org.jboss.weld.manager,javax.enterprise.inject,org.jboss.weld.event,org.jboss.weld.context,org.jboss.weld.bootstrap.api,org.jboss.weld.bean,org.jboss.weld.util,javax.enterprise.inject.spi,org.jboss.weld.resources.spi,com.google.common.base,org.jboss.weld.ejb.spi,com.google.common.collect,org.jboss.weld.ejb.spi.helpers,org.jboss.weld.injection,org.jboss.weld.bootstrap.api.helpers,org.jboss.weld";version="2.2.9.Final",org.jboss.weld.el;uses:="javax.enterprise.inject.spi,org.jboss.weld.manager,javax.enterprise.context,org.jboss.weld.context,javax.enterprise.context.spi,javax.el";version="2.2.9.Final",org.jboss.weld.event;uses:="org.jboss.weld.injection,javax.enterprise.inject.spi,org.jboss.weld.manager,javax.enterprise.inject,org.jboss.weld.context,org.jboss.weld,org.jboss.weld.bean.builtin,javax.enterprise.util,javax.enterprise.context.spi,org.jboss.weld.util,javax.enterprise.event,com.google.common.collect,org.jboss.weld.bean,org.jboss.weld.bootstrap.api,com.google.common.base,javax.enterprise.context,javax.inject,com.google.common.cache,org.jboss.weld.transaction.spi,javax.transaction";version="2.2.9.Final",org.jboss.weld.injection;uses:="javax.enterprise.inject.spi,org.jboss.weld.manager,javax.enterprise.inject,org.jboss.weld.util,org.jboss.weld.injection.spi,org.jboss.weld.context,javax.enterprise.context.spi,org.jboss.weld.construction.api,org.jboss.weld.bootstrap.api,org.jboss.weld,org.jboss.weld.bean.proxy,javax.enterprise.event,javax.inject,org.jboss.weld.bean.builtin,org.jboss.weld.event,org.jboss.weld.ejb,com.google.common.collect";version="2.2.9.Final",org.jboss.weld.jsf;uses:="org.jboss.weld.manager,javax.enterprise.inject,javax.faces.application,org.jboss.weld.bootstrap.api.helpers,org.jboss.weld.context,org.jboss.weld,javax.faces.context,org.jboss.weld.bootstrap.api,org.jboss.weld.util,org.jboss.weld.resources.spi";version="2.2.9.Final",org.jboss.weld.manager;uses:="org.jboss.weld.bootstrap.api,org.jboss.weld.bean,javax.enterprise.inject.spi,com.google.common.base,com.google.common.collect,javax.enterprise.util,org.jboss.weld.ejb,javax.enterprise.inject,org.jboss.weld.interceptor.spi.model,javax.enterprise.context.spi,org.jboss.weld.injection,org.jboss.weld.util,javax.enterprise.context,org.jboss.weld.ejb.spi,org.jboss.weld.event,javax.el,org.jboss.weld.bean.proxy,org.jboss.weld.construction.api,org.jboss.weld.bootstrap,org.jboss.weld.serialization.spi,org.jboss.weld.el,org.jboss.weld.bean.builtin,org.jboss.weld.context,org.jboss.weld,org.jboss.weld.manager.api,org.jboss.weld.bootstrap.spi,javax.interceptor,org.jboss.weld.injection.spi,javax.decorator";version="2.2.9.Final",org.jboss.weld.servlet;uses:="javax.servlet.http,org.jboss.weld.util,org.jboss.weld.manager,org.jboss.weld.event,javax.enterprise.inject,org.jboss.weld.context,javax.servlet,org.jboss.weld.servlet.spi,javax.inject,org.jboss.weld.jsf,javax.enterprise.context,javax.faces.context,org.jboss.weld.bootstrap.api.helpers,javax.enterprise.context.spi,org.jboss.weld,org.jboss.weld.bootstrap.api,org.jboss.weld.resources.spi,javax.enterprise.inject.spi,org.jboss.weld.bean.builtin,org.jboss.weld.servlet.api,org.jboss.weld.servlet.api.helpers";version="2.2.9.Final",org.jboss.weld.util;uses:="javax.enterprise.inject.spi,org.jboss.weld.bootstrap.api,org.jboss.weld.resources.spi,com.google.common.base,javax.annotation,org.jboss.weld.interceptor.spi.model,com.google.common.collect,org.jboss.weld.manager,javax.enterprise.inject,org.jboss.weld.injection,javax.inject,javax.enterprise.event,javax.interceptor,org.jboss.weld.ejb,javax.enterprise.context.spi,javax.decorator,javax.enterprise.context,org.jboss.weld.ejb.spi,org.jboss.weld.bean,org.jboss.weld.bootstrap,org.jboss.weld.bean.proxy,org.jboss.weld.serialization.spi,org.jboss.weld.bootstrap.spi,javax.el,org.jboss.weld.event";version="2.2.9.Final"
+exports = org.jboss.weld.bootstrap.api.helpers;uses:="org.jboss.weld.bootstrap.api,org.jboss.weld.bootstrap.spi,org.jboss.weld.manager.api";version="2.2.9.Final",org.jboss.weld.servlet.api.helpers;uses:="javax.servlet,javax.servlet.http,org.jboss.weld.servlet.api";version="2.2.9.Final",org.jboss.weld.context.api;uses:="javax.enterprise.context.spi";version="2.2.9.Final",org.jboss.weld.construction.api;uses:="javax.enterprise.inject.spi,javax.enterprise.context.spi";version="2.2.9.Final",org.jboss.weld.ejb.api;version="2.2.9.Final",org.jboss.weld.bootstrap.api;uses:="javax.enterprise.inject.spi,org.jboss.weld.bootstrap.spi,org.jboss.weld.manager.api,org.jboss.weld.transaction.spi,org.jboss.weld.resources.spi,org.jboss.weld.security.spi,org.jboss.weld.injection.spi,org.jboss.weld.bootstrap.api.helpers";version="2.2.9.Final",org.jboss.weld.servlet.api;uses:="javax.servlet,javax.servlet.http";version="2.2.9.Final",org.jboss.weld.manager.api;uses:="org.jboss.weld.bootstrap.api,javax.enterprise.inject.spi,org.jboss.weld.serialization.spi,javax.enterprise.inject,org.jboss.weld.construction.api,org.jboss.weld.ejb.spi,javax.enterprise.context.spi";version="2.2.9.Final",org.jboss.weld.ejb.spi;uses:="org.jboss.weld.bootstrap.api,org.jboss.weld.ejb.api,javax.enterprise.inject.spi";version="2.2.9.Final",org.jboss.weld.serialization.spi.helpers;uses:="javax.enterprise.context.spi,org.jboss.weld.context.api";version="2.2.9.Final",org.jboss.weld.injection.spi.helpers;uses:="javax.enterprise.inject.spi,org.jboss.weld.injection.spi,javax.annotation,org.jboss.weld.bootstrap.api,javax.naming,javax.persistence";version="2.2.9.Final",org.jboss.weld.servlet.spi;uses:="org.jboss.weld.bootstrap.api,javax.servlet.http";version="2.2.9.Final",org.jboss.weld.security.spi;uses:="org.jboss.weld.bootstrap.api";version="2.2.9.Final",org.jboss.weld.interceptor.spi.metadata;uses:="org.jboss.weld.manager,javax.enterprise.context.spi,org.jboss.weld.interceptor.spi.model";version="2.2.9.Final",org.jboss.weld.bootstrap.spi;uses:="org.jboss.weld.bootstrap.api,org.jboss.weld.ejb.spi,javax.enterprise.inject.spi";version="2.2.9.Final",org.jboss.weld.interceptor.spi.model;uses:="org.jboss.weld.interceptor.spi.metadata,javax.enterprise.inject.spi";version="2.2.9.Final",org.jboss.weld.injection.spi;uses:="org.jboss.weld.bootstrap.api,javax.enterprise.inject.spi,javax.persistence";version="2.2.9.Final",org.jboss.weld.transaction.spi;uses:="org.jboss.weld.bootstrap.api,javax.transaction";version="2.2.9.Final",org.jboss.weld.ejb.spi.helpers;uses:="org.jboss.weld.ejb.spi,org.jboss.weld.ejb.api";version="2.2.9.Final",org.jboss.weld.servlet.spi.helpers;uses:="javax.servlet.http,org.jboss.weld.servlet.spi";version="2.2.9.Final",org.jboss.weld.bootstrap.spi.helpers;uses:="org.jboss.weld.bootstrap.spi,org.jboss.weld.resources.spi,org.jboss.weld.ejb.spi";version="2.2.9.Final",org.jboss.weld.serialization.spi;uses:="org.jboss.weld.serialization.spi.helpers,org.jboss.weld.bootstrap.api,javax.enterprise.context.spi";version="2.2.9.Final",org.jboss.weld.resources.spi;uses:="org.jboss.weld.bootstrap.api";version="2.2.9.Final",org.jboss.weld.resources.spi.helpers;uses:="org.jboss.weld.resources.spi";version="2.2.9.Final",org.jboss.weld.validation.spi;uses:="org.jboss.weld.bootstrap.api,jakarta.validation";version="2.2.9.Final",org.jboss.weld;uses:="javax.enterprise.inject.spi,javax.enterprise.util,javax.enterprise.inject,org.jboss.weld.manager,org.jboss.weld.bean.builtin,com.google.common.collect,org.jboss.weld.bootstrap,org.jboss.weld.bootstrap.api,org.jboss.weld.bootstrap.spi,org.jboss.weld.bootstrap.api.helpers,com.google.common.cache";version="2.2.9.Final",org.jboss.weld.bean;uses:="javax.enterprise.inject.spi,org.jboss.weld.manager,javax.enterprise.inject,org.jboss.weld.bootstrap,org.jboss.weld.serialization.spi,org.jboss.weld.bootstrap.api,javax.enterprise.context,javax.inject,org.jboss.weld.interceptor.spi.model,org.jboss.weld.util,com.google.common.base,javax.enterprise.context.spi,org.jboss.weld.injection,org.jboss.weld.ejb.spi,javax.enterprise.event,javax.interceptor,org.jboss.weld.interceptor.spi.metadata,org.jboss.weld.context,org.jboss.weld.ejb,org.jboss.weld.ejb.api,javax.decorator,org.jboss.weld.bean.proxy";version="2.2.9.Final",org.jboss.weld.bean.builtin;uses:="javax.enterprise.inject,javax.enterprise.context,com.google.common.collect,org.jboss.weld.bootstrap,org.jboss.weld.serialization.spi,org.jboss.weld.bean,javax.enterprise.inject.spi,org.jboss.weld.manager,org.jboss.weld.bootstrap.api,org.jboss.weld.context,javax.enterprise.context.spi,org.jboss.weld.injection,org.jboss.weld.util,org.jboss.weld.bean.proxy,org.jboss.weld.bootstrap.spi,org.jboss.weld.construction.api,org.jboss.weld.ejb.spi,org.jboss.weld.manager.api,org.jboss.weld,javax.enterprise.util,org.jboss.weld.event,javax.enterprise.event,org.jboss.weld.ejb,com.google.common.base";version="2.2.9.Final",org.jboss.weld.bean.proxy;uses:="javax.enterprise.inject.spi,org.jboss.weld.util,javax.enterprise.context,com.google.common.collect,javax.enterprise.context.spi,org.jboss.weld.serialization.spi,org.jboss.weld.bootstrap.api,org.jboss.weld,com.google.common.cache,org.jboss.weld.manager,org.jboss.weld.injection,org.jboss.weld.context,org.jboss.weld.serialization.spi.helpers,org.jboss.weld.bean,javax.inject,org.jboss.weld.ejb,org.jboss.weld.ejb.api,org.jboss.weld.resources.spi,org.jboss.weld.bootstrap.api.helpers";version="2.2.9.Final",org.jboss.weld.bootstrap;uses:="org.jboss.weld.ejb,javax.enterprise.inject.spi,org.jboss.weld.manager,javax.enterprise.inject,org.jboss.weld.bootstrap.api,org.jboss.weld.util,org.jboss.weld.event,org.jboss.weld.bean,org.jboss.weld.bean.builtin,javax.annotation,org.jboss.weld.bootstrap.spi,org.jboss.weld.resources.spi,javax.interceptor,org.jboss.weld.interceptor.spi.model,javax.decorator,org.jboss.weld.ejb.spi,com.google.common.cache,org.jboss.weld,com.google.common.collect,javax.enterprise.event,com.google.common.base,org.jboss.weld.security.spi,javax.enterprise.context.spi,org.jboss.weld.transaction.spi,org.jboss.weld.servlet,org.jboss.weld.bootstrap.api.helpers,org.jboss.weld.manager.api,org.jboss.weld.interceptor.spi.metadata,javax.enterprise.context,javax.inject,org.jboss.weld.context,org.jboss.weld.servlet.spi.helpers,org.jboss.weld.bootstrap.spi.helpers,org.jboss.weld.servlet.spi,org.jboss.weld.serialization.spi,org.jboss.weld.injection,org.jboss.weld.bean.proxy";version="2.2.9.Final",org.jboss.weld.context;uses:="org.jboss.weld.bean,org.jboss.weld.context.api,javax.enterprise.context.spi,org.jboss.weld.serialization.spi,org.jboss.weld.bootstrap.api,javax.enterprise.context,org.jboss.weld,org.jboss.weld.manager,org.jboss.weld.event,org.jboss.weld.injection.spi,org.jboss.weld.construction.api,org.jboss.weld.serialization.spi.helpers,org.jboss.weld.util,javax.enterprise.inject.spi";version="2.2.9.Final",org.jboss.weld.ejb;uses:="javax.interceptor,org.jboss.weld.manager,javax.enterprise.inject,org.jboss.weld.event,org.jboss.weld.context,org.jboss.weld.bootstrap.api,org.jboss.weld.bean,org.jboss.weld.util,javax.enterprise.inject.spi,org.jboss.weld.resources.spi,com.google.common.base,org.jboss.weld.ejb.spi,com.google.common.collect,org.jboss.weld.ejb.spi.helpers,org.jboss.weld.injection,org.jboss.weld.bootstrap.api.helpers,org.jboss.weld";version="2.2.9.Final",org.jboss.weld.el;uses:="javax.enterprise.inject.spi,org.jboss.weld.manager,javax.enterprise.context,org.jboss.weld.context,javax.enterprise.context.spi,javax.el";version="2.2.9.Final",org.jboss.weld.event;uses:="org.jboss.weld.injection,javax.enterprise.inject.spi,org.jboss.weld.manager,javax.enterprise.inject,org.jboss.weld.context,org.jboss.weld,org.jboss.weld.bean.builtin,javax.enterprise.util,javax.enterprise.context.spi,org.jboss.weld.util,javax.enterprise.event,com.google.common.collect,org.jboss.weld.bean,org.jboss.weld.bootstrap.api,com.google.common.base,javax.enterprise.context,javax.inject,com.google.common.cache,org.jboss.weld.transaction.spi,javax.transaction";version="2.2.9.Final",org.jboss.weld.injection;uses:="javax.enterprise.inject.spi,org.jboss.weld.manager,javax.enterprise.inject,org.jboss.weld.util,org.jboss.weld.injection.spi,org.jboss.weld.context,javax.enterprise.context.spi,org.jboss.weld.construction.api,org.jboss.weld.bootstrap.api,org.jboss.weld,org.jboss.weld.bean.proxy,javax.enterprise.event,javax.inject,org.jboss.weld.bean.builtin,org.jboss.weld.event,org.jboss.weld.ejb,com.google.common.collect";version="2.2.9.Final",org.jboss.weld.jsf;uses:="org.jboss.weld.manager,javax.enterprise.inject,jakarta.faces.application,org.jboss.weld.bootstrap.api.helpers,org.jboss.weld.context,org.jboss.weld,jakarta.faces.context,org.jboss.weld.bootstrap.api,org.jboss.weld.util,org.jboss.weld.resources.spi";version="2.2.9.Final",org.jboss.weld.manager;uses:="org.jboss.weld.bootstrap.api,org.jboss.weld.bean,javax.enterprise.inject.spi,com.google.common.base,com.google.common.collect,javax.enterprise.util,org.jboss.weld.ejb,javax.enterprise.inject,org.jboss.weld.interceptor.spi.model,javax.enterprise.context.spi,org.jboss.weld.injection,org.jboss.weld.util,javax.enterprise.context,org.jboss.weld.ejb.spi,org.jboss.weld.event,javax.el,org.jboss.weld.bean.proxy,org.jboss.weld.construction.api,org.jboss.weld.bootstrap,org.jboss.weld.serialization.spi,org.jboss.weld.el,org.jboss.weld.bean.builtin,org.jboss.weld.context,org.jboss.weld,org.jboss.weld.manager.api,org.jboss.weld.bootstrap.spi,javax.interceptor,org.jboss.weld.injection.spi,javax.decorator";version="2.2.9.Final",org.jboss.weld.servlet;uses:="javax.servlet.http,org.jboss.weld.util,org.jboss.weld.manager,org.jboss.weld.event,javax.enterprise.inject,org.jboss.weld.context,javax.servlet,org.jboss.weld.servlet.spi,javax.inject,org.jboss.weld.jsf,javax.enterprise.context,jakarta.faces.context,org.jboss.weld.bootstrap.api.helpers,javax.enterprise.context.spi,org.jboss.weld,org.jboss.weld.bootstrap.api,org.jboss.weld.resources.spi,javax.enterprise.inject.spi,org.jboss.weld.bean.builtin,org.jboss.weld.servlet.api,org.jboss.weld.servlet.api.helpers";version="2.2.9.Final",org.jboss.weld.util;uses:="javax.enterprise.inject.spi,org.jboss.weld.bootstrap.api,org.jboss.weld.resources.spi,com.google.common.base,javax.annotation,org.jboss.weld.interceptor.spi.model,com.google.common.collect,org.jboss.weld.manager,javax.enterprise.inject,org.jboss.weld.injection,javax.inject,javax.enterprise.event,javax.interceptor,org.jboss.weld.ejb,javax.enterprise.context.spi,javax.decorator,javax.enterprise.context,org.jboss.weld.ejb.spi,org.jboss.weld.bean,org.jboss.weld.bootstrap,org.jboss.weld.bean.proxy,org.jboss.weld.serialization.spi,org.jboss.weld.bootstrap.spi,javax.el,org.jboss.weld.event";version="2.2.9.Final"
\ No newline at end of file

appserver/tests/sse/videoplayer/src/main/java/org/glassfish/sse/videoplayer/PlayingStatus.java

diff --git a/appserver/tests/sse/videoplayer/src/main/java/org/glassfish/sse/videoplayer/PlayingStatus.java b/appserver/tests/sse/videoplayer/src/main/java/org/glassfish/sse/videoplayer/PlayingStatus.java
index 81f3eb4..3a85b3d 100644
--- a/appserver/tests/sse/videoplayer/src/main/java/org/glassfish/sse/videoplayer/PlayingStatus.java
+++ b/appserver/tests/sse/videoplayer/src/main/java/org/glassfish/sse/videoplayer/PlayingStatus.java
@@ -16,7 +16,7 @@
 
 package org.glassfish.sse.videoplayer;
 
-import javax.faces.bean.ApplicationScoped;
+import jakarta.faces.bean.ApplicationScoped;
 import javax.inject.Singleton;
 
 /**

appserver/tests/v2-tests/appserv-tests/sqetests/jsfcomponents/descriptor/web.xml

diff --git a/appserver/tests/v2-tests/appserv-tests/sqetests/jsfcomponents/descriptor/web.xml b/appserver/tests/v2-tests/appserv-tests/sqetests/jsfcomponents/descriptor/web.xml
index c069472..22f0de7 100644
--- a/appserver/tests/v2-tests/appserv-tests/sqetests/jsfcomponents/descriptor/web.xml
+++ b/appserver/tests/v2-tests/appserv-tests/sqetests/jsfcomponents/descriptor/web.xml
@@ -30,7 +30,7 @@
     </description>
 
     <context-param>
-        <param-name>javax.faces.STATE_SAVING_METHOD</param-name>
+        <param-name>jakarta.faces.STATE_SAVING_METHOD</param-name>
         <param-value>client</param-value>
     </context-param>
 
@@ -70,7 +70,7 @@
     <!-- Faces Servlet -->
     <servlet>
         <servlet-name>Faces Servlet</servlet-name>
-        <servlet-class>javax.faces.webapp.FacesServlet</servlet-class>
+        <servlet-class>jakarta.faces.webapp.FacesServlet</servlet-class>
         <load-on-startup> 1 </load-on-startup>
     </servlet>
     

appserver/tests/v2-tests/appserv-tests/sqetests/jsfcomponents/docroot/repeater.jsp

diff --git a/appserver/tests/v2-tests/appserv-tests/sqetests/jsfcomponents/docroot/repeater.jsp b/appserver/tests/v2-tests/appserv-tests/sqetests/jsfcomponents/docroot/repeater.jsp
index 45ff0a2..fcd28a5 100644
--- a/appserver/tests/v2-tests/appserv-tests/sqetests/jsfcomponents/docroot/repeater.jsp
+++ b/appserver/tests/v2-tests/appserv-tests/sqetests/jsfcomponents/docroot/repeater.jsp
@@ -181,7 +181,7 @@
 <h1>How to Use this Component</h1>
 
 <p>This tag uses the standard <code>UIData</code> component, coupled with
-a custom <em>javax.faces.render.Renderer</em> implementation
+a custom <em>jakarta.faces.render.Renderer</em> implementation
 (<a href="ShowSource.jsp?filename=/src/components/renderkit/RepeaterRenderer.java">RepeaterRenderer.java</a>)
 that takes advantage of the fact that <code>UIData</code> automatically manages
 the iteration of the rows in the underlying data model.  At the same time, this
@@ -250,7 +250,7 @@
   <td>
     <p>Value reference expression pointing at one of the following:</p>
     <ul>
-    <li>An instance of <em>javax.faces.model.DataModel</em>.</li>
+    <li>An instance of <em>jakarta.faces.model.DataModel</em>.</li>
     <li>An array of JavaBeans.</li>
     <li>A <em>List</em> of JavaBeans.</li>
     <li>An instance of <em>java.sql.ResultSet</em> (or RowSet).</li>

appserver/tests/v2-tests/appserv-tests/sqetests/jsfcomponents/src/components/components/AreaComponent.java

diff --git a/appserver/tests/v2-tests/appserv-tests/sqetests/jsfcomponents/src/components/components/AreaComponent.java b/appserver/tests/v2-tests/appserv-tests/sqetests/jsfcomponents/src/components/components/AreaComponent.java
index a9eca40..c4e1d23 100644
--- a/appserver/tests/v2-tests/appserv-tests/sqetests/jsfcomponents/src/components/components/AreaComponent.java
+++ b/appserver/tests/v2-tests/appserv-tests/sqetests/jsfcomponents/src/components/components/AreaComponent.java
@@ -19,8 +19,8 @@
 
 import components.model.ImageArea;
 
-import javax.faces.component.UIOutput;
-import javax.faces.context.FacesContext;
+import jakarta.faces.component.UIOutput;
+import jakarta.faces.context.FacesContext;
 
 import java.io.IOException;
 

appserver/tests/v2-tests/appserv-tests/sqetests/jsfcomponents/src/components/components/AreaSelectedEvent.java

diff --git a/appserver/tests/v2-tests/appserv-tests/sqetests/jsfcomponents/src/components/components/AreaSelectedEvent.java b/appserver/tests/v2-tests/appserv-tests/sqetests/jsfcomponents/src/components/components/AreaSelectedEvent.java
index 51eb1bc..fd6c914 100644
--- a/appserver/tests/v2-tests/appserv-tests/sqetests/jsfcomponents/src/components/components/AreaSelectedEvent.java
+++ b/appserver/tests/v2-tests/appserv-tests/sqetests/jsfcomponents/src/components/components/AreaSelectedEvent.java
@@ -21,7 +21,7 @@
 package components.components;
 
 
-import javax.faces.event.ActionEvent;
+import jakarta.faces.event.ActionEvent;
 
 
 /**

appserver/tests/v2-tests/appserv-tests/sqetests/jsfcomponents/src/components/components/AreaSelectedListener.java

diff --git a/appserver/tests/v2-tests/appserv-tests/sqetests/jsfcomponents/src/components/components/AreaSelectedListener.java b/appserver/tests/v2-tests/appserv-tests/sqetests/jsfcomponents/src/components/components/AreaSelectedListener.java
index 433b7c0..9aa28ef 100644
--- a/appserver/tests/v2-tests/appserv-tests/sqetests/jsfcomponents/src/components/components/AreaSelectedListener.java
+++ b/appserver/tests/v2-tests/appserv-tests/sqetests/jsfcomponents/src/components/components/AreaSelectedListener.java
@@ -21,7 +21,7 @@
 package components.components;
 
 
-import javax.faces.event.FacesListener;
+import jakarta.faces.event.FacesListener;
 
 
 /**

appserver/tests/v2-tests/appserv-tests/sqetests/jsfcomponents/src/components/components/ChartComponent.java

diff --git a/appserver/tests/v2-tests/appserv-tests/sqetests/jsfcomponents/src/components/components/ChartComponent.java b/appserver/tests/v2-tests/appserv-tests/sqetests/jsfcomponents/src/components/components/ChartComponent.java
index 7fa2358..d1d0baa 100644
--- a/appserver/tests/v2-tests/appserv-tests/sqetests/jsfcomponents/src/components/components/ChartComponent.java
+++ b/appserver/tests/v2-tests/appserv-tests/sqetests/jsfcomponents/src/components/components/ChartComponent.java
@@ -16,12 +16,12 @@
 
 package components.components;
 
-import javax.faces.context.FacesContext;
-import javax.faces.component.UIOutput;
-import javax.faces.el.ValueBinding;
-import javax.faces.component.UIComponent;
-import javax.faces.context.ResponseWriter;
-import javax.faces.component.UIViewRoot;
+import jakarta.faces.context.FacesContext;
+import jakarta.faces.component.UIOutput;
+import jakarta.faces.el.ValueBinding;
+import jakarta.faces.component.UIComponent;
+import jakarta.faces.context.ResponseWriter;
+import jakarta.faces.component.UIViewRoot;
 
 import java.io.IOException;
 import java.util.Iterator;

appserver/tests/v2-tests/appserv-tests/sqetests/jsfcomponents/src/components/components/ChartItemComponent.java

diff --git a/appserver/tests/v2-tests/appserv-tests/sqetests/jsfcomponents/src/components/components/ChartItemComponent.java b/appserver/tests/v2-tests/appserv-tests/sqetests/jsfcomponents/src/components/components/ChartItemComponent.java
index de88629..5c92474 100644
--- a/appserver/tests/v2-tests/appserv-tests/sqetests/jsfcomponents/src/components/components/ChartItemComponent.java
+++ b/appserver/tests/v2-tests/appserv-tests/sqetests/jsfcomponents/src/components/components/ChartItemComponent.java
@@ -22,10 +22,10 @@
 
 
 import java.io.IOException;
-import javax.faces.application.Application;
-import javax.faces.context.FacesContext;
-import javax.faces.el.ValueBinding;
-import javax.faces.component.UIComponentBase;
+import jakarta.faces.application.Application;
+import jakarta.faces.context.FacesContext;
+import jakarta.faces.el.ValueBinding;
+import jakarta.faces.component.UIComponentBase;
 
 
 /**

appserver/tests/v2-tests/appserv-tests/sqetests/jsfcomponents/src/components/components/GraphComponent.java

diff --git a/appserver/tests/v2-tests/appserv-tests/sqetests/jsfcomponents/src/components/components/GraphComponent.java b/appserver/tests/v2-tests/appserv-tests/sqetests/jsfcomponents/src/components/components/GraphComponent.java
index 486b37d..19d8380 100644
--- a/appserver/tests/v2-tests/appserv-tests/sqetests/jsfcomponents/src/components/components/GraphComponent.java
+++ b/appserver/tests/v2-tests/appserv-tests/sqetests/jsfcomponents/src/components/components/GraphComponent.java
@@ -26,9 +26,9 @@
 import com.sun.org.apache.commons.logging.Log;
 import com.sun.org.apache.commons.logging.LogFactory;
 
-import javax.faces.component.UICommand;
-import javax.faces.context.FacesContext;
-import javax.faces.event.ActionEvent;
+import jakarta.faces.component.UICommand;
+import jakarta.faces.context.FacesContext;
+import jakarta.faces.event.ActionEvent;
 
 /**
  * Component wrapping a {@link Graph} object that is pointed at by the

appserver/tests/v2-tests/appserv-tests/sqetests/jsfcomponents/src/components/components/MapComponent.java

diff --git a/appserver/tests/v2-tests/appserv-tests/sqetests/jsfcomponents/src/components/components/MapComponent.java b/appserver/tests/v2-tests/appserv-tests/sqetests/jsfcomponents/src/components/components/MapComponent.java
index d07aa45..ba47c93 100644
--- a/appserver/tests/v2-tests/appserv-tests/sqetests/jsfcomponents/src/components/components/MapComponent.java
+++ b/appserver/tests/v2-tests/appserv-tests/sqetests/jsfcomponents/src/components/components/MapComponent.java
@@ -17,14 +17,14 @@
 package components.components;
 
 
-import javax.faces.component.UICommand;
-import javax.faces.context.FacesContext;
-import javax.faces.el.MethodBinding;
-import javax.faces.event.AbortProcessingException;
-import javax.faces.event.ActionEvent;
-import javax.faces.event.ActionListener;
-import javax.faces.event.FacesEvent;
-import javax.faces.event.PhaseId;
+import jakarta.faces.component.UICommand;
+import jakarta.faces.context.FacesContext;
+import jakarta.faces.el.MethodBinding;
+import jakarta.faces.event.AbortProcessingException;
+import jakarta.faces.event.ActionEvent;
+import jakarta.faces.event.ActionListener;
+import jakarta.faces.event.FacesEvent;
+import jakarta.faces.event.PhaseId;
 
 import java.io.IOException;
 

appserver/tests/v2-tests/appserv-tests/sqetests/jsfcomponents/src/components/components/PaneComponent.java

diff --git a/appserver/tests/v2-tests/appserv-tests/sqetests/jsfcomponents/src/components/components/PaneComponent.java b/appserver/tests/v2-tests/appserv-tests/sqetests/jsfcomponents/src/components/components/PaneComponent.java
index aa7770a..ef84268 100644
--- a/appserver/tests/v2-tests/appserv-tests/sqetests/jsfcomponents/src/components/components/PaneComponent.java
+++ b/appserver/tests/v2-tests/appserv-tests/sqetests/jsfcomponents/src/components/components/PaneComponent.java
@@ -24,12 +24,12 @@
 import com.sun.org.apache.commons.logging.Log;
 import com.sun.org.apache.commons.logging.LogFactory;
 
-import javax.faces.component.StateHolder;
-import javax.faces.component.UIComponent;
-import javax.faces.component.UIComponentBase;
-import javax.faces.context.FacesContext;
-import javax.faces.event.FacesEvent;
-import javax.faces.event.FacesListener;
+import jakarta.faces.component.StateHolder;
+import jakarta.faces.component.UIComponent;
+import jakarta.faces.component.UIComponentBase;
+import jakarta.faces.context.FacesContext;
+import jakarta.faces.event.FacesEvent;
+import jakarta.faces.event.FacesListener;
 
 import java.util.Iterator;
 

appserver/tests/v2-tests/appserv-tests/sqetests/jsfcomponents/src/components/components/PaneSelectedEvent.java

diff --git a/appserver/tests/v2-tests/appserv-tests/sqetests/jsfcomponents/src/components/components/PaneSelectedEvent.java b/appserver/tests/v2-tests/appserv-tests/sqetests/jsfcomponents/src/components/components/PaneSelectedEvent.java
index 648395a..8ab5003 100644
--- a/appserver/tests/v2-tests/appserv-tests/sqetests/jsfcomponents/src/components/components/PaneSelectedEvent.java
+++ b/appserver/tests/v2-tests/appserv-tests/sqetests/jsfcomponents/src/components/components/PaneSelectedEvent.java
@@ -21,9 +21,9 @@
 package components.components;
 
 
-import javax.faces.component.UIComponent;
-import javax.faces.event.FacesEvent;
-import javax.faces.event.FacesListener;
+import jakarta.faces.component.UIComponent;
+import jakarta.faces.event.FacesEvent;
+import jakarta.faces.event.FacesListener;
 
 
 /**

appserver/tests/v2-tests/appserv-tests/sqetests/jsfcomponents/src/components/components/ScrollerComponent.java

diff --git a/appserver/tests/v2-tests/appserv-tests/sqetests/jsfcomponents/src/components/components/ScrollerComponent.java b/appserver/tests/v2-tests/appserv-tests/sqetests/jsfcomponents/src/components/components/ScrollerComponent.java
index b29b2e3..5f0d7ed 100644
--- a/appserver/tests/v2-tests/appserv-tests/sqetests/jsfcomponents/src/components/components/ScrollerComponent.java
+++ b/appserver/tests/v2-tests/appserv-tests/sqetests/jsfcomponents/src/components/components/ScrollerComponent.java
@@ -22,14 +22,14 @@
 
 import components.renderkit.Util;
 
-import javax.faces.component.UICommand;
-import javax.faces.component.UIComponent;
-import javax.faces.component.UIData;
-import javax.faces.component.UIForm;
-import javax.faces.context.FacesContext;
-import javax.faces.context.ResponseWriter;
-import javax.faces.el.MethodBinding;
-import javax.faces.event.ActionEvent;
+import jakarta.faces.component.UICommand;
+import jakarta.faces.component.UIComponent;
+import jakarta.faces.component.UIData;
+import jakarta.faces.component.UIForm;
+import jakarta.faces.context.FacesContext;
+import jakarta.faces.context.ResponseWriter;
+import jakarta.faces.el.MethodBinding;
+import jakarta.faces.event.ActionEvent;
 
 import java.io.IOException;
 import java.util.Map;

appserver/tests/v2-tests/appserv-tests/sqetests/jsfcomponents/src/components/conf/faces-config.xml

diff --git a/appserver/tests/v2-tests/appserv-tests/sqetests/jsfcomponents/src/components/conf/faces-config.xml b/appserver/tests/v2-tests/appserv-tests/sqetests/jsfcomponents/src/components/conf/faces-config.xml
index 04b3550..dea48f1 100644
--- a/appserver/tests/v2-tests/appserv-tests/sqetests/jsfcomponents/src/components/conf/faces-config.xml
+++ b/appserver/tests/v2-tests/appserv-tests/sqetests/jsfcomponents/src/components/conf/faces-config.xml
@@ -195,13 +195,13 @@
         different markup creation for the components that are children
         of the child UIColumn components.
       </description>
-      <component-family>javax.faces.Data</component-family>
+      <component-family>jakarta.faces.Data</component-family>
       <renderer-type>Repeater</renderer-type>
       <renderer-class>components.renderkit.RepeaterRenderer</renderer-class>
     </renderer>
 
     <renderer>
-      <component-family>javax.faces.Output</component-family>
+      <component-family>jakarta.faces.Output</component-family>
       <renderer-type>Stylesheet</renderer-type>
       <renderer-class>components.renderkit.StylesheetRenderer</renderer-class>
     </renderer>

appserver/tests/v2-tests/appserv-tests/sqetests/jsfcomponents/src/components/model/ImageMap.java

diff --git a/appserver/tests/v2-tests/appserv-tests/sqetests/jsfcomponents/src/components/model/ImageMap.java b/appserver/tests/v2-tests/appserv-tests/sqetests/jsfcomponents/src/components/model/ImageMap.java
index cd71e00..47ea8aa 100644
--- a/appserver/tests/v2-tests/appserv-tests/sqetests/jsfcomponents/src/components/model/ImageMap.java
+++ b/appserver/tests/v2-tests/appserv-tests/sqetests/jsfcomponents/src/components/model/ImageMap.java
@@ -19,8 +19,8 @@
 
 import components.components.AreaSelectedEvent;
 
-import javax.faces.context.FacesContext;
-import javax.faces.event.ActionEvent;
+import jakarta.faces.context.FacesContext;
+import jakarta.faces.event.ActionEvent;
 
 import java.util.HashMap;
 import java.util.Locale;

appserver/tests/v2-tests/appserv-tests/sqetests/jsfcomponents/src/components/renderkit/AreaRenderer.java

diff --git a/appserver/tests/v2-tests/appserv-tests/sqetests/jsfcomponents/src/components/renderkit/AreaRenderer.java b/appserver/tests/v2-tests/appserv-tests/sqetests/jsfcomponents/src/components/renderkit/AreaRenderer.java
index 162d8a5..7a1d58b 100644
--- a/appserver/tests/v2-tests/appserv-tests/sqetests/jsfcomponents/src/components/renderkit/AreaRenderer.java
+++ b/appserver/tests/v2-tests/appserv-tests/sqetests/jsfcomponents/src/components/renderkit/AreaRenderer.java
@@ -21,9 +21,9 @@
 import components.components.MapComponent;
 import components.model.ImageArea;
 
-import javax.faces.component.UIComponent;
-import javax.faces.context.FacesContext;
-import javax.faces.context.ResponseWriter;
+import jakarta.faces.component.UIComponent;
+import jakarta.faces.context.FacesContext;
+import jakarta.faces.context.ResponseWriter;
 
 import java.io.IOException;
 

appserver/tests/v2-tests/appserv-tests/sqetests/jsfcomponents/src/components/renderkit/BaseRenderer.java

diff --git a/appserver/tests/v2-tests/appserv-tests/sqetests/jsfcomponents/src/components/renderkit/BaseRenderer.java b/appserver/tests/v2-tests/appserv-tests/sqetests/jsfcomponents/src/components/renderkit/BaseRenderer.java
index 6c26484..9d74c7b 100644
--- a/appserver/tests/v2-tests/appserv-tests/sqetests/jsfcomponents/src/components/renderkit/BaseRenderer.java
+++ b/appserver/tests/v2-tests/appserv-tests/sqetests/jsfcomponents/src/components/renderkit/BaseRenderer.java
@@ -21,9 +21,9 @@
 package components.renderkit;
 
 
-import javax.faces.component.UIComponent;
-import javax.faces.context.FacesContext;
-import javax.faces.render.Renderer;
+import jakarta.faces.component.UIComponent;
+import jakarta.faces.context.FacesContext;
+import jakarta.faces.render.Renderer;
 
 import java.io.IOException;
 import java.util.Iterator;

appserver/tests/v2-tests/appserv-tests/sqetests/jsfcomponents/src/components/renderkit/ConstantMethodBinding.java

diff --git a/appserver/tests/v2-tests/appserv-tests/sqetests/jsfcomponents/src/components/renderkit/ConstantMethodBinding.java b/appserver/tests/v2-tests/appserv-tests/sqetests/jsfcomponents/src/components/renderkit/ConstantMethodBinding.java
index 1e70fa0..4c2179a 100644
--- a/appserver/tests/v2-tests/appserv-tests/sqetests/jsfcomponents/src/components/renderkit/ConstantMethodBinding.java
+++ b/appserver/tests/v2-tests/appserv-tests/sqetests/jsfcomponents/src/components/renderkit/ConstantMethodBinding.java
@@ -22,9 +22,9 @@
 
 package components.renderkit;
 
-import javax.faces.component.StateHolder;
-import javax.faces.context.FacesContext;
-import javax.faces.el.MethodBinding;
+import jakarta.faces.component.StateHolder;
+import jakarta.faces.context.FacesContext;
+import jakarta.faces.el.MethodBinding;
 
 public class ConstantMethodBinding extends MethodBinding
     implements StateHolder {

appserver/tests/v2-tests/appserv-tests/sqetests/jsfcomponents/src/components/renderkit/MapRenderer.java

diff --git a/appserver/tests/v2-tests/appserv-tests/sqetests/jsfcomponents/src/components/renderkit/MapRenderer.java b/appserver/tests/v2-tests/appserv-tests/sqetests/jsfcomponents/src/components/renderkit/MapRenderer.java
index cd89ba6..353076e 100644
--- a/appserver/tests/v2-tests/appserv-tests/sqetests/jsfcomponents/src/components/renderkit/MapRenderer.java
+++ b/appserver/tests/v2-tests/appserv-tests/sqetests/jsfcomponents/src/components/renderkit/MapRenderer.java
@@ -19,9 +19,9 @@
 
 import components.components.MapComponent;
 
-import javax.faces.component.UIComponent;
-import javax.faces.context.FacesContext;
-import javax.faces.context.ResponseWriter;
+import jakarta.faces.component.UIComponent;
+import jakarta.faces.context.FacesContext;
+import jakarta.faces.context.ResponseWriter;
 
 import java.io.IOException;
 

appserver/tests/v2-tests/appserv-tests/sqetests/jsfcomponents/src/components/renderkit/MenuBarRenderer.java

diff --git a/appserver/tests/v2-tests/appserv-tests/sqetests/jsfcomponents/src/components/renderkit/MenuBarRenderer.java b/appserver/tests/v2-tests/appserv-tests/sqetests/jsfcomponents/src/components/renderkit/MenuBarRenderer.java
index e8b619a..779fe0c 100644
--- a/appserver/tests/v2-tests/appserv-tests/sqetests/jsfcomponents/src/components/renderkit/MenuBarRenderer.java
+++ b/appserver/tests/v2-tests/appserv-tests/sqetests/jsfcomponents/src/components/renderkit/MenuBarRenderer.java
@@ -27,12 +27,12 @@
 import com.sun.org.apache.commons.logging.Log;
 import com.sun.org.apache.commons.logging.LogFactory;
 
-import javax.faces.FacesException;
-import javax.faces.component.UIComponent;
-import javax.faces.component.UIForm;
-import javax.faces.context.FacesContext;
-import javax.faces.context.ResponseWriter;
-import javax.faces.event.ActionEvent;
+import jakarta.faces.FacesException;
+import jakarta.faces.component.UIComponent;
+import jakarta.faces.component.UIForm;
+import jakarta.faces.context.FacesContext;
+import jakarta.faces.context.ResponseWriter;
+import jakarta.faces.event.ActionEvent;
 
 import java.io.IOException;
 import java.util.Iterator;

appserver/tests/v2-tests/appserv-tests/sqetests/jsfcomponents/src/components/renderkit/MenuTreeRenderer.java

diff --git a/appserver/tests/v2-tests/appserv-tests/sqetests/jsfcomponents/src/components/renderkit/MenuTreeRenderer.java b/appserver/tests/v2-tests/appserv-tests/sqetests/jsfcomponents/src/components/renderkit/MenuTreeRenderer.java
index 1da887d..1930afd 100644
--- a/appserver/tests/v2-tests/appserv-tests/sqetests/jsfcomponents/src/components/renderkit/MenuTreeRenderer.java
+++ b/appserver/tests/v2-tests/appserv-tests/sqetests/jsfcomponents/src/components/renderkit/MenuTreeRenderer.java
@@ -25,10 +25,10 @@
 import components.model.Graph;
 import components.model.Node;
 
-import javax.faces.FacesException;
-import javax.faces.component.UIComponent;
-import javax.faces.context.FacesContext;
-import javax.faces.context.ResponseWriter;
+import jakarta.faces.FacesException;
+import jakarta.faces.component.UIComponent;
+import jakarta.faces.context.FacesContext;
+import jakarta.faces.context.ResponseWriter;
 
 import java.io.IOException;
 import java.util.Iterator;

appserver/tests/v2-tests/appserv-tests/sqetests/jsfcomponents/src/components/renderkit/RepeaterRenderer.java

diff --git a/appserver/tests/v2-tests/appserv-tests/sqetests/jsfcomponents/src/components/renderkit/RepeaterRenderer.java b/appserver/tests/v2-tests/appserv-tests/sqetests/jsfcomponents/src/components/renderkit/RepeaterRenderer.java
index faa2210..a8d895b 100644
--- a/appserver/tests/v2-tests/appserv-tests/sqetests/jsfcomponents/src/components/renderkit/RepeaterRenderer.java
+++ b/appserver/tests/v2-tests/appserv-tests/sqetests/jsfcomponents/src/components/renderkit/RepeaterRenderer.java
@@ -21,11 +21,11 @@
 package components.renderkit;
 
 
-import javax.faces.component.UIColumn;
-import javax.faces.component.UIComponent;
-import javax.faces.component.UIData;
-import javax.faces.context.FacesContext;
-import javax.faces.context.ResponseWriter;
+import jakarta.faces.component.UIColumn;
+import jakarta.faces.component.UIComponent;
+import jakarta.faces.component.UIData;
+import jakarta.faces.context.FacesContext;
+import jakarta.faces.context.ResponseWriter;
 
 import java.io.IOException;
 import java.util.Iterator;

appserver/tests/v2-tests/appserv-tests/sqetests/jsfcomponents/src/components/renderkit/StylesheetRenderer.java

diff --git a/appserver/tests/v2-tests/appserv-tests/sqetests/jsfcomponents/src/components/renderkit/StylesheetRenderer.java b/appserver/tests/v2-tests/appserv-tests/sqetests/jsfcomponents/src/components/renderkit/StylesheetRenderer.java
index 2c58425..215e1a3 100644
--- a/appserver/tests/v2-tests/appserv-tests/sqetests/jsfcomponents/src/components/renderkit/StylesheetRenderer.java
+++ b/appserver/tests/v2-tests/appserv-tests/sqetests/jsfcomponents/src/components/renderkit/StylesheetRenderer.java
@@ -21,10 +21,10 @@
 package components.renderkit;
 
 
-import javax.faces.component.UIComponent;
-import javax.faces.component.UIOutput;
-import javax.faces.context.FacesContext;
-import javax.faces.context.ResponseWriter;
+import jakarta.faces.component.UIComponent;
+import jakarta.faces.component.UIOutput;
+import jakarta.faces.context.FacesContext;
+import jakarta.faces.context.ResponseWriter;
 
 import java.io.IOException;
 

appserver/tests/v2-tests/appserv-tests/sqetests/jsfcomponents/src/components/renderkit/TabLabelRenderer.java

diff --git a/appserver/tests/v2-tests/appserv-tests/sqetests/jsfcomponents/src/components/renderkit/TabLabelRenderer.java b/appserver/tests/v2-tests/appserv-tests/sqetests/jsfcomponents/src/components/renderkit/TabLabelRenderer.java
index cb159e9..d25d8f2 100644
--- a/appserver/tests/v2-tests/appserv-tests/sqetests/jsfcomponents/src/components/renderkit/TabLabelRenderer.java
+++ b/appserver/tests/v2-tests/appserv-tests/sqetests/jsfcomponents/src/components/renderkit/TabLabelRenderer.java
@@ -25,9 +25,9 @@
 
 import components.components.PaneSelectedEvent;
 
-import javax.faces.component.UIComponent;
-import javax.faces.context.FacesContext;
-import javax.faces.context.ResponseWriter;
+import jakarta.faces.component.UIComponent;
+import jakarta.faces.context.FacesContext;
+import jakarta.faces.context.ResponseWriter;
 
 import java.io.IOException;
 import java.util.Map;

appserver/tests/v2-tests/appserv-tests/sqetests/jsfcomponents/src/components/renderkit/TabRenderer.java

diff --git a/appserver/tests/v2-tests/appserv-tests/sqetests/jsfcomponents/src/components/renderkit/TabRenderer.java b/appserver/tests/v2-tests/appserv-tests/sqetests/jsfcomponents/src/components/renderkit/TabRenderer.java
index 933292d..3815302 100644
--- a/appserver/tests/v2-tests/appserv-tests/sqetests/jsfcomponents/src/components/renderkit/TabRenderer.java
+++ b/appserver/tests/v2-tests/appserv-tests/sqetests/jsfcomponents/src/components/renderkit/TabRenderer.java
@@ -25,8 +25,8 @@
 import com.sun.org.apache.commons.logging.Log;
 import com.sun.org.apache.commons.logging.LogFactory;
 
-import javax.faces.component.UIComponent;
-import javax.faces.context.FacesContext;
+import jakarta.faces.component.UIComponent;
+import jakarta.faces.context.FacesContext;
 
 import java.io.IOException;
 import java.util.Iterator;

appserver/tests/v2-tests/appserv-tests/sqetests/jsfcomponents/src/components/renderkit/TabbedRenderer.java

diff --git a/appserver/tests/v2-tests/appserv-tests/sqetests/jsfcomponents/src/components/renderkit/TabbedRenderer.java b/appserver/tests/v2-tests/appserv-tests/sqetests/jsfcomponents/src/components/renderkit/TabbedRenderer.java
index 9813d30..2c2b6bb 100644
--- a/appserver/tests/v2-tests/appserv-tests/sqetests/jsfcomponents/src/components/renderkit/TabbedRenderer.java
+++ b/appserver/tests/v2-tests/appserv-tests/sqetests/jsfcomponents/src/components/renderkit/TabbedRenderer.java
@@ -25,9 +25,9 @@
 import com.sun.org.apache.commons.logging.Log;
 import com.sun.org.apache.commons.logging.LogFactory;
 
-import javax.faces.component.UIComponent;
-import javax.faces.context.FacesContext;
-import javax.faces.context.ResponseWriter;
+import jakarta.faces.component.UIComponent;
+import jakarta.faces.context.FacesContext;
+import jakarta.faces.context.ResponseWriter;
 
 import java.io.IOException;
 import java.util.Iterator;

appserver/tests/v2-tests/appserv-tests/sqetests/jsfcomponents/src/components/renderkit/Util.java

diff --git a/appserver/tests/v2-tests/appserv-tests/sqetests/jsfcomponents/src/components/renderkit/Util.java b/appserver/tests/v2-tests/appserv-tests/sqetests/jsfcomponents/src/components/renderkit/Util.java
index 2401876..edc1ef9 100644
--- a/appserver/tests/v2-tests/appserv-tests/sqetests/jsfcomponents/src/components/renderkit/Util.java
+++ b/appserver/tests/v2-tests/appserv-tests/sqetests/jsfcomponents/src/components/renderkit/Util.java
@@ -22,13 +22,13 @@
 
 package components.renderkit;
 
-import javax.faces.FactoryFinder;
-import javax.faces.application.Application;
-import javax.faces.application.ApplicationFactory;
-import javax.faces.component.UIComponent;
-import javax.faces.context.FacesContext;
-import javax.faces.el.MethodBinding;
-import javax.faces.el.ValueBinding;
+import jakarta.faces.FactoryFinder;
+import jakarta.faces.application.Application;
+import jakarta.faces.application.ApplicationFactory;
+import jakarta.faces.component.UIComponent;
+import jakarta.faces.context.FacesContext;
+import jakarta.faces.el.MethodBinding;
+import jakarta.faces.el.ValueBinding;
 
 import java.util.Locale;
 

appserver/tests/v2-tests/appserv-tests/sqetests/jsfcomponents/src/components/taglib/AreaTag.java

diff --git a/appserver/tests/v2-tests/appserv-tests/sqetests/jsfcomponents/src/components/taglib/AreaTag.java b/appserver/tests/v2-tests/appserv-tests/sqetests/jsfcomponents/src/components/taglib/AreaTag.java
index 6d8c26e..ee2d0e6 100644
--- a/appserver/tests/v2-tests/appserv-tests/sqetests/jsfcomponents/src/components/taglib/AreaTag.java
+++ b/appserver/tests/v2-tests/appserv-tests/sqetests/jsfcomponents/src/components/taglib/AreaTag.java
@@ -19,9 +19,9 @@
 import components.components.AreaComponent;
 import components.renderkit.Util;
 
-import javax.faces.component.UIComponent;
-import javax.faces.component.ValueHolder;
-import javax.faces.webapp.UIComponentTag;
+import jakarta.faces.component.UIComponent;
+import jakarta.faces.component.ValueHolder;
+import jakarta.faces.webapp.UIComponentTag;
 
 
 /**

appserver/tests/v2-tests/appserv-tests/sqetests/jsfcomponents/src/components/taglib/ChartItemTag.java

diff --git a/appserver/tests/v2-tests/appserv-tests/sqetests/jsfcomponents/src/components/taglib/ChartItemTag.java b/appserver/tests/v2-tests/appserv-tests/sqetests/jsfcomponents/src/components/taglib/ChartItemTag.java
index 30512bf..d444203 100644
--- a/appserver/tests/v2-tests/appserv-tests/sqetests/jsfcomponents/src/components/taglib/ChartItemTag.java
+++ b/appserver/tests/v2-tests/appserv-tests/sqetests/jsfcomponents/src/components/taglib/ChartItemTag.java
@@ -17,11 +17,11 @@
 package components.taglib;
 
 import components.components.ChartItemComponent;
-import javax.faces.component.UIComponent;
-import javax.faces.context.FacesContext;
+import jakarta.faces.component.UIComponent;
+import jakarta.faces.context.FacesContext;
 
-import javax.faces.el.ValueBinding;
-import javax.faces.webapp.UIComponentTag;
+import jakarta.faces.el.ValueBinding;
+import jakarta.faces.webapp.UIComponentTag;
 
 /**
  * <p><strong>ChartItemTag</strong> is the tag handler that processes the 

appserver/tests/v2-tests/appserv-tests/sqetests/jsfcomponents/src/components/taglib/ChartTag.java

diff --git a/appserver/tests/v2-tests/appserv-tests/sqetests/jsfcomponents/src/components/taglib/ChartTag.java b/appserver/tests/v2-tests/appserv-tests/sqetests/jsfcomponents/src/components/taglib/ChartTag.java
index 13c7a5c..4839020 100644
--- a/appserver/tests/v2-tests/appserv-tests/sqetests/jsfcomponents/src/components/taglib/ChartTag.java
+++ b/appserver/tests/v2-tests/appserv-tests/sqetests/jsfcomponents/src/components/taglib/ChartTag.java
@@ -17,11 +17,11 @@
 package components.taglib;
 
 import components.components.ChartComponent;
-import javax.faces.component.UIComponent;
-import javax.faces.context.FacesContext;
+import jakarta.faces.component.UIComponent;
+import jakarta.faces.context.FacesContext;
 
-import javax.faces.el.ValueBinding;
-import javax.faces.webapp.UIComponentTag;
+import jakarta.faces.el.ValueBinding;
+import jakarta.faces.webapp.UIComponentTag;
 
 
 /**

appserver/tests/v2-tests/appserv-tests/sqetests/jsfcomponents/src/components/taglib/DataRepeaterTag.java

diff --git a/appserver/tests/v2-tests/appserv-tests/sqetests/jsfcomponents/src/components/taglib/DataRepeaterTag.java b/appserver/tests/v2-tests/appserv-tests/sqetests/jsfcomponents/src/components/taglib/DataRepeaterTag.java
index f473fec..7338de9 100644
--- a/appserver/tests/v2-tests/appserv-tests/sqetests/jsfcomponents/src/components/taglib/DataRepeaterTag.java
+++ b/appserver/tests/v2-tests/appserv-tests/sqetests/jsfcomponents/src/components/taglib/DataRepeaterTag.java
@@ -20,10 +20,10 @@
 
 package components.taglib;
 
-import javax.faces.component.UIComponent;
-import javax.faces.component.UIData;
-import javax.faces.el.ValueBinding;
-import javax.faces.webapp.UIComponentTag;
+import jakarta.faces.component.UIComponent;
+import jakarta.faces.component.UIData;
+import jakarta.faces.el.ValueBinding;
+import jakarta.faces.webapp.UIComponentTag;
 
 /**
  * <p>DataRepeaterTag is the tag handler class for a <code>UIData</code>
@@ -80,7 +80,7 @@
 
 
     public String getComponentType() {
-        return ("javax.faces.Data");
+        return ("jakarta.faces.Data");
     }
 
 

appserver/tests/v2-tests/appserv-tests/sqetests/jsfcomponents/src/components/taglib/GraphMenuBarTag.java

diff --git a/appserver/tests/v2-tests/appserv-tests/sqetests/jsfcomponents/src/components/taglib/GraphMenuBarTag.java b/appserver/tests/v2-tests/appserv-tests/sqetests/jsfcomponents/src/components/taglib/GraphMenuBarTag.java
index 52c4c3e..94003dd 100644
--- a/appserver/tests/v2-tests/appserv-tests/sqetests/jsfcomponents/src/components/taglib/GraphMenuBarTag.java
+++ b/appserver/tests/v2-tests/appserv-tests/sqetests/jsfcomponents/src/components/taglib/GraphMenuBarTag.java
@@ -24,12 +24,12 @@
 import components.components.GraphComponent;
 import components.model.Graph;
 
-import javax.faces.component.UIComponent;
-import javax.faces.context.FacesContext;
-import javax.faces.el.MethodBinding;
-import javax.faces.el.ValueBinding;
-import javax.faces.event.ActionEvent;
-import javax.faces.webapp.UIComponentTag;
+import jakarta.faces.component.UIComponent;
+import jakarta.faces.context.FacesContext;
+import jakarta.faces.el.MethodBinding;
+import jakarta.faces.el.ValueBinding;
+import jakarta.faces.event.ActionEvent;
+import jakarta.faces.webapp.UIComponentTag;
 
 
 /**
@@ -134,7 +134,7 @@
                 graphComponent.setActionListener(mb);
             } else {
                 Object params [] = {actionListener};
-                throw new javax.faces.FacesException();
+                throw new jakarta.faces.FacesException();
             }
         }
         // if the attributes are values set them directly on the component, if

appserver/tests/v2-tests/appserv-tests/sqetests/jsfcomponents/src/components/taglib/GraphMenuNodeTag.java

diff --git a/appserver/tests/v2-tests/appserv-tests/sqetests/jsfcomponents/src/components/taglib/GraphMenuNodeTag.java b/appserver/tests/v2-tests/appserv-tests/sqetests/jsfcomponents/src/components/taglib/GraphMenuNodeTag.java
index f9aa7d6..5932e4d 100644
--- a/appserver/tests/v2-tests/appserv-tests/sqetests/jsfcomponents/src/components/taglib/GraphMenuNodeTag.java
+++ b/appserver/tests/v2-tests/appserv-tests/sqetests/jsfcomponents/src/components/taglib/GraphMenuNodeTag.java
@@ -26,8 +26,8 @@
 import components.model.Node;
 import components.renderkit.Util;
 
-import javax.faces.context.FacesContext;
-import javax.faces.webapp.UIComponentBodyTag;
+import jakarta.faces.context.FacesContext;
+import jakarta.faces.webapp.UIComponentBodyTag;
 import javax.servlet.jsp.JspException;
 import javax.servlet.jsp.tagext.BodyTag;
 import javax.servlet.jsp.tagext.TagSupport;

appserver/tests/v2-tests/appserv-tests/sqetests/jsfcomponents/src/components/taglib/GraphMenuTreeTag.java

diff --git a/appserver/tests/v2-tests/appserv-tests/sqetests/jsfcomponents/src/components/taglib/GraphMenuTreeTag.java b/appserver/tests/v2-tests/appserv-tests/sqetests/jsfcomponents/src/components/taglib/GraphMenuTreeTag.java
index 02bb7d8..2ebf37e 100644
--- a/appserver/tests/v2-tests/appserv-tests/sqetests/jsfcomponents/src/components/taglib/GraphMenuTreeTag.java
+++ b/appserver/tests/v2-tests/appserv-tests/sqetests/jsfcomponents/src/components/taglib/GraphMenuTreeTag.java
@@ -23,12 +23,12 @@
 import components.components.GraphComponent;
 import components.model.Graph;
 
-import javax.faces.component.UIComponent;
-import javax.faces.context.FacesContext;
-import javax.faces.el.MethodBinding;
-import javax.faces.el.ValueBinding;
-import javax.faces.event.ActionEvent;
-import javax.faces.webapp.UIComponentBodyTag;
+import jakarta.faces.component.UIComponent;
+import jakarta.faces.context.FacesContext;
+import jakarta.faces.el.MethodBinding;
+import jakarta.faces.el.ValueBinding;
+import jakarta.faces.event.ActionEvent;
+import jakarta.faces.webapp.UIComponentBodyTag;
 
 
 /**
@@ -131,7 +131,7 @@
                 graphComponent.setActionListener(mb);
             } else {
                 Object params [] = {actionListener};
-                throw new javax.faces.FacesException();
+                throw new jakarta.faces.FacesException();
             }
         }
 

appserver/tests/v2-tests/appserv-tests/sqetests/jsfcomponents/src/components/taglib/GraphTreeNodeTag.java

diff --git a/appserver/tests/v2-tests/appserv-tests/sqetests/jsfcomponents/src/components/taglib/GraphTreeNodeTag.java b/appserver/tests/v2-tests/appserv-tests/sqetests/jsfcomponents/src/components/taglib/GraphTreeNodeTag.java
index 99ce519..78286ac 100644
--- a/appserver/tests/v2-tests/appserv-tests/sqetests/jsfcomponents/src/components/taglib/GraphTreeNodeTag.java
+++ b/appserver/tests/v2-tests/appserv-tests/sqetests/jsfcomponents/src/components/taglib/GraphTreeNodeTag.java
@@ -26,8 +26,8 @@
 import components.model.Node;
 import components.renderkit.Util;
 
-import javax.faces.context.FacesContext;
-import javax.faces.webapp.UIComponentBodyTag;
+import jakarta.faces.context.FacesContext;
+import jakarta.faces.webapp.UIComponentBodyTag;
 import javax.servlet.jsp.JspException;
 import javax.servlet.jsp.tagext.BodyTag;
 import javax.servlet.jsp.tagext.TagSupport;

appserver/tests/v2-tests/appserv-tests/sqetests/jsfcomponents/src/components/taglib/MapTag.java

diff --git a/appserver/tests/v2-tests/appserv-tests/sqetests/jsfcomponents/src/components/taglib/MapTag.java b/appserver/tests/v2-tests/appserv-tests/sqetests/jsfcomponents/src/components/taglib/MapTag.java
index beb55d1..06418e4 100644
--- a/appserver/tests/v2-tests/appserv-tests/sqetests/jsfcomponents/src/components/taglib/MapTag.java
+++ b/appserver/tests/v2-tests/appserv-tests/sqetests/jsfcomponents/src/components/taglib/MapTag.java
@@ -20,12 +20,12 @@
 import components.components.MapComponent;
 import components.renderkit.Util;
 
-import javax.faces.component.UIComponent;
-import javax.faces.context.FacesContext;
-import javax.faces.el.MethodBinding;
-import javax.faces.el.ValueBinding;
-import javax.faces.event.ActionEvent;
-import javax.faces.webapp.UIComponentTag;
+import jakarta.faces.component.UIComponent;
+import jakarta.faces.context.FacesContext;
+import jakarta.faces.el.MethodBinding;
+import jakarta.faces.el.ValueBinding;
+import jakarta.faces.event.ActionEvent;
+import jakarta.faces.webapp.UIComponentTag;
 
 
 /**
@@ -121,7 +121,7 @@
                 map.setActionListener(mb);
             } else {
                 Object params [] = {actionListener};
-                throw new javax.faces.FacesException();
+                throw new jakarta.faces.FacesException();
             }
         }
 

appserver/tests/v2-tests/appserv-tests/sqetests/jsfcomponents/src/components/taglib/PaneTabLabelTag.java

diff --git a/appserver/tests/v2-tests/appserv-tests/sqetests/jsfcomponents/src/components/taglib/PaneTabLabelTag.java b/appserver/tests/v2-tests/appserv-tests/sqetests/jsfcomponents/src/components/taglib/PaneTabLabelTag.java
index bcd70ea..e7c6cb2 100644
--- a/appserver/tests/v2-tests/appserv-tests/sqetests/jsfcomponents/src/components/taglib/PaneTabLabelTag.java
+++ b/appserver/tests/v2-tests/appserv-tests/sqetests/jsfcomponents/src/components/taglib/PaneTabLabelTag.java
@@ -24,9 +24,9 @@
 import com.sun.org.apache.commons.logging.Log;
 import com.sun.org.apache.commons.logging.LogFactory;
 
-import javax.faces.component.UIComponent;
-import javax.faces.el.ValueBinding;
-import javax.faces.webapp.UIComponentTag;
+import jakarta.faces.component.UIComponent;
+import jakarta.faces.el.ValueBinding;
+import jakarta.faces.webapp.UIComponentTag;
 
 
 /**

appserver/tests/v2-tests/appserv-tests/sqetests/jsfcomponents/src/components/taglib/PaneTabTag.java

diff --git a/appserver/tests/v2-tests/appserv-tests/sqetests/jsfcomponents/src/components/taglib/PaneTabTag.java b/appserver/tests/v2-tests/appserv-tests/sqetests/jsfcomponents/src/components/taglib/PaneTabTag.java
index 35ea00a..567024a 100644
--- a/appserver/tests/v2-tests/appserv-tests/sqetests/jsfcomponents/src/components/taglib/PaneTabTag.java
+++ b/appserver/tests/v2-tests/appserv-tests/sqetests/jsfcomponents/src/components/taglib/PaneTabTag.java
@@ -24,9 +24,9 @@
 import com.sun.org.apache.commons.logging.Log;
 import com.sun.org.apache.commons.logging.LogFactory;
 
-import javax.faces.component.UIComponent;
-import javax.faces.webapp.UIComponentTag;
-import javax.faces.el.ValueBinding;
+import jakarta.faces.component.UIComponent;
+import jakarta.faces.webapp.UIComponentTag;
+import jakarta.faces.el.ValueBinding;
 
 
 /**

appserver/tests/v2-tests/appserv-tests/sqetests/jsfcomponents/src/components/taglib/PaneTabbedTag.java

diff --git a/appserver/tests/v2-tests/appserv-tests/sqetests/jsfcomponents/src/components/taglib/PaneTabbedTag.java b/appserver/tests/v2-tests/appserv-tests/sqetests/jsfcomponents/src/components/taglib/PaneTabbedTag.java
index e55c9d5..b5fdde1 100644
--- a/appserver/tests/v2-tests/appserv-tests/sqetests/jsfcomponents/src/components/taglib/PaneTabbedTag.java
+++ b/appserver/tests/v2-tests/appserv-tests/sqetests/jsfcomponents/src/components/taglib/PaneTabbedTag.java
@@ -24,9 +24,9 @@
 import com.sun.org.apache.commons.logging.Log;
 import com.sun.org.apache.commons.logging.LogFactory;
 
-import javax.faces.component.UIComponent;
-import javax.faces.el.ValueBinding;
-import javax.faces.webapp.UIComponentTag;
+import jakarta.faces.component.UIComponent;
+import jakarta.faces.el.ValueBinding;
+import jakarta.faces.webapp.UIComponentTag;
 
 
 /**

appserver/tests/v2-tests/appserv-tests/sqetests/jsfcomponents/src/components/taglib/ScrollerTag.java

diff --git a/appserver/tests/v2-tests/appserv-tests/sqetests/jsfcomponents/src/components/taglib/ScrollerTag.java b/appserver/tests/v2-tests/appserv-tests/sqetests/jsfcomponents/src/components/taglib/ScrollerTag.java
index 1b91cf3..dfcc578 100644
--- a/appserver/tests/v2-tests/appserv-tests/sqetests/jsfcomponents/src/components/taglib/ScrollerTag.java
+++ b/appserver/tests/v2-tests/appserv-tests/sqetests/jsfcomponents/src/components/taglib/ScrollerTag.java
@@ -22,12 +22,12 @@
 
 import components.components.ScrollerComponent;
 
-import javax.faces.component.UIComponent;
-import javax.faces.context.FacesContext;
-import javax.faces.el.MethodBinding;
-import javax.faces.el.ValueBinding;
-import javax.faces.event.ActionEvent;
-import javax.faces.webapp.UIComponentTag;
+import jakarta.faces.component.UIComponent;
+import jakarta.faces.context.FacesContext;
+import jakarta.faces.el.MethodBinding;
+import jakarta.faces.el.ValueBinding;
+import jakarta.faces.event.ActionEvent;
+import jakarta.faces.webapp.UIComponentTag;
 
 /**
  * <p> ScrollerTag is the tag handler class for <code>ScrollerComponent.
@@ -99,7 +99,7 @@
                 ((ScrollerComponent) component).setActionListener(mb);
             } else {
                 Object params [] = {actionListener};
-                throw new javax.faces.FacesException();
+                throw new jakarta.faces.FacesException();
             }
         }
 

appserver/tests/v2-tests/appserv-tests/sqetests/jsfcomponents/src/components/taglib/StylesheetTag.java

diff --git a/appserver/tests/v2-tests/appserv-tests/sqetests/jsfcomponents/src/components/taglib/StylesheetTag.java b/appserver/tests/v2-tests/appserv-tests/sqetests/jsfcomponents/src/components/taglib/StylesheetTag.java
index a860193..40d3db1 100644
--- a/appserver/tests/v2-tests/appserv-tests/sqetests/jsfcomponents/src/components/taglib/StylesheetTag.java
+++ b/appserver/tests/v2-tests/appserv-tests/sqetests/jsfcomponents/src/components/taglib/StylesheetTag.java
@@ -16,8 +16,8 @@
 
 package components.taglib;
 
-import javax.faces.component.UIComponent;
-import javax.faces.webapp.UIComponentTag;
+import jakarta.faces.component.UIComponent;
+import jakarta.faces.webapp.UIComponentTag;
 
 
 /**
@@ -37,7 +37,7 @@
 
 
     public String getComponentType() {
-        return ("javax.faces.Output");
+        return ("jakarta.faces.Output");
     }
 
 

appserver/tests/v2-tests/appserv-tests/sqetests/jsfcomponents/src/demo/model/GraphBean.java

diff --git a/appserver/tests/v2-tests/appserv-tests/sqetests/jsfcomponents/src/demo/model/GraphBean.java b/appserver/tests/v2-tests/appserv-tests/sqetests/jsfcomponents/src/demo/model/GraphBean.java
index c9ff507..aed6d31 100644
--- a/appserver/tests/v2-tests/appserv-tests/sqetests/jsfcomponents/src/demo/model/GraphBean.java
+++ b/appserver/tests/v2-tests/appserv-tests/sqetests/jsfcomponents/src/demo/model/GraphBean.java
@@ -26,7 +26,7 @@
 import com.sun.org.apache.commons.logging.Log;
 import com.sun.org.apache.commons.logging.LogFactory;
 
-import javax.faces.event.ActionEvent;
+import jakarta.faces.event.ActionEvent;
 
 import java.util.Iterator;
 

appserver/tests/v2-tests/appserv-tests/sqetests/jsfcomponents/src/demo/model/RepeaterBean.java

diff --git a/appserver/tests/v2-tests/appserv-tests/sqetests/jsfcomponents/src/demo/model/RepeaterBean.java b/appserver/tests/v2-tests/appserv-tests/sqetests/jsfcomponents/src/demo/model/RepeaterBean.java
index 05f779f..ea45ae8 100644
--- a/appserver/tests/v2-tests/appserv-tests/sqetests/jsfcomponents/src/demo/model/RepeaterBean.java
+++ b/appserver/tests/v2-tests/appserv-tests/sqetests/jsfcomponents/src/demo/model/RepeaterBean.java
@@ -21,11 +21,11 @@
 package demo.model;
 
 
-import javax.faces.application.FacesMessage;
-import javax.faces.component.UIData;
-import javax.faces.component.UIInput;
-import javax.faces.component.UISelectBoolean;
-import javax.faces.context.FacesContext;
+import jakarta.faces.application.FacesMessage;
+import jakarta.faces.component.UIData;
+import jakarta.faces.component.UIInput;
+import jakarta.faces.component.UISelectBoolean;
+import jakarta.faces.context.FacesContext;
 
 import java.util.ArrayList;
 import java.util.Iterator;

appserver/tests/v2-tests/appserv-tests/sqetests/jsfcomponents/src/demo/model/ResultSetBean.java

diff --git a/appserver/tests/v2-tests/appserv-tests/sqetests/jsfcomponents/src/demo/model/ResultSetBean.java b/appserver/tests/v2-tests/appserv-tests/sqetests/jsfcomponents/src/demo/model/ResultSetBean.java
index 557fbae..2225c14 100644
--- a/appserver/tests/v2-tests/appserv-tests/sqetests/jsfcomponents/src/demo/model/ResultSetBean.java
+++ b/appserver/tests/v2-tests/appserv-tests/sqetests/jsfcomponents/src/demo/model/ResultSetBean.java
@@ -23,10 +23,10 @@
 import com.sun.org.apache.commons.logging.Log;
 import com.sun.org.apache.commons.logging.LogFactory;
 
-import javax.faces.component.UIComponent;
-import javax.faces.component.UIData;
-import javax.faces.context.FacesContext;
-import javax.faces.event.ActionEvent;
+import jakarta.faces.component.UIComponent;
+import jakarta.faces.component.UIData;
+import jakarta.faces.context.FacesContext;
+import jakarta.faces.event.ActionEvent;
 
 import java.util.ArrayList;
 import java.util.List;

appserver/web/gui-plugin-common/src/main/manpages/org/glassfish/web/plugin/common/list-web-context-param.1

diff --git a/appserver/web/gui-plugin-common/src/main/manpages/org/glassfish/web/plugin/common/list-web-context-param.1 b/appserver/web/gui-plugin-common/src/main/manpages/org/glassfish/web/plugin/common/list-web-context-param.1
index a6cb181..7feaa41 100644
--- a/appserver/web/gui-plugin-common/src/main/manpages/org/glassfish/web/plugin/common/list-web-context-param.1
+++ b/appserver/web/gui-plugin-common/src/main/manpages/org/glassfish/web/plugin/common/list-web-context-param.1
@@ -82,13 +82,13 @@
            This example lists all servlet context-initialization parameters of
            the web application basic-ezcomp that have been set by using the
            set-web-context-param subcommand. Because no description was
-           specified when the javax.faces.PROJECT_STAGE parameter was set,
+           specified when the jakarta.faces.PROJECT_STAGE parameter was set,
            null is displayed instead of a description for this parameter.
 
                asadmin> list-web-context-param basic-ezcomp
-               javax.faces.STATE_SAVING_METHOD = client ignoreDescriptorItem=false
+               jakarta.faces.STATE_SAVING_METHOD = client ignoreDescriptorItem=false
                //The location where the application's state is preserved
-               javax.faces.PROJECT_STAGE = null ignoreDescriptorItem=true //null
+               jakarta.faces.PROJECT_STAGE = null ignoreDescriptorItem=true //null
 
                Command list-web-context-param executed successfully.
 

appserver/web/gui-plugin-common/src/main/manpages/org/glassfish/web/plugin/common/set-web-context-param.1

diff --git a/appserver/web/gui-plugin-common/src/main/manpages/org/glassfish/web/plugin/common/set-web-context-param.1 b/appserver/web/gui-plugin-common/src/main/manpages/org/glassfish/web/plugin/common/set-web-context-param.1
index 16863a6..a49dc86 100644
--- a/appserver/web/gui-plugin-common/src/main/manpages/org/glassfish/web/plugin/common/set-web-context-param.1
+++ b/appserver/web/gui-plugin-common/src/main/manpages/org/glassfish/web/plugin/common/set-web-context-param.1
@@ -110,11 +110,11 @@
        Example 1, Setting a Servlet Context-Initialization Parameter for a Web
        Application
            This example sets the servlet context-initialization parameter
-           javax.faces.STATE_SAVING_METHOD of the web application basic-ezcomp
+           jakarta.faces.STATE_SAVING_METHOD of the web application basic-ezcomp
            to client. The description The location where the application's
            state is preserved is provided for this parameter.
 
-               asadmin> set-web-context-param --name=javax.faces.STATE_SAVING_METHOD
+               asadmin> set-web-context-param --name=jakarta.faces.STATE_SAVING_METHOD
                --description="The location where the application's state is preserved"
                --value=client basic-ezcomp
 
@@ -123,9 +123,9 @@
        Example 2, Ignoring a Servlet Context-Initialization Parameter That Is
        Defined in a Deployment Descriptor
            This example ignores the servlet context-initialization parameter
-           javax.faces.PROJECT_STAGE of the web application basic-ezcomp.
+           jakarta.faces.PROJECT_STAGE of the web application basic-ezcomp.
 
-               asadmin> set-web-context-param --name=javax.faces.PROJECT_STAGE
+               asadmin> set-web-context-param --name=jakarta.faces.PROJECT_STAGE
                --ignoredescriptoritem=true
                basic-ezcomp
 

appserver/web/gui-plugin-common/src/main/manpages/org/glassfish/web/plugin/common/unset-web-context-param.1

diff --git a/appserver/web/gui-plugin-common/src/main/manpages/org/glassfish/web/plugin/common/unset-web-context-param.1 b/appserver/web/gui-plugin-common/src/main/manpages/org/glassfish/web/plugin/common/unset-web-context-param.1
index deb34fd..03d40fb 100644
--- a/appserver/web/gui-plugin-common/src/main/manpages/org/glassfish/web/plugin/common/unset-web-context-param.1
+++ b/appserver/web/gui-plugin-common/src/main/manpages/org/glassfish/web/plugin/common/unset-web-context-param.1
@@ -88,12 +88,12 @@
        Example 1, Unsetting a Servlet Context-Initialization Parameter for a
        Web Application
            This example unsets the servlet context-initialization parameter
-           javax.faces.STATE_SAVING_METHOD of the web application
+           jakarta.faces.STATE_SAVING_METHOD of the web application
            basic-ezcomp. The parameter reverts to the value, if any, that is
            defined in the application's deployment descriptor.
 
                asadmin> unset-web-context-param
-               --name=javax.faces.STATE_SAVING_METHOD basic-ezcomp
+               --name=jakarta.faces.STATE_SAVING_METHOD basic-ezcomp
 
                Command unset-web-context-param executed successfully.
 

appserver/web/war-util/src/main/java/org/glassfish/web/loader/WebappClassLoader.java

diff --git a/appserver/web/war-util/src/main/java/org/glassfish/web/loader/WebappClassLoader.java b/appserver/web/war-util/src/main/java/org/glassfish/web/loader/WebappClassLoader.java
index b8b41bf..947ee6e 100644
--- a/appserver/web/war-util/src/main/java/org/glassfish/web/loader/WebappClassLoader.java
+++ b/appserver/web/war-util/src/main/java/org/glassfish/web/loader/WebappClassLoader.java
@@ -653,7 +653,7 @@
     public void setUseMyFaces(boolean useMyFaces) {
         this.useMyFaces = useMyFaces;
         if (useMyFaces) {
-            addOverridablePackage("javax.faces");
+            addOverridablePackage("jakarta.faces");
             addOverridablePackage("com.sun.faces");
         }
     }
@@ -3326,7 +3326,7 @@
     private boolean isResourceDelegate(String name) {
         return (delegate
                 || (name.startsWith("javax") &&
-                    (!name.startsWith("javax.faces") || !useMyFaces))
+                    (!name.startsWith("jakarta.faces") || !useMyFaces))
                 || name.startsWith("sun")
                 || (name.startsWith("com/sun/faces") &&
                     !name.startsWith("com/sun/faces/extensions") &&

appserver/web/web-core/src/main/java/org/apache/catalina/core/StandardContext.java

diff --git a/appserver/web/web-core/src/main/java/org/apache/catalina/core/StandardContext.java b/appserver/web/web-core/src/main/java/org/apache/catalina/core/StandardContext.java
index 2dac532..cb66a78 100644
--- a/appserver/web/web-core/src/main/java/org/apache/catalina/core/StandardContext.java
+++ b/appserver/web/web-core/src/main/java/org/apache/catalina/core/StandardContext.java
@@ -2164,7 +2164,7 @@
             }
         }
 
-        if ("javax.faces.webapp.FacesServlet".equals(
+        if ("jakarta.faces.webapp.FacesServlet".equals(
                 wrapper.getServletClassName())) {
             isJsfApplication = true;
         }

appserver/web/web-sse/src/main/java/org/glassfish/sse/impl/ServerSentEventApplication.java

diff --git a/appserver/web/web-sse/src/main/java/org/glassfish/sse/impl/ServerSentEventApplication.java b/appserver/web/web-sse/src/main/java/org/glassfish/sse/impl/ServerSentEventApplication.java
index 5036d65..d8ac38c 100644
--- a/appserver/web/web-sse/src/main/java/org/glassfish/sse/impl/ServerSentEventApplication.java
+++ b/appserver/web/web-sse/src/main/java/org/glassfish/sse/impl/ServerSentEventApplication.java
@@ -18,10 +18,7 @@
 
 import org.glassfish.sse.api.ServerSentEventHandler;
 
-<<<<<<< HEAD
-=======
 import jakarta.enterprise.context.spi.CreationalContext;
->>>>>>> Got a lot further, Now blocked on compiling due to Woodstock needs to be moved to the jakarta namespace
 import jakarta.servlet.AsyncContext;
 import jakarta.servlet.http.HttpServletRequest;
 import jakarta.enterprise.context.spi.CreationalContext;

appserver/web/weld-integration/src/main/java/org/glassfish/cdi/transaction/TransactionalInterceptorBase.java

diff --git a/appserver/web/weld-integration/src/main/java/org/glassfish/cdi/transaction/TransactionalInterceptorBase.java b/appserver/web/weld-integration/src/main/java/org/glassfish/cdi/transaction/TransactionalInterceptorBase.java
index d410174..d3034c8 100644
--- a/appserver/web/weld-integration/src/main/java/org/glassfish/cdi/transaction/TransactionalInterceptorBase.java
+++ b/appserver/web/weld-integration/src/main/java/org/glassfish/cdi/transaction/TransactionalInterceptorBase.java
@@ -27,15 +27,9 @@
 import org.glassfish.logging.annotation.LoggerInfo;
 import org.glassfish.logging.annotation.LogMessagesResourceBundle;
 
-<<<<<<< HEAD
 import jakarta.annotation.PostConstruct;
 import jakarta.annotation.PreDestroy;
-import javax.interceptor.InvocationContext;
-=======
-import javax.annotation.PostConstruct;
-import javax.annotation.PreDestroy;
 import jakarta.interceptor.InvocationContext;
->>>>>>> Got a lot further, Now blocked on compiling due to Woodstock needs to be moved to the jakarta namespace
 import javax.naming.InitialContext;
 import javax.naming.NameNotFoundException;
 import javax.naming.NamingException;

appserver/web/weld-integration/src/main/java/org/glassfish/weld/services/InjectionServicesImpl.java

diff --git a/appserver/web/weld-integration/src/main/java/org/glassfish/weld/services/InjectionServicesImpl.java b/appserver/web/weld-integration/src/main/java/org/glassfish/weld/services/InjectionServicesImpl.java
index f839c49..a0aa361 100644
--- a/appserver/web/weld-integration/src/main/java/org/glassfish/weld/services/InjectionServicesImpl.java
+++ b/appserver/web/weld-integration/src/main/java/org/glassfish/weld/services/InjectionServicesImpl.java
@@ -34,19 +34,11 @@
 import jakarta.enterprise.inject.Produces;
 import jakarta.enterprise.inject.spi.*;
 import jakarta.enterprise.inject.spi.InjectionTarget;
-<<<<<<< HEAD
-import javax.persistence.EntityManager;
-import javax.persistence.EntityManagerFactory;
-import javax.persistence.PersistenceContext;
-import javax.persistence.PersistenceUnit;
 import jakarta.xml.ws.WebServiceRef;
-=======
 import jakarta.persistence.EntityManager;
 import jakarta.persistence.EntityManagerFactory;
 import jakarta.persistence.PersistenceContext;
 import jakarta.persistence.PersistenceUnit;
-import javax.xml.ws.WebServiceRef;
->>>>>>> Got a lot further, Now blocked on compiling due to Woodstock needs to be moved to the jakarta namespace
 import java.util.Collection;
 import java.util.HashSet;
 import java.util.List;

appserver/webservices/jsr109-impl/osgi.bundle

diff --git a/appserver/webservices/jsr109-impl/osgi.bundle b/appserver/webservices/jsr109-impl/osgi.bundle
index afa8b71..a23e58b 100644
--- a/appserver/webservices/jsr109-impl/osgi.bundle
+++ b/appserver/webservices/jsr109-impl/osgi.bundle
@@ -17,10 +17,10 @@
 -exportcontents: \
                         org.glassfish.webservices; \
                         org.glassfish.webservices.config; \
+                        org.glassfish.webservices.deployment; \
                         org.glassfish.webservices.monitoring; version=${project.osgi.version}
 Import-Package: \
                        com.sun.enterprise.deployment.*, \
-                       com.sun.enterprise.deployment.annotation.*, \
                        com.sun.enterprise.config.serverbeans, \
                        javax.ejb;resolution:=optional, \
                        * 

appserver/webservices/jsr109-impl/pom.xml

diff --git a/appserver/webservices/jsr109-impl/pom.xml b/appserver/webservices/jsr109-impl/pom.xml
index 429bf23..35f86d7 100755
--- a/appserver/webservices/jsr109-impl/pom.xml
+++ b/appserver/webservices/jsr109-impl/pom.xml
@@ -119,6 +119,10 @@
             <version>5.0.0-M1</version>
         </dependency>
         <dependency>
+            <groupId>jakarta.servlet</groupId>
+            <artifactId>jakarta.servlet-api</artifactId>
+        </dependency>
+        <dependency>
             <groupId>org.glassfish.main.ejb</groupId>
             <artifactId>ejb-internal-api</artifactId>
             <version>${project.version}</version>