(tomcat) branch main updated: Various spec version updates

[markt]

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 8e09685a9c Various spec version updates
8e09685a9c is described below

commit 8e09685a9c647eacdfddc56bfb9a1bbefa2730b3
Author: Mark Thomas <ma...@apache.org>
AuthorDate: Fri May 24 14:39:36 2024 +0100

    Various spec version updates
---
 RELEASE-NOTES                       | 8 ++++----
 webapps/docs/class-loader-howto.xml | 8 ++++----
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/RELEASE-NOTES b/RELEASE-NOTES
index 28680c7743..df6fd20d0e 100644
--- a/RELEASE-NOTES
+++ b/RELEASE-NOTES
@@ -77,16 +77,16 @@ for use by web applications (by placing them in "lib"):
 * jasper.jar (Jasper 2 Compiler and Runtime)
 * jasper-el.jar (Jasper 2 EL implementation)
 * jsp-api.jar (JSP 4.0 API)
-* servlet-api.jar (Servlet 6.0 API)
+* servlet-api.jar (Servlet 6.1 API)
 * tomcat-api.jar (Interfaces shared by Catalina and Jasper)
 * tomcat-coyote.jar (Tomcat connectors and utility classes)
 * tomcat-dbcp.jar (package renamed database connection pool based on Commons 
DBCP 2)
 * tomcat-jdbc.jar (Tomcat's database connection pooling solution)
 * tomcat-jni.jar (Interface to the native component of the APR/native 
connector)
 * tomcat-util.jar (Various utilities)
-* tomcat-websocket.jar (WebSocket 2.1 implementation)
-* websocket-api.jar (WebSocket 2.1 API)
-* websocket-client-api.jar (WebSocket 2.1 Client API)
+* tomcat-websocket.jar (WebSocket 2.2 implementation)
+* websocket-api.jar (WebSocket 2.2 API)
+* websocket-client-api.jar (WebSocket 2.2 Client API)
 
 You can make additional APIs available to all of your web applications by
 putting unpacked classes into a "classes" directory (not created by default),
diff --git a/webapps/docs/class-loader-howto.xml 
b/webapps/docs/class-loader-howto.xml
index 66ee7cb79d..abc5bb80b9 100644
--- a/webapps/docs/class-loader-howto.xml
+++ b/webapps/docs/class-loader-howto.xml
@@ -130,7 +130,7 @@ loaders as it is initialized:</p>
     </ul>
     <p>By default, this includes the following:</p>
     <ul>
-    <li><em>annotations-api.jar</em> &#8212; Jakarta Annotations 2.1.1 classes.
+    <li><em>annotations-api.jar</em> &#8212; Jakarta Annotations 3.0 classes.
         </li>
     <li><em>catalina.jar</em> &#8212; Implementation of the Catalina servlet
         container portion of Tomcat.</li>
@@ -175,12 +175,12 @@ loaders as it is initialized:</p>
         components of Apache Tomcat.</li>
     <li><em>tomcat-util-scan.jar</em> &#8212; Provides the class scanning
         functionality used by Tomcat.</li>
-    <li><em>tomcat-websocket.jar</em> &#8212; Optional. Jakarta WebSocket 2.1
+    <li><em>tomcat-websocket.jar</em> &#8212; Optional. Jakarta WebSocket 2.2
         implementation</li>
-    <li><em>websocket-api.jar</em> &#8212; Optional. Jakarta WebSocket 2.1 API
+    <li><em>websocket-api.jar</em> &#8212; Optional. Jakarta WebSocket 2.2 API
         </li>
     <li><em>websocket-client-api.jar</em> &#8212; Optional. Jakarta WebSocket
-        2.1 Client API</li>
+        2.2 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


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