This is an automated email from the ASF dual-hosted git repository. markt pushed a commit to branch 10.0.x in repository https://gitbox.apache.org/repos/asf/tomcat.git
The following commit(s) were added to refs/heads/10.0.x by this push: new 38b808c Working on removing the APR connector - found more required deprecation 38b808c is described below commit 38b808c7a98d64a661937e50aba52b903ade13fe Author: Mark Thomas <ma...@apache.org> AuthorDate: Wed Aug 18 17:18:23 2021 +0100 Working on removing the APR connector - found more required deprecation --- java/org/apache/catalina/connector/Connector.java | 1 + java/org/apache/catalina/manager/StatusManagerServlet.java | 1 + java/org/apache/catalina/manager/StatusTransformer.java | 3 +++ java/org/apache/coyote/ProtocolHandler.java | 3 +++ 4 files changed, 8 insertions(+) diff --git a/java/org/apache/catalina/connector/Connector.java b/java/org/apache/catalina/connector/Connector.java index 485a26a..b423784 100644 --- a/java/org/apache/catalina/connector/Connector.java +++ b/java/org/apache/catalina/connector/Connector.java @@ -1006,6 +1006,7 @@ public class Connector extends LifecycleMBeanBase { } + @SuppressWarnings("deprecation") @Override protected void initInternal() throws LifecycleException { diff --git a/java/org/apache/catalina/manager/StatusManagerServlet.java b/java/org/apache/catalina/manager/StatusManagerServlet.java index 65609b3..e4cb5dd 100644 --- a/java/org/apache/catalina/manager/StatusManagerServlet.java +++ b/java/org/apache/catalina/manager/StatusManagerServlet.java @@ -184,6 +184,7 @@ public class StatusManagerServlet * @exception IOException if an input/output error occurs * @exception ServletException if a servlet-specified error occurs */ + @SuppressWarnings("deprecation") @Override public void doGet(HttpServletRequest request, HttpServletResponse response) diff --git a/java/org/apache/catalina/manager/StatusTransformer.java b/java/org/apache/catalina/manager/StatusTransformer.java index 2cf2cc9..54d696f 100644 --- a/java/org/apache/catalina/manager/StatusTransformer.java +++ b/java/org/apache/catalina/manager/StatusTransformer.java @@ -150,7 +150,10 @@ public class StatusTransformer { * @param mode Mode <code>0</code> will generate HTML. * Mode <code>1</code> will generate XML. * @param args I18n labels for the OS state values + * + * @deprecated This method will be removed in Tomcat 10.1.x onwards */ + @Deprecated public static void writeOSState(PrintWriter writer, int mode, Object[] args) { long[] result = new long[16]; boolean ok = false; diff --git a/java/org/apache/coyote/ProtocolHandler.java b/java/org/apache/coyote/ProtocolHandler.java index cf25010..6992ea9 100644 --- a/java/org/apache/coyote/ProtocolHandler.java +++ b/java/org/apache/coyote/ProtocolHandler.java @@ -153,7 +153,10 @@ public interface ProtocolHandler { * * @return <code>true</code> if this Protocol Handler requires the * APR/native library, otherwise <code>false</code> + * + * @deprecated This method will be removed in Tomcat 10.1.x onwards */ + @Deprecated public boolean isAprRequired(); --------------------------------------------------------------------- To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org