This is an automated email from the ASF dual-hosted git repository.
markt pushed a commit to branch 9.0.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git
The following commit(s) were added to refs/heads/9.0.x by this push:
new 4dea075ced Update APR/Native connector deprecation
4dea075ced is described below
commit 4dea075cedb531329f78ecfc9912e42a29c22679
Author: Mark Thomas <ma...@apache.org>
AuthorDate: Thu Feb 27 15:18:03 2025 +0000
Update APR/Native connector deprecation
---
java/org/apache/coyote/ProtocolHandler.java | 2 +-
java/org/apache/coyote/ajp/AjpAprProtocol.java | 3 ++-
java/org/apache/coyote/http11/Http11AprProtocol.java | 3 ++-
java/org/apache/tomcat/jni/Address.java | 1 +
java/org/apache/tomcat/jni/BIOCallback.java | 2 +-
java/org/apache/tomcat/jni/Directory.java | 1 +
java/org/apache/tomcat/jni/Error.java | 2 +-
java/org/apache/tomcat/jni/File.java | 1 +
java/org/apache/tomcat/jni/FileInfo.java | 1 +
java/org/apache/tomcat/jni/Global.java | 1 +
java/org/apache/tomcat/jni/Local.java | 1 +
java/org/apache/tomcat/jni/Lock.java | 1 +
java/org/apache/tomcat/jni/Mmap.java | 1 +
java/org/apache/tomcat/jni/Multicast.java | 1 +
java/org/apache/tomcat/jni/OS.java | 1 +
java/org/apache/tomcat/jni/PasswordCallback.java | 2 +-
java/org/apache/tomcat/jni/Poll.java | 1 +
java/org/apache/tomcat/jni/PoolCallback.java | 1 +
java/org/apache/tomcat/jni/Proc.java | 1 +
java/org/apache/tomcat/jni/ProcErrorCallback.java | 1 +
java/org/apache/tomcat/jni/Procattr.java | 1 +
java/org/apache/tomcat/jni/Registry.java | 1 +
java/org/apache/tomcat/jni/SSLSocket.java | 1 +
java/org/apache/tomcat/jni/Shm.java | 1 +
java/org/apache/tomcat/jni/Sockaddr.java | 1 +
java/org/apache/tomcat/jni/Socket.java | 1 +
java/org/apache/tomcat/jni/Status.java | 1 +
java/org/apache/tomcat/jni/Stdlib.java | 1 +
java/org/apache/tomcat/jni/Thread.java | 1 +
java/org/apache/tomcat/jni/Time.java | 1 +
java/org/apache/tomcat/jni/User.java | 1 +
java/org/apache/tomcat/util/net/AprEndpoint.java | 4 ++--
java/org/apache/tomcat/util/net/AprSSLSupport.java | 4 ++--
33 files changed, 37 insertions(+), 10 deletions(-)
diff --git a/java/org/apache/coyote/ProtocolHandler.java
b/java/org/apache/coyote/ProtocolHandler.java
index 1a6fc1fa9e..50a2525579 100644
--- a/java/org/apache/coyote/ProtocolHandler.java
+++ b/java/org/apache/coyote/ProtocolHandler.java
@@ -152,7 +152,7 @@ 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 This method will be removed in Tomcat 9.1.x onwards and
has been removed from Tomcat 10.1.x onwards.
*/
@Deprecated
boolean isAprRequired();
diff --git a/java/org/apache/coyote/ajp/AjpAprProtocol.java
b/java/org/apache/coyote/ajp/AjpAprProtocol.java
index e43d1fbc91..0c75a1714a 100644
--- a/java/org/apache/coyote/ajp/AjpAprProtocol.java
+++ b/java/org/apache/coyote/ajp/AjpAprProtocol.java
@@ -24,7 +24,8 @@ import org.apache.tomcat.util.net.AprEndpoint;
/**
* This the APR/native based protocol handler implementation for AJP.
*
- * @deprecated The APR/Native Connector will be removed in Tomcat 10.1.x
onwards.
+ * @deprecated The APR/Native Connector will be removed in Tomcat 9.1.x
+ * onwards and has been removed from Tomcat 10.1.x onwards.
*/
@Deprecated
public class AjpAprProtocol extends AbstractAjpProtocol<Long> {
diff --git a/java/org/apache/coyote/http11/Http11AprProtocol.java
b/java/org/apache/coyote/http11/Http11AprProtocol.java
index 51766a81b7..4c6ecbcad3 100644
--- a/java/org/apache/coyote/http11/Http11AprProtocol.java
+++ b/java/org/apache/coyote/http11/Http11AprProtocol.java
@@ -24,7 +24,8 @@ import org.apache.tomcat.util.net.AprEndpoint;
/**
* HTTP/1.1 protocol implementation using APR/native.
*
- * @deprecated The APR/Native Connector will be removed in Tomcat 10.1.x
onwards.
+ * @deprecated The APR/Native Connector will be removed in Tomcat 9.1.x
+ * onwards and has been removed from Tomcat 10.1.x onwards.
*/
@Deprecated
public class Http11AprProtocol extends AbstractHttp11Protocol<Long> {
diff --git a/java/org/apache/tomcat/jni/Address.java
b/java/org/apache/tomcat/jni/Address.java
index a245f21f4d..8080154882 100644
--- a/java/org/apache/tomcat/jni/Address.java
+++ b/java/org/apache/tomcat/jni/Address.java
@@ -22,6 +22,7 @@ package org.apache.tomcat.jni;
* @author Mladen Turk
*
* @deprecated The scope of the APR/Native Library will be reduced in Tomcat
+ * 9.1.x / Tomcat Native 2.x and has been reduced in Tomcat
* 10.1.x / Tomcat Native 2.x onwards to only include those
* components required to provide OpenSSL integration with the NIO
* and NIO2 connectors.
diff --git a/java/org/apache/tomcat/jni/BIOCallback.java
b/java/org/apache/tomcat/jni/BIOCallback.java
index b98dd949b9..c5b8cd84e0 100644
--- a/java/org/apache/tomcat/jni/BIOCallback.java
+++ b/java/org/apache/tomcat/jni/BIOCallback.java
@@ -21,7 +21,7 @@ package org.apache.tomcat.jni;
*
* @author Mladen Turk
*
- * @deprecated Unused. Will be removed in Tomcat 10.1
+ * @deprecated Unused. Will be removed in Tomcat 9.1 an has been removed in
Tomcat 10.1.
*/
@Deprecated
public interface BIOCallback {
diff --git a/java/org/apache/tomcat/jni/Directory.java
b/java/org/apache/tomcat/jni/Directory.java
index 353483ae06..418e40cf14 100644
--- a/java/org/apache/tomcat/jni/Directory.java
+++ b/java/org/apache/tomcat/jni/Directory.java
@@ -22,6 +22,7 @@ package org.apache.tomcat.jni;
* @author Mladen Turk
*
* @deprecated The scope of the APR/Native Library will be reduced in Tomcat
+ * 9.1.x / Tomcat Native 2.x and has been reduced in Tomcat
* 10.1.x / Tomcat Native 2.x onwards to only include those
* components required to provide OpenSSL integration with the NIO
* and NIO2 connectors.
diff --git a/java/org/apache/tomcat/jni/Error.java
b/java/org/apache/tomcat/jni/Error.java
index dc312d5d82..efc859051d 100644
--- a/java/org/apache/tomcat/jni/Error.java
+++ b/java/org/apache/tomcat/jni/Error.java
@@ -21,7 +21,7 @@ package org.apache.tomcat.jni;
*
* @author Mladen Turk
*
- * @deprecated Unused. Will be removed in Tomcat 10.1
+ * @deprecated Unused. Will be removed in Tomcat 9.1 an has been removed in
Tomcat 10.1.
*/
@Deprecated
public class Error extends Exception {
diff --git a/java/org/apache/tomcat/jni/File.java
b/java/org/apache/tomcat/jni/File.java
index 4ba2e16de6..6afc70b7d5 100644
--- a/java/org/apache/tomcat/jni/File.java
+++ b/java/org/apache/tomcat/jni/File.java
@@ -24,6 +24,7 @@ import java.nio.ByteBuffer;
* @author Mladen Turk
*
* @deprecated The scope of the APR/Native Library will be reduced in Tomcat
+ * 9.1.x / Tomcat Native 2.x and has been reduced in Tomcat
* 10.1.x / Tomcat Native 2.x onwards to only include those
* components required to provide OpenSSL integration with the NIO
* and NIO2 connectors.
diff --git a/java/org/apache/tomcat/jni/FileInfo.java
b/java/org/apache/tomcat/jni/FileInfo.java
index ea18f7e021..406973e685 100644
--- a/java/org/apache/tomcat/jni/FileInfo.java
+++ b/java/org/apache/tomcat/jni/FileInfo.java
@@ -22,6 +22,7 @@ package org.apache.tomcat.jni;
* @author Mladen Turk
*
* @deprecated The scope of the APR/Native Library will be reduced in Tomcat
+ * 9.1.x / Tomcat Native 2.x and has been reduced in Tomcat
* 10.1.x / Tomcat Native 2.x onwards to only include those
* components required to provide OpenSSL integration with the NIO
* and NIO2 connectors.
diff --git a/java/org/apache/tomcat/jni/Global.java
b/java/org/apache/tomcat/jni/Global.java
index 3f9e4bd832..9a481a9dc2 100644
--- a/java/org/apache/tomcat/jni/Global.java
+++ b/java/org/apache/tomcat/jni/Global.java
@@ -22,6 +22,7 @@ package org.apache.tomcat.jni;
* @author Mladen Turk
*
* @deprecated The scope of the APR/Native Library will be reduced in Tomcat
+ * 9.1.x / Tomcat Native 2.x and has been reduced in Tomcat
* 10.1.x / Tomcat Native 2.x onwards to only include those
* components required to provide OpenSSL integration with the NIO
* and NIO2 connectors.
diff --git a/java/org/apache/tomcat/jni/Local.java
b/java/org/apache/tomcat/jni/Local.java
index fd0f3bb064..0c3083323b 100644
--- a/java/org/apache/tomcat/jni/Local.java
+++ b/java/org/apache/tomcat/jni/Local.java
@@ -22,6 +22,7 @@ package org.apache.tomcat.jni;
* @author Mladen Turk
*
* @deprecated The scope of the APR/Native Library will be reduced in Tomcat
+ * 9.1.x / Tomcat Native 2.x and has been reduced in Tomcat
* 10.1.x / Tomcat Native 2.x onwards to only include those
* components required to provide OpenSSL integration with the NIO
* and NIO2 connectors.
diff --git a/java/org/apache/tomcat/jni/Lock.java
b/java/org/apache/tomcat/jni/Lock.java
index f8bb480844..eb7c078f9c 100644
--- a/java/org/apache/tomcat/jni/Lock.java
+++ b/java/org/apache/tomcat/jni/Lock.java
@@ -22,6 +22,7 @@ package org.apache.tomcat.jni;
* @author Mladen Turk
*
* @deprecated The scope of the APR/Native Library will be reduced in Tomcat
+ * 9.1.x / Tomcat Native 2.x and has been reduced in Tomcat
* 10.1.x / Tomcat Native 2.x onwards to only include those
* components required to provide OpenSSL integration with the NIO
* and NIO2 connectors.
diff --git a/java/org/apache/tomcat/jni/Mmap.java
b/java/org/apache/tomcat/jni/Mmap.java
index 0467c09807..5b658f7db3 100644
--- a/java/org/apache/tomcat/jni/Mmap.java
+++ b/java/org/apache/tomcat/jni/Mmap.java
@@ -22,6 +22,7 @@ package org.apache.tomcat.jni;
* @author Mladen Turk
*
* @deprecated The scope of the APR/Native Library will be reduced in Tomcat
+ * 9.1.x / Tomcat Native 2.x and has been reduced in Tomcat
* 10.1.x / Tomcat Native 2.x onwards to only include those
* components required to provide OpenSSL integration with the NIO
* and NIO2 connectors.
diff --git a/java/org/apache/tomcat/jni/Multicast.java
b/java/org/apache/tomcat/jni/Multicast.java
index 210b59dd38..bdee04ac97 100644
--- a/java/org/apache/tomcat/jni/Multicast.java
+++ b/java/org/apache/tomcat/jni/Multicast.java
@@ -22,6 +22,7 @@ package org.apache.tomcat.jni;
* @author Mladen Turk
*
* @deprecated The scope of the APR/Native Library will be reduced in Tomcat
+ * 9.1.x / Tomcat Native 2.x and has been reduced in Tomcat
* 10.1.x / Tomcat Native 2.x onwards to only include those
* components required to provide OpenSSL integration with the NIO
* and NIO2 connectors.
diff --git a/java/org/apache/tomcat/jni/OS.java
b/java/org/apache/tomcat/jni/OS.java
index 0105efcfa5..2d09aac59a 100644
--- a/java/org/apache/tomcat/jni/OS.java
+++ b/java/org/apache/tomcat/jni/OS.java
@@ -22,6 +22,7 @@ package org.apache.tomcat.jni;
* @author Mladen Turk
*
* @deprecated The scope of the APR/Native Library will be reduced in Tomcat
+ * 9.1.x / Tomcat Native 2.x and has been reduced in Tomcat
* 10.1.x / Tomcat Native 2.x onwards to only include those
* components required to provide OpenSSL integration with the NIO
* and NIO2 connectors.
diff --git a/java/org/apache/tomcat/jni/PasswordCallback.java
b/java/org/apache/tomcat/jni/PasswordCallback.java
index fb06867b3a..87c89e5227 100644
--- a/java/org/apache/tomcat/jni/PasswordCallback.java
+++ b/java/org/apache/tomcat/jni/PasswordCallback.java
@@ -21,7 +21,7 @@ package org.apache.tomcat.jni;
*
* @author Mladen Turk
*
- * @deprecated Unused. Will be removed in Tomcat 10.1
+ * @deprecated Unused. Will be removed in Tomcat 9.1 an has been removed in
Tomcat 10.1.
*/
@Deprecated
public interface PasswordCallback {
diff --git a/java/org/apache/tomcat/jni/Poll.java
b/java/org/apache/tomcat/jni/Poll.java
index 2afecf9a60..e0e19fd833 100644
--- a/java/org/apache/tomcat/jni/Poll.java
+++ b/java/org/apache/tomcat/jni/Poll.java
@@ -22,6 +22,7 @@ package org.apache.tomcat.jni;
* @author Mladen Turk
*
* @deprecated The scope of the APR/Native Library will be reduced in Tomcat
+ * 9.1.x / Tomcat Native 2.x and has been reduced in Tomcat
* 10.1.x / Tomcat Native 2.x onwards to only include those
* components required to provide OpenSSL integration with the NIO
* and NIO2 connectors.
diff --git a/java/org/apache/tomcat/jni/PoolCallback.java
b/java/org/apache/tomcat/jni/PoolCallback.java
index 95b4261460..09d93e90cb 100644
--- a/java/org/apache/tomcat/jni/PoolCallback.java
+++ b/java/org/apache/tomcat/jni/PoolCallback.java
@@ -22,6 +22,7 @@ package org.apache.tomcat.jni;
* @author Mladen Turk
*
* @deprecated The scope of the APR/Native Library will be reduced in Tomcat
+ * 9.1.x / Tomcat Native 2.x and has been reduced in Tomcat
* 10.1.x / Tomcat Native 2.x onwards to only include those
* components required to provide OpenSSL integration with the NIO
* and NIO2 connectors.
diff --git a/java/org/apache/tomcat/jni/Proc.java
b/java/org/apache/tomcat/jni/Proc.java
index c09d71fe0a..af0eb00d49 100644
--- a/java/org/apache/tomcat/jni/Proc.java
+++ b/java/org/apache/tomcat/jni/Proc.java
@@ -22,6 +22,7 @@ package org.apache.tomcat.jni;
* @author Mladen Turk
*
* @deprecated The scope of the APR/Native Library will be reduced in Tomcat
+ * 9.1.x / Tomcat Native 2.x and has been reduced in Tomcat
* 10.1.x / Tomcat Native 2.x onwards to only include those
* components required to provide OpenSSL integration with the NIO
* and NIO2 connectors.
diff --git a/java/org/apache/tomcat/jni/ProcErrorCallback.java
b/java/org/apache/tomcat/jni/ProcErrorCallback.java
index 0ecc84254a..2927d768d3 100644
--- a/java/org/apache/tomcat/jni/ProcErrorCallback.java
+++ b/java/org/apache/tomcat/jni/ProcErrorCallback.java
@@ -22,6 +22,7 @@ package org.apache.tomcat.jni;
* @author Mladen Turk
*
* @deprecated The scope of the APR/Native Library will be reduced in Tomcat
+ * 9.1.x / Tomcat Native 2.x and has been reduced in Tomcat
* 10.1.x / Tomcat Native 2.x onwards to only include those
* components required to provide OpenSSL integration with the NIO
* and NIO2 connectors.
diff --git a/java/org/apache/tomcat/jni/Procattr.java
b/java/org/apache/tomcat/jni/Procattr.java
index 26512147e8..7c044e4886 100644
--- a/java/org/apache/tomcat/jni/Procattr.java
+++ b/java/org/apache/tomcat/jni/Procattr.java
@@ -22,6 +22,7 @@ package org.apache.tomcat.jni;
* @author Mladen Turk
*
* @deprecated The scope of the APR/Native Library will be reduced in Tomcat
+ * 9.1.x / Tomcat Native 2.x and has been reduced in Tomcat
* 10.1.x / Tomcat Native 2.x onwards to only include those
* components required to provide OpenSSL integration with the NIO
* and NIO2 connectors.
diff --git a/java/org/apache/tomcat/jni/Registry.java
b/java/org/apache/tomcat/jni/Registry.java
index bf32f796c6..b3db25a1a4 100644
--- a/java/org/apache/tomcat/jni/Registry.java
+++ b/java/org/apache/tomcat/jni/Registry.java
@@ -22,6 +22,7 @@ package org.apache.tomcat.jni;
* @author Mladen Turk
*
* @deprecated The scope of the APR/Native Library will be reduced in Tomcat
+ * 9.1.x / Tomcat Native 2.x and has been reduced in Tomcat
* 10.1.x / Tomcat Native 2.x onwards to only include those
* components required to provide OpenSSL integration with the NIO
* and NIO2 connectors.
diff --git a/java/org/apache/tomcat/jni/SSLSocket.java
b/java/org/apache/tomcat/jni/SSLSocket.java
index 12c79f08c5..d73b132a01 100644
--- a/java/org/apache/tomcat/jni/SSLSocket.java
+++ b/java/org/apache/tomcat/jni/SSLSocket.java
@@ -22,6 +22,7 @@ package org.apache.tomcat.jni;
* @author Mladen Turk
*
* @deprecated The scope of the APR/Native Library will be reduced in Tomcat
+ * 9.1.x / Tomcat Native 2.x and has been reduced in Tomcat
* 10.1.x / Tomcat Native 2.x onwards to only include those
* components required to provide OpenSSL integration with the NIO
* and NIO2 connectors.
diff --git a/java/org/apache/tomcat/jni/Shm.java
b/java/org/apache/tomcat/jni/Shm.java
index d5a7b34361..6d2bf2286c 100644
--- a/java/org/apache/tomcat/jni/Shm.java
+++ b/java/org/apache/tomcat/jni/Shm.java
@@ -24,6 +24,7 @@ import java.nio.ByteBuffer;
* @author Mladen Turk
*
* @deprecated The scope of the APR/Native Library will be reduced in Tomcat
+ * 9.1.x / Tomcat Native 2.x and has been reduced in Tomcat
* 10.1.x / Tomcat Native 2.x onwards to only include those
* components required to provide OpenSSL integration with the NIO
* and NIO2 connectors.
diff --git a/java/org/apache/tomcat/jni/Sockaddr.java
b/java/org/apache/tomcat/jni/Sockaddr.java
index eada7424f2..1397ba5304 100644
--- a/java/org/apache/tomcat/jni/Sockaddr.java
+++ b/java/org/apache/tomcat/jni/Sockaddr.java
@@ -22,6 +22,7 @@ package org.apache.tomcat.jni;
* @author Mladen Turk
*
* @deprecated The scope of the APR/Native Library will be reduced in Tomcat
+ * 9.1.x / Tomcat Native 2.x and has been reduced in Tomcat
* 10.1.x / Tomcat Native 2.x onwards to only include those
* components required to provide OpenSSL integration with the NIO
* and NIO2 connectors.
diff --git a/java/org/apache/tomcat/jni/Socket.java
b/java/org/apache/tomcat/jni/Socket.java
index 242ded1f0d..045a6345f3 100644
--- a/java/org/apache/tomcat/jni/Socket.java
+++ b/java/org/apache/tomcat/jni/Socket.java
@@ -25,6 +25,7 @@ import java.nio.ByteBuffer;
* @author Mladen Turk
*
* @deprecated The scope of the APR/Native Library will be reduced in Tomcat
+ * 9.1.x / Tomcat Native 2.x and has been reduced in Tomcat
* 10.1.x / Tomcat Native 2.x onwards to only include those
* components required to provide OpenSSL integration with the NIO
* and NIO2 connectors.
diff --git a/java/org/apache/tomcat/jni/Status.java
b/java/org/apache/tomcat/jni/Status.java
index f1b0c6224d..274e208f4d 100644
--- a/java/org/apache/tomcat/jni/Status.java
+++ b/java/org/apache/tomcat/jni/Status.java
@@ -22,6 +22,7 @@ package org.apache.tomcat.jni;
* @author Mladen Turk
*
* @deprecated The scope of the APR/Native Library will be reduced in Tomcat
+ * 9.1.x / Tomcat Native 2.x and has been reduced in Tomcat
* 10.1.x / Tomcat Native 2.x onwards to only include those
* components required to provide OpenSSL integration with the NIO
* and NIO2 connectors.
diff --git a/java/org/apache/tomcat/jni/Stdlib.java
b/java/org/apache/tomcat/jni/Stdlib.java
index be49b97d80..c6c3ec3d71 100644
--- a/java/org/apache/tomcat/jni/Stdlib.java
+++ b/java/org/apache/tomcat/jni/Stdlib.java
@@ -22,6 +22,7 @@ package org.apache.tomcat.jni;
* @author Mladen Turk
*
* @deprecated The scope of the APR/Native Library will be reduced in Tomcat
+ * 9.1.x / Tomcat Native 2.x and has been reduced in Tomcat
* 10.1.x / Tomcat Native 2.x onwards to only include those
* components required to provide OpenSSL integration with the NIO
* and NIO2 connectors.
diff --git a/java/org/apache/tomcat/jni/Thread.java
b/java/org/apache/tomcat/jni/Thread.java
index 4b2644a5a8..14420ee0bb 100644
--- a/java/org/apache/tomcat/jni/Thread.java
+++ b/java/org/apache/tomcat/jni/Thread.java
@@ -22,6 +22,7 @@ package org.apache.tomcat.jni;
* @author Mladen Turk
*
* @deprecated The scope of the APR/Native Library will be reduced in Tomcat
+ * 9.1.x / Tomcat Native 2.x and has been reduced in Tomcat
* 10.1.x / Tomcat Native 2.x onwards to only include those
* components required to provide OpenSSL integration with the NIO
* and NIO2 connectors.
diff --git a/java/org/apache/tomcat/jni/Time.java
b/java/org/apache/tomcat/jni/Time.java
index 241f8e2f1b..eed53f55b6 100644
--- a/java/org/apache/tomcat/jni/Time.java
+++ b/java/org/apache/tomcat/jni/Time.java
@@ -22,6 +22,7 @@ package org.apache.tomcat.jni;
* @author Mladen Turk
*
* @deprecated The scope of the APR/Native Library will be reduced in Tomcat
+ * 9.1.x / Tomcat Native 2.x and has been reduced in Tomcat
* 10.1.x / Tomcat Native 2.x onwards to only include those
* components required to provide OpenSSL integration with the NIO
* and NIO2 connectors.
diff --git a/java/org/apache/tomcat/jni/User.java
b/java/org/apache/tomcat/jni/User.java
index 1f1295e174..b487b91b64 100644
--- a/java/org/apache/tomcat/jni/User.java
+++ b/java/org/apache/tomcat/jni/User.java
@@ -22,6 +22,7 @@ package org.apache.tomcat.jni;
* @author Mladen Turk
*
* @deprecated The scope of the APR/Native Library will be reduced in Tomcat
+ * 9.1.x / Tomcat Native 2.x and has been reduced in Tomcat
* 10.1.x / Tomcat Native 2.x onwards to only include those
* components required to provide OpenSSL integration with the NIO
* and NIO2 connectors.
diff --git a/java/org/apache/tomcat/util/net/AprEndpoint.java
b/java/org/apache/tomcat/util/net/AprEndpoint.java
index b7fcad831d..80aac0ebab 100644
--- a/java/org/apache/tomcat/util/net/AprEndpoint.java
+++ b/java/org/apache/tomcat/util/net/AprEndpoint.java
@@ -81,8 +81,8 @@ import org.apache.tomcat.util.net.openssl.OpenSSLUtil;
* @author Mladen Turk
* @author Remy Maucherat
*
- * @deprecated The APR/Native Connector will be removed in Tomcat 10.1.x
- * onwards.
+ * @deprecated The APR/Native Connector will be removed in Tomcat 9.1.x
+ * onwards and has been removed from Tomcat 10.1.x onwards.
*/
@Deprecated
public class AprEndpoint extends AbstractEndpoint<Long,Long> implements
SNICallBack {
diff --git a/java/org/apache/tomcat/util/net/AprSSLSupport.java
b/java/org/apache/tomcat/util/net/AprSSLSupport.java
index 3262df9123..6b298dcb6e 100644
--- a/java/org/apache/tomcat/util/net/AprSSLSupport.java
+++ b/java/org/apache/tomcat/util/net/AprSSLSupport.java
@@ -29,8 +29,8 @@ import org.apache.tomcat.jni.SSL;
* TODO: Add a mechanism (or figure out how to use what we already have) to
* invalidate the session.
*
- * @deprecated The APR/Native Connector will be removed in Tomcat 10.1.x
- * onwards.
+ * @deprecated The APR/Native Connector will be removed in Tomcat 9.1.x
+ * onwards and has been removed from Tomcat 10.1.x onwards.
*/
@Deprecated
public class AprSSLSupport implements SSLSupport {
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
