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 081b7ff7 Comment: Remove unnecessary Latin acronym 081b7ff7 is described below commit 081b7ff749ffaee453d8b06dd5be10bc7f964af1 Author: Gary Gregory <garydgreg...@gmail.com> AuthorDate: Fri Mar 14 10:02:58 2025 -0400 Comment: Remove unnecessary Latin acronym --- .github/workflows/maven.yml | 2 +- pom.xml | 2 +- src/main/java/org/apache/commons/net/SocketClient.java | 2 +- src/main/java/org/apache/commons/net/ftp/FTPClient.java | 8 ++++---- src/main/java/org/apache/commons/net/ftp/FTPSClient.java | 2 +- .../apache/commons/net/ftp/parser/MacOsPeterFTPEntryParser.java | 2 +- .../org/apache/commons/net/ftp/parser/UnixFTPEntryParser.java | 2 +- src/main/java/org/apache/commons/net/nntp/NNTPClient.java | 2 +- 8 files changed, 11 insertions(+), 11 deletions(-) diff --git a/.github/workflows/maven.yml b/.github/workflows/maven.yml index d3dc254a..ca43462b 100644 --- a/.github/workflows/maven.yml +++ b/.github/workflows/maven.yml @@ -82,7 +82,7 @@ jobs: server-password: NEXUS_PW # env variable for token in deploy - name: Build and test with Maven run: mvn --errors --show-version --batch-mode --no-transfer-progress -Ddoclint=all -# N.B. Add -Pslf4j-simple to enable logging above +# Add -Pslf4j-simple to enable logging above - name: Deploy SNAPSHOT using minimal build if: matrix.deploy && github.repository == 'apache/commons-net' && github.ref_name == 'master' env: diff --git a/pom.xml b/pom.xml index 385b6847..9968df1f 100644 --- a/pom.xml +++ b/pom.xml @@ -30,7 +30,7 @@ <artifactId>commons-net</artifactId> <version>3.12.0-SNAPSHOT</version> <name>Apache Commons Net</name> - <!-- N.B. the description content is deliberately not indented ! to improve the layout of the Release Notes generated + <!-- The description content is deliberately not indented ! to improve the layout of the Release Notes generated by mvn changes:announcement-generate --> <description> Apache Commons Net library contains a collection of network utilities and protocol implementations. diff --git a/src/main/java/org/apache/commons/net/SocketClient.java b/src/main/java/org/apache/commons/net/SocketClient.java index 1d60d929..7abb1b81 100644 --- a/src/main/java/org/apache/commons/net/SocketClient.java +++ b/src/main/java/org/apache/commons/net/SocketClient.java @@ -793,7 +793,7 @@ public abstract class SocketClient { } /* - * N.B. Fields cannot be pulled up into a super-class without breaking binary compatibility, so the abstract method is needed to pass the instance to the + * Fields cannot be pulled up into a super-class without breaking binary compatibility, so the abstract method is needed to pass the instance to the * methods which were moved here. */ } 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 08d37449..fd9b44cb 100644 --- a/src/main/java/org/apache/commons/net/ftp/FTPClient.java +++ b/src/main/java/org/apache/commons/net/ftp/FTPClient.java @@ -2195,7 +2195,7 @@ public class FTPClient extends FTP implements Configurable { * This information is obtained through the LIST command. The contents of the returned array is determined by the{@link FTPFileEntryParser} used. * </p> * <p> - * N.B. the LIST command does not generally return very precise timestamps. For recent files, the response usually contains hours and minutes (not seconds). + * The LIST command does not generally return very precise timestamps. For recent files, the response usually contains hours and minutes (not seconds). * For older files, the output may only contain a date. If the server supports it, the MLSD command returns timestamps with a precision of seconds, and may * include milliseconds. See {@link #mlistDir()} * </p> @@ -2227,7 +2227,7 @@ public class FTPClient extends FTP implements Configurable { * This information is obtained through the LIST command. The contents of the returned array is determined by the{@link FTPFileEntryParser} used. * </p> * <p> - * N.B. the LIST command does not generally return very precise timestamps. For recent files, the response usually contains hours and minutes (not seconds). + * The LIST command does not generally return very precise timestamps. For recent files, the response usually contains hours and minutes (not seconds). * For older files, the output may only contain a date. If the server supports it, the MLSD command returns timestamps with a precision of seconds, and may * include milliseconds. See {@link #mlistDir()} * </p> @@ -2260,7 +2260,7 @@ public class FTPClient extends FTP implements Configurable { * This information is obtained through the LIST command. The contents of the returned array is determined by the {@link FTPFileEntryParser} used. * </p> * <p> - * N.B. the LIST command does not generally return very precise timestamps. For recent files, the response usually contains hours and minutes (not seconds). + * The LIST command does not generally return very precise timestamps. For recent files, the response usually contains hours and minutes (not seconds). * For older files, the output may only contain a date. If the server supports it, the MLSD command returns timestamps with a precision of seconds, and may * include milliseconds. See {@link #mlistDir()} * </p> @@ -2293,7 +2293,7 @@ public class FTPClient extends FTP implements Configurable { * This information is obtained through the LIST command. The contents of the returned array is determined by the {@link FTPFileEntryParser} used. * </p> * <p> - * N.B. the LIST command does not generally return very precise timestamps. For recent files, the response usually contains hours and minutes (not seconds). + * The LIST command does not generally return very precise timestamps. For recent files, the response usually contains hours and minutes (not seconds). * For older files, the output may only contain a date. If the server supports it, the MLSD command returns timestamps with a precision of seconds, and may * include milliseconds. See {@link #mlistDir()} * </p> diff --git a/src/main/java/org/apache/commons/net/ftp/FTPSClient.java b/src/main/java/org/apache/commons/net/ftp/FTPSClient.java index dc26b5c8..58598c62 100644 --- a/src/main/java/org/apache/commons/net/ftp/FTPSClient.java +++ b/src/main/java/org/apache/commons/net/ftp/FTPSClient.java @@ -550,7 +550,7 @@ public class FTPSClient extends FTPClient { if (idx == -1) { return null; } - // N.B. Cannot use trim before substring as leading space would affect the offset. + // Cannot use trim before substring as leading space would affect the offset. return reply.substring(idx + prefix.length()).trim(); } diff --git a/src/main/java/org/apache/commons/net/ftp/parser/MacOsPeterFTPEntryParser.java b/src/main/java/org/apache/commons/net/ftp/parser/MacOsPeterFTPEntryParser.java index 406396b8..1f0ae049 100644 --- a/src/main/java/org/apache/commons/net/ftp/parser/MacOsPeterFTPEntryParser.java +++ b/src/main/java/org/apache/commons/net/ftp/parser/MacOsPeterFTPEntryParser.java @@ -47,7 +47,7 @@ public class MacOsPeterFTPEntryParser extends ConfigurableFTPFileEntryParserImpl + "(" + "(folder\\s+)" + "|" + "((\\d+)\\s+(\\d+)\\s+)" // resource size & data size + ")" + "(\\d+)\\s+" // size /* - * numeric or standard format date: yyyy-mm-dd (expecting hh:mm to follow) MMM [d]d [d]d MMM N.B. use non-space for MMM to allow for languages such + * numeric or standard format date: yyyy-mm-dd (expecting hh:mm to follow) MMM [d]d [d]d MMM Use non-space for MMM to allow for languages such * as German which use diacritics (e.g. umlaut) in some abbreviations. */ + "((?:\\d+[-/]\\d+[-/]\\d+)|(?:\\S{3}\\s+\\d{1,2})|(?:\\d{1,2}\\s+\\S{3}))\\s+" diff --git a/src/main/java/org/apache/commons/net/ftp/parser/UnixFTPEntryParser.java b/src/main/java/org/apache/commons/net/ftp/parser/UnixFTPEntryParser.java index 09dd9f4b..2896573d 100644 --- a/src/main/java/org/apache/commons/net/ftp/parser/UnixFTPEntryParser.java +++ b/src/main/java/org/apache/commons/net/ftp/parser/UnixFTPEntryParser.java @@ -89,7 +89,7 @@ public class UnixFTPEntryParser extends ConfigurableFTPFileEntryParserImpl { + "\\s+" // separator /* - * numeric or standard format date: yyyy-mm-dd (expecting hh:mm to follow) MMM [d]d [d]d MMM N.B. use non-space for MMM to allow for languages such + * numeric or standard format date: yyyy-mm-dd (expecting hh:mm to follow) MMM [d]d [d]d MMM Use non-space for MMM to allow for languages such * as German which use diacritics (e.g. umlaut) in some abbreviations. Japanese uses numeric day and month with suffixes to distinguish them [d]dXX * [d]dZZ */ 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 bd19b841..3450b372 100644 --- a/src/main/java/org/apache/commons/net/nntp/NNTPClient.java +++ b/src/main/java/org/apache/commons/net/nntp/NNTPClient.java @@ -276,7 +276,7 @@ public class NNTPClient extends NNTP { if (info == null) { throw new IOException("XOVER command failed: " + getReplyString()); } - // N.B. info is already DotTerminated, so don't rewrap + // Info is already DotTerminated, so don't rewrap return new ArticleIterator(new ReplyIterator(info, false)); }