From 7e719fe3f844f066faed786366e666175eb96ed7 Mon Sep 17 00:00:00 2001
From: Vedran Pavic <vpavic@duck.com>
Date: Mon, 1 Aug 2022 11:13:29 +0200
Subject: [PATCH] Use Jakarta EE XML namespaces instead of Java EE

Closes gh-28903
---
 .../src/main/resources/META-INF/web-fragment.xml |  8 ++++----
 src/docs/asciidoc/web/websocket.adoc             | 16 ++++++++--------
 2 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/spring-web/src/main/resources/META-INF/web-fragment.xml b/spring-web/src/main/resources/META-INF/web-fragment.xml
index ef85d0866a..915f4e39df 100644
--- a/spring-web/src/main/resources/META-INF/web-fragment.xml
+++ b/spring-web/src/main/resources/META-INF/web-fragment.xml
@@ -1,8 +1,8 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<web-fragment xmlns="http://java.sun.com/xml/ns/javaee"
+<?xml version="1.0" encoding="UTF-8"?>
+<web-fragment 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 https://java.sun.com/xml/ns/javaee/web-fragment_3_0.xsd"
-	version="3.0" metadata-complete="true">
+	xsi:schemaLocation="https://jakarta.ee/xml/ns/jakartaee https://jakarta.ee/xml/ns/jakartaee/web-fragment_5_0.xsd"
+	version="5.0" metadata-complete="true">
 
 	<name>spring_web</name>
 	<distributable/>
diff --git a/src/docs/asciidoc/web/websocket.adoc b/src/docs/asciidoc/web/websocket.adoc
index 82526adabc..a230337e18 100644
--- a/src/docs/asciidoc/web/websocket.adoc
+++ b/src/docs/asciidoc/web/websocket.adoc
@@ -215,12 +215,12 @@ through the use of the `<absolute-ordering />` element in `web.xml`, as the foll
 
 [source,xml,indent=0,subs="verbatim,quotes,attributes"]
 ----
-	<web-app xmlns="http://java.sun.com/xml/ns/javaee"
+	<web-app 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
-			https://java.sun.com/xml/ns/javaee/web-app_3_0.xsd"
-		version="3.0">
+			https://jakarta.ee/xml/ns/jakartaee
+			https://jakarta.ee/xml/ns/jakartaee/web-app_5_0.xsd"
+		version="5.0">
 
 		<absolute-ordering/>
 
@@ -233,12 +233,12 @@ Java initialization API. The following example shows how to do so:
 
 [source,xml,indent=0,subs="verbatim,quotes,attributes"]
 ----
-	<web-app xmlns="http://java.sun.com/xml/ns/javaee"
+	<web-app 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
-			https://java.sun.com/xml/ns/javaee/web-app_3_0.xsd"
-		version="3.0">
+			https://jakarta.ee/xml/ns/jakartaee
+			https://jakarta.ee/xml/ns/jakartaee/web-app_5_0.xsd"
+		version="5.0">
 
 		<absolute-ordering>
 			<name>spring_web</name>