From d9e195d8cde15fbd0eadab02bfb219732ea55a20 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?JEAN-PROST=20Fr=C3=A9d=C3=A9ric?=
 <jean-prost.frederic@neuf.fr>
Date: Wed, 8 May 2024 09:43:29 +0200
Subject: [PATCH 1/5] WFLY-19315 Migrate xmlns entries in faces-config.xml
 files

---
 hibernate/src/main/webapp/WEB-INF/faces-config.xml              | 2 +-
 jsonp/src/main/webapp/WEB-INF/faces-config.xml                  | 2 +-
 .../src/main/webapp/WEB-INF/faces-config.xml                    | 2 +-
 kitchensink/src/main/webapp/WEB-INF/faces-config.xml            | 2 +-
 numberguess/src/main/webapp/WEB-INF/faces-config.xml            | 2 +-
 temperature-converter/src/main/webapp/WEB-INF/faces-config.xml  | 2 +-
 6 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/hibernate/src/main/webapp/WEB-INF/faces-config.xml b/hibernate/src/main/webapp/WEB-INF/faces-config.xml
index eda18c7693..a9eee898d3 100644
--- 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/jsonp/src/main/webapp/WEB-INF/faces-config.xml b/jsonp/src/main/webapp/WEB-INF/faces-config.xml
index 702b99bbc3..fc21f233d3 100644
--- 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/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
index efcfbb847c..c51ddb3ec4 100644
--- 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/kitchensink/src/main/webapp/WEB-INF/faces-config.xml b/kitchensink/src/main/webapp/WEB-INF/faces-config.xml
index c9e3a5941f..b5afc377eb 100644
--- a/kitchensink/src/main/webapp/WEB-INF/faces-config.xml
+++ b/kitchensink/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/numberguess/src/main/webapp/WEB-INF/faces-config.xml b/numberguess/src/main/webapp/WEB-INF/faces-config.xml
index 0e98f602ce..fd99a4fa47 100644
--- a/numberguess/src/main/webapp/WEB-INF/faces-config.xml
+++ b/numberguess/src/main/webapp/WEB-INF/faces-config.xml
@@ -17,7 +17,7 @@
 -->
 
 <!-- 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/temperature-converter/src/main/webapp/WEB-INF/faces-config.xml b/temperature-converter/src/main/webapp/WEB-INF/faces-config.xml
index 0e98f602ce..fd99a4fa47 100644
--- a/temperature-converter/src/main/webapp/WEB-INF/faces-config.xml
+++ b/temperature-converter/src/main/webapp/WEB-INF/faces-config.xml
@@ -17,7 +17,7 @@
 -->
 
 <!-- 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

From 4d80d450db30a036621b660729e53271f104fd18 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?JEAN-PROST=20Fr=C3=A9d=C3=A9ric?=
 <jean-prost.frederic@neuf.fr>
Date: Wed, 8 May 2024 09:47:49 +0200
Subject: [PATCH 2/5] WFLY-19315 Migrate xmlns entries in web.xml files

---
 .../src/main/webapp/WEB-INF/web.xml                         | 4 ++--
 helloworld-mutual-ssl/src/main/webapp/WEB-INF/web.xml       | 4 ++--
 .../webapp/src/main/webapp/WEB-INF/web.xml                  | 4 ++--
 microprofile-jwt/src/main/webapp/WEB-INF/web.xml            | 6 +++---
 microprofile-openapi/src/main/webapp/WEB-INF/web.xml        | 6 +++---
 .../web/src/main/webapp/WEB-INF/web.xml                     | 4 ++--
 servlet-security/src/main/webapp/WEB-INF/web.xml            | 4 ++--
 spring-resteasy/src/main/webapp/WEB-INF/web.xml             | 6 +++---
 spring-resteasy/src/test/resources/web.xml                  | 6 +++---
 9 files changed, 22 insertions(+), 22 deletions(-)

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
index 0568c031f0..df4cdb6892 100644
--- 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/web.xml b/helloworld-mutual-ssl/src/main/webapp/WEB-INF/web.xml
index 41a54e18b4..fefca7d101 100644
--- 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/http-custom-mechanism/webapp/src/main/webapp/WEB-INF/web.xml b/http-custom-mechanism/webapp/src/main/webapp/WEB-INF/web.xml
index 7575f3a8db..0befd792a7 100644
--- 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/microprofile-jwt/src/main/webapp/WEB-INF/web.xml b/microprofile-jwt/src/main/webapp/WEB-INF/web.xml
index eeb2c9ddd1..7a2b5a4bd5 100644
--- a/microprofile-jwt/src/main/webapp/WEB-INF/web.xml
+++ b/microprofile-jwt/src/main/webapp/WEB-INF/web.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<web-app version="3.1"
-         xmlns="http://xmlns.jcp.org/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://xmlns.jcp.org/xml/ns/javaee http://xmlns.jcp.org/xml/ns/javaee/web-app_3_1.xsd">
+         xsi:schemaLocation="https://jakarta.ee/xml/ns/jakartaee https://jakarta.ee/xml/ns/jakartaee/web-app_6_0.xsd">
 
     <context-param>
         <param-name>resteasy.role.based.security</param-name>
diff --git a/microprofile-openapi/src/main/webapp/WEB-INF/web.xml b/microprofile-openapi/src/main/webapp/WEB-INF/web.xml
index a994710334..c93751bc69 100644
--- a/microprofile-openapi/src/main/webapp/WEB-INF/web.xml
+++ b/microprofile-openapi/src/main/webapp/WEB-INF/web.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<web-app xmlns="http://xmlns.jcp.org/xml/ns/javaee"
+<web-app 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/web-app_4_0.xsd"
-         version="4.0">
+         xsi:schemaLocation="https://jakarta.ee/xml/ns/jakartaee https://jakarta.ee/xml/ns/jakartaee/web-app_6_0.xsd"
+         version="6.0">
     <display-name>Store inventory</display-name>
     <description>Application for tracking store inventory</description>
 </web-app>
diff --git a/security-domain-to-domain/web/src/main/webapp/WEB-INF/web.xml b/security-domain-to-domain/web/src/main/webapp/WEB-INF/web.xml
index 0aa0d49031..9b01d8a09c 100644
--- a/security-domain-to-domain/web/src/main/webapp/WEB-INF/web.xml
+++ b/security-domain-to-domain/web/src/main/webapp/WEB-INF/web.xml
@@ -15,8 +15,8 @@
     See the License for the specific language governing permissions and
     limitations under the License.
 -->
-<web-app version="3.1" 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/web-app_3_1.xsd">
+<web-app version="6.0" 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/web-app_6_0.xsd">
 
    <!-- Configure login to be HTTP Basic -->
    <login-config>
diff --git a/servlet-security/src/main/webapp/WEB-INF/web.xml b/servlet-security/src/main/webapp/WEB-INF/web.xml
index 0aa0d49031..9b01d8a09c 100644
--- a/servlet-security/src/main/webapp/WEB-INF/web.xml
+++ b/servlet-security/src/main/webapp/WEB-INF/web.xml
@@ -15,8 +15,8 @@
     See the License for the specific language governing permissions and
     limitations under the License.
 -->
-<web-app version="3.1" 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/web-app_3_1.xsd">
+<web-app version="6.0" 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/web-app_6_0.xsd">
 
    <!-- Configure login to be HTTP Basic -->
    <login-config>
diff --git a/spring-resteasy/src/main/webapp/WEB-INF/web.xml b/spring-resteasy/src/main/webapp/WEB-INF/web.xml
index 1a14e85ad7..4100573fd4 100644
--- a/spring-resteasy/src/main/webapp/WEB-INF/web.xml
+++ b/spring-resteasy/src/main/webapp/WEB-INF/web.xml
@@ -15,9 +15,9 @@
     See the License for the specific language governing permissions and
     limitations under the License.
 -->
-<web-app version="3.1"
-    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/web-app_3_1.xsd"
+<web-app version="6.0"
+    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/web-app_6_0.xsd"
          metadata-complete="true">
 
     <display-name>Archetype Created Web Application</display-name>
diff --git a/spring-resteasy/src/test/resources/web.xml b/spring-resteasy/src/test/resources/web.xml
index 1a14e85ad7..4100573fd4 100644
--- a/spring-resteasy/src/test/resources/web.xml
+++ b/spring-resteasy/src/test/resources/web.xml
@@ -15,9 +15,9 @@
     See the License for the specific language governing permissions and
     limitations under the License.
 -->
-<web-app version="3.1"
-    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/web-app_3_1.xsd"
+<web-app version="6.0"
+    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/web-app_6_0.xsd"
          metadata-complete="true">
 
     <display-name>Archetype Created Web Application</display-name>

From 8684293ecff78d277fc0d4633bab8eb92d8174d1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?JEAN-PROST=20Fr=C3=A9d=C3=A9ric?=
 <jean-prost.frederic@neuf.fr>
Date: Wed, 8 May 2024 09:51:43 +0200
Subject: [PATCH 3/5] WFLY-19315 Faces XHTML migration for Jakarta EE 10

---
 batch-processing/src/main/webapp/batch.xhtml                | 4 ++--
 .../app-main/web/src/main/webapp/ejbinvoke.xhtml            | 4 ++--
 helloworld-singleton/src/main/webapp/home.xhtml             | 6 +++---
 helloworld-singleton/src/main/webapp/template.xhtml         | 2 +-
 hibernate/src/main/webapp/WEB-INF/templates/default.xhtml   | 4 ++--
 hibernate/src/main/webapp/index.xhtml                       | 6 +++---
 jsonp/src/main/webapp/jsonp.xhtml                           | 4 ++--
 .../src/main/webapp/addCustomer.xhtml                       | 6 +++---
 jts/application-component-1/src/main/webapp/customers.xhtml | 6 +++---
 jts/application-component-1/src/main/webapp/duplicate.xhtml | 6 +++---
 jts/application-component-1/src/main/webapp/template.xhtml  | 6 +++---
 kitchensink/src/main/webapp/WEB-INF/templates/default.xhtml | 4 ++--
 tasks-jsf/src/main/webapp/index.xhtml                       | 4 ++--
 tasks-jsf/src/main/webapp/tasks.xhtml                       | 4 ++--
 14 files changed, 33 insertions(+), 33 deletions(-)

diff --git a/batch-processing/src/main/webapp/batch.xhtml b/batch-processing/src/main/webapp/batch.xhtml
index 68ef4606cf..80a0409de0 100644
--- 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/ejb-multi-server/app-main/web/src/main/webapp/ejbinvoke.xhtml b/ejb-multi-server/app-main/web/src/main/webapp/ejbinvoke.xhtml
index 92052c53ff..17ed233df9 100644
--- 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/helloworld-singleton/src/main/webapp/home.xhtml b/helloworld-singleton/src/main/webapp/home.xhtml
index 5e7624ee6b..b1121e5d97 100644
--- 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
index fd21e0fff5..f8d93adbc7 100644
--- 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/webapp/WEB-INF/templates/default.xhtml b/hibernate/src/main/webapp/WEB-INF/templates/default.xhtml
index 456356613f..2adad4ce3d 100644
--- 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
index af43d91281..1c33fb4f78 100644
--- 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/jsonp/src/main/webapp/jsonp.xhtml b/jsonp/src/main/webapp/jsonp.xhtml
index 11ba34c9d7..2524e598e7 100644
--- 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/jts/application-component-1/src/main/webapp/addCustomer.xhtml b/jts/application-component-1/src/main/webapp/addCustomer.xhtml
index 537a7e5c40..20acbbc331 100644
--- 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
index 84334a8c9a..72aebe97a7 100644
--- 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
index 624a3e6cb1..e90bfd4e40 100644
--- 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
index 18d3203fd1..e34b2cbb0c 100644
--- 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 -->
 
diff --git a/kitchensink/src/main/webapp/WEB-INF/templates/default.xhtml b/kitchensink/src/main/webapp/WEB-INF/templates/default.xhtml
index 8385a77ebd..e4b2978aa3 100644
--- a/kitchensink/src/main/webapp/WEB-INF/templates/default.xhtml
+++ b/kitchensink/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>kitchensink</title>
     <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
diff --git a/tasks-jsf/src/main/webapp/index.xhtml b/tasks-jsf/src/main/webapp/index.xhtml
index 37e0561cc0..659d534fe8 100644
--- a/tasks-jsf/src/main/webapp/index.xhtml
+++ b/tasks-jsf/src/main/webapp/index.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:h="http://java.sun.com/jsf/html" xmlns:f="http://java.sun.com/jsf/core"
-    xmlns:ui="http://java.sun.com/jsf/facelets">
+<html xmlns="http://www.w3.org/1999/xhtml" xmlns:h="jakarta.faces.html" xmlns:f="jakarta.faces.core"
+    xmlns:ui="jakarta.faces.facelets">
 
 <h:head>
     <title>tasks-jsf</title>
diff --git a/tasks-jsf/src/main/webapp/tasks.xhtml b/tasks-jsf/src/main/webapp/tasks.xhtml
index a39dd3111b..753f2632d4 100644
--- a/tasks-jsf/src/main/webapp/tasks.xhtml
+++ b/tasks-jsf/src/main/webapp/tasks.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:h="http://java.sun.com/jsf/html" xmlns:f="http://java.sun.com/jsf/core"
-    xmlns:ui="http://java.sun.com/jsf/facelets">
+<html xmlns="http://www.w3.org/1999/xhtml" xmlns:h="jakarta.faces.html" xmlns:f="jakarta.faces.core"
+    xmlns:ui="jakarta.faces.facelets">
 
 <h:head>
     <title>tasks-jsf</title>

From 15346c1a1ecb8910deb760b5180a8ebdd07b47b2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?JEAN-PROST=20Fr=C3=A9d=C3=A9ric?=
 <jean-prost.frederic@neuf.fr>
Date: Sat, 11 May 2024 20:15:01 +0200
Subject: [PATCH 4/5] WFLY-19315 Migrate xmlns entries in beans.xml files

---
 bmt/src/main/webapp/WEB-INF/beans.xml                     | 8 +++-----
 cmt/src/main/webapp/WEB-INF/beans.xml                     | 8 +++-----
 ee-security/src/main/webapp/WEB-INF/beans.xml             | 8 +++-----
 .../src/main/webapp/WEB-INF/beans.xml                     | 6 ++----
 .../src/main/java/webapp/WEB-INF/beans.xml                | 6 ++----
 .../src/main/webapp/WEB-INF/beans.xml                     | 8 +++-----
 helloworld-mutual-ssl/src/main/webapp/WEB-INF/beans.xml   | 8 +++-----
 hibernate/src/main/webapp/WEB-INF/beans.xml               | 8 +++-----
 jsonp/src/main/webapp/WEB-INF/beans.xml                   | 8 +++-----
 jta-crash-rec/src/main/webapp/WEB-INF/beans.xml           | 8 +++-----
 .../src/main/webapp/WEB-INF/beans.xml                     | 8 +++-----
 .../src/main/resources/META-INF/beans.xml                 | 8 +++-----
 kitchensink/src/main/webapp/WEB-INF/beans.xml             | 8 +++-----
 numberguess/src/main/webapp/WEB-INF/beans.xml             | 8 +++-----
 .../ejb/src/main/java/META-INF/beans.xml                  | 8 +++-----
 .../web/src/main/webapp/WEB-INF/beans.xml                 | 8 +++-----
 servlet-async/src/main/webapp/WEB-INF/beans.xml           | 8 +++-----
 servlet-filterlistener/src/main/webapp/WEB-INF/beans.xml  | 8 +++-----
 servlet-security/src/main/webapp/WEB-INF/beans.xml        | 8 +++-----
 tasks-jsf/src/main/webapp/WEB-INF/beans.xml               | 8 +++-----
 temperature-converter/src/main/webapp/WEB-INF/beans.xml   | 8 +++-----
 thread-racing/src/main/webapp/WEB-INF/beans.xml           | 8 +++-----
 todo-backend/src/main/webapp/WEB-INF/beans.xml            | 8 +++-----
 websocket-endpoint/src/main/webapp/WEB-INF/beans.xml      | 8 +++-----
 24 files changed, 70 insertions(+), 118 deletions(-)

diff --git a/bmt/src/main/webapp/WEB-INF/beans.xml b/bmt/src/main/webapp/WEB-INF/beans.xml
index d3ddf148e7..4507678e2e 100644
--- 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
index d3ddf148e7..4507678e2e 100644
--- 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
index 2d96d0e249..a6c504cb58 100644
--- 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-security-context-propagation/src/main/webapp/WEB-INF/beans.xml b/ejb-security-context-propagation/src/main/webapp/WEB-INF/beans.xml
index f418aba2f0..620545afa4 100644
--- 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
index cae9254552..778baac68c 100644
--- 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>
\ No newline at end of file
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
index d3ddf148e7..4507678e2e 100644
--- 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/src/main/webapp/WEB-INF/beans.xml b/helloworld-mutual-ssl/src/main/webapp/WEB-INF/beans.xml
index d3ddf148e7..4507678e2e 100644
--- 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/hibernate/src/main/webapp/WEB-INF/beans.xml b/hibernate/src/main/webapp/WEB-INF/beans.xml
index d3ddf148e7..4507678e2e 100644
--- 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/jsonp/src/main/webapp/WEB-INF/beans.xml b/jsonp/src/main/webapp/WEB-INF/beans.xml
index d3ddf148e7..4507678e2e 100644
--- 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/jta-crash-rec/src/main/webapp/WEB-INF/beans.xml b/jta-crash-rec/src/main/webapp/WEB-INF/beans.xml
index d3ddf148e7..4507678e2e 100644
--- 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/webapp/WEB-INF/beans.xml b/jts/application-component-1/src/main/webapp/WEB-INF/beans.xml
index d3ddf148e7..4507678e2e 100644
--- 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-2/src/main/resources/META-INF/beans.xml b/jts/application-component-2/src/main/resources/META-INF/beans.xml
index d3ddf148e7..4507678e2e 100644
--- a/jts/application-component-2/src/main/resources/META-INF/beans.xml
+++ b/jts/application-component-2/src/main/resources/META-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/kitchensink/src/main/webapp/WEB-INF/beans.xml b/kitchensink/src/main/webapp/WEB-INF/beans.xml
index d3ddf148e7..4507678e2e 100644
--- a/kitchensink/src/main/webapp/WEB-INF/beans.xml
+++ b/kitchensink/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/numberguess/src/main/webapp/WEB-INF/beans.xml b/numberguess/src/main/webapp/WEB-INF/beans.xml
index d3ddf148e7..4507678e2e 100644
--- a/numberguess/src/main/webapp/WEB-INF/beans.xml
+++ b/numberguess/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/security-domain-to-domain/ejb/src/main/java/META-INF/beans.xml b/security-domain-to-domain/ejb/src/main/java/META-INF/beans.xml
index d3ddf148e7..4507678e2e 100644
--- a/security-domain-to-domain/ejb/src/main/java/META-INF/beans.xml
+++ b/security-domain-to-domain/ejb/src/main/java/META-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/security-domain-to-domain/web/src/main/webapp/WEB-INF/beans.xml b/security-domain-to-domain/web/src/main/webapp/WEB-INF/beans.xml
index d3ddf148e7..4507678e2e 100644
--- a/security-domain-to-domain/web/src/main/webapp/WEB-INF/beans.xml
+++ b/security-domain-to-domain/web/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/servlet-async/src/main/webapp/WEB-INF/beans.xml b/servlet-async/src/main/webapp/WEB-INF/beans.xml
index d3ddf148e7..4507678e2e 100644
--- a/servlet-async/src/main/webapp/WEB-INF/beans.xml
+++ b/servlet-async/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/servlet-filterlistener/src/main/webapp/WEB-INF/beans.xml b/servlet-filterlistener/src/main/webapp/WEB-INF/beans.xml
index d3ddf148e7..4507678e2e 100644
--- a/servlet-filterlistener/src/main/webapp/WEB-INF/beans.xml
+++ b/servlet-filterlistener/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/servlet-security/src/main/webapp/WEB-INF/beans.xml b/servlet-security/src/main/webapp/WEB-INF/beans.xml
index d3ddf148e7..4507678e2e 100644
--- a/servlet-security/src/main/webapp/WEB-INF/beans.xml
+++ b/servlet-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/tasks-jsf/src/main/webapp/WEB-INF/beans.xml b/tasks-jsf/src/main/webapp/WEB-INF/beans.xml
index d3ddf148e7..4507678e2e 100644
--- a/tasks-jsf/src/main/webapp/WEB-INF/beans.xml
+++ b/tasks-jsf/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/temperature-converter/src/main/webapp/WEB-INF/beans.xml b/temperature-converter/src/main/webapp/WEB-INF/beans.xml
index d3ddf148e7..4507678e2e 100644
--- a/temperature-converter/src/main/webapp/WEB-INF/beans.xml
+++ b/temperature-converter/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/thread-racing/src/main/webapp/WEB-INF/beans.xml b/thread-racing/src/main/webapp/WEB-INF/beans.xml
index d3ddf148e7..4507678e2e 100644
--- a/thread-racing/src/main/webapp/WEB-INF/beans.xml
+++ b/thread-racing/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/todo-backend/src/main/webapp/WEB-INF/beans.xml b/todo-backend/src/main/webapp/WEB-INF/beans.xml
index d3ddf148e7..4507678e2e 100644
--- a/todo-backend/src/main/webapp/WEB-INF/beans.xml
+++ b/todo-backend/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/websocket-endpoint/src/main/webapp/WEB-INF/beans.xml b/websocket-endpoint/src/main/webapp/WEB-INF/beans.xml
index d3ddf148e7..4507678e2e 100644
--- a/websocket-endpoint/src/main/webapp/WEB-INF/beans.xml
+++ b/websocket-endpoint/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>

From b3f1bf01773aa406308318a25658216393f2d30a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?JEAN-PROST=20Fr=C3=A9d=C3=A9ric?=
 <jean-prost.frederic@neuf.fr>
Date: Sat, 11 May 2024 20:32:37 +0200
Subject: [PATCH 5/5] WFLY-19315 Migrate xmlns entries in persistence.xml files

---
 bmt/src/main/resources/META-INF/persistence.xml           | 8 +++-----
 hibernate/src/main/resources/META-INF/persistence.xml     | 8 +++-----
 jta-crash-rec/src/main/resources/META-INF/persistence.xml | 8 +++-----
 .../src/main/resources/META-INF/persistence.xml           | 8 +++-----
 .../src/main/resources/META-INF/persistence.xml           | 8 +++-----
 thread-racing/src/main/resources/META-INF/persistence.xml | 6 +++---
 6 files changed, 18 insertions(+), 28 deletions(-)

diff --git a/bmt/src/main/resources/META-INF/persistence.xml b/bmt/src/main/resources/META-INF/persistence.xml
index 7968e4f377..1ef840125d 100644
--- 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/hibernate/src/main/resources/META-INF/persistence.xml b/hibernate/src/main/resources/META-INF/persistence.xml
index dd8cf37a3e..5fcf2e9203 100644
--- 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/jta-crash-rec/src/main/resources/META-INF/persistence.xml b/jta-crash-rec/src/main/resources/META-INF/persistence.xml
index f9228e29b7..a2f64705d0 100644
--- 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/jts/application-component-1/src/main/resources/META-INF/persistence.xml b/jts/application-component-1/src/main/resources/META-INF/persistence.xml
index 6f095369f7..060eca0400 100644
--- 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/microprofile-reactive-messaging-kafka/src/main/resources/META-INF/persistence.xml b/microprofile-reactive-messaging-kafka/src/main/resources/META-INF/persistence.xml
index 9db0a5194b..7ea6c547b0 100644
--- a/microprofile-reactive-messaging-kafka/src/main/resources/META-INF/persistence.xml
+++ b/microprofile-reactive-messaging-kafka/src/main/resources/META-INF/persistence.xml
@@ -1,9 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<persistence version="2.2"
-             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_2.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="test">
         <jta-data-source>java:jboss/datasources/ExampleDS</jta-data-source>
         <properties>
diff --git a/thread-racing/src/main/resources/META-INF/persistence.xml b/thread-racing/src/main/resources/META-INF/persistence.xml
index ff43ef9b02..bc74aea0a1 100644
--- a/thread-racing/src/main/resources/META-INF/persistence.xml
+++ b/thread-racing/src/main/resources/META-INF/persistence.xml
@@ -16,10 +16,10 @@ 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"
+    version="3.0"
+    xmlns="https://jakarta.ee/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">
+    xsi:schemaLocation="https://jakarta.ee/xml/ns/persistence https://jakarta.ee/xml/ns/persistence/persistence_3_0.xsd">
     <persistence-unit name="RacePU" transaction-type="JTA">
         <properties>
             <property name="jakarta.persistence.schema-generation.database.action" value="drop-and-create"/>