[tomcat] 02/03: Update the fragment for the Jasper EL Jar to use the Servlet 6.0 schema

[markt]

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 919babdb734fcf429fdb28280ceead199a9b7ddf
Author: Mark Thomas <ma...@apache.org>
AuthorDate: Tue May 17 08:45:01 2022 +0100

    Update the fragment for the Jasper EL Jar to use the Servlet 6.0 schema
---
 res/META-INF/jasper-el.jar/web-fragment.xml | 4 ++--
 res/META-INF/jasper.jar/web-fragment.xml    | 4 ++--
 webapps/docs/changelog.xml                  | 4 ++++
 3 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/res/META-INF/jasper-el.jar/web-fragment.xml 
b/res/META-INF/jasper-el.jar/web-fragment.xml
index 6769e6f446..1e7d6c50ac 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_5_0.xsd";
-              version="5.0"
+                      https://jakarta.ee/xml/ns/jakartaee/web-fragment_6_0.xsd";
+              version="6.0"
               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 0e7f4dcb84..a255c865d1 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_5_0.xsd";
-              version="5.0"
+                      https://jakarta.ee/xml/ns/jakartaee/web-fragment_6_0.xsd";
+              version="6.0"
               metadata-complete="true">
     <name>org_apache_jasper</name>
     <distributable/>
diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index 5a4c6193c2..881ea2cdde 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -111,6 +111,10 @@
         Update XML schema used for generated web fragments to use the Servlet
         6.0 web fragment schema. (markt)
       </fix>
+      <fix>
+        Update the XML schema used by the web fragment defined for the Jasper 
EL
+        JAR to use the Servlet 6.0 web fragment schema. (markt)
+      </fix>
     </changelog>
   </subsection>
   <subsection name="Web applications">


---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org