This is an automated email from the ASF dual-hosted git repository.
ggregory pushed a commit to branch release
in repository https://gitbox.apache.org/repos/asf/commons-net.git
commit e260e836025adf8571251a30f0671fc996e3f3ba
Merge: 2b95bc2a 26fbd9ed
Author: Gary Gregory <garydgreg...@gmail.com>
AuthorDate: Sun Oct 1 09:23:26 2023 -0400
Merge branch 'master' into release
.asf.yaml | 4 +
.github/workflows/codeql-analysis.yml | 10 +-
.github/workflows/coverage.yml | 8 +-
.github/workflows/maven.yml | 6 +-
.github/workflows/maven_adhoc.yml | 4 +-
.github/workflows/scorecards-analysis.yml | 8 +-
BUILDING.txt | 29 +-
NOTICE.txt | 2 +-
README.md | 14 +-
RELEASE-NOTES.txt | 81 ++++-
pom.xml | 43 +--
src/changes/changes.xml | 137 ++++++--
src/changes/release-notes.vm | 4 +-
.../conf/checkstyle-suppressions.xml | 0
checkstyle.xml => src/conf/checkstyle.xml | 4 +-
.../conf/findbugs-exclude-filter.xml | 0
.../apache/commons/net/DatagramSocketClient.java | 92 ++++--
.../apache/commons/net/DatagramSocketFactory.java | 6 +-
.../commons/net/DefaultDatagramSocketFactory.java | 11 +-
.../commons/net/MalformedServerReplyException.java | 2 -
.../apache/commons/net/PrintCommandListener.java | 2 +-
.../apache/commons/net/ProtocolCommandEvent.java | 2 +-
.../java/org/apache/commons/net/SocketClient.java | 39 ++-
.../org/apache/commons/net/bsd/RCommandClient.java | 71 ++---
.../org/apache/commons/net/bsd/RExecClient.java | 22 +-
.../org/apache/commons/net/bsd/RLoginClient.java | 10 +-
.../commons/net/chargen/CharGenTCPClient.java | 2 +-
.../commons/net/chargen/CharGenUDPClient.java | 8 +-
.../commons/net/daytime/DaytimeUDPClient.java | 4 +-
.../commons/net/discard/DiscardUDPClient.java | 2 +-
.../org/apache/commons/net/echo/EchoUDPClient.java | 2 +-
.../java/org/apache/commons/net/examples/Main.java | 1 -
.../net/examples/cidr/SubnetUtilsExample.java | 1 -
.../commons/net/examples/ftp/FTPClientExample.java | 26 +-
.../net/examples/ftp/ServerToServerFTP.java | 14 +-
.../commons/net/examples/ftp/TFTPExample.java | 35 +-
.../commons/net/examples/mail/IMAPExportMbox.java | 11 +-
.../commons/net/examples/mail/IMAPImportMbox.java | 4 +-
.../apache/commons/net/examples/mail/IMAPMail.java | 11 +-
.../commons/net/examples/mail/IMAPUtils.java | 19 +-
.../commons/net/examples/mail/POP3ExportMbox.java | 15 +-
.../apache/commons/net/examples/mail/POP3Mail.java | 5 +-
.../apache/commons/net/examples/mail/Utils.java | 4 +-
.../commons/net/examples/nntp/ExtendedNNTPOps.java | 2 +-
.../net/examples/nntp/MessageThreading.java | 2 +-
.../apache/commons/net/examples/ntp/NTPClient.java | 3 +-
.../commons/net/examples/ntp/SimpleNTPServer.java | 2 +-
.../commons/net/examples/ntp/TimeClient.java | 3 +-
.../net/examples/telnet/TelnetClientExample.java | 7 +-
.../apache/commons/net/examples/unix/chargen.java | 54 ++--
.../apache/commons/net/examples/unix/daytime.java | 13 +-
.../org/apache/commons/net/examples/unix/echo.java | 103 +++---
.../apache/commons/net/examples/unix/rdate.java | 14 +-
.../apache/commons/net/examples/unix/rexec.java | 22 +-
.../apache/commons/net/examples/unix/rlogin.java | 26 +-
.../apache/commons/net/examples/unix/rshell.java | 16 +-
.../apache/commons/net/finger/FingerClient.java | 19 +-
src/main/java/org/apache/commons/net/ftp/FTP.java | 30 +-
.../java/org/apache/commons/net/ftp/FTPClient.java | 95 +++---
.../apache/commons/net/ftp/FTPClientConfig.java | 26 +-
.../java/org/apache/commons/net/ftp/FTPCmd.java | 193 ++++++++++-
.../org/apache/commons/net/ftp/FTPCommand.java | 202 +++++++++++-
.../java/org/apache/commons/net/ftp/FTPFile.java | 48 +--
.../apache/commons/net/ftp/FTPFileEntryParser.java | 6 +-
.../commons/net/ftp/FTPFileEntryParserImpl.java | 1 -
.../org/apache/commons/net/ftp/FTPFileFilter.java | 1 -
.../org/apache/commons/net/ftp/FTPFileFilters.java | 1 -
.../org/apache/commons/net/ftp/FTPHTTPClient.java | 15 +-
.../apache/commons/net/ftp/FTPListParseEngine.java | 14 +-
.../java/org/apache/commons/net/ftp/FTPReply.java | 184 +++++++++--
.../org/apache/commons/net/ftp/FTPSClient.java | 50 ++-
.../net/ftp/parser/CompositeFileEntryParser.java | 4 +-
.../parser/DefaultFTPFileEntryParserFactory.java | 2 +-
.../ftp/parser/EnterpriseUnixFTPEntryParser.java | 2 +-
.../net/ftp/parser/FTPFileEntryParserFactory.java | 2 +-
.../net/ftp/parser/FTPTimestampParserImpl.java | 10 +-
.../commons/net/ftp/parser/MLSxEntryParser.java | 2 +-
.../commons/net/ftp/parser/MVSFTPEntryParser.java | 89 +++---
.../net/ftp/parser/MacOsPeterFTPEntryParser.java | 10 +-
.../commons/net/ftp/parser/NTFTPEntryParser.java | 4 +-
.../net/ftp/parser/NetwareFTPEntryParser.java | 6 +-
.../commons/net/ftp/parser/OS2FTPEntryParser.java | 4 +-
.../net/ftp/parser/OS400FTPEntryParser.java | 10 +-
.../ftp/parser/ParserInitializationException.java | 2 +-
.../ftp/parser/RegexFTPFileEntryParserImpl.java | 10 +-
.../commons/net/ftp/parser/UnixFTPEntryParser.java | 16 +-
.../commons/net/ftp/parser/VMSFTPEntryParser.java | 10 +-
.../ftp/parser/VMSVersioningFTPEntryParser.java | 14 +-
.../commons/net/imap/AuthenticatingIMAPClient.java | 55 ++--
.../java/org/apache/commons/net/imap/IMAP.java | 10 +-
.../org/apache/commons/net/imap/IMAPClient.java | 14 +-
.../org/apache/commons/net/imap/IMAPCommand.java | 125 +++++++-
.../org/apache/commons/net/imap/IMAPReply.java | 12 +-
.../org/apache/commons/net/imap/IMAPSClient.java | 6 +-
.../commons/net/io/DotTerminatedMessageReader.java | 6 +-
.../commons/net/io/DotTerminatedMessageWriter.java | 7 +-
.../commons/net/io/FromNetASCIIInputStream.java | 2 -
.../commons/net/io/FromNetASCIIOutputStream.java | 2 -
.../commons/net/io/ToNetASCIIInputStream.java | 2 -
.../commons/net/io/ToNetASCIIOutputStream.java | 2 -
src/main/java/org/apache/commons/net/io/Util.java | 16 +-
.../java/org/apache/commons/net/nntp/Article.java | 8 +-
.../org/apache/commons/net/nntp/ArticleInfo.java | 2 -
.../apache/commons/net/nntp/ArticleIterator.java | 1 -
.../java/org/apache/commons/net/nntp/NNTP.java | 48 +--
.../org/apache/commons/net/nntp/NNTPClient.java | 115 +++----
.../org/apache/commons/net/nntp/NNTPCommand.java | 41 ++-
.../net/nntp/NNTPConnectionClosedException.java | 1 -
.../org/apache/commons/net/nntp/NNTPReply.java | 102 +++++-
.../commons/net/nntp/NewGroupsOrNewsQuery.java | 22 +-
.../org/apache/commons/net/nntp/NewsgroupInfo.java | 7 +-
.../apache/commons/net/nntp/NewsgroupIterator.java | 1 -
...readContainer.java => NntpThreadContainer.java} | 20 +-
.../org/apache/commons/net/nntp/ReplyIterator.java | 1 -
.../apache/commons/net/nntp/SimpleNNTPHeader.java | 15 +-
.../org/apache/commons/net/nntp/Threadable.java | 1 -
.../java/org/apache/commons/net/nntp/Threader.java | 109 ++++---
.../org/apache/commons/net/ntp/NTPUDPClient.java | 12 +-
.../java/org/apache/commons/net/ntp/NtpUtils.java | 7 +-
.../java/org/apache/commons/net/ntp/NtpV3Impl.java | 41 ++-
.../org/apache/commons/net/ntp/NtpV3Packet.java | 26 +-
.../java/org/apache/commons/net/ntp/TimeInfo.java | 14 +-
.../java/org/apache/commons/net/ntp/TimeStamp.java | 28 +-
.../commons/net/pop3/ExtendedPOP3Client.java | 42 +--
.../java/org/apache/commons/net/pop3/POP3.java | 10 +-
.../org/apache/commons/net/pop3/POP3Client.java | 42 +--
.../org/apache/commons/net/pop3/POP3Command.java | 6 +-
.../apache/commons/net/pop3/POP3MessageInfo.java | 2 -
.../org/apache/commons/net/pop3/POP3Reply.java | 2 +-
.../org/apache/commons/net/pop3/POP3SClient.java | 6 +-
.../commons/net/smtp/AuthenticatingSMTPClient.java | 57 ++--
.../org/apache/commons/net/smtp/RelayPath.java | 4 -
.../java/org/apache/commons/net/smtp/SMTP.java | 42 +--
.../org/apache/commons/net/smtp/SMTPClient.java | 57 ++--
.../org/apache/commons/net/smtp/SMTPCommand.java | 64 +++-
.../net/smtp/SMTPConnectionClosedException.java | 1 -
.../org/apache/commons/net/smtp/SMTPReply.java | 68 +++-
.../org/apache/commons/net/smtp/SMTPSClient.java | 6 +-
.../apache/commons/net/smtp/SimpleSMTPHeader.java | 16 +-
.../commons/net/telnet/EchoOptionHandler.java | 1 -
.../net/telnet/InvalidTelnetOptionException.java | 2 -
.../commons/net/telnet/SimpleOptionHandler.java | 2 -
.../net/telnet/SuppressGAOptionHandler.java | 1 -
.../java/org/apache/commons/net/telnet/Telnet.java | 51 +--
.../apache/commons/net/telnet/TelnetClient.java | 26 +-
.../apache/commons/net/telnet/TelnetCommand.java | 6 +-
.../commons/net/telnet/TelnetInputStream.java | 2 -
.../net/telnet/TelnetNotificationHandler.java | 12 +-
.../apache/commons/net/telnet/TelnetOption.java | 7 +-
.../commons/net/telnet/TelnetOptionHandler.java | 78 ++---
.../commons/net/telnet/TelnetOutputStream.java | 9 +-
.../net/telnet/TerminalTypeOptionHandler.java | 18 +-
.../net/telnet/WindowSizeOptionHandler.java | 12 +-
.../java/org/apache/commons/net/tftp/TFTP.java | 45 +--
.../org/apache/commons/net/tftp/TFTPAckPacket.java | 6 +-
.../org/apache/commons/net/tftp/TFTPClient.java | 9 +-
.../apache/commons/net/tftp/TFTPDataPacket.java | 6 +-
.../apache/commons/net/tftp/TFTPErrorPacket.java | 4 +-
.../org/apache/commons/net/tftp/TFTPPacket.java | 6 +-
.../commons/net/tftp/TFTPReadRequestPacket.java | 2 +-
.../commons/net/tftp/TFTPWriteRequestPacket.java | 2 +-
.../org/apache/commons/net/time/TimeUDPClient.java | 26 +-
.../java/org/apache/commons/net/util/Base64.java | 111 ++++---
.../java/org/apache/commons/net/util/Charsets.java | 2 +-
.../apache/commons/net/util/KeyManagerUtils.java | 1 -
.../apache/commons/net/util/SSLContextUtils.java | 5 +-
.../apache/commons/net/util/SSLSocketUtils.java | 1 -
.../org/apache/commons/net/util/SubnetUtils.java | 6 +-
.../org/apache/commons/net/whois/WhoisClient.java | 3 -
src/site/xdoc/download_net.xml | 26 +-
.../org/apache/commons/net/SocketClientTest.java | 40 ++-
.../org/apache/commons/net/SubnetUtilsTest.java | 139 ++++----
.../apache/commons/net/ftp/AbstractFtpsTest.java | 4 +-
.../net/ftp/FTPClientConfigFunctionalTest.java | 2 +-
.../commons/net/ftp/FTPClientConfigTest.java | 38 +--
.../org/apache/commons/net/ftp/FTPClientTest.java | 3 +-
.../org/apache/commons/net/ftp/FTPCommandTest.java | 1 -
.../org/apache/commons/net/ftp/FTPFileTest.java | 187 +++++++++++
.../net/ftp/NoProtocolSslConfigurationProxy.java | 4 +-
...estFramework.java => AbstractFTPParseTest.java} | 4 +-
.../ftp/parser/CompositeFTPParseTestFramework.java | 2 +-
.../DefaultFTPFileEntryParserFactoryTest.java | 18 +-
.../commons/net/ftp/parser/DownloadListings.java | 15 +-
.../parser/EnterpriseUnixFTPEntryParserTest.java | 13 +-
.../net/ftp/parser/FTPConfigEntryParserTest.java | 1 -
.../net/ftp/parser/FTPTimestampParserImplTest.java | 69 +---
.../commons/net/ftp/parser/MLSDComparison.java | 13 +-
.../net/ftp/parser/MLSxEntryParserTest.java | 2 +-
.../net/ftp/parser/MVSFTPEntryParserTest.java | 20 +-
.../ftp/parser/MacOsPeterFTPEntryParserTest.java | 2 +-
.../net/ftp/parser/NTFTPEntryParserTest.java | 6 +-
.../net/ftp/parser/NetwareFTPEntryParserTest.java | 2 +-
.../net/ftp/parser/OS2FTPEntryParserTest.java | 2 +-
.../net/ftp/parser/OS400FTPEntryParserTest.java | 12 +-
.../net/ftp/parser/UnixFTPEntryParserTest.java | 2 +-
.../net/ftp/parser/VMSFTPEntryParserTest.java | 2 +-
.../net/imap/AuthenticatingIMAPClientTest.java | 46 +++
.../apache/commons/net/imap/IMAPCommandTest.java | 67 ++++
.../org/apache/commons/net/imap/IMAPReplyTest.java | 186 +++++++++++
.../java/org/apache/commons/net/imap/IMAPTest.java | 67 +++-
.../commons/net/io/ToNetASCIIInputStreamTest.java | 1 -
.../org/apache/commons/net/ntp/TestNtpClient.java | 3 +-
.../org/apache/commons/net/ntp/TestTimeInfo.java | 2 +-
.../commons/net/pop3/POP3ClientCommandsTest.java | 7 +-
.../org/apache/commons/net/pop3/POP3Constants.java | 2 +-
...t.java => AbstractTelnetOptionHandlerTest.java} | 2 +-
.../commons/net/telnet/EchoOptionHandlerTest.java | 10 +-
.../net/telnet/SimpleOptionHandlerTest.java | 10 +-
.../net/telnet/SuppressGAOptionHandlerTest.java | 10 +-
.../net/telnet/TelnetClientFunctionalTest.java | 9 +-
.../commons/net/telnet/TelnetClientTest.java | 97 +++---
.../commons/net/telnet/TelnetTestResponder.java | 2 +-
.../net/telnet/TerminalTypeOptionHandlerTest.java | 16 +-
.../net/telnet/WindowSizeOptionHandlerTest.java | 10 +-
.../org/apache/commons/net/tftp/TFTPServer.java | 354 +++++++++++----------
.../apache/commons/net/tftp/TFTPServerMain.java | 6 +-
.../commons/net/tftp/TFTPServerPathTest.java | 249 +++++++++------
.../java/org/apache/commons/net/tftp/TFTPTest.java | 150 ++++-----
.../commons/net/time/TimeTestSimpleServer.java | 1 -
.../org/apache/commons/net/util/Base64Test.java | 85 +++--
.../java/org/apache/commons/net/util/UtilTest.java | 1 -
221 files changed, 3697 insertions(+), 2217 deletions(-)
diff --cc src/changes/changes.xml
index bb9a1f9f,9c8b5a72..5488533a
--- a/src/changes/changes.xml
+++ b/src/changes/changes.xml
@@@ -788,7 -903,7 +903,6 @@@ This release fixes a few bugs and adds
[Site] typo in migration how-to.
</action>
</release>
--
<release version="3.0.1" date="June 6, 2011" description="
This is a bug-fix release.
">
@@@ -1238,9 -1353,9 +1352,7 @@@ This is primarily a maintenance release
UnixFTPEntryParser fails to parse some entries
</action>
</release>
--
<release version="2.1" description="Not released" />
--
<release version="2.0" date="October 20, 2008" description="Java 5.0
release">
<action dev="rwinston" type="fix" issue="NET-307">
One of the "connect" method in class
org.apache.commons.net.SocketClient doesn't handle connection timeout properly
@@@ -1396,8 -1511,8 +1508,6 @@@
FTPFileEntryParserImpl.preParse() doesn't remove unparsable entries
at the end of the file list
</action>
</release>
--
--
<!-- 1.5.0 has not yet been released, so comment out the section until it
is ready for release -->
<!-- <release version="1.5.0" date="" description=""> <action dev="dfs"
type="fix" issue="NET-3"> TelnetInputStream.java:
Applied Rob Hasselbaum's rhasselb...@alumni.ithaca.edu patch for PR
38688 fixing a TelnetInputStream hang. </action> <action
@@@ -1414,8 -1529,8 +1524,6 @@@
Netware FTP servers. Tested on Novell Netware 6.5. </action> <action
dev="rwinston" type="fix" issue="NET-188"> FTPTimestampParserImpl.java:
Fix leap year date parsing bug. </action> <action dev="rwinston"
type="fix"> Article.java: Fix minor issues with NNTP parsing.
</action> </release> -->
--
--
<release version="1.4.1" date="December 3, 2005" description="fix release
to restore jdk 1.3 compatability">
<action dev="scohen" type="fix">
Applied patches for defect 37113. Code incompatible with jdk 1.3.
Original patch submitted by Andrea Rombald
@@@ -1424,7 -1539,7 +1532,6 @@@
Applied patches for defect 37522. updated project.xml to correct
compatibility level.
</action>
</release>
--
<release version="1.4.0" date="May 7, 2005" description="Some additions
and enhancements">
<action dev="dfs" type="fix">
Fixed typo in method name.
@@@ -1458,7 -1573,7 +1565,6 @@@
FTP client to operate across many different locales and date formats.
</action>
</release>
--
<release version="1.3.0" date="December 15, 2004" description="many fixes
and enhancements">
<action dev="rwinston" type="fix">
Applied patch for PR 31793. Thanks to ma...@ops.co.at
@@@ -1513,8 -1628,8 +1619,6 @@@
<action dev="dfs" type="fix">
Fix TelnetClient zombie thread issue
</action>
--
--
</release>
<release version="1.3.0-dev" date="July 28, 2004" description="regression
fix">
<action dev="dfs" type="fix">
@@@ -1535,13 -1650,13 +1639,11 @@@
fixed handling of certain unusual "special" file types in the Unix
parser.
</action>
</release>
--
<release version="1.2.1" date="May 6, 2004" description="fix release">
<action dev="scohen" type="fix">
changed code that rendered package uncompilable under JDK 1.2
</action>
</release>
--
<release version="1.2.0" date="April 30, 2004" description="autodetection
of system for listings">
<action dev="scohen" type="fix">
Mario Ivankovits ma...@ops.co.at added
@@@ -1575,7 -1690,7 +1677,6 @@@
autodetection.
</action>
</release>
--
<!-- Not yet released; probably never will be <release version="1.1.1"
date="TBD" description="last jdk1.1 compatible
release"> <action dev="scohen" type="fix"> Removed all JDK 1.1
incompatibilities that had been introduced unintentionally
in previous versions. Release 1.1.1 is the last JDK 1.1 compatible
release. Any future 1.1.x maintenance releases will remain
@@@ -1597,7 -1712,7 +1698,6 @@@
reported failure of SMTP on OS/390 which has EBCDIC as the
native character set.
</action>
--
<action dev="dfs" type="fix">
Applied variation of fix suggested by Matthieu Recouly
matthieu.reco...@laposte.net so that
@@@ -1642,7 -1757,7 +1742,6 @@@
New parsers merged with mainline with support for old list parsers.
</action>
</release>
--
<release version="1.0.0" date="February 23, 2003" description="first
jakarta-commons release">
<action dev="brekke" type="add">
Added a migration document for moving from NetComponents to
Commons/Net.
