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 a4107885785ea4c611c2e4e85c36a0381f48e3f0
Author: Mark Thomas <ma...@apache.org>
AuthorDate: Tue May 17 08:44:11 2022 +0100
Update generated fragments to use Servlet 6.0 fragment schema
---
java/org/apache/jasper/resources/LocalStrings.properties | 4 ++--
java/org/apache/jasper/resources/LocalStrings_cs.properties | 4 ++--
java/org/apache/jasper/resources/LocalStrings_de.properties | 4 ++--
java/org/apache/jasper/resources/LocalStrings_es.properties | 4 ++--
java/org/apache/jasper/resources/LocalStrings_fr.properties | 4 ++--
java/org/apache/jasper/resources/LocalStrings_ja.properties | 4 ++--
java/org/apache/jasper/resources/LocalStrings_ko.properties | 4 ++--
java/org/apache/jasper/resources/LocalStrings_pt_BR.properties | 4 ++--
java/org/apache/jasper/resources/LocalStrings_zh_CN.properties | 4 ++--
webapps/docs/changelog.xml | 8 ++++++++
10 files changed, 26 insertions(+), 18 deletions(-)
diff --git a/java/org/apache/jasper/resources/LocalStrings.properties
b/java/org/apache/jasper/resources/LocalStrings.properties
index b3ae626e93..aba19e3c71 100644
--- a/java/org/apache/jasper/resources/LocalStrings.properties
+++ b/java/org/apache/jasper/resources/LocalStrings.properties
@@ -373,8 +373,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_5_0.xsd"\n\
-\ version="5.0"\n\
+\
https://jakarta.ee/xml/ns/jakartaee/web-fragment_6_0.xsd"\n\
+\ version="6.0"\n\
\ metadata-complete="true">\n\
\ <name>org_apache_jasper.jspc</name>\n\
\ <distributable/>\n\
diff --git a/java/org/apache/jasper/resources/LocalStrings_cs.properties
b/java/org/apache/jasper/resources/LocalStrings_cs.properties
index 7da196ce5c..6293b1347e 100644
--- a/java/org/apache/jasper/resources/LocalStrings_cs.properties
+++ b/java/org/apache/jasper/resources/LocalStrings_cs.properties
@@ -71,8 +71,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_5_0.xsd"\n\
-\ version="5.0"\n\
+\
https://jakarta.ee/xml/ns/jakartaee/web-fragment_6_0.xsd"\n\
+\ version="6.0"\n\
\ metadata-complete="true">\n\
\ <name>org_apache_jasper.jspc</name>\n\
\ <distributable/>\n\
diff --git a/java/org/apache/jasper/resources/LocalStrings_de.properties
b/java/org/apache/jasper/resources/LocalStrings_de.properties
index 255d4a6a1a..178e53b93e 100644
--- a/java/org/apache/jasper/resources/LocalStrings_de.properties
+++ b/java/org/apache/jasper/resources/LocalStrings_de.properties
@@ -84,8 +84,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_5_0.xsd"\n\
-\ version="5.0"\n\
+\
https://jakarta.ee/xml/ns/jakartaee/web-fragment_6_0.xsd"\n\
+\ version="6.0"\n\
\ metadata-complete="true">\n\
\ <name>org_apache_jasper.jspc</name>\n\
\ <distributable/>\n\
diff --git a/java/org/apache/jasper/resources/LocalStrings_es.properties
b/java/org/apache/jasper/resources/LocalStrings_es.properties
index 7d97ec956a..e213ba1a81 100644
--- a/java/org/apache/jasper/resources/LocalStrings_es.properties
+++ b/java/org/apache/jasper/resources/LocalStrings_es.properties
@@ -305,8 +305,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_5_0.xsd"\n\
-\ version="5.0"\n\
+\
https://jakarta.ee/xml/ns/jakartaee/web-fragment_6_0.xsd"\n\
+\ version="6.0"\n\
\ metadata-complete="true">\n\
\ <name>org_apache_jasper.jspc</name>\n\
\ <distributable/>\n\
diff --git a/java/org/apache/jasper/resources/LocalStrings_fr.properties
b/java/org/apache/jasper/resources/LocalStrings_fr.properties
index 8d78f491b6..1a42f053b4 100644
--- a/java/org/apache/jasper/resources/LocalStrings_fr.properties
+++ b/java/org/apache/jasper/resources/LocalStrings_fr.properties
@@ -368,8 +368,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_5_0.xsd"\n\
-\ version="5.0"\n\
+\
https://jakarta.ee/xml/ns/jakartaee/web-fragment_6_0.xsd"\n\
+\ version="6.0"\n\
\ metadata-complete="true">\n\
\ <name>org_apache_jasper.jspc</name>\n\
\ <distributable/>\n\
diff --git a/java/org/apache/jasper/resources/LocalStrings_ja.properties
b/java/org/apache/jasper/resources/LocalStrings_ja.properties
index 6b50f5d6fa..1a4314c027 100644
--- a/java/org/apache/jasper/resources/LocalStrings_ja.properties
+++ b/java/org/apache/jasper/resources/LocalStrings_ja.properties
@@ -371,8 +371,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_5_0.xsd"\n\
-\ version="5.0"\n\
+\
https://jakarta.ee/xml/ns/jakartaee/web-fragment_6_0.xsd"\n\
+\ version="6.0"\n\
\ metadata-complete="true">\n\
\ <name>org_apache_jasper.jspc</name>\n\
\ <distributable/>\n\
diff --git a/java/org/apache/jasper/resources/LocalStrings_ko.properties
b/java/org/apache/jasper/resources/LocalStrings_ko.properties
index 6ddd74974e..7024698300 100644
--- a/java/org/apache/jasper/resources/LocalStrings_ko.properties
+++ b/java/org/apache/jasper/resources/LocalStrings_ko.properties
@@ -372,8 +372,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_5_0.xsd"\n\
-\ version="5.0"\n\
+\
https://jakarta.ee/xml/ns/jakartaee/web-fragment_6_0.xsd"\n\
+\ version="6.0"\n\
\ metadata-complete="true">\n\
\ <name>org_apache_jasper.jspc</name>\n\
\ <distributable/>\n\
diff --git a/java/org/apache/jasper/resources/LocalStrings_pt_BR.properties
b/java/org/apache/jasper/resources/LocalStrings_pt_BR.properties
index d4bae33a53..f504b8f067 100644
--- a/java/org/apache/jasper/resources/LocalStrings_pt_BR.properties
+++ b/java/org/apache/jasper/resources/LocalStrings_pt_BR.properties
@@ -36,8 +36,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_5_0.xsd"\n\
-\ version="5.0"\n\
+\
https://jakarta.ee/xml/ns/jakartaee/web-fragment_6_0.xsd"\n\
+\ version="6.0"\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 398993e591..d711882685 100644
--- a/java/org/apache/jasper/resources/LocalStrings_zh_CN.properties
+++ b/java/org/apache/jasper/resources/LocalStrings_zh_CN.properties
@@ -371,8 +371,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_5_0.xsd"\n\
-\ version="5.0"\n\
+\
https://jakarta.ee/xml/ns/jakartaee/web-fragment_6_0.xsd"\n\
+\ version="6.0"\n\
\ metadata-complete="true">\n\
\ <name>org_apache_jasper.jspc</name>\n\
\ <distributable/>\n\
diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index 9b3df11a8b..5a4c6193c2 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -105,6 +105,14 @@
issues do not "pop up" wrt. others).
-->
<section name="Tomcat 10.1.0-M16 (markt)" rtext="in development">
+ <subsection name="Jasper">
+ <changelog>
+ <fix>
+ Update XML schema used for generated web fragments to use the Servlet
+ 6.0 web fragment schema. (markt)
+ </fix>
+ </changelog>
+ </subsection>
<subsection name="Web applications">
<changelog>
<fix>
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
