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 595428ec3fcf83fd437f3f7b696571fc4d1e07a3 Author: Mark Thomas <ma...@apache.org> AuthorDate: Tue May 17 08:46:07 2022 +0100 Update the WebSocket JAR to use the Servlet 6.0 web fragment schema --- res/META-INF/tomcat-websocket.jar/web-fragment.xml | 4 ++-- webapps/docs/changelog.xml | 8 ++++++++ 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/res/META-INF/tomcat-websocket.jar/web-fragment.xml b/res/META-INF/tomcat-websocket.jar/web-fragment.xml index 6a2d3159ce..378fe7d1f7 100644 --- a/res/META-INF/tomcat-websocket.jar/web-fragment.xml +++ b/res/META-INF/tomcat-websocket.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_tomcat_websocket</name> <distributable/> diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml index 881ea2cdde..9fb16d17ae 100644 --- a/webapps/docs/changelog.xml +++ b/webapps/docs/changelog.xml @@ -117,6 +117,14 @@ </fix> </changelog> </subsection> + <subsection name="Web Socket"> + <changelog> + <fix> + Update the XML schema used by the web fragment defined for the WebSocket + JAR to use the Servlet 6.0 web fragment schema. (markt) + </fix> + </changelog> + </subsection> <subsection name="Web applications"> <changelog> <fix> --------------------------------------------------------------------- To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org