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
The following commit(s) were added to refs/heads/main by this push:
new 5ba1cda Update schema used in web-fragments
5ba1cda is described below
commit 5ba1cdaaa6a4862929c68a3c6d8beeac61bcec36
Author: Mark Thomas <[email protected]>
AuthorDate: Tue May 25 16:28:47 2021 +0100
Update schema used in web-fragments
---
res/META-INF/jasper-el.jar/web-fragment.xml | 8 ++++----
res/META-INF/jasper.jar/web-fragment.xml | 8 ++++----
res/META-INF/tomcat-websocket.jar/web-fragment.xml | 12 ++++++------
webapps/docs/changelog.xml | 9 +++++++++
4 files changed, 23 insertions(+), 14 deletions(-)
diff --git a/res/META-INF/jasper-el.jar/web-fragment.xml
b/res/META-INF/jasper-el.jar/web-fragment.xml
index 26b2e6c..6769e6f 100644
--- a/res/META-INF/jasper-el.jar/web-fragment.xml
+++ b/res/META-INF/jasper-el.jar/web-fragment.xml
@@ -15,11 +15,11 @@
See the License for the specific language governing permissions and
limitations under the License.
-->
-<web-fragment xmlns="http://xmlns.jcp.org/xml/ns/javaee";
+<web-fragment xmlns="https://jakarta.ee/xml/ns/jakartaee";
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
- xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/javaee
- http://xmlns.jcp.org/xml/ns/javaee/web-fragment_4_0.xsd";
- version="4.0"
+ xsi:schemaLocation="https://jakarta.ee/xml/ns/jakartaee
+ https://jakarta.ee/xml/ns/jakartaee/web-fragment_5_0.xsd";
+ version="5.0"
metadata-complete="true">
<name>org_apache_jasper_el</name>
<distributable/>
diff --git a/res/META-INF/jasper.jar/web-fragment.xml
b/res/META-INF/jasper.jar/web-fragment.xml
index 24ecb31..0e7f4dc 100644
--- a/res/META-INF/jasper.jar/web-fragment.xml
+++ b/res/META-INF/jasper.jar/web-fragment.xml
@@ -15,11 +15,11 @@
See the License for the specific language governing permissions and
limitations under the License.
-->
-<web-fragment xmlns="http://xmlns.jcp.org/xml/ns/javaee";
+<web-fragment xmlns="https://jakarta.ee/xml/ns/jakartaee";
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
- xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/javaee
- http://xmlns.jcp.org/xml/ns/javaee/web-fragment_4_0.xsd";
- version="4.0"
+ xsi:schemaLocation="https://jakarta.ee/xml/ns/jakartaee
+ https://jakarta.ee/xml/ns/jakartaee/web-fragment_5_0.xsd";
+ version="5.0"
metadata-complete="true">
<name>org_apache_jasper</name>
<distributable/>
diff --git a/res/META-INF/tomcat-websocket.jar/web-fragment.xml
b/res/META-INF/tomcat-websocket.jar/web-fragment.xml
index f912fb1..6a2d315 100644
--- a/res/META-INF/tomcat-websocket.jar/web-fragment.xml
+++ b/res/META-INF/tomcat-websocket.jar/web-fragment.xml
@@ -15,12 +15,12 @@
See the License for the specific language governing permissions and
limitations under the License.
-->
-<web-fragment xmlns="http://xmlns.jcp.org/xml/ns/javaee";
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
- xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/javaee
- http://xmlns.jcp.org/xml/ns/javaee/web-fragment_4_0.xsd";
- version="4.0"
- metadata-complete="true">
+<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"
+ metadata-complete="true">
<name>org_apache_tomcat_websocket</name>
<distributable/>
</web-fragment>
\ No newline at end of file
diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index 818fbe1..5a11a70 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -191,6 +191,11 @@
Add generics to the EL 5.0 API to align with the current EL 5.0
development branch. (markt)
</scode>
+ <update>
+ Update the <code>web-fragment.xml</code> included in
+ <code>jasper.jar</code> and <code>jasper-el.jar</code> to use the
+ Servlet 5.0 schema. (markt)
+ </update>
</changelog>
</subsection>
<subsection name="WebSocket">
@@ -201,6 +206,10 @@
size was an exact multiple of 8192. Based on a patch provided by
Saksham
Verma. (markt)
</fix>
+ <update>
+ Update the <code>web-fragment.xml</code> included in
+ <code>tomcat-websocket.jar</code>to use the Servlet 5.0 schema. (markt)
+ </update>
</changelog>
</subsection>
<subsection name="Web applications">
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
