On 24/05/2021 12:36, Rémy Maucherat wrote:
On Mon, May 24, 2021 at 1:26 PM <ma...@apache.org> wrote:
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 502b6fe Correction. Currently, next iteration of the Servlet
spec is 5.1
502b6fe is described below
commit 502b6fe021fbc85164401cf7edd81542a62b9260
Author: Mark Thomas <ma...@apache.org>
AuthorDate: Mon May 24 12:25:14 2021 +0100
Correction. Currently, next iteration of the Servlet spec is 5.1
Seems 6.0 to me here: https://projects.eclipse.org/projects/ee4j.servlet
Right ?
But I don't see any actual content or changes.
I filled that in and it was a guess. The current API repo is using 5.1
and a recent API change had @since 5.1 so I am going with that for now.
Mark
Rémy
---
BUILDING.txt | 2 +-
RELEASE-NOTES | 2 +-
build.xml | 2 +-
java/jakarta/el/ImportHandler.java | 4 ++--
java/jakarta/servlet/ServletContext.java | 12 ++++++------
java/org/apache/catalina/connector/CoyoteAdapter.java | 2 +-
webapps/docs/class-loader-howto.xml | 2 +-
webapps/docs/index.xml | 2 +-
webapps/docs/project.xml | 2 +-
9 files changed, 15 insertions(+), 15 deletions(-)
diff --git a/BUILDING.txt b/BUILDING.txt
index 9bcd4b8..9c6d883 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.0, EL 4.0, WebSocket 2.0 and
+implements the Jakarta Servlet 5.1, JSP 3.0, EL 4.0, WebSocket 2.0 and
Authentication 2.0 specifications from the Jakarta EE project at Eclipse
<https://jakarta.ee//>.
diff --git a/RELEASE-NOTES b/RELEASE-NOTES
index 1a02fb7..b90c48b 100644
--- a/RELEASE-NOTES
+++ b/RELEASE-NOTES
@@ -78,7 +78,7 @@ 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 3.0 API)
-* servlet-api.jar (Servlet 6.0 API)
+* servlet-api.jar (Servlet 5.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)
diff --git a/build.xml b/build.xml
index 48f726b..f244afa 100644
--- a/build.xml
+++ b/build.xml
@@ -52,7 +52,7 @@
<property name="md5sum.binary-prefix" value=" *" />
<!-- Exact spec versions (for the manifests etc.) -->
- <property name="servlet.spec.version" value="6.0" />
+ <property name="servlet.spec.version" value="5.1" />
<property name="servlet.revision" value="0" />
<property name="jsp.spec.version" value="3.0" />
<property name="jsp.revision" value="0" />
diff --git a/java/jakarta/el/ImportHandler.java
b/java/jakarta/el/ImportHandler.java
index 018f53d..74858d2 100644
--- a/java/jakarta/el/ImportHandler.java
+++ b/java/jakarta/el/ImportHandler.java
@@ -38,7 +38,7 @@ public class ImportHandler {
private static final Map<String,Set<String>> standardPackages = new
HashMap<>();
static {
- // Servlet 6.0
+ // Servlet 5.1
Set<String> servletClassNames = new HashSet<>();
// Interfaces
servletClassNames.add("AsyncContext");
@@ -91,7 +91,7 @@ public class ImportHandler {
servletClassNames.add("UnavailableException");
standardPackages.put("jakarta.servlet", servletClassNames);
- // Servlet 6.0
+ // Servlet 5.1
Set<String> servletHttpClassNames = new HashSet<>();
// Interfaces
servletHttpClassNames.add("HttpServletMapping");
diff --git a/java/jakarta/servlet/ServletContext.java
b/java/jakarta/servlet/ServletContext.java
index 3c8894c..b66891a 100644
--- a/java/jakarta/servlet/ServletContext.java
+++ b/java/jakarta/servlet/ServletContext.java
@@ -92,19 +92,19 @@ 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.
+ * container supports. All implementations that comply with Version
5.1 must
+ * have this method return the integer 5.
*
- * @return 6
+ * @return 5
*/
public int getMajorVersion();
/**
* 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.
+ * supports. All implementations that comply with Version 5.1 must
have this
+ * method return the integer 1.
*
- * @return 0
+ * @return 1
*/
public int getMinorVersion();
diff --git a/java/org/apache/catalina/connector/CoyoteAdapter.java
b/java/org/apache/catalina/connector/CoyoteAdapter.java
index 3367425..818b881 100644
--- a/java/org/apache/catalina/connector/CoyoteAdapter.java
+++ b/java/org/apache/catalina/connector/CoyoteAdapter.java
@@ -67,7 +67,7 @@ public class CoyoteAdapter implements Adapter {
// --------------------------------------------------------------
Constants
- private static final String POWERED_BY = "Servlet/6.0 JSP/3.0 " +
+ private static final String POWERED_BY = "Servlet/5.1 JSP/3.0 " +
"(" + ServerInfo.getServerInfo() + " Java/" +
System.getProperty("java.vm.vendor") + "/" +
System.getProperty("java.runtime.version") + ")";
diff --git a/webapps/docs/class-loader-howto.xml
b/webapps/docs/class-loader-howto.xml
index c032be8..a566f3f 100644
--- a/webapps/docs/class-loader-howto.xml
+++ b/webapps/docs/class-loader-howto.xml
@@ -144,7 +144,7 @@ loaders as it is initialized:</p>
<li><em>jasper.jar</em> — Tomcat Jasper JSP Compiler and
Runtime.</li>
<li><em>jasper-el.jar</em> — Tomcat Jasper EL
implementation.</li>
<li><em>jsp-api.jar</em> — JSP 3.0 API.</li>
- <li><em>servlet-api.jar</em> — Servlet 6.0 API.</li>
+ <li><em>servlet-api.jar</em> — Servlet 5.1 API.</li>
<li><em>tomcat-api.jar</em> — Several interfaces defined by
Tomcat.</li>
<li><em>tomcat-coyote.jar</em> — Tomcat connectors and utility
classes.</li>
<li><em>tomcat-dbcp.jar</em> — Database connection pool
diff --git a/webapps/docs/index.xml b/webapps/docs/index.xml
index b9f3dbf..317fd32 100644
--- a/webapps/docs/index.xml
+++ b/webapps/docs/index.xml
@@ -35,7 +35,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 JavaServer Pages 3.0
+<version-major-minor/> implements the Servlet 5.1 and JavaServer Pages 3.0
<a href="https://wiki.apache.org/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
diff --git a/webapps/docs/project.xml b/webapps/docs/project.xml
index ab85b08..e4cf153 100644
--- a/webapps/docs/project.xml
+++ b/webapps/docs/project.xml
@@ -83,7 +83,7 @@
<item name="Release Notes" href="RELEASE-NOTES.txt"/>
<item name="Configuration" href="config/index.html"/>
<item name="Tomcat Javadocs" href="api/index.html"/>
- <item name="Servlet 6.0 Javadocs" href="servletapi/index.html"/>
+ <item name="Servlet 5.1 Javadocs" href="servletapi/index.html"/>
<item name="JSP 3.0 Javadocs" href="jspapi/index.html"/>
<item name="EL 4.0 Javadocs" href="elapi/index.html"/>
<item name="WebSocket 2.0 Javadocs"
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
