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 f5d92b5ca4 Remove deprecated code scheduled for removal in Tomcat 12.
f5d92b5ca4 is described below

commit f5d92b5ca4106092d81c7178cb4ba3ddf4f34681
Author: Mark Thomas <[email protected]>
AuthorDate: Fri Oct 10 09:29:38 2025 +0100

    Remove deprecated code scheduled for removal in Tomcat 12.
---
 java/org/apache/catalina/filters/Constants.java           |  5 -----
 java/org/apache/catalina/valves/rewrite/ResolverImpl.java | 13 -------------
 2 files changed, 18 deletions(-)

diff --git a/java/org/apache/catalina/filters/Constants.java 
b/java/org/apache/catalina/filters/Constants.java
index 350289b7be..a446d25945 100644
--- a/java/org/apache/catalina/filters/Constants.java
+++ b/java/org/apache/catalina/filters/Constants.java
@@ -16,8 +16,6 @@
  */
 package org.apache.catalina.filters;
 
-import org.apache.tomcat.util.http.Method;
-
 /**
  * Manifest constants for this Java package.
  */
@@ -43,9 +41,6 @@ public final class Constants {
      */
     public static final String CSRF_NONCE_REQUEST_PARAM_NAME_KEY = 
"org.apache.catalina.filters.CSRF_NONCE_PARAM_NAME";
 
-    @Deprecated
-    public static final String METHOD_GET = Method.GET;
-
     public static final String CSRF_REST_NONCE_HEADER_NAME = "X-CSRF-Token";
 
     public static final String CSRF_REST_NONCE_HEADER_FETCH_VALUE = "Fetch";
diff --git a/java/org/apache/catalina/valves/rewrite/ResolverImpl.java 
b/java/org/apache/catalina/valves/rewrite/ResolverImpl.java
index 50e7aa8c48..7b37676a04 100644
--- a/java/org/apache/catalina/valves/rewrite/ResolverImpl.java
+++ b/java/org/apache/catalina/valves/rewrite/ResolverImpl.java
@@ -51,19 +51,6 @@ public class ResolverImpl extends Resolver {
     private final Log containerLog;
 
 
-    /**
-     * Create a resolver for the given request.
-     *
-     * @param request The request
-     *
-     * @deprecated Will be removed in Tomcat 12 onwards. Use {@link 
#ResolverImpl(Request, Log)}
-     */
-    @Deprecated
-    public ResolverImpl(Request request) {
-        this(request, request.getContext().getLogger());
-    }
-
-
     public ResolverImpl(Request request, Log containerLog) {
         this.request = request;
         this.containerLog = containerLog;


---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]

Reply via email to