You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@tomcat.apache.org by ma...@apache.org on 2026/06/16 18:42:56 UTC
(tomcat) 01/02: Fix backport
This is an automated email from the ASF dual-hosted git repository.
markt-asf pushed a commit to branch 10.1.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git
commit ebbff0ddd91b3ab6a6eff508d43e7a28490c14e7
Author: Mark Thomas <ma...@apache.org>
AuthorDate: Tue Jun 16 19:39:32 2026 +0100
Fix backport
---
.../tomcat/util/descriptor/web/TestWebXml.java | 24 +++++++++++-----------
1 file changed, 12 insertions(+), 12 deletions(-)
diff --git a/test/org/apache/tomcat/util/descriptor/web/TestWebXml.java b/test/org/apache/tomcat/util/descriptor/web/TestWebXml.java
index 19583f369b..abdd2c41cb 100644
--- a/test/org/apache/tomcat/util/descriptor/web/TestWebXml.java
+++ b/test/org/apache/tomcat/util/descriptor/web/TestWebXml.java
@@ -639,8 +639,8 @@ public class TestWebXml {
"<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" +
- " https://jakarta.ee/xml/ns/jakartaee/web-app_6_2.xsd\"\n" +
- " version=\"6.2\"\n" +
+ " https://jakarta.ee/xml/ns/jakartaee/web-app_6_0.xsd\"\n" +
+ " version=\"6.0\"\n" +
" metadata-complete=\"true\">\n" +
"\n" +
"</web-app>");
@@ -654,8 +654,8 @@ public class TestWebXml {
"<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" +
- " https://jakarta.ee/xml/ns/jakartaee/web-app_6_2.xsd\"\n" +
- " version=\"6.2\"\n" +
+ " https://jakarta.ee/xml/ns/jakartaee/web-app_6_0.xsd\"\n" +
+ " version=\"6.0\"\n" +
" metadata-complete=\"true\">\n" +
"\n" +
" <security-constraint>\n" +
@@ -680,8 +680,8 @@ public class TestWebXml {
"<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" +
- " https://jakarta.ee/xml/ns/jakartaee/web-app_6_2.xsd\"\n" +
- " version=\"6.2\"\n" +
+ " https://jakarta.ee/xml/ns/jakartaee/web-app_6_0.xsd\"\n" +
+ " version=\"6.0\"\n" +
" metadata-complete=\"true\">\n" +
"\n" +
" <security-constraint>\n" +
@@ -709,8 +709,8 @@ public class TestWebXml {
"<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" +
- " https://jakarta.ee/xml/ns/jakartaee/web-app_6_2.xsd\"\n" +
- " version=\"6.2\"\n" +
+ " https://jakarta.ee/xml/ns/jakartaee/web-app_6_0.xsd\"\n" +
+ " version=\"6.0\"\n" +
" metadata-complete=\"true\">\n" +
"\n" +
" <security-constraint>\n" +
@@ -737,8 +737,8 @@ public class TestWebXml {
"<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" +
- " https://jakarta.ee/xml/ns/jakartaee/web-app_6_2.xsd\"\n" +
- " version=\"6.2\"\n" +
+ " https://jakarta.ee/xml/ns/jakartaee/web-app_6_0.xsd\"\n" +
+ " version=\"6.0\"\n" +
" metadata-complete=\"true\">\n" +
"\n" +
" <security-constraint>\n" +
@@ -766,8 +766,8 @@ public class TestWebXml {
"<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" +
- " https://jakarta.ee/xml/ns/jakartaee/web-app_6_2.xsd\"\n" +
- " version=\"6.2\"\n" +
+ " https://jakarta.ee/xml/ns/jakartaee/web-app_6_0.xsd\"\n" +
+ " version=\"6.0\"\n" +
" metadata-complete=\"true\">\n" +
"\n" +
" <security-constraint>\n" +
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org