Merge pull request #905 from ritonglue/WFLY-19315_xmlns_entries_migra…

…tion WFLY-19315 xmlns entries migration
wildfly · May 17, 2024 · 4c36d46 · 4c36d46
2 parents 644b043 + b3f1bf0
commit 4c36d46
Show file tree

Hide file tree

Showing 59 changed files with 149 additions and 207 deletions.
diff --git a/batch-processing/src/main/webapp/batch.xhtml b/batch-processing/src/main/webapp/batch.xhtml
@@ -16,8 +16,8 @@
 -->
 
 <!DOCTYPE html>
-<html xmlns="http://www.w3.org/1999/xhtml" xmlns:ui="http://java.sun.com/jsf/facelets" xmlns:f="http://java.sun.com/jsf/core"
-    xmlns:h="http://java.sun.com/jsf/html"
+<html xmlns="http://www.w3.org/1999/xhtml" xmlns:ui="jakarta.faces.facelets" xmlns:f="jakarta.faces.core"
+    xmlns:h="jakarta.faces.html"
 >
 <h:head>
     <title>Batch Processing</title>

diff --git a/bmt/src/main/resources/META-INF/persistence.xml b/bmt/src/main/resources/META-INF/persistence.xml
@@ -15,11 +15,9 @@
     See the License for the specific language governing permissions and
     limitations under the License.
 -->
-<persistence version="2.1"
-   xmlns="http://xmlns.jcp.org/xml/ns/persistence" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-   xsi:schemaLocation="
-        http://xmlns.jcp.org/xml/ns/persistence
-        http://xmlns.jcp.org/xml/ns/persistence/persistence_2_1.xsd">
+<persistence version="3.0"
+   xmlns="https://jakarta.ee/xml/ns/persistence" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+   xsi:schemaLocation="https://jakarta.ee/xml/ns/persistence https://jakarta.ee/xml/ns/persistence/persistence_3_0.xsd">
    <persistence-unit name="primary">
       <!-- If you are running in a production environment, add a managed
          data source, this example data source is just for development and testing! -->

diff --git a/bmt/src/main/webapp/WEB-INF/beans.xml b/bmt/src/main/webapp/WEB-INF/beans.xml
@@ -16,9 +16,7 @@
     limitations under the License.
 -->
 <!-- Marker file indicating CDI should be enabled -->
-<beans xmlns="http://xmlns.jcp.org/xml/ns/javaee" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-    xsi:schemaLocation="
-      http://xmlns.jcp.org/xml/ns/javaee
-      http://xmlns.jcp.org/xml/ns/javaee/beans_1_1.xsd"
-    bean-discovery-mode="all">
+<beans xmlns="https://jakarta.ee/xml/ns/jakartaee" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    xsi:schemaLocation="https://jakarta.ee/xml/ns/jakartaee https://jakarta.ee/xml/ns/jakartaee/beans_4_0.xsd"
+    bean-discovery-mode="all" version="4.0">
 </beans>
diff --git a/cmt/src/main/webapp/WEB-INF/beans.xml b/cmt/src/main/webapp/WEB-INF/beans.xml
@@ -16,9 +16,7 @@
     limitations under the License.
 -->
 <!-- Marker file indicating CDI should be enabled -->
-<beans xmlns="http://xmlns.jcp.org/xml/ns/javaee" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-    xsi:schemaLocation="
-      http://xmlns.jcp.org/xml/ns/javaee
-      http://xmlns.jcp.org/xml/ns/javaee/beans_1_1.xsd"
-    bean-discovery-mode="all">
+<beans xmlns="https://jakarta.ee/xml/ns/jakartaee" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    xsi:schemaLocation="https://jakarta.ee/xml/ns/jakartaee https://jakarta.ee/xml/ns/jakartaee/beans_4_0.xsd"
+    bean-discovery-mode="all" version="4.0">
 </beans>
diff --git a/ee-security/src/main/webapp/WEB-INF/beans.xml b/ee-security/src/main/webapp/WEB-INF/beans.xml
@@ -16,9 +16,7 @@
     limitations under the License.
 -->
 <!-- Marker file indicating CDI should be enabled -->
-<beans xmlns="http://xmlns.jcp.org/xml/ns/javaee" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-    xsi:schemaLocation="
-      http://xmlns.jcp.org/xml/ns/javaee
-      http://xmlns.jcp.org/xml/ns/javaee/beans_1_1.xsd"
-    bean-discovery-mode="all">
+<beans xmlns="https://jakarta.ee/xml/ns/jakartaee" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    xsi:schemaLocation="https://jakarta.ee/xml/ns/jakartaee https://jakarta.ee/xml/ns/jakartaee/beans_4_0.xsd"
+    bean-discovery-mode="all" version="4.0">
 </beans>
diff --git a/ejb-multi-server/app-main/web/src/main/webapp/ejbinvoke.xhtml b/ejb-multi-server/app-main/web/src/main/webapp/ejbinvoke.xhtml
@@ -15,8 +15,8 @@
     limitations under the License.
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml" xmlns:ui="http://java.sun.com/jsf/facelets" xmlns:h="http://java.sun.com/jsf/html"
-    xmlns:f="http://java.sun.com/jsf/core">
+<html xmlns="http://www.w3.org/1999/xhtml" xmlns:ui="jakarta.faces.facelets" xmlns:h="jakarta.faces.html"
+    xmlns:f="jakarta.faces.core">
 
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1" />

diff --git a/ejb-security-context-propagation/src/main/webapp/WEB-INF/beans.xml b/ejb-security-context-propagation/src/main/webapp/WEB-INF/beans.xml
@@ -14,9 +14,7 @@
 -->
 
 <!-- Marker file indicating CDI should be enabled -->
-<beans xmlns="http://xmlns.jcp.org/xml/ns/javaee"
+<beans xmlns="https://jakarta.ee/xml/ns/jakartaee"
    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-   xsi:schemaLocation="
-      http://xmlns.jcp.org/xml/ns/javaee
-      http://xmlns.jcp.org/xml/ns/javaee/beans_1_1.xsd" bean-discovery-mode="all">
+   xsi:schemaLocation="https://jakarta.ee/xml/ns/jakartaee https://jakarta.ee/xml/ns/jakartaee/beans_4_0.xsd" bean-discovery-mode="all" version="4.0">
 </beans>
diff --git a/ejb-security-programmatic-auth/src/main/java/webapp/WEB-INF/beans.xml b/ejb-security-programmatic-auth/src/main/java/webapp/WEB-INF/beans.xml
@@ -13,9 +13,7 @@
 -->
 
 <!-- Marker file indicating CDI should be enabled -->
-<beans xmlns="http://xmlns.jcp.org/xml/ns/javaee"
+<beans xmlns="https://jakarta.ee/xml/ns/jakartaee"
    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-   xsi:schemaLocation="
-      http://xmlns.jcp.org/xml/ns/javaee
-      http://xmlns.jcp.org/xml/ns/javaee/beans_1_1.xsd" bean-discovery-mode="all">
+   xsi:schemaLocation="https://jakarta.ee/xml/ns/jakartaee https://jakarta.ee/xml/ns/jakartaee/beans_4_0.xsd" bean-discovery-mode="all" version="4.0">
 </beans>
diff --git a/helloworld-mutual-ssl-secured/src/main/webapp/WEB-INF/beans.xml b/helloworld-mutual-ssl-secured/src/main/webapp/WEB-INF/beans.xml
@@ -16,9 +16,7 @@
     limitations under the License.
 -->
 <!-- Marker file indicating CDI should be enabled -->
-<beans xmlns="http://xmlns.jcp.org/xml/ns/javaee" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-    xsi:schemaLocation="
-      http://xmlns.jcp.org/xml/ns/javaee
-      http://xmlns.jcp.org/xml/ns/javaee/beans_1_1.xsd"
-    bean-discovery-mode="all">
+<beans xmlns="https://jakarta.ee/xml/ns/jakartaee" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    xsi:schemaLocation="https://jakarta.ee/xml/ns/jakartaee https://jakarta.ee/xml/ns/jakartaee/beans_4_0.xsd"
+    bean-discovery-mode="all" version="4.0">
 </beans>
diff --git a/helloworld-mutual-ssl-secured/src/main/webapp/WEB-INF/web.xml b/helloworld-mutual-ssl-secured/src/main/webapp/WEB-INF/web.xml
@@ -14,9 +14,9 @@
     See the License for the specific language governing permissions and
     limitations under the License.
 -->
-<web-app version="3.0" xmlns="http://java.sun.com/xml/ns/javaee"
+<web-app version="6.0" xmlns="https://jakarta.ee/xml/ns/jakartaee"
         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">
+        xsi:schemaLocation="https://jakarta.ee/xml/ns/jakartaee https://jakarta.ee/xml/ns/jakartaee/web-app_6_0.xsd">
 
     <security-constraint>
         <display-name>Constraint1</display-name>

diff --git a/helloworld-mutual-ssl/src/main/webapp/WEB-INF/beans.xml b/helloworld-mutual-ssl/src/main/webapp/WEB-INF/beans.xml
@@ -16,9 +16,7 @@
     limitations under the License.
 -->
 <!-- Marker file indicating CDI should be enabled -->
-<beans xmlns="http://xmlns.jcp.org/xml/ns/javaee" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-    xsi:schemaLocation="
-      http://xmlns.jcp.org/xml/ns/javaee
-      http://xmlns.jcp.org/xml/ns/javaee/beans_1_1.xsd"
-    bean-discovery-mode="all">
+<beans xmlns="https://jakarta.ee/xml/ns/jakartaee" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    xsi:schemaLocation="https://jakarta.ee/xml/ns/jakartaee https://jakarta.ee/xml/ns/jakartaee/beans_4_0.xsd"
+    bean-discovery-mode="all" version="4.0">
 </beans>
diff --git a/helloworld-mutual-ssl/src/main/webapp/WEB-INF/web.xml b/helloworld-mutual-ssl/src/main/webapp/WEB-INF/web.xml
@@ -14,9 +14,9 @@
     See the License for the specific language governing permissions and
     limitations under the License.
 -->
-<web-app version="3.0" xmlns="http://java.sun.com/xml/ns/javaee"
+<web-app version="6.0" xmlns="https://jakarta.ee/xml/ns/jakartaee"
         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">
+        xsi:schemaLocation="https://jakarta.ee/xml/ns/jakartaee https://jakarta.ee/xml/ns/jakartaee/web-app_6_0.xsd">
 
     <!-- One of the ways of activating REST Servises is adding these lines.
          The server is responsible for adding the corresponding servlet automatically.

diff --git a/helloworld-singleton/src/main/webapp/home.xhtml b/helloworld-singleton/src/main/webapp/home.xhtml
@@ -16,9 +16,9 @@
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 <html lang="en" xmlns="http://www.w3.org/1999/xhtml"
-	xmlns:h="http://java.sun.com/jsf/html"
-	xmlns:f="http://java.sun.com/jsf/core"
-	xmlns:ui="http://java.sun.com/jsf/facelets">
+	xmlns:h="jakarta.faces.html"
+	xmlns:f="jakarta.faces.core"
+	xmlns:ui="jakarta.faces.facelets">
 <body>
 	<ui:composition template="/template.xhtml">
 		<ui:define name="title">

diff --git a/helloworld-singleton/src/main/webapp/template.xhtml b/helloworld-singleton/src/main/webapp/template.xhtml
@@ -16,7 +16,7 @@
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 <html lang="en" xmlns="http://www.w3.org/1999/xhtml"
-	xmlns:ui="http://java.sun.com/jsf/facelets">
+	xmlns:ui="jakarta.faces.facelets">
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
 <title>helloworld-singleton</title>

diff --git a/hibernate/src/main/resources/META-INF/persistence.xml b/hibernate/src/main/resources/META-INF/persistence.xml
@@ -15,11 +15,9 @@
     See the License for the specific language governing permissions and
     limitations under the License.
 -->
-<persistence version="2.1"
-   xmlns="http://xmlns.jcp.org/xml/ns/persistence" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-   xsi:schemaLocation="
-        http://xmlns.jcp.org/xml/ns/persistence
-        http://xmlns.jcp.org/xml/ns/persistence/persistence_2_1.xsd">
+<persistence version="3.0"
+   xmlns="https://jakarta.ee/xml/ns/persistence" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+   xsi:schemaLocation="https://jakarta.ee/xml/ns/persistence https://jakarta.ee/xml/ns/persistence/persistence_3_0.xsd">
    <persistence-unit name="primary">
       <!-- If you are running in a production environment, add a managed
          data source, this example data source is just for development and testing! -->

diff --git a/hibernate/src/main/webapp/WEB-INF/beans.xml b/hibernate/src/main/webapp/WEB-INF/beans.xml
@@ -16,9 +16,7 @@
     limitations under the License.
 -->
 <!-- Marker file indicating CDI should be enabled -->
-<beans xmlns="http://xmlns.jcp.org/xml/ns/javaee" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-    xsi:schemaLocation="
-      http://xmlns.jcp.org/xml/ns/javaee
-      http://xmlns.jcp.org/xml/ns/javaee/beans_1_1.xsd"
-    bean-discovery-mode="all">
+<beans xmlns="https://jakarta.ee/xml/ns/jakartaee" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    xsi:schemaLocation="https://jakarta.ee/xml/ns/jakartaee https://jakarta.ee/xml/ns/jakartaee/beans_4_0.xsd"
+    bean-discovery-mode="all" version="4.0">
 </beans>
diff --git a/hibernate/src/main/webapp/WEB-INF/faces-config.xml b/hibernate/src/main/webapp/WEB-INF/faces-config.xml
@@ -16,7 +16,7 @@
     limitations under the License.
 -->
 <!-- This file is not required if you don't need any extra configuration. -->
-<faces-config xmlns="http://xmlns.jcp.org/xml/ns/javaee"
+<faces-config xmlns="https://jakarta.ee/xml/ns/jakartaee"
               xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
               xsi:schemaLocation="
                   https://jakarta.ee/xml/ns/jakartaee

diff --git a/hibernate/src/main/webapp/WEB-INF/templates/default.xhtml b/hibernate/src/main/webapp/WEB-INF/templates/default.xhtml
@@ -17,8 +17,8 @@
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
     "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml"
-   xmlns:h="http://java.sun.com/jsf/html"
-   xmlns:ui="http://java.sun.com/jsf/facelets">
+   xmlns:h="jakarta.faces.html"
+   xmlns:ui="jakarta.faces.facelets">
 <h:head>
    <title>hibernate</title>
    <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />

diff --git a/hibernate/src/main/webapp/index.xhtml b/hibernate/src/main/webapp/index.xhtml
@@ -16,9 +16,9 @@
     limitations under the License.
 -->
 <ui:composition xmlns="http://www.w3.org/1999/xhtml"
-   xmlns:ui="http://java.sun.com/jsf/facelets"
-   xmlns:f="http://java.sun.com/jsf/core"
-   xmlns:h="http://java.sun.com/jsf/html"
+   xmlns:ui="jakarta.faces.facelets"
+   xmlns:f="jakarta.faces.core"
+   xmlns:h="jakarta.faces.html"
    template="/WEB-INF/templates/default.xhtml">
    <ui:define name="content">
       <h1>Welcome to JBoss!</h1>

diff --git a/http-custom-mechanism/webapp/src/main/webapp/WEB-INF/web.xml b/http-custom-mechanism/webapp/src/main/webapp/WEB-INF/web.xml
@@ -18,9 +18,9 @@
   ~ limitations under the License.
   -->
 
-<web-app version="2.5" xmlns="http://java.sun.com/xml/ns/javaee"
+<web-app version="6.0" xmlns="https://jakarta.ee/xml/ns/jakartaee"
    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"
+   xsi:schemaLocation="https://jakarta.ee/xml/ns/jakartaee https://jakarta.ee/xml/ns/jakartaee/web-app_6_0.xsd"
    metadata-complete="false">
 
     <login-config>

diff --git a/jsonp/src/main/webapp/WEB-INF/beans.xml b/jsonp/src/main/webapp/WEB-INF/beans.xml
@@ -16,9 +16,7 @@
     limitations under the License.
 -->
 <!-- Marker file indicating CDI should be enabled -->
-<beans xmlns="http://xmlns.jcp.org/xml/ns/javaee" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-    xsi:schemaLocation="
-      http://xmlns.jcp.org/xml/ns/javaee
-      http://xmlns.jcp.org/xml/ns/javaee/beans_1_1.xsd"
-    bean-discovery-mode="all">
+<beans xmlns="https://jakarta.ee/xml/ns/jakartaee" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    xsi:schemaLocation="https://jakarta.ee/xml/ns/jakartaee https://jakarta.ee/xml/ns/jakartaee/beans_4_0.xsd"
+    bean-discovery-mode="all" version="4.0">
 </beans>
diff --git a/jsonp/src/main/webapp/WEB-INF/faces-config.xml b/jsonp/src/main/webapp/WEB-INF/faces-config.xml
@@ -16,7 +16,7 @@
     limitations under the License.
 -->
 <!-- Marker file indicating JSF should be enabled -->
-<faces-config xmlns="http://xmlns.jcp.org/xml/ns/javaee"
+<faces-config xmlns="https://jakarta.ee/xml/ns/jakartaee"
               xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
               xsi:schemaLocation="
                   https://jakarta.ee/xml/ns/jakartaee

diff --git a/jsonp/src/main/webapp/jsonp.xhtml b/jsonp/src/main/webapp/jsonp.xhtml
@@ -15,8 +15,8 @@
     limitations under the License.
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml" xmlns:ui="http://java.sun.com/jsf/facelets" xmlns:f="http://java.sun.com/jsf/core"
-    xmlns:h="http://java.sun.com/jsf/html"
+<html xmlns="http://www.w3.org/1999/xhtml" xmlns:ui="jakarta.faces.facelets" xmlns:f="jakarta.faces.core"
+    xmlns:h="jakarta.faces.html"
 >
 <h:body>
     <h:form id="form">

diff --git a/jta-crash-rec/src/main/resources/META-INF/persistence.xml b/jta-crash-rec/src/main/resources/META-INF/persistence.xml
@@ -15,11 +15,9 @@
     See the License for the specific language governing permissions and
     limitations under the License.
 -->
-<persistence version="2.1"
-             xmlns="http://xmlns.jcp.org/xml/ns/persistence" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-             xsi:schemaLocation="
-        http://xmlns.jcp.org/xml/ns/persistence
-        http://xmlns.jcp.org/xml/ns/persistence/persistence_2_1.xsd">
+<persistence version="3.0"
+             xmlns="https://jakarta.ee/xml/ns/persistence" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+             xsi:schemaLocation="https://jakarta.ee/xml/ns/persistence https://jakarta.ee/xml/ns/persistence/persistence_3_0.xsd">
     <persistence-unit name="primary">
         <!-- If you are running in a production environment, add a managed
             data source, this example data source is just for development and testing! -->

diff --git a/jta-crash-rec/src/main/webapp/WEB-INF/beans.xml b/jta-crash-rec/src/main/webapp/WEB-INF/beans.xml
@@ -16,9 +16,7 @@
     limitations under the License.
 -->
 <!-- Marker file indicating CDI should be enabled -->
-<beans xmlns="http://xmlns.jcp.org/xml/ns/javaee" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-    xsi:schemaLocation="
-      http://xmlns.jcp.org/xml/ns/javaee
-      http://xmlns.jcp.org/xml/ns/javaee/beans_1_1.xsd"
-    bean-discovery-mode="all">
+<beans xmlns="https://jakarta.ee/xml/ns/jakartaee" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    xsi:schemaLocation="https://jakarta.ee/xml/ns/jakartaee https://jakarta.ee/xml/ns/jakartaee/beans_4_0.xsd"
+    bean-discovery-mode="all" version="4.0">
 </beans>
diff --git a/jts/application-component-1/src/main/resources/META-INF/persistence.xml b/jts/application-component-1/src/main/resources/META-INF/persistence.xml
@@ -15,11 +15,9 @@
     See the License for the specific language governing permissions and
     limitations under the License.
 -->
-<persistence version="2.1"
-   xmlns="http://xmlns.jcp.org/xml/ns/persistence" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-   xsi:schemaLocation="
-        http://xmlns.jcp.org/xml/ns/persistence
-        http://xmlns.jcp.org/xml/ns/persistence/persistence_2_1.xsd">
+<persistence version="3.0"
+   xmlns="https://jakarta.ee/xml/ns/persistence" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+   xsi:schemaLocation="https://jakarta.ee/xml/ns/persistence https://jakarta.ee/xml/ns/persistence/persistence_3_0.xsd">
    <persistence-unit name="primary">
       <!-- If you are running in a production environment, add a managed
          data source, this example data source is just for development and testing! -->

diff --git a/jts/application-component-1/src/main/webapp/WEB-INF/beans.xml b/jts/application-component-1/src/main/webapp/WEB-INF/beans.xml
@@ -16,9 +16,7 @@
     limitations under the License.
 -->
 <!-- Marker file indicating CDI should be enabled -->
-<beans xmlns="http://xmlns.jcp.org/xml/ns/javaee" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-    xsi:schemaLocation="
-      http://xmlns.jcp.org/xml/ns/javaee
-      http://xmlns.jcp.org/xml/ns/javaee/beans_1_1.xsd"
-    bean-discovery-mode="all">
+<beans xmlns="https://jakarta.ee/xml/ns/jakartaee" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    xsi:schemaLocation="https://jakarta.ee/xml/ns/jakartaee https://jakarta.ee/xml/ns/jakartaee/beans_4_0.xsd"
+    bean-discovery-mode="all" version="4.0">
 </beans>
diff --git a/jts/application-component-1/src/main/webapp/WEB-INF/faces-config.xml b/jts/application-component-1/src/main/webapp/WEB-INF/faces-config.xml
@@ -16,7 +16,7 @@
     limitations under the License.
 -->
 <!-- Marker file indicating JSF should be enabled -->
-<faces-config xmlns="http://xmlns.jcp.org/xml/ns/javaee"
+<faces-config xmlns="https://jakarta.ee/xml/ns/jakartaee"
               xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
               xsi:schemaLocation="
                   https://jakarta.ee/xml/ns/jakartaee

diff --git a/jts/application-component-1/src/main/webapp/addCustomer.xhtml b/jts/application-component-1/src/main/webapp/addCustomer.xhtml
@@ -16,9 +16,9 @@
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml"
-	xmlns:ui="http://java.sun.com/jsf/facelets"
-	xmlns:h="http://java.sun.com/jsf/html"
-	xmlns:f="http://java.sun.com/jsf/core">
+	xmlns:ui="jakarta.faces.facelets"
+	xmlns:h="jakarta.faces.html"
+	xmlns:f="jakarta.faces.core">
 
 <ui:composition template="template.xhtml">
 	<ui:define name="content">

diff --git a/jts/application-component-1/src/main/webapp/customers.xhtml b/jts/application-component-1/src/main/webapp/customers.xhtml
@@ -16,9 +16,9 @@
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml"
-	xmlns:ui="http://java.sun.com/jsf/facelets"
-	xmlns:h="http://java.sun.com/jsf/html"
-	xmlns:f="http://java.sun.com/jsf/core">
+	xmlns:ui="jakarta.faces.facelets"
+	xmlns:h="jakarta.faces.html"
+	xmlns:f="jakarta.faces.core">
 
 <ui:composition template="template.xhtml">
 	<ui:define name="content">

diff --git a/jts/application-component-1/src/main/webapp/duplicate.xhtml b/jts/application-component-1/src/main/webapp/duplicate.xhtml
@@ -16,9 +16,9 @@
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml"
-	xmlns:ui="http://java.sun.com/jsf/facelets"
-	xmlns:h="http://java.sun.com/jsf/html"
-	xmlns:f="http://java.sun.com/jsf/core">
+	xmlns:ui="jakarta.faces.facelets"
+	xmlns:h="jakarta.faces.html"
+	xmlns:f="jakarta.faces.core">
 
 <ui:composition template="template.xhtml">
 	<ui:define name="content">

diff --git a/jts/application-component-1/src/main/webapp/template.xhtml b/jts/application-component-1/src/main/webapp/template.xhtml
@@ -16,9 +16,9 @@
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml"
-	xmlns:ui="http://java.sun.com/jsf/facelets"
-	xmlns:h="http://java.sun.com/jsf/html"
-	xmlns:f="http://java.sun.com/jsf/core">
+	xmlns:ui="jakarta.faces.facelets"
+	xmlns:h="jakarta.faces.html"
+	xmlns:f="jakarta.faces.core">
 
 <!-- The template for our app, defines some regions and imports styles -->