This is an automated email from the ASF dual-hosted git repository.
markt-asf pushed a commit to branch 11.0.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git
The following commit(s) were added to refs/heads/11.0.x by this push:
new b3ef206fe8 Fix backport
b3ef206fe8 is described below
commit b3ef206fe8c304d3966f832de01baaae3a300620
Author: Mark Thomas <[email protected]>
AuthorDate: Tue Jun 16 19:38:13 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 bf1920a2fd..8964f399c7 100644
--- a/test/org/apache/tomcat/util/descriptor/web/TestWebXml.java
+++ b/test/org/apache/tomcat/util/descriptor/web/TestWebXml.java
@@ -666,8 +666,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_1.xsd\"\n"; +
+ " version=\"6.1\"\n" +
" metadata-complete=\"true\">\n" +
"\n" +
"</web-app>");
@@ -681,8 +681,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_1.xsd\"\n"; +
+ " version=\"6.1\"\n" +
" metadata-complete=\"true\">\n" +
"\n" +
" <security-constraint>\n" +
@@ -707,8 +707,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_1.xsd\"\n"; +
+ " version=\"6.1\"\n" +
" metadata-complete=\"true\">\n" +
"\n" +
" <security-constraint>\n" +
@@ -736,8 +736,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_1.xsd\"\n"; +
+ " version=\"6.1\"\n" +
" metadata-complete=\"true\">\n" +
"\n" +
" <security-constraint>\n" +
@@ -764,8 +764,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_1.xsd\"\n"; +
+ " version=\"6.1\"\n" +
" metadata-complete=\"true\">\n" +
"\n" +
" <security-constraint>\n" +
@@ -793,8 +793,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_1.xsd\"\n"; +
+ " version=\"6.1\"\n" +
" metadata-complete=\"true\">\n" +
"\n" +
" <security-constraint>\n" +
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
