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 c24a27d Next version of servlet spec will be 6.0 rather than 5.1
c24a27d is described below
commit c24a27dfb5ea566755806bfd6ede28ac934ef4f7
Author: Mark Thomas <ma...@apache.org>
AuthorDate: Tue Jul 27 11:30:12 2021 +0100
Next version of servlet spec will be 6.0 rather than 5.1
Spec versions will always be major.minor and the various modifiers (PD,
MR1 etc) will no longer be used. Use the standard Maven modifier of
"-SNAPSHOT" to align with the servlet spec project
---
BUILDING.txt | 2 +-
RELEASE-NOTES | 2 +-
build.xml | 4 ++--
java/jakarta/el/ImportHandler.java | 4 ++--
java/jakarta/servlet/ServletContext.java | 12 ++++++------
java/jakarta/servlet/http/Cookie.java | 6 +++---
java/org/apache/catalina/connector/CoyoteAdapter.java | 2 +-
res/META-INF/servlet-api.jar.manifest | 2 +-
res/bnd/servlet-api.jar.tmp.bnd | 2 +-
res/bnd/tomcat-embed-core.jar.tmp.bnd | 2 +-
webapps/docs/changelog.xml | 8 +++++++-
webapps/docs/class-loader-howto.xml | 2 +-
webapps/docs/index.xml | 2 +-
webapps/docs/project.xml | 2 +-
14 files changed, 29 insertions(+), 23 deletions(-)
diff --git a/BUILDING.txt b/BUILDING.txt
index 956ca68..6f95801 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 5.1, JSP 3.0, EL 5.0, WebSocket 2.0 and
+implements the Jakarta Servlet 6.0, JSP 3.0, EL 5.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 7bd6f7c..1a7b622 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 5.1 API)
+* servlet-api.jar (Servlet 6.0 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 77f9083..4ca8941 100644
--- a/build.xml
+++ b/build.xml
@@ -52,8 +52,8 @@
<property name="md5sum.binary-prefix" value=" *" />
<!-- Exact spec versions (for the manifests etc.) -->
- <property name="servlet.spec.version" value="5.1" />
- <property name="servlet.revision" value="0" />
+ <property name="servlet.spec.version" value="6.0" />
+ <property name="servlet.revision" value="-SNAPSHOT" />
<property name="jsp.spec.version" value="3.0" />
<property name="jsp.revision" value="0" />
<property name="el.spec.version" value="5.0" />
diff --git a/java/jakarta/el/ImportHandler.java
b/java/jakarta/el/ImportHandler.java
index 74858d2..018f53d 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 5.1
+ // Servlet 6.0
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 5.1
+ // Servlet 6.0
Set<String> servletHttpClassNames = new HashSet<>();
// Interfaces
servletHttpClassNames.add("HttpServletMapping");
diff --git a/java/jakarta/servlet/ServletContext.java
b/java/jakarta/servlet/ServletContext.java
index b66891a..3c8894c 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 5.1
must
- * have this method return the integer 5.
+ * container supports. All implementations that comply with Version 6.0
must
+ * have this method return the integer 6.
*
- * @return 5
+ * @return 6
*/
public int getMajorVersion();
/**
* Returns the minor version of the Servlet API that this servlet container
- * supports. All implementations that comply with Version 5.1 must have
this
- * method return the integer 1.
+ * supports. All implementations that comply with Version 6.0 must have
this
+ * method return the integer 0.
*
- * @return 1
+ * @return 0
*/
public int getMinorVersion();
diff --git a/java/jakarta/servlet/http/Cookie.java
b/java/jakarta/servlet/http/Cookie.java
index 8422c65..62921f3 100644
--- a/java/jakarta/servlet/http/Cookie.java
+++ b/java/jakarta/servlet/http/Cookie.java
@@ -459,7 +459,7 @@ public class Cookie implements Cloneable, Serializable {
* @throws NumberFormatException If the attribute is known to be numerical
* but the provided value cannot be parsed to a number.
*
- * @since Servlet 5.1
+ * @since Servlet 6.0
*/
public void setAttribute(String name, String value) {
if (name == null) {
@@ -506,7 +506,7 @@ public class Cookie implements Cloneable, Serializable {
*
* @return Value of specified attribute
*
- * @since Servlet 5.1
+ * @since Servlet 6.0
*/
public String getAttribute(String name) {
if (attributes == null) {
@@ -523,7 +523,7 @@ public class Cookie implements Cloneable, Serializable {
*
* @return A read-only Map of attributes to values, excluding version.
*
- * @since Servlet 5.1
+ * @since Servlet 6.0
*/
public Map<String,String> getAttributes() {
if (attributes == null) {
diff --git a/java/org/apache/catalina/connector/CoyoteAdapter.java
b/java/org/apache/catalina/connector/CoyoteAdapter.java
index 818b881..3367425 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/5.1 JSP/3.0 " +
+ private static final String POWERED_BY = "Servlet/6.0 JSP/3.0 " +
"(" + ServerInfo.getServerInfo() + " Java/" +
System.getProperty("java.vm.vendor") + "/" +
System.getProperty("java.runtime.version") + ")";
diff --git a/res/META-INF/servlet-api.jar.manifest
b/res/META-INF/servlet-api.jar.manifest
index 3e7733e..d61b4a3 100644
--- a/res/META-INF/servlet-api.jar.manifest
+++ b/res/META-INF/servlet-api.jar.manifest
@@ -7,5 +7,5 @@ Specification-Title: Jakarta Servlet
Specification-Version: @servlet.spec.version@
Specification-Vendor: Eclipse Foundation
Implementation-Title: jakarta.servlet
-Implementation-Version: @servlet.spec.version@.@servlet.revision@
+Implementation-Version: @servlet.spec.version@@servlet.revision@
Implementation-Vendor: Apache Software Foundation
diff --git a/res/bnd/servlet-api.jar.tmp.bnd b/res/bnd/servlet-api.jar.tmp.bnd
index 6877d3f..f656b97 100644
--- a/res/bnd/servlet-api.jar.tmp.bnd
+++ b/res/bnd/servlet-api.jar.tmp.bnd
@@ -35,7 +35,7 @@ Provide-Capability: \
Specification-Version=${servlet.spec.version};\
Specification-Vendor=Eclipse Foundation;\
Implementation-Title=jakarta.servlet;\
- Implementation-Version=${servlet.spec.version}.${servlet.revision};\
+ Implementation-Version=${servlet.spec.version}${servlet.revision};\
Implementation-Vendor=Apache Software Foundation
-jpms-module-info: \
diff --git a/res/bnd/tomcat-embed-core.jar.tmp.bnd
b/res/bnd/tomcat-embed-core.jar.tmp.bnd
index 40e7f17..48980e7 100644
--- a/res/bnd/tomcat-embed-core.jar.tmp.bnd
+++ b/res/bnd/tomcat-embed-core.jar.tmp.bnd
@@ -122,7 +122,7 @@ Provide-Capability: \
Specification-Version=${servlet.spec.version};\
Specification-Vendor=Eclipse Foundation;\
Implementation-Title=jakarta.servlet;\
- Implementation-Version=${servlet.spec.version}.${servlet.revision};\
+ Implementation-Version=${servlet.spec.version}${servlet.revision};\
Implementation-Vendor=Apache Software Foundation
-jpms-module-info: \
diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index ecfd884..975ba43 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -107,6 +107,12 @@
<section name="Tomcat 10.1.0-M3 (markt)" rtext="in development">
<subsection name="Catalina">
<changelog>
+ <scode>
+ Incremented the supported Jakarta Servlet version to 6.0 to align with
+ the current development branch of the Jakarta Servlet specification.
+ Plans have changed and the next iteration of the Servlet specification
+ will be 6.0 rather than 5.1. (markt)
+ </scode>
<fix>
<bug>65411</bug>: Always close the connection when an uncaught
<code>NamingException</code> occurs to avoid connection locking.
@@ -440,7 +446,7 @@
<add>
Implement the new <code>Cookie</code> methods
<code>setAttribute()</code>, <code>getAttribute()</code> and
- <code>getAttributes()</code> introduced in Servlet 5.1. (markt)
+ <code>getAttributes()</code> introduced in Servlet 6.0. (markt)
</add>
<fix>
AprLifecycleListener does not show dev version suffix for libtcnative
diff --git a/webapps/docs/class-loader-howto.xml
b/webapps/docs/class-loader-howto.xml
index a85ead7..f80fb6d 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 5.1 API.</li>
+ <li><em>servlet-api.jar</em> — Servlet 6.0 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 cfa893f..b0a17ba 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 5.1 and JavaServer Pages 3.0
+<version-major-minor/> implements the Servlet 6.0 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 d241683..d0b8f50 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 5.1 Javadocs" href="servletapi/index.html"/>
+ <item name="Servlet 6.0 Javadocs" href="servletapi/index.html"/>
<item name="JSP 3.0 Javadocs" href="jspapi/index.html"/>
<item name="EL 5.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
