This is an automated email from the ASF dual-hosted git repository.
markt pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/tomcat.git
commit 6ae057c994f9be026e9edc4a1a75784e98997ea1
Author: Mark Thomas <ma...@apache.org>
AuthorDate: Thu Mar 28 11:09:17 2024 +0000
Update to use Jakarta 11 Schemas
---
conf/web.xml | 4 ++--
java/org/apache/jasper/resources/LocalStrings.properties | 8 ++++----
java/org/apache/jasper/resources/LocalStrings_cs.properties | 8 ++++----
java/org/apache/jasper/resources/LocalStrings_de.properties | 8 ++++----
java/org/apache/jasper/resources/LocalStrings_es.properties | 8 ++++----
java/org/apache/jasper/resources/LocalStrings_fr.properties | 8 ++++----
java/org/apache/jasper/resources/LocalStrings_ja.properties | 8 ++++----
java/org/apache/jasper/resources/LocalStrings_ko.properties | 8 ++++----
java/org/apache/jasper/resources/LocalStrings_pt_BR.properties | 8 ++++----
java/org/apache/jasper/resources/LocalStrings_ru.properties | 4 ++--
java/org/apache/jasper/resources/LocalStrings_zh_CN.properties | 8 ++++----
res/META-INF/jasper-el.jar/web-fragment.xml | 4 ++--
res/META-INF/jasper.jar/web-fragment.xml | 4 ++--
res/META-INF/tomcat-websocket.jar/web-fragment.xml | 4 ++--
webapps/ROOT/WEB-INF/web.xml | 4 ++--
webapps/docs/WEB-INF/web.xml | 4 ++--
webapps/docs/appdev/sample/web/WEB-INF/web.xml | 4 ++--
webapps/docs/appdev/web.xml.txt | 4 ++--
webapps/docs/changelog.xml | 4 ++++
webapps/docs/jndi-datasource-examples-howto.xml | 4 ++--
webapps/examples/WEB-INF/web.xml | 4 ++--
webapps/host-manager/WEB-INF/web.xml | 4 ++--
webapps/manager/WEB-INF/web.xml | 4 ++--
23 files changed, 66 insertions(+), 62 deletions(-)
diff --git a/conf/web.xml b/conf/web.xml
index 788f411d48..aa2292c336 100644
--- a/conf/web.xml
+++ b/conf/web.xml
@@ -18,8 +18,8 @@
<web-app 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";
- version="6.0">
+ https://jakarta.ee/xml/ns/jakartaee/web-app_6_1.xsd";
+ version="6.1">
<!-- ======================== Introduction ============================== -->
<!-- This document defines default values for *all* web applications -->
diff --git a/java/org/apache/jasper/resources/LocalStrings.properties
b/java/org/apache/jasper/resources/LocalStrings.properties
index 67f4b9e405..8fec3e4fa9 100644
--- a/java/org/apache/jasper/resources/LocalStrings.properties
+++ b/java/org/apache/jasper/resources/LocalStrings.properties
@@ -375,8 +375,8 @@ jspc.webfrg.header=<?xml version="1.0" encoding="{0}"?>\n\
<web-fragment xmlns="https://jakarta.ee/xml/ns/jakartaee"\n\
\ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"\n\
\ xsi:schemaLocation="https://jakarta.ee/xml/ns/jakartaee\n\
-\
https://jakarta.ee/xml/ns/jakartaee/web-fragment_6_0.xsd"\n\
-\ version="6.0"\n\
+\
https://jakarta.ee/xml/ns/jakartaee/web-fragment_6_1.xsd"\n\
+\ version="6.1"\n\
\ metadata-complete="true">\n\
\ <name>org_apache_jasper.jspc</name>\n\
\ <distributable/>\n\
@@ -403,8 +403,8 @@ jspc.webxml.header=<?xml version="1.0" encoding="{0}"?>\n\
<web-app xmlns="https://jakarta.ee/xml/ns/jakartaee"\n\
\ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"\n\
\ xsi:schemaLocation="https://jakarta.ee/xml/ns/jakartaee\n\
-\ https://jakarta.ee/xml/ns/jakartaee/web-app_6_0.xsd"\n\
-\ version="6.0"\n\
+\ https://jakarta.ee/xml/ns/jakartaee/web-app_6_1.xsd"\n\
+\ version="6.1"\n\
\ metadata-complete="false">\n\
<!--\n\
Automatically created by Apache Tomcat JspC.\n\
diff --git a/java/org/apache/jasper/resources/LocalStrings_cs.properties
b/java/org/apache/jasper/resources/LocalStrings_cs.properties
index cfc53c63d4..576cb008dc 100644
--- a/java/org/apache/jasper/resources/LocalStrings_cs.properties
+++ b/java/org/apache/jasper/resources/LocalStrings_cs.properties
@@ -69,8 +69,8 @@ jspc.webfrg.header=<?xml version="1.0" encoding="{0}"?>\n\
<web-fragment xmlns="https://jakarta.ee/xml/ns/jakartaee"\n\
\ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"\n\
\ xsi:schemaLocation="https://jakarta.ee/xml/ns/jakartaee\n\
-\
https://jakarta.ee/xml/ns/jakartaee/web-fragment_6_0.xsd"\n\
-\ version="6.0"\n\
+\
https://jakarta.ee/xml/ns/jakartaee/web-fragment_6_1.xsd"\n\
+\ version="6.1"\n\
\ metadata-complete="true">\n\
\ <name>org_apache_jasper.jspc</name>\n\
\ <distributable/>\n\
@@ -90,8 +90,8 @@ jspc.webxml.header=<?xml version="1.0" encoding="{0}"?>\n\
<web-app xmlns="https://jakarta.ee/xml/ns/jakartaee"\n\
\ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"\n\
\ xsi:schemaLocation="https://jakarta.ee/xml/ns/jakartaee\n\
-\ https://jakarta.ee/xml/ns/jakartaee/web-app_6_0.xsd"\n\
-\ version="6.0"\n\
+\ https://jakarta.ee/xml/ns/jakartaee/web-app_6_1.xsd"\n\
+\ version="6.1"\n\
\ metadata-complete="false">\n\
<!--\n\
Automaticky vytvořeno pomocí Apache Tomcat JspC.\n\
diff --git a/java/org/apache/jasper/resources/LocalStrings_de.properties
b/java/org/apache/jasper/resources/LocalStrings_de.properties
index 1d5f23bcf9..0018c388d1 100644
--- a/java/org/apache/jasper/resources/LocalStrings_de.properties
+++ b/java/org/apache/jasper/resources/LocalStrings_de.properties
@@ -82,8 +82,8 @@ jspc.webfrg.header=<?xml version="1.0" encoding="{0}"?>\n\
<web-fragment xmlns="https://jakarta.ee/xml/ns/jakartaee"\n\
\ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"\n\
\ xsi:schemaLocation="https://jakarta.ee/xml/ns/jakartaee\n\
-\
https://jakarta.ee/xml/ns/jakartaee/web-fragment_6_0.xsd"\n\
-\ version="6.0"\n\
+\
https://jakarta.ee/xml/ns/jakartaee/web-fragment_6_1.xsd"\n\
+\ version="6.1"\n\
\ metadata-complete="true">\n\
\ <name>org_apache_jasper.jspc</name>\n\
\ <distributable/>\n\
@@ -103,8 +103,8 @@ jspc.webxml.header=<?xml version="1.0" encoding="{0}"?>\n\
<web-app xmlns="https://jakarta.ee/xml/ns/jakartaee"\n\
\ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"\n\
\ xsi:schemaLocation="https://jakarta.ee/xml/ns/jakartaee\n\
-\ https://jakarta.ee/xml/ns/jakartaee/web-app_6_0.xsd"\n\
-\ version="6.0"\n\
+\ https://jakarta.ee/xml/ns/jakartaee/web-app_6_1.xsd"\n\
+\ version="6.1"\n\
\ metadata-complete="false">\n\
<!--\n\
Automatisch erstellt durch Apache Tomcat JspC.\n\
diff --git a/java/org/apache/jasper/resources/LocalStrings_es.properties
b/java/org/apache/jasper/resources/LocalStrings_es.properties
index 0235b22a0d..aeefac328e 100644
--- a/java/org/apache/jasper/resources/LocalStrings_es.properties
+++ b/java/org/apache/jasper/resources/LocalStrings_es.properties
@@ -295,8 +295,8 @@ jspc.webfrg.header=<?xml version="1.0" encoding="{0}"?>\n\
<web-fragment xmlns="https://jakarta.ee/xml/ns/jakartaee"\n\
\ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"\n\
\ xsi:schemaLocation="https://jakarta.ee/xml/ns/jakartaee\n\
-\
https://jakarta.ee/xml/ns/jakartaee/web-fragment_6_0.xsd"\n\
-\ version="6.0"\n\
+\
https://jakarta.ee/xml/ns/jakartaee/web-fragment_6_1.xsd"\n\
+\ version="6.1"\n\
\ metadata-complete="true">\n\
\ <name>org_apache_jasper.jspc</name>\n\
\ <distributable/>\n\
@@ -318,8 +318,8 @@ jspc.webxml.header=<?xml version="1.0" encoding="{0}"?>\n\
<web-app xmlns="https://jakarta.ee/xml/ns/jakartaee"\n\
\ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"\n\
\ xsi:schemaLocation="https://jakarta.ee/xml/ns/jakartaee\n\
-\ https://jakarta.ee/xml/ns/jakartaee/web-app_6_0.xsd"\n\
-\ version="6.0"\n\
+\ https://jakarta.ee/xml/ns/jakartaee/web-app_6_1.xsd"\n\
+\ version="6.1"\n\
\ metadata-complete="false">\n\
<!--\n\
Creado automaticamente mediante Apache Tomcat JspC.\n\
diff --git a/java/org/apache/jasper/resources/LocalStrings_fr.properties
b/java/org/apache/jasper/resources/LocalStrings_fr.properties
index 908fad030f..8ba6b31f97 100644
--- a/java/org/apache/jasper/resources/LocalStrings_fr.properties
+++ b/java/org/apache/jasper/resources/LocalStrings_fr.properties
@@ -376,8 +376,8 @@ jspc.webfrg.header=<?xml version="1.0" encoding="{0}"?>\n\
<web-fragment xmlns="https://jakarta.ee/xml/ns/jakartaee"\n\
\ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"\n\
\ xsi:schemaLocation="https://jakarta.ee/xml/ns/jakartaee\n\
-\
https://jakarta.ee/xml/ns/jakartaee/web-fragment_6_0.xsd"\n\
-\ version="6.0"\n\
+\
https://jakarta.ee/xml/ns/jakartaee/web-fragment_6_1.xsd"\n\
+\ version="6.1"\n\
\ metadata-complete="true">\n\
\ <name>org_apache_jasper.jspc</name>\n\
\ <distributable/>\n\
@@ -403,8 +403,8 @@ jspc.webxml.header=<?xml version="1.0" encoding="{0}"?>\n\
<web-app xmlns="https://jakarta.ee/xml/ns/jakartaee"\n\
\ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"\n\
\ xsi:schemaLocation="https://jakarta.ee/xml/ns/jakartaee\n\
-\ https://jakarta.ee/xml/ns/jakartaee/web-app_6_0.xsd"\n\
-\ version="6.0"\n\
+\ https://jakarta.ee/xml/ns/jakartaee/web-app_6_1.xsd"\n\
+\ version="6.1"\n\
\ metadata-complete="false">\n\
<!--\n\
Crée automatiquement par JspC de Apache Tomcat.\n\
diff --git a/java/org/apache/jasper/resources/LocalStrings_ja.properties
b/java/org/apache/jasper/resources/LocalStrings_ja.properties
index 2360475455..a61d3a9ff4 100644
--- a/java/org/apache/jasper/resources/LocalStrings_ja.properties
+++ b/java/org/apache/jasper/resources/LocalStrings_ja.properties
@@ -376,8 +376,8 @@ jspc.webfrg.header=<?xml version="1.0" encoding="{0}"?>\n\
<web-fragment xmlns="https://jakarta.ee/xml/ns/jakartaee"\n\
\ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"\n\
\ xsi:schemaLocation="https://jakarta.ee/xml/ns/jakartaee\n\
-\
https://jakarta.ee/xml/ns/jakartaee/web-fragment_6_0.xsd"\n\
-\ version="6.0"\n\
+\
https://jakarta.ee/xml/ns/jakartaee/web-fragment_6_1.xsd"\n\
+\ version="6.1"\n\
\ metadata-complete="true">\n\
\ <name>org_apache_jasper.jspc</name>\n\
\ <distributable/>\n\
@@ -404,8 +404,8 @@ jspc.webxml.header=<?xml version="1.0" encoding="{0}"?>\n\
<web-app xmlns="https://jakarta.ee/xml/ns/jakartaee"\n\
\ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"\n\
\ xsi:schemaLocation="https://jakarta.ee/xml/ns/jakartaee\n\
-\ https://jakarta.ee/xml/ns/jakartaee/web-app_6_0.xsd"\n\
-\ version="6.0"\n\
+\ https://jakarta.ee/xml/ns/jakartaee/web-app_6_1.xsd"\n\
+\ version="6.1"\n\
\ metadata-complete="false">\n\
<!--\n\
Apache Tomcat JspC による自動生成\n\
diff --git a/java/org/apache/jasper/resources/LocalStrings_ko.properties
b/java/org/apache/jasper/resources/LocalStrings_ko.properties
index 78626fdaf7..804c6a9766 100644
--- a/java/org/apache/jasper/resources/LocalStrings_ko.properties
+++ b/java/org/apache/jasper/resources/LocalStrings_ko.properties
@@ -362,8 +362,8 @@ jspc.webfrg.header=<?xml version="1.0" encoding="{0}"?>\n\
<web-fragment xmlns="https://jakarta.ee/xml/ns/jakartaee"\n\
\ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"\n\
\ xsi:schemaLocation="https://jakarta.ee/xml/ns/jakartaee\n\
-\
https://jakarta.ee/xml/ns/jakartaee/web-fragment_6_0.xsd"\n\
-\ version="6.0"\n\
+\
https://jakarta.ee/xml/ns/jakartaee/web-fragment_6_1.xsd"\n\
+\ version="6.1"\n\
\ metadata-complete="true">\n\
\ <name>org_apache_jasper.jspc</name>\n\
\ <distributable/>\n\
@@ -389,8 +389,8 @@ jspc.webxml.header=<?xml version="1.0" encoding="{0}"?>\n\
<web-app xmlns="https://jakarta.ee/xml/ns/jakartaee"\n\
\ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"\n\
\ xsi:schemaLocation="https://jakarta.ee/xml/ns/jakartaee\n\
-\ https://jakarta.ee/xml/ns/jakartaee/web-app_6_0.xsd"\n\
-\ version="6.0"\n\
+\ https://jakarta.ee/xml/ns/jakartaee/web-app_6_1.xsd"\n\
+\ version="6.1"\n\
\ metadata-complete="false">\n\
<!--\n\
Automatically created by Apache Tomcat JspC.\n\
diff --git a/java/org/apache/jasper/resources/LocalStrings_pt_BR.properties
b/java/org/apache/jasper/resources/LocalStrings_pt_BR.properties
index 7ef3a68a8e..1fe7d7728b 100644
--- a/java/org/apache/jasper/resources/LocalStrings_pt_BR.properties
+++ b/java/org/apache/jasper/resources/LocalStrings_pt_BR.properties
@@ -35,8 +35,8 @@ jspc.webfrg.header=<?xml version="1.0" encoding="{0}"?>\n\
<web-fragment xmlns="https://jakarta.ee/xml/ns/jakartaee"\n\
\ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"\n\
\ xsi:schemaLocation="https://jakarta.ee/xml/ns/jakartaee\n\
-\
https://jakarta.ee/xml/ns/jakartaee/web-fragment_6_0.xsd"\n\
-\ version="6.0"\n\
+\
https://jakarta.ee/xml/ns/jakartaee/web-fragment_6_1.xsd"\n\
+\ version="6.1"\n\
\ metadata-complete="true">\n\
\ <name>org_apache_jasper.jspc</name>\n\
\ <distributable/>\n\
@@ -56,8 +56,8 @@ jspc.webxml.header=<?xml version="1.0" encoding="{0}"?>\n\
<web-app xmlns="https://jakarta.ee/xml/ns/jakartaee"\n\
\ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"\n\
\ xsi:schemaLocation="https://jakarta.ee/xml/ns/jakartaee\n\
-\ https://jakarta.ee/xml/ns/jakartaee/web-app_6_0.xsd"\n\
-\ version="6.0"\n\
+\ https://jakarta.ee/xml/ns/jakartaee/web-app_6_1.xsd"\n\
+\ version="6.1"\n\
\ metadata-complete="false">\n\
<!--\n\
Automaticamente criado pelo Apache Tomcat JspC.\n\
diff --git a/java/org/apache/jasper/resources/LocalStrings_ru.properties
b/java/org/apache/jasper/resources/LocalStrings_ru.properties
index 2be84ca60d..d4b34eddcc 100644
--- a/java/org/apache/jasper/resources/LocalStrings_ru.properties
+++ b/java/org/apache/jasper/resources/LocalStrings_ru.properties
@@ -44,8 +44,8 @@ jspc.webfrg.header=<?xml version="1.0" encoding="{0}"?>\n\
<web-fragment xmlns="https://jakarta.ee/xml/ns/jakartaee"\n\
\ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"\n\
\ xsi:schemaLocation="https://jakarta.ee/xml/ns/jakartaee\n\
-\
https://jakarta.ee/xml/ns/jakartaee/web-fragment_6_0.xsd"\n\
-\ version="6.0"\n\
+\
https://jakarta.ee/xml/ns/jakartaee/web-fragment_6_1.xsd"\n\
+\ version="6.1"\n\
\ metadata-complete="true">\n\
\ <name>org_apache_jasper.jspc</name>\n\
\ <distributable/>\n\
diff --git a/java/org/apache/jasper/resources/LocalStrings_zh_CN.properties
b/java/org/apache/jasper/resources/LocalStrings_zh_CN.properties
index e48c8e9241..6687adbb89 100644
--- a/java/org/apache/jasper/resources/LocalStrings_zh_CN.properties
+++ b/java/org/apache/jasper/resources/LocalStrings_zh_CN.properties
@@ -361,8 +361,8 @@ jspc.webfrg.header=<?xml version="1.0" encoding="{0}"?>\n\
<web-fragment xmlns="https://jakarta.ee/xml/ns/jakartaee"\n\
\ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"\n\
\ xsi:schemaLocation="https://jakarta.ee/xml/ns/jakartaee\n\
-\
https://jakarta.ee/xml/ns/jakartaee/web-fragment_6_0.xsd"\n\
-\ version="6.0"\n\
+\
https://jakarta.ee/xml/ns/jakartaee/web-fragment_6_1.xsd"\n\
+\ version="6.1"\n\
\ metadata-complete="true">\n\
\ <name>org_apache_jasper.jspc</name>\n\
\ <distributable/>\n\
@@ -388,8 +388,8 @@ jspc.webxml.header=<?xml version="1.0" encoding="{0}"?>\n\
<web-app xmlns="https://jakarta.ee/xml/ns/jakartaee"\n\
\ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"\n\
\ xsi:schemaLocation="https://jakarta.ee/xml/ns/jakartaee\n\
-\ https://jakarta.ee/xml/ns/jakartaee/web-app_6_0.xsd"\n\
-\ version="6.0"\n\
+\ https://jakarta.ee/xml/ns/jakartaee/web-app_6_1.xsd"\n\
+\ version="6.1"\n\
\ metadata-complete="false">\n\
<!--\n\
由 Apache Tomcat JspC 自动生成。\n\
diff --git a/res/META-INF/jasper-el.jar/web-fragment.xml
b/res/META-INF/jasper-el.jar/web-fragment.xml
index 1e7d6c50ac..55e70903ab 100644
--- a/res/META-INF/jasper-el.jar/web-fragment.xml
+++ b/res/META-INF/jasper-el.jar/web-fragment.xml
@@ -18,8 +18,8 @@
<web-fragment 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-fragment_6_0.xsd";
- version="6.0"
+ https://jakarta.ee/xml/ns/jakartaee/web-fragment_6_1.xsd";
+ version="6.1"
metadata-complete="true">
<name>org_apache_jasper_el</name>
<distributable/>
diff --git a/res/META-INF/jasper.jar/web-fragment.xml
b/res/META-INF/jasper.jar/web-fragment.xml
index a255c865d1..eb0a6cfdc0 100644
--- a/res/META-INF/jasper.jar/web-fragment.xml
+++ b/res/META-INF/jasper.jar/web-fragment.xml
@@ -18,8 +18,8 @@
<web-fragment 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-fragment_6_0.xsd";
- version="6.0"
+ https://jakarta.ee/xml/ns/jakartaee/web-fragment_6_1.xsd";
+ version="6.1"
metadata-complete="true">
<name>org_apache_jasper</name>
<distributable/>
diff --git a/res/META-INF/tomcat-websocket.jar/web-fragment.xml
b/res/META-INF/tomcat-websocket.jar/web-fragment.xml
index 378fe7d1f7..f80de18bcb 100644
--- a/res/META-INF/tomcat-websocket.jar/web-fragment.xml
+++ b/res/META-INF/tomcat-websocket.jar/web-fragment.xml
@@ -18,8 +18,8 @@
<web-fragment 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-fragment_6_0.xsd";
- version="6.0"
+ https://jakarta.ee/xml/ns/jakartaee/web-fragment_6_1.xsd";
+ version="6.1"
metadata-complete="true">
<name>org_apache_tomcat_websocket</name>
<distributable/>
diff --git a/webapps/ROOT/WEB-INF/web.xml b/webapps/ROOT/WEB-INF/web.xml
index e2436014eb..885b1c345e 100644
--- a/webapps/ROOT/WEB-INF/web.xml
+++ b/webapps/ROOT/WEB-INF/web.xml
@@ -18,8 +18,8 @@
<web-app 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";
- version="6.0"
+ https://jakarta.ee/xml/ns/jakartaee/web-app_6_1.xsd";
+ version="6.1"
metadata-complete="true">
<display-name>Welcome to Tomcat</display-name>
diff --git a/webapps/docs/WEB-INF/web.xml b/webapps/docs/WEB-INF/web.xml
index 0731a2d26d..057eaaf96e 100644
--- a/webapps/docs/WEB-INF/web.xml
+++ b/webapps/docs/WEB-INF/web.xml
@@ -18,8 +18,8 @@
<web-app 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";
- version="6.0"
+ https://jakarta.ee/xml/ns/jakartaee/web-app_6_1.xsd";
+ version="6.1"
metadata-complete="true">
<display-name>Tomcat Documentation</display-name>
diff --git a/webapps/docs/appdev/sample/web/WEB-INF/web.xml
b/webapps/docs/appdev/sample/web/WEB-INF/web.xml
index f9e24c1b6b..440ccae39d 100644
--- a/webapps/docs/appdev/sample/web/WEB-INF/web.xml
+++ b/webapps/docs/appdev/sample/web/WEB-INF/web.xml
@@ -18,8 +18,8 @@
<web-app 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";
- version="6.0">
+ https://jakarta.ee/xml/ns/jakartaee/web-app_6_1.xsd";
+ version="6.1">
<display-name>Hello, World Application</display-name>
<description>
diff --git a/webapps/docs/appdev/web.xml.txt b/webapps/docs/appdev/web.xml.txt
index 70caa81bdb..afeb6a374a 100644
--- a/webapps/docs/appdev/web.xml.txt
+++ b/webapps/docs/appdev/web.xml.txt
@@ -18,8 +18,8 @@
<web-app 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";
- version="6.0">
+ https://jakarta.ee/xml/ns/jakartaee/web-app_6_1.xsd";
+ version="6.1">
<!-- General description of your web application -->
diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index 0eca891322..86243c6a61 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -128,6 +128,10 @@
Add a default implementation for <code>HttpSession.getAccessor()</code>
to align with the Servlet 6.1 API. (markt)
</add>
+ <add>
+ Add the Jakarta EE 11 XML schemas and update Tomcat and included web
+ applications to use them. (markt)
+ </add>
</changelog>
</subsection>
<subsection name="Coyote">
diff --git a/webapps/docs/jndi-datasource-examples-howto.xml
b/webapps/docs/jndi-datasource-examples-howto.xml
index 981543578b..eadd626b8f 100644
--- a/webapps/docs/jndi-datasource-examples-howto.xml
+++ b/webapps/docs/jndi-datasource-examples-howto.xml
@@ -298,8 +298,8 @@ resource to your <a
href="config/context.html">Context</a>.</p>
<web-app 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";
- version="6.0">
+ https://jakarta.ee/xml/ns/jakartaee/web-app_6_1.xsd";
+ version="6.1">
<description>MySQL Test App</description>
<resource-ref>
<description>DB Connection</description>
diff --git a/webapps/examples/WEB-INF/web.xml b/webapps/examples/WEB-INF/web.xml
index 442aa032e8..6fecfe135a 100644
--- a/webapps/examples/WEB-INF/web.xml
+++ b/webapps/examples/WEB-INF/web.xml
@@ -18,8 +18,8 @@
<web-app 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";
- version="6.0"
+ https://jakarta.ee/xml/ns/jakartaee/web-app_6_1.xsd";
+ version="6.1"
metadata-complete="true">
<description>
diff --git a/webapps/host-manager/WEB-INF/web.xml
b/webapps/host-manager/WEB-INF/web.xml
index 6c6d501f18..db0862d77b 100644
--- a/webapps/host-manager/WEB-INF/web.xml
+++ b/webapps/host-manager/WEB-INF/web.xml
@@ -18,8 +18,8 @@
<web-app 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";
- version="6.0"
+ https://jakarta.ee/xml/ns/jakartaee/web-app_6_1.xsd";
+ version="6.1"
metadata-complete="true">
<display-name>Tomcat Host Manager Application</display-name>
diff --git a/webapps/manager/WEB-INF/web.xml b/webapps/manager/WEB-INF/web.xml
index d9e83df3f3..a5332d59d8 100644
--- a/webapps/manager/WEB-INF/web.xml
+++ b/webapps/manager/WEB-INF/web.xml
@@ -18,8 +18,8 @@
<web-app 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";
- version="6.0"
+ https://jakarta.ee/xml/ns/jakartaee/web-app_6_1.xsd";
+ version="6.1"
metadata-complete="true">
<display-name>Tomcat Manager Application</display-name>
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
