This is an automated email from the ASF dual-hosted git repository.
ggregory pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/commons-net.git
The following commit(s) were added to refs/heads/master by this push:
new eda636b7 Javadoc: The @deprecated tag should be last.
eda636b7 is described below
commit eda636b700e66b956770d24b293d2c2aa32e0a21
Author: Gary Gregory <[email protected]>
AuthorDate: Wed Dec 31 18:37:01 2025 -0500
Javadoc: The @deprecated tag should be last.
---
src/main/java/org/apache/commons/net/ftp/FTPClient.java | 14 +++++++-------
src/main/java/org/apache/commons/net/nntp/NNTPClient.java | 2 +-
src/main/java/org/apache/commons/net/util/Base64.java | 2 +-
3 files changed, 9 insertions(+), 9 deletions(-)
diff --git a/src/main/java/org/apache/commons/net/ftp/FTPClient.java
b/src/main/java/org/apache/commons/net/ftp/FTPClient.java
index 1780c922..8a75e1cb 100644
--- a/src/main/java/org/apache/commons/net/ftp/FTPClient.java
+++ b/src/main/java/org/apache/commons/net/ftp/FTPClient.java
@@ -1507,9 +1507,9 @@ public class FTPClient extends FTP implements
Configurable {
/**
* Gets how long to wait for control keep-alive message replies.
*
- * @deprecated Use {@link #getControlKeepAliveReplyTimeoutDuration()}.
* @return wait time in milliseconds.
* @since 3.0
+ * @deprecated Use {@link #getControlKeepAliveReplyTimeoutDuration()}.
*/
@Deprecated
public int getControlKeepAliveReplyTimeout() {
@@ -1532,9 +1532,9 @@ public class FTPClient extends FTP implements
Configurable {
* See the class Javadoc section "Control channel keep-alive feature"
* </p>
*
- * @deprecated Use {@link #getControlKeepAliveTimeoutDuration()}.
* @return the number of seconds between keepalive messages.
* @since 3.0
+ * @deprecated Use {@link #getControlKeepAliveTimeoutDuration()}.
*/
@Deprecated
public long getControlKeepAliveTimeout() {
@@ -1579,8 +1579,8 @@ public class FTPClient extends FTP implements
Configurable {
* <li>Number of IOErrors ignored</li>
* </ul>
*
- * @deprecated 3.7 For testing only; may be dropped or changed at any time
* @return the debug array
+ * @deprecated 3.7 For testing only; may be dropped or changed at any time
*/
@Deprecated // only for use in testing
public int[] getCslDebug() {
@@ -2952,10 +2952,10 @@ public class FTPClient extends FTP implements
Configurable {
/**
* Sets the duration to wait for control keep-alive message replies.
*
- * @deprecated Use {@link #setControlKeepAliveReplyTimeout(Duration)}.
* @param timeoutMillis number of milliseconds to wait (defaults to 1,000).
* @since 3.0
* @see #setControlKeepAliveTimeout(long)
+ * @deprecated Use {@link #setControlKeepAliveReplyTimeout(Duration)}.
*/
@Deprecated
public void setControlKeepAliveReplyTimeout(final int timeoutMillis) {
@@ -2982,10 +2982,10 @@ public class FTPClient extends FTP implements
Configurable {
* See the class Javadoc section "Control channel keep-alive feature"
* </p>
*
- * @deprecated Use {@link #setControlKeepAliveTimeout(Duration)}.
* @param controlIdleSeconds the wait in seconds between keepalive
messages. Zero (or less) disables.
* @since 3.0
* @see #setControlKeepAliveReplyTimeout(int)
+ * @deprecated Use {@link #setControlKeepAliveTimeout(Duration)}.
*/
@Deprecated
public void setControlKeepAliveTimeout(final long controlIdleSeconds) {
@@ -3023,8 +3023,8 @@ public class FTPClient extends FTP implements
Configurable {
* <strong>Note:</strong> the timeout will also be applied when calling
accept() whilst establishing an active local data connection.
* </p>
*
- * @deprecated Use {@link #setDataTimeout(Duration)}.
* @param timeoutMillis The default timeout in milliseconds that is used
when opening a data connection socket. The value 0 means an infinite timeout.
+ * @deprecated Use {@link #setDataTimeout(Duration)}.
*/
@Deprecated
public void setDataTimeout(final int timeoutMillis) {
@@ -3214,8 +3214,8 @@ public class FTPClient extends FTP implements
Configurable {
* The default is true, i.e. site-local replies are replaced.
* </p>
*
- * @deprecated (3.6) use {@link
#setPassiveNatWorkaroundStrategy(HostnameResolver)} instead
* @param enabled true to enable replacing internal IP's in passive mode.
+ * @deprecated (3.6) use {@link
#setPassiveNatWorkaroundStrategy(HostnameResolver)} instead
*/
@Deprecated
public void setPassiveNatWorkaround(final boolean enabled) {
diff --git a/src/main/java/org/apache/commons/net/nntp/NNTPClient.java
b/src/main/java/org/apache/commons/net/nntp/NNTPClient.java
index 8fa73a1c..b584fa29 100644
--- a/src/main/java/org/apache/commons/net/nntp/NNTPClient.java
+++ b/src/main/java/org/apache/commons/net/nntp/NNTPClient.java
@@ -751,9 +751,9 @@ public class NNTPClient extends NNTP {
/**
* @param articleId The unique article identifier of the article to
retrieve
* @param pointer A parameter through which to return the article's
number and unique id
- * @deprecated 3.0 use {@link #retrieveArticle(String, ArticleInfo)}
instead
* @return A DotTerminatedMessageReader instance from which the article
can be read. null if the article does not exist.
* @throws IOException on error
+ * @deprecated 3.0 use {@link #retrieveArticle(String, ArticleInfo)}
instead
*/
@Deprecated
public Reader retrieveArticle(final String articleId, final ArticlePointer
pointer) throws IOException {
diff --git a/src/main/java/org/apache/commons/net/util/Base64.java
b/src/main/java/org/apache/commons/net/util/Base64.java
index 239515c4..797cc03e 100644
--- a/src/main/java/org/apache/commons/net/util/Base64.java
+++ b/src/main/java/org/apache/commons/net/util/Base64.java
@@ -42,9 +42,9 @@ import java.util.Objects;
* compatible with the lower 127 ASCII chart (ISO-8859-1, Windows-1252, UTF-8,
etc).
* </p>
*
- * @deprecated Use {@link java.util.Base64}.
* @see <a href="https://www.ietf.org/rfc/rfc2045.txt";>RFC 2045</a>
* @since 2.2
+ * @deprecated Use {@link java.util.Base64}.
*/
@Deprecated
public class Base64 {
