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 2021/11/25 09:03:24 UTC

[tomcat] branch main updated: More spec version updates

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 a23c096  More spec version updates
a23c096 is described below

commit a23c096336636a970e82cd4b6cab5f3f975e9284
Author: Mark Thomas <ma...@apache.org>
AuthorDate: Thu Nov 25 09:03:13 2021 +0000

    More spec version updates
---
 BUILDING.txt                        |  2 +-
 webapps/docs/class-loader-howto.xml |  6 +++---
 webapps/docs/index.xml              | 12 ++++++------
 webapps/docs/project.xml            |  2 +-
 webapps/docs/web-socket-howto.xml   |  2 +-
 5 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/BUILDING.txt b/BUILDING.txt
index 27fb422..166ee1f 100644
--- a/BUILDING.txt
+++ b/BUILDING.txt
@@ -20,7 +20,7 @@
             ====================================================
 
 This project contains the source code for Tomcat @VERSION_MAJOR_MINOR@, a container that
-implements the Jakarta Servlet 6.0, JSP 3.1, EL 5.0, WebSocket 2.0 and
+implements the Jakarta Servlet 6.0, JSP 3.1, EL 5.0, WebSocket 2.1 and
 Authentication 2.0 specifications from the Jakarta EE project at Eclipse
 <https://jakarta.ee//>.
 
diff --git a/webapps/docs/class-loader-howto.xml b/webapps/docs/class-loader-howto.xml
index 1906eda..814c0f9 100644
--- a/webapps/docs/class-loader-howto.xml
+++ b/webapps/docs/class-loader-howto.xml
@@ -159,9 +159,9 @@ loaders as it is initialized:</p>
         <a href="jdbc-pool.html">documentation</a> for more details.</li>
     <li><em>tomcat-util.jar</em> &#8212; Common classes used by various components of
         Apache Tomcat.</li>
-    <li><em>tomcat-websocket.jar</em> &#8212; WebSocket 2.0 implementation</li>
-    <li><em>websocket-api.jar</em> &#8212; WebSocket 2.0 API</li>
-    <li><em>websocket-client-api.jar</em> &#8212; WebSocket 2.0 Client API</li>
+    <li><em>tomcat-websocket.jar</em> &#8212; WebSocket 2.1 implementation</li>
+    <li><em>websocket-api.jar</em> &#8212; WebSocket 2.1 API</li>
+    <li><em>websocket-client-api.jar</em> &#8212; WebSocket 2.1 Client API</li>
     </ul></li>
 <li><p><strong>WebappX</strong> &#8212; A class loader is created for each web
     application that is deployed in a single Tomcat instance.  All unpacked
diff --git a/webapps/docs/index.xml b/webapps/docs/index.xml
index 16f4ad9..af15b2c 100644
--- a/webapps/docs/index.xml
+++ b/webapps/docs/index.xml
@@ -176,16 +176,16 @@ are responsible for installing, configuring, and operating an Apache Tomcat serv
     <a href="https://jakarta.ee/specifications/pages/3.1/apidocs">
     <strong>Javadoc</strong></a>
     </li>
-<li>EL 4.0
-    <a href="https://jakarta.ee/specifications/expression-language/4.0/">
+<li>EL 5.0
+    <a href="https://jakarta.ee/specifications/expression-language/5.0/">
     <strong>Specification</strong></a> and
-    <a href="https://jakarta.ee/specifications/expression-language/4.0/apidocs">
+    <a href="https://jakarta.ee/specifications/expression-language/5.0/apidocs">
     <strong>Javadoc</strong></a>
     </li>
-<li>WebSocket 2.0
-    <a href="https://jakarta.ee/specifications/websocket/2.0/">
+<li>WebSocket 2.1
+    <a href="https://jakarta.ee/specifications/websocket/2.1/">
     <strong>Specification</strong></a> and
-    <a href="https://jakarta.ee/specifications/websocket/2.0/apidocs">
+    <a href="https://jakarta.ee/specifications/websocket/2.1/apidocs">
     <strong>Javadoc</strong></a>
     </li>
 <li>Authentication 2.0
diff --git a/webapps/docs/project.xml b/webapps/docs/project.xml
index 78752e4..a9356a1 100644
--- a/webapps/docs/project.xml
+++ b/webapps/docs/project.xml
@@ -86,7 +86,7 @@
         <item name="Servlet 6.0 Javadocs"  href="servletapi/index.html"/>
         <item name="JSP 3.1 Javadocs"      href="jspapi/index.html"/>
         <item name="EL 5.0 Javadocs"       href="elapi/index.html"/>
-        <item name="WebSocket 2.0 Javadocs"
+        <item name="WebSocket 2.1 Javadocs"
               href="websocketapi/index.html"/>
         <item name="JASPIC 2.0 Javadocs"   href="jaspicapi/index.html"/>
         <item name="Annotations 2.0 Javadocs"
diff --git a/webapps/docs/web-socket-howto.xml b/webapps/docs/web-socket-howto.xml
index 709a2c3..e97b00b 100644
--- a/webapps/docs/web-socket-howto.xml
+++ b/webapps/docs/web-socket-howto.xml
@@ -38,7 +38,7 @@
 </section>
 
 <section name="Application development">
-<p>Tomcat implements the Jakarta WebSocket 2.0 API defined by the <a
+<p>Tomcat implements the Jakarta WebSocket 2.1 API defined by the <a
    href="https://projects.eclipse.org/projects/ee4j.websocket">Jakarta
    WebSocket</a> project.</p>
 

---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org