This is an automated email from the ASF dual-hosted git repository.
markt pushed a change to branch main
in repository https://gitbox.apache.org/repos/asf/tomcat.git.
from d96e0fc Remove test for STM JSP
new 3e3c4d9 Add currently available Jakarta EE 10 schemas
new 1fb7a2c Update license files for Jakarta EE 10 schemas
new 5674941 Add the Servlet/JSP version specific tests for Servlet 6.0 /
JSP 3.1
new 60d8274 Update web apps, pre-compilation etc to use Jakarta EE 10
schema
new e6304ca Fix test failures
The 5 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
LICENSE | 6 +++
conf/web.xml | 4 +-
.../{jakartaee_9.xsd => jakartaee_10.xsd} | 8 ++--
.../servlet/resources/{jsp_3_0.xsd => jsp_3_1.xsd} | 12 ++---
.../resources/{web-app_5_0.xsd => web-app_6_0.xsd} | 12 ++---
.../{web-common_5_0.xsd => web-common_6_0.xsd} | 53 ++++++++++++++++++----
.../{web-fragment_5_0.xsd => web-fragment_6_0.xsd} | 12 ++---
...aglibrary_3_0.xsd => web-jsptaglibrary_3_1.xsd} | 40 ++++++++--------
.../jasper/resources/LocalStrings.properties | 4 +-
.../jasper/resources/LocalStrings_cs.properties | 4 +-
.../jasper/resources/LocalStrings_de.properties | 4 +-
.../jasper/resources/LocalStrings_es.properties | 4 +-
.../jasper/resources/LocalStrings_fr.properties | 4 +-
.../jasper/resources/LocalStrings_ja.properties | 4 +-
.../jasper/resources/LocalStrings_ko.properties | 4 +-
.../jasper/resources/LocalStrings_pt_BR.properties | 4 +-
.../jasper/resources/LocalStrings_zh_CN.properties | 4 +-
.../tomcat/util/descriptor/DigesterFactory.java | 10 ++++
.../tomcat/util/descriptor/XmlIdentifiers.java | 6 +++
.../apache/tomcat/util/descriptor/web/WebXml.java | 5 +-
res/INSTALLLICENSE | 6 +++
res/META-INF/servlet-api.jar.license | 6 +++
res/maven/tomcat-servlet-api.pom | 6 +++
res/rat/rat-excludes.txt | 18 ++++++++
.../servlet/resources/TestSchemaValidation.java | 16 ++++++-
test/org/apache/jasper/TestJspC.java | 8 ++++
test/org/apache/jasper/compiler/TestJspConfig.java | 18 ++++++++
test/org/apache/jasper/compiler/TestValidator.java | 27 +++++++++++
.../jasper/servlet/TestJspCServletContext.java | 14 +++++-
.../tomcat/util/descriptor/web/TestWebXml.java | 7 ++-
test/{webapp-5.0 => webapp-6.0}/WEB-INF/tags11.tld | 0
test/{webapp-5.0 => webapp-6.0}/WEB-INF/tags12.tld | 0
test/{webapp-5.0 => webapp-6.0}/WEB-INF/tags20.tld | 0
test/{webapp-5.0 => webapp-6.0}/WEB-INF/tags21.tld | 0
test/{webapp-5.0 => webapp-6.0}/WEB-INF/tags30.tld | 0
.../tags21.tld => webapp-6.0/WEB-INF/tags31.tld} | 8 ++--
test/{webapp-5.0 => webapp-6.0}/WEB-INF/web.xml | 10 ++--
test/{webapp-5.0 => webapp-6.0}/el-as-literal.jsp | 0
test/{webapp-5.0 => webapp-6.0}/tld-versions.jsp | 2 +
test/webapp/WEB-INF/web.xml | 4 +-
webapps/ROOT/WEB-INF/web.xml | 4 +-
webapps/docs/WEB-INF/web.xml | 4 +-
webapps/docs/appdev/sample/web/WEB-INF/web.xml | 4 +-
webapps/docs/appdev/web.xml.txt | 11 ++---
webapps/docs/changelog.xml | 12 +++++
webapps/docs/jndi-datasource-examples-howto.xml | 11 +++--
webapps/examples/WEB-INF/web.xml | 4 +-
webapps/host-manager/WEB-INF/web.xml | 4 +-
webapps/manager/WEB-INF/web.xml | 4 +-
49 files changed, 303 insertions(+), 109 deletions(-)
copy java/jakarta/servlet/resources/{jakartaee_9.xsd => jakartaee_10.xsd} (99%)
copy java/jakarta/servlet/resources/{jsp_3_0.xsd => jsp_3_1.xsd} (97%)
copy java/jakarta/servlet/resources/{web-app_5_0.xsd => web-app_6_0.xsd} (97%)
copy java/jakarta/servlet/resources/{web-common_5_0.xsd => web-common_6_0.xsd}
(96%)
copy java/jakarta/servlet/resources/{web-fragment_5_0.xsd =>
web-fragment_6_0.xsd} (97%)
copy java/jakarta/servlet/resources/{web-jsptaglibrary_3_0.xsd =>
web-jsptaglibrary_3_1.xsd} (96%)
copy test/{webapp-5.0 => webapp-6.0}/WEB-INF/tags11.tld (100%)
copy test/{webapp-5.0 => webapp-6.0}/WEB-INF/tags12.tld (100%)
copy test/{webapp-5.0 => webapp-6.0}/WEB-INF/tags20.tld (100%)
copy test/{webapp-5.0 => webapp-6.0}/WEB-INF/tags21.tld (100%)
copy test/{webapp-5.0 => webapp-6.0}/WEB-INF/tags30.tld (100%)
copy test/{webapp-2.3/WEB-INF/tags21.tld => webapp-6.0/WEB-INF/tags31.tld}
(88%)
copy test/{webapp-5.0 => webapp-6.0}/WEB-INF/web.xml (87%)
copy test/{webapp-5.0 => webapp-6.0}/el-as-literal.jsp (100%)
copy test/{webapp-5.0 => webapp-6.0}/tld-versions.jsp (92%)
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
