This is an automated email from the ASF dual-hosted git repository.
markt pushed a commit to branch 8.5.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git
commit c82d8641786caccf4d968a2be17665c221e18861
Author: Mark Thomas <ma...@apache.org>
AuthorDate: Mon May 4 16:52:12 2020 +0100
Correct backport. web.xml versions are 3.1 for Tomcat 8.5.x
---
java/org/apache/jasper/resources/LocalStrings.properties | 8 ++++----
java/org/apache/jasper/resources/LocalStrings_de.properties | 8 ++++----
2 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/java/org/apache/jasper/resources/LocalStrings.properties
b/java/org/apache/jasper/resources/LocalStrings.properties
index edd2477..44ed90d 100644
--- a/java/org/apache/jasper/resources/LocalStrings.properties
+++ b/java/org/apache/jasper/resources/LocalStrings.properties
@@ -362,8 +362,8 @@ jspc.webfrg.header=<?xml version="1.0" encoding="{0}"?>\n\
<web-fragment xmlns="http://xmlns.jcp.org/xml/ns/javaee"\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\
+\
http://xmlns.jcp.org/xml/ns/javaee/web-fragment_3_1.xsd"\n\
+\ version="3.1"\n\
\ metadata-complete="true">\n\
\ <name>org_apache_jasper.jspc</name>\n\
\ <distributable/>\n\
@@ -390,8 +390,8 @@ jspc.webxml.header=<?xml version="1.0" encoding="{0}"?>\n\
<web-app xmlns="http://xmlns.jcp.org/xml/ns/javaee"\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\
+\ http://xmlns.jcp.org/xml/ns/javaee/web-app_3_1.xsd"\n\
+\ version="3.1"\n\
\ metadata-complete="false">\n\
<!--\n\
Automatically created by 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 4ea6cbf..e3e52ec 100644
--- a/java/org/apache/jasper/resources/LocalStrings_de.properties
+++ b/java/org/apache/jasper/resources/LocalStrings_de.properties
@@ -68,8 +68,8 @@ jspc.webfrg.header=<?xml version="1.0" encoding="{0}"?>\n\
<web-fragment xmlns="http://xmlns.jcp.org/xml/ns/javaee"\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\
+\
http://xmlns.jcp.org/xml/ns/javaee/web-fragment_3_1.xsd"\n\
+\ version="3.1"\n\
\ metadata-complete="true">\n\
\ <name>org_apache_jasper.jspc</name>\n\
\ <distributable/>\n\
@@ -89,8 +89,8 @@ jspc.webxml.header=<?xml version="1.0" encoding="{0}"?>\n\
<web-app xmlns="http://xmlns.jcp.org/xml/ns/javaee"\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\
+\ http://xmlns.jcp.org/xml/ns/javaee/web-app_3_1.xsd"\n\
+\ version="3.1"\n\
\ metadata-complete="false">\n\
<!--\n\
Automatisch erstellt durch Apache Tomcat JspC.\n\
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
