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 ef88dfd484 Correct removal version for deprecated code
ef88dfd484 is described below
commit ef88dfd4849dfc3f5eaa14df446b89efafaded18
Author: Mark Thomas <ma...@apache.org>
AuthorDate: Wed Mar 15 13:51:59 2023 +0000
Correct removal version for deprecated code
---
java/org/apache/coyote/Request.java | 6 +++---
java/org/apache/coyote/Response.java | 6 +++---
2 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/java/org/apache/coyote/Request.java
b/java/org/apache/coyote/Request.java
index 1e38610581..dec9be5deb 100644
--- a/java/org/apache/coyote/Request.java
+++ b/java/org/apache/coyote/Request.java
@@ -388,7 +388,7 @@ public final class Request {
* @return The value set via {@link #setCharset(Charset)} or if no call
has been made to that method try to obtain
* if from the content type.
*
- * @deprecated Unused. This method will be removed in Tomcat 11.
+ * @deprecated Unused. This method will be removed in Tomcat 12.
*/
@Deprecated
public String getCharacterEncoding() {
@@ -408,7 +408,7 @@ public final class Request {
*
* @throws UnsupportedEncodingException If the user agent has specified an
invalid character encoding
*
- * @deprecated Unused. This method will be removed in Tomcat 11.
+ * @deprecated Unused. This method will be removed in Tomcat 12.
*/
@Deprecated
public Charset getCharset() throws UnsupportedEncodingException {
@@ -426,7 +426,7 @@ public final class Request {
*
* @param charset The Charset to use for the request
*
- * @deprecated Unused. This method will be removed in Tomcat 11.
+ * @deprecated Unused. This method will be removed in Tomcat 12.
*/
@Deprecated
public void setCharset(Charset charset) {
diff --git a/java/org/apache/coyote/Response.java
b/java/org/apache/coyote/Response.java
index 571b1bd8ab..af26e5f6d9 100644
--- a/java/org/apache/coyote/Response.java
+++ b/java/org/apache/coyote/Response.java
@@ -495,7 +495,7 @@ public final class Response {
*
* @throws UnsupportedEncodingException If the specified name is not
recognised
*
- * @deprecated Unused. Will be removed in Tomcat 11.
+ * @deprecated Unused. Will be removed in Tomcat 12.
*/
@Deprecated
public void setCharacterEncoding(String characterEncoding) throws
UnsupportedEncodingException {
@@ -513,7 +513,7 @@ public final class Response {
*
* @return The current character set
*
- * @deprecated Unused. Will be removed in Tomcat 11.
+ * @deprecated Unused. Will be removed in Tomcat 12.
*/
@Deprecated
public Charset getCharset() {
@@ -526,7 +526,7 @@ public final class Response {
*
* @return The name of the current encoding
*
- * @deprecated Unused. Will be removed in Tomcat 11.
+ * @deprecated Unused. Will be removed in Tomcat 12.
*/
@Deprecated
public String getCharacterEncoding() {
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
