This is an automated email from the ASF dual-hosted git repository.
markt pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/tomcat.git
commit 05da26a0cf2cc8ade3cfc7a2be16aeb42f5b929f
Author: Mark Thomas <ma...@apache.org>
AuthorDate: Mon Jan 13 11:33:43 2020 +0000
Update Servlet version returned by API
---
java/jakarta/servlet/ServletContext.java | 6 +++---
java/org/apache/catalina/core/Constants.java | 2 +-
2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/java/jakarta/servlet/ServletContext.java
b/java/jakarta/servlet/ServletContext.java
index 95191f9..82427ca 100644
--- a/java/jakarta/servlet/ServletContext.java
+++ b/java/jakarta/servlet/ServletContext.java
@@ -92,8 +92,8 @@ public interface ServletContext {
/**
* Returns the major version of the Java Servlet API that this servlet
- * container supports. All implementations that comply with Version 4.0
must
- * have this method return the integer 4.
+ * container supports. All implementations that comply with Version 5.0
must
+ * have this method return the integer 5.
*
* @return 4
*/
@@ -101,7 +101,7 @@ public interface ServletContext {
/**
* Returns the minor version of the Servlet API that this servlet container
- * supports. All implementations that comply with Version 4.0 must have
this
+ * supports. All implementations that comply with Version 5.0 must have
this
* method return the integer 0.
*
* @return 0
diff --git a/java/org/apache/catalina/core/Constants.java
b/java/org/apache/catalina/core/Constants.java
index 197e0c6..6d6f80e 100644
--- a/java/org/apache/catalina/core/Constants.java
+++ b/java/org/apache/catalina/core/Constants.java
@@ -19,7 +19,7 @@ package org.apache.catalina.core;
public class Constants {
public static final String Package = "org.apache.catalina.core";
- public static final int MAJOR_VERSION = 4;
+ public static final int MAJOR_VERSION = 5;
public static final int MINOR_VERSION = 0;
public static final String JSP_SERVLET_CLASS =
"org.apache.jasper.servlet.JspServlet";
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
