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 1235b8b98ca44440443ead49048aa88a4d69392b
Author: Mark Thomas <ma...@apache.org>
AuthorDate: Tue May 25 17:19:48 2021 +0100
Update JspC to use Servlet 5.0 schemas
---
java/org/apache/jasper/resources/LocalStrings.properties | 16 ++++++++--------
.../apache/jasper/resources/LocalStrings_cs.properties | 16 ++++++++--------
.../apache/jasper/resources/LocalStrings_de.properties | 16 ++++++++--------
.../apache/jasper/resources/LocalStrings_es.properties | 16 ++++++++--------
.../apache/jasper/resources/LocalStrings_fr.properties | 16 ++++++++--------
.../apache/jasper/resources/LocalStrings_ja.properties | 16 ++++++++--------
.../apache/jasper/resources/LocalStrings_ko.properties | 16 ++++++++--------
.../jasper/resources/LocalStrings_pt_BR.properties | 16 ++++++++--------
.../jasper/resources/LocalStrings_zh_CN.properties | 16 ++++++++--------
webapps/docs/changelog.xml | 4 ++++
10 files changed, 76 insertions(+), 72 deletions(-)
diff --git a/java/org/apache/jasper/resources/LocalStrings.properties
b/java/org/apache/jasper/resources/LocalStrings.properties
index 9a73999..25673d5 100644
--- a/java/org/apache/jasper/resources/LocalStrings.properties
+++ b/java/org/apache/jasper/resources/LocalStrings.properties
@@ -364,11 +364,11 @@ jspc.webfrg.footer=\n\
</web-fragment>\n\
\n
jspc.webfrg.header=<?xml version="1.0" encoding="{0}"?>\n\
-<web-fragment xmlns="http://xmlns.jcp.org/xml/ns/javaee"\n\
+<web-fragment xmlns="https://jakarta.ee/xml/ns/jakartaee"\n\
\ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"\n\
-\ xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/javaee\n\
-\
http://xmlns.jcp.org/xml/ns/javaee/web-fragment_4_0.xsd"\n\
-\ version="4.0"\n\
+\ xsi:schemaLocation="https://jakarta.ee/xml/ns/jakartaee\n\
+\
https://jakarta.ee/xml/ns/jakartaee/web-fragment_5_0.xsd"\n\
+\ version="5.0"\n\
\ metadata-complete="true">\n\
\ <name>org_apache_jasper.jspc</name>\n\
\ <distributable/>\n\
@@ -392,11 +392,11 @@ jspc.webxml.footer=\n\
</web-app>\n\
\n
jspc.webxml.header=<?xml version="1.0" encoding="{0}"?>\n\
-<web-app xmlns="http://xmlns.jcp.org/xml/ns/javaee"\n\
+<web-app xmlns="https://jakarta.ee/xml/ns/jakartaee"\n\
\ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"\n\
-\ xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/javaee\n\
-\ http://xmlns.jcp.org/xml/ns/javaee/web-app_4_0.xsd"\n\
-\ version="4.0"\n\
+\ xsi:schemaLocation="https://jakarta.ee/xml/ns/jakartaee\n\
+\ https://jakarta.ee/xml/ns/jakartaee/web-app_5_0.xsd"\n\
+\ version="5.0"\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 78f6a61..f042af1 100644
--- a/java/org/apache/jasper/resources/LocalStrings_cs.properties
+++ b/java/org/apache/jasper/resources/LocalStrings_cs.properties
@@ -68,11 +68,11 @@ jspc.webfrg.footer=\n\
</web-fragment>\n\
\n
jspc.webfrg.header=<?xml version="1.0" encoding="{0}"?>\n\
-<web-fragment xmlns="http://xmlns.jcp.org/xml/ns/javaee"\n\
+<web-fragment xmlns="https://jakarta.ee/xml/ns/jakartaee"\n\
\ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"\n\
-\ xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/javaee\n\
-\
http://xmlns.jcp.org/xml/ns/javaee/web-fragment_4_0.xsd"\n\
-\ version="4.0"\n\
+\ xsi:schemaLocation="https://jakarta.ee/xml/ns/jakartaee\n\
+\
https://jakarta.ee/xml/ns/jakartaee/web-fragment_5_0.xsd"\n\
+\ version="5.0"\n\
\ metadata-complete="true">\n\
\ <name>org_apache_jasper.jspc</name>\n\
\ <distributable/>\n\
@@ -89,11 +89,11 @@ jspc.webxml.footer=\n\
</web-app>\n\
\n
jspc.webxml.header=<?xml version="1.0" encoding="{0}"?>\n\
-<web-app xmlns="http://xmlns.jcp.org/xml/ns/javaee"\n\
+<web-app xmlns="https://jakarta.ee/xml/ns/jakartaee"\n\
\ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"\n\
-\ xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/javaee\n\
-\ http://xmlns.jcp.org/xml/ns/javaee/web-app_4_0.xsd"\n\
-\ version="4.0"\n\
+\ xsi:schemaLocation="https://jakarta.ee/xml/ns/jakartaee\n\
+\ https://jakarta.ee/xml/ns/jakartaee/web-app_5_0.xsd"\n\
+\ version="5.0"\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 6bccad8..34c7923 100644
--- a/java/org/apache/jasper/resources/LocalStrings_de.properties
+++ b/java/org/apache/jasper/resources/LocalStrings_de.properties
@@ -76,11 +76,11 @@ jspc.webfrg.footer=\n\
</web-fragment>\n\
\n
jspc.webfrg.header=<?xml version="1.0" encoding="{0}"?>\n\
-<web-fragment xmlns="http://xmlns.jcp.org/xml/ns/javaee"\n\
+<web-fragment xmlns="https://jakarta.ee/xml/ns/jakartaee"\n\
\ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"\n\
-\ xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/javaee\n\
-\
http://xmlns.jcp.org/xml/ns/javaee/web-fragment_4_0.xsd"\n\
-\ version="4.0"\n\
+\ xsi:schemaLocation="https://jakarta.ee/xml/ns/jakartaee\n\
+\
https://jakarta.ee/xml/ns/jakartaee/web-fragment_5_0.xsd"\n\
+\ version="5.0"\n\
\ metadata-complete="true">\n\
\ <name>org_apache_jasper.jspc</name>\n\
\ <distributable/>\n\
@@ -97,11 +97,11 @@ jspc.webxml.footer=\n\
</web-app>\n\
\n
jspc.webxml.header=<?xml version="1.0" encoding="{0}"?>\n\
-<web-app xmlns="http://xmlns.jcp.org/xml/ns/javaee"\n\
+<web-app xmlns="https://jakarta.ee/xml/ns/jakartaee"\n\
\ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"\n\
-\ xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/javaee\n\
-\ http://xmlns.jcp.org/xml/ns/javaee/web-app_4_0.xsd"\n\
-\ version="4.0"\n\
+\ xsi:schemaLocation="https://jakarta.ee/xml/ns/jakartaee\n\
+\ https://jakarta.ee/xml/ns/jakartaee/web-app_5_0.xsd"\n\
+\ version="5.0"\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 fe27ecf..6c27edf 100644
--- a/java/org/apache/jasper/resources/LocalStrings_es.properties
+++ b/java/org/apache/jasper/resources/LocalStrings_es.properties
@@ -302,11 +302,11 @@ jspc.webfrg.footer=\n\
</web-fragment>\n\
\n
jspc.webfrg.header=<?xml version="1.0" encoding="{0}"?>\n\
-<web-fragment xmlns="http://xmlns.jcp.org/xml/ns/javaee"\n\
+<web-fragment xmlns="https://jakarta.ee/xml/ns/jakartaee"\n\
\ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"\n\
-\ xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/javaee\n\
-\
http://xmlns.jcp.org/xml/ns/javaee/web-fragment_4_0.xsd"\n\
-\ version="4.0"\n\
+\ xsi:schemaLocation="https://jakarta.ee/xml/ns/jakartaee\n\
+\
https://jakarta.ee/xml/ns/jakartaee/web-fragment_5_0.xsd"\n\
+\ version="5.0"\n\
\ metadata-complete="true">\n\
\ <name>org_apache_jasper.jspc</name>\n\
\ <distributable/>\n\
@@ -325,11 +325,11 @@ jspc.webxml.footer=\n\
</web-app>\n\
\n
jspc.webxml.header=<?xml version="1.0" encoding="{0}"?>\n\
-<web-app xmlns="http://xmlns.jcp.org/xml/ns/javaee"\n\
+<web-app xmlns="https://jakarta.ee/xml/ns/jakartaee"\n\
\ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"\n\
-\ xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/javaee\n\
-\ http://xmlns.jcp.org/xml/ns/javaee/web-app_4_0.xsd"\n\
-\ version="4.0"\n\
+\ xsi:schemaLocation="https://jakarta.ee/xml/ns/jakartaee\n\
+\ https://jakarta.ee/xml/ns/jakartaee/web-app_5_0.xsd"\n\
+\ version="5.0"\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 e710ec0..4329375 100644
--- a/java/org/apache/jasper/resources/LocalStrings_fr.properties
+++ b/java/org/apache/jasper/resources/LocalStrings_fr.properties
@@ -363,11 +363,11 @@ jspc.webfrg.footer=\n\
</web-fragment>\n\
\n
jspc.webfrg.header=<?xml version="1.0" encoding="{0}"?>\n\
-<web-fragment xmlns="http://xmlns.jcp.org/xml/ns/javaee"\n\
+<web-fragment xmlns="https://jakarta.ee/xml/ns/jakartaee"\n\
\ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"\n\
-\ xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/javaee\n\
-\
http://xmlns.jcp.org/xml/ns/javaee/web-fragment_4_0.xsd"\n\
-\ version="4.0"\n\
+\ xsi:schemaLocation="https://jakarta.ee/xml/ns/jakartaee\n\
+\
https://jakarta.ee/xml/ns/jakartaee/web-fragment_5_0.xsd"\n\
+\ version="5.0"\n\
\ metadata-complete="true">\n\
\ <name>org_apache_jasper.jspc</name>\n\
\ <distributable/>\n\
@@ -390,11 +390,11 @@ jspc.webxml.footer=\n\
</web-app>\n\
\n
jspc.webxml.header=<?xml version="1.0" encoding="{0}"?>\n\
-<web-app xmlns="http://xmlns.jcp.org/xml/ns/javaee"\n\
+<web-app xmlns="https://jakarta.ee/xml/ns/jakartaee"\n\
\ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"\n\
-\ xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/javaee\n\
-\ http://xmlns.jcp.org/xml/ns/javaee/web-app_4_0.xsd"\n\
-\ version="4.0"\n\
+\ xsi:schemaLocation="https://jakarta.ee/xml/ns/jakartaee\n\
+\ https://jakarta.ee/xml/ns/jakartaee/web-app_5_0.xsd"\n\
+\ version="5.0"\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 57d7a21..3990cf5 100644
--- a/java/org/apache/jasper/resources/LocalStrings_ja.properties
+++ b/java/org/apache/jasper/resources/LocalStrings_ja.properties
@@ -361,11 +361,11 @@ jspc.webfrg.footer=\n\
</web-fragment>\n\
\n
jspc.webfrg.header=<?xml version="1.0" encoding="{0}"?>\n\
-<web-fragment xmlns="http://xmlns.jcp.org/xml/ns/javaee"\n\
+<web-fragment xmlns="https://jakarta.ee/xml/ns/jakartaee"\n\
\ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"\n\
-\ xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/javaee\n\
-\
http://xmlns.jcp.org/xml/ns/javaee/web-fragment_4_0.xsd"\n\
-\ version="4.0"\n\
+\ xsi:schemaLocation="https://jakarta.ee/xml/ns/jakartaee\n\
+\
https://jakarta.ee/xml/ns/jakartaee/web-fragment_5_0.xsd"\n\
+\ version="5.0"\n\
\ metadata-complete="true">\n\
\ <name>org_apache_jasper.jspc</name>\n\
\ <distributable/>\n\
@@ -391,11 +391,11 @@ jspc.webxml.footer=\n\
</web-app>\n\
\n
jspc.webxml.header=<?xml version="1.0" encoding="{0}"?>\n\
-<web-app xmlns="http://xmlns.jcp.org/xml/ns/javaee"\n\
+<web-app xmlns="https://jakarta.ee/xml/ns/jakartaee"\n\
\ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"\n\
-\ xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/javaee\n\
-\ http://xmlns.jcp.org/xml/ns/javaee/web-app_4_0.xsd"\n\
-\ version="4.0"\n\
+\ xsi:schemaLocation="https://jakarta.ee/xml/ns/jakartaee\n\
+\ https://jakarta.ee/xml/ns/jakartaee/web-app_5_0.xsd"\n\
+\ version="5.0"\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 d5c6818..fba9176 100644
--- a/java/org/apache/jasper/resources/LocalStrings_ko.properties
+++ b/java/org/apache/jasper/resources/LocalStrings_ko.properties
@@ -363,11 +363,11 @@ jspc.webfrg.footer=\n\
</web-fragment>\n\
\n
jspc.webfrg.header=<?xml version="1.0" encoding="{0}"?>\n\
-<web-fragment xmlns="http://xmlns.jcp.org/xml/ns/javaee"\n\
+<web-fragment xmlns="https://jakarta.ee/xml/ns/jakartaee"\n\
\ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"\n\
-\ xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/javaee\n\
-\
http://xmlns.jcp.org/xml/ns/javaee/web-fragment_4_0.xsd"\n\
-\ version="4.0"\n\
+\ xsi:schemaLocation="https://jakarta.ee/xml/ns/jakartaee\n\
+\
https://jakarta.ee/xml/ns/jakartaee/web-fragment_5_0.xsd"\n\
+\ version="5.0"\n\
\ metadata-complete="true">\n\
\ <name>org_apache_jasper.jspc</name>\n\
\ <distributable/>\n\
@@ -393,11 +393,11 @@ jspc.webxml.footer=\n\
</web-app>\n\
\n
jspc.webxml.header=<?xml version="1.0" encoding="{0}"?>\n\
-<web-app xmlns="http://xmlns.jcp.org/xml/ns/javaee"\n\
+<web-app xmlns="https://jakarta.ee/xml/ns/jakartaee"\n\
\ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"\n\
-\ xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/javaee\n\
-\ http://xmlns.jcp.org/xml/ns/javaee/web-app_4_0.xsd"\n\
-\ version="4.0"\n\
+\ xsi:schemaLocation="https://jakarta.ee/xml/ns/jakartaee\n\
+\ https://jakarta.ee/xml/ns/jakartaee/web-app_5_0.xsd"\n\
+\ version="5.0"\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 a2270b2..7ec2d0f 100644
--- a/java/org/apache/jasper/resources/LocalStrings_pt_BR.properties
+++ b/java/org/apache/jasper/resources/LocalStrings_pt_BR.properties
@@ -33,11 +33,11 @@ jspc.webfrg.footer=\n\
</web-fragment>\n\
\n
jspc.webfrg.header=<?xml version="1.0" encoding="{0}"?>\n\
-<web-fragment xmlns="http://xmlns.jcp.org/xml/ns/javaee"\n\
+<web-fragment xmlns="https://jakarta.ee/xml/ns/jakartaee"\n\
\ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"\n\
-\ xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/javaee\n\
-\
http://xmlns.jcp.org/xml/ns/javaee/web-fragment_4_0.xsd"\n\
-\ version="4.0"\n\
+\ xsi:schemaLocation="https://jakarta.ee/xml/ns/jakartaee\n\
+\
https://jakarta.ee/xml/ns/jakartaee/web-fragment_5_0.xsd"\n\
+\ version="5.0"\n\
\ metadata-complete="true">\n\
\ <name>org_apache_jasper.jspc</name>\n\
\ <distributable/>\n\
@@ -54,11 +54,11 @@ jspc.webxml.footer=\n\
</web-app>\n\
\n
jspc.webxml.header=<?xml version="1.0" encoding="{0}"?>\n\
-<web-app xmlns="http://xmlns.jcp.org/xml/ns/javaee"\n\
+<web-app xmlns="https://jakarta.ee/xml/ns/jakartaee"\n\
\ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"\n\
-\ xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/javaee\n\
-\ http://xmlns.jcp.org/xml/ns/javaee/web-app_4_0.xsd"\n\
-\ version="4.0"\n\
+\ xsi:schemaLocation="https://jakarta.ee/xml/ns/jakartaee\n\
+\ https://jakarta.ee/xml/ns/jakartaee/web-app_5_0.xsd"\n\
+\ version="5.0"\n\
\ metadata-complete="false">\n\
<!--\n\
Automaticamente criado pelo Apache Tomcat JspC.\n\
diff --git a/java/org/apache/jasper/resources/LocalStrings_zh_CN.properties
b/java/org/apache/jasper/resources/LocalStrings_zh_CN.properties
index 06b37c0..1938a58 100644
--- a/java/org/apache/jasper/resources/LocalStrings_zh_CN.properties
+++ b/java/org/apache/jasper/resources/LocalStrings_zh_CN.properties
@@ -361,11 +361,11 @@ jspc.webfrg.footer=\n\
</web-fragment>\n\
\n
jspc.webfrg.header=<?xml version="1.0" encoding="{0}"?>\n\
-<web-fragment xmlns="http://xmlns.jcp.org/xml/ns/javaee"\n\
+<web-fragment xmlns="https://jakarta.ee/xml/ns/jakartaee"\n\
\ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"\n\
-\ xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/javaee\n\
-\
http://xmlns.jcp.org/xml/ns/javaee/web-fragment_4_0.xsd"\n\
-\ version="4.0"\n\
+\ xsi:schemaLocation="https://jakarta.ee/xml/ns/jakartaee\n\
+\
https://jakarta.ee/xml/ns/jakartaee/web-fragment_5_0.xsd"\n\
+\ version="5.0"\n\
\ metadata-complete="true">\n\
\ <name>org_apache_jasper.jspc</name>\n\
\ <distributable/>\n\
@@ -388,11 +388,11 @@ jspc.webxml.footer=\n\
</web-app>\n\
\n
jspc.webxml.header=<?xml version="1.0" encoding="{0}"?>\n\
-<web-app xmlns="http://xmlns.jcp.org/xml/ns/javaee"\n\
+<web-app xmlns="https://jakarta.ee/xml/ns/jakartaee"\n\
\ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"\n\
-\ xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/javaee\n\
-\ http://xmlns.jcp.org/xml/ns/javaee/web-app_4_0.xsd"\n\
-\ version="4.0"\n\
+\ xsi:schemaLocation="https://jakarta.ee/xml/ns/jakartaee\n\
+\ https://jakarta.ee/xml/ns/jakartaee/web-app_5_0.xsd"\n\
+\ version="5.0"\n\
\ metadata-complete="false">\n\
<!--\n\
由 Apache Tomcat JspC 自动生成。\n\
diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index 035be32..7f8b6ad 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -196,6 +196,10 @@
<code>jasper.jar</code> and <code>jasper-el.jar</code> to use the
Servlet 5.0 schema. (markt)
</update>
+ <fix>
+ Update JspC to generate <code>web.xml</code> and
+ <code>web-fragment.xml</code> files using Servlet 5.0 schemas. (markt)
+ </fix>
</changelog>
</subsection>
<subsection name="WebSocket">
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
