This is an automated email from the ASF dual-hosted git repository.
markt-asf pushed a commit to branch 11.0.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git
The following commit(s) were added to refs/heads/11.0.x by this push:
new ef0ceb2008 Tomcat 11 implements Servlet 6.1 (not 6.0)
ef0ceb2008 is described below
commit ef0ceb20082d3c627707b2a0d69e7991bcc1aa1d
Author: Mark Thomas <[email protected]>
AuthorDate: Thu Jul 23 13:52:12 2026 +0100
Tomcat 11 implements Servlet 6.1 (not 6.0)
---
java/jakarta/servlet/ServletContext.java | 6 +++---
webapps/docs/appdev/deployment.xml | 2 +-
webapps/docs/appdev/introduction.xml | 4 ++--
webapps/docs/changelog.xml | 8 ++++++++
webapps/docs/config/ajp.xml | 2 +-
webapps/docs/config/http.xml | 2 +-
webapps/docs/index.xml | 8 ++++----
7 files changed, 20 insertions(+), 12 deletions(-)
diff --git a/java/jakarta/servlet/ServletContext.java
b/java/jakarta/servlet/ServletContext.java
index adf8ececdf..6aa794f5e7 100644
--- a/java/jakarta/servlet/ServletContext.java
+++ b/java/jakarta/servlet/ServletContext.java
@@ -89,7 +89,7 @@ public interface ServletContext {
/**
* Returns the major version of the Java Servlet API that this servlet
container supports. All implementations that
- * comply with Version 6.0 must have this method return the integer 6.
+ * comply with Version 6.1 must have this method return the integer 6.
*
* @return 6
*/
@@ -97,9 +97,9 @@ public interface ServletContext {
/**
* Returns the minor version of the Servlet API that this servlet
container supports. All implementations that
- * comply with Version 6.0 must have this method return the integer 0.
+ * comply with Version 6.1 must have this method return the integer 1.
*
- * @return 0
+ * @return 1
*/
int getMinorVersion();
diff --git a/webapps/docs/appdev/deployment.xml
b/webapps/docs/appdev/deployment.xml
index 92d64f1379..7f9de84b63 100644
--- a/webapps/docs/appdev/deployment.xml
+++ b/webapps/docs/appdev/deployment.xml
@@ -135,7 +135,7 @@ drivers that are required for both your application or
internal Tomcat use
<p>Out of the box, a standard Tomcat installation includes a variety
of pre-installed shared library files, including:</p>
<ul>
-<li>The <em>Servlet 6.0</em> and <em>JSP 4.0</em> APIs that are fundamental
+<li>The <em>Servlet 6.1</em> and <em>JSP 4.0</em> APIs that are fundamental
to writing servlets and JSPs.<br/><br/></li>
</ul>
diff --git a/webapps/docs/appdev/introduction.xml
b/webapps/docs/appdev/introduction.xml
index a4e6806a77..900bb57f03 100644
--- a/webapps/docs/appdev/introduction.xml
+++ b/webapps/docs/appdev/introduction.xml
@@ -69,8 +69,8 @@ web applications with Tomcat.</p>
what a portable JSP page is allowed to contain. Specific
information on scripting (Chapter 9), tag extensions (Chapter 7),
and packaging JSP pages (Appendix A) is useful..</p></li>
-<li><p><a
href="https://jakarta.ee/specifications/servlet/6.0/";>https://jakarta.ee/specifications/servlet/6.0/</a>
-
- <i>Jakarta Servlet API Specification, Version 6.0</i>. Describes the
+<li><p><a
href="https://jakarta.ee/specifications/servlet/6.1/";>https://jakarta.ee/specifications/servlet/6.1/</a>
-
+ <i>Jakarta Servlet API Specification, Version 6.1</i>. Describes the
programming environment that must be provided by all servlet
containers conforming to this specification. In particular, you
will need this document to understand the web application
diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index 54a5f31a96..703e81640b 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -203,6 +203,14 @@
</add>
</changelog>
</subsection>
+ <subsection name="Web applications">
+ <changelog>
+ <fix>
+ <bug>70160</bug>: Correct various references to the Servlet
+ specification to use version 6.1. (markt)
+ </fix>
+ </changelog>
+ </subsection>
</section>
<section name="Tomcat 11.0.24 (markt)" rtext="2026-07-08">
<subsection name="Catalina">
diff --git a/webapps/docs/config/ajp.xml b/webapps/docs/config/ajp.xml
index 086596bfc7..5bafadd16c 100644
--- a/webapps/docs/config/ajp.xml
+++ b/webapps/docs/config/ajp.xml
@@ -304,7 +304,7 @@
<attribute name="rejectSuspiciousURIs" required="false">
<p>Should this <strong>Connector</strong> reject a requests if the URI
- matches one of the suspicious URIs patterns identified by the Servlet 6.0
+ matches one of the suspicious URIs patterns identified by the Servlet 6.1
specification? The default value is <code>false</code>.</p>
</attribute>
diff --git a/webapps/docs/config/http.xml b/webapps/docs/config/http.xml
index ddf83426b9..06f07a7042 100644
--- a/webapps/docs/config/http.xml
+++ b/webapps/docs/config/http.xml
@@ -299,7 +299,7 @@
<attribute name="rejectSuspiciousURIs" required="false">
<p>Should this <strong>Connector</strong> reject a requests if the URI
- matches one of the suspicious URIs patterns identified by the Servlet 6.0
+ matches one of the suspicious URIs patterns identified by the Servlet 6.1
specification? The default value is <code>false</code>.</p>
</attribute>
diff --git a/webapps/docs/index.xml b/webapps/docs/index.xml
index 95832a5ff9..4968e66c36 100644
--- a/webapps/docs/index.xml
+++ b/webapps/docs/index.xml
@@ -32,7 +32,7 @@
<p>This is the top-level entry point of the documentation bundle for the
<strong>Apache Tomcat</strong> Servlet/JSP container. Apache Tomcat version
-<version-major-minor/> implements the Servlet 6.0 and Pages 4.0
+<version-major-minor/> implements the Servlet 6.1 and Pages 4.0
<a
href="https://cwiki.apache.org/confluence/display/TOMCAT/Specifications";>specifications</a>
from
<a href="https://jakarta.ee/";>Jakarta EE</a>, and includes many
additional features that make it a useful platform for developing and deploying
@@ -157,10 +157,10 @@ are responsible for installing, configuring, and
operating an Apache Tomcat serv
- Complete documentation and HOWTOs on the JK native webserver connector,
used to interface Apache Tomcat with servers like Apache HTTPd, IIS
and others.</li>
-<li>Servlet 6.0
- <a href="https://jakarta.ee/specifications/servlet/6.0/";>
+<li>Servlet 6.1
+ <a href="https://jakarta.ee/specifications/servlet/6.1/";>
<strong>Specification</strong></a> and
- <a href="https://jakarta.ee/specifications/servlet/6.0/apidocs";>
+ <a href="https://jakarta.ee/specifications/servlet/6.1/apidocs";>
<strong>Javadoc</strong></a>
</li>
<li>JSP 4.0
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
