This is an automated email from the ASF dual-hosted git repository. github-bot pushed a change to branch dependabot/maven/1.2.X/org.slf4j-slf4j-api-2.0.16 in repository https://gitbox.apache.org/repos/asf/mina-ftpserver.git
discard 7db51d2b Bump org.slf4j:slf4j-api from 1.7.36 to 2.0.16 add 473ca0b0 Fix copyright end date in notice file add a804abd1 Use HTTPS in notice file add 672398ae Bump org.apache.logging.log4j:log4j-core from 2.20.0 to 2.24.3 add 4b80b43c Merge pull request #47 from apache/dependabot/maven/1.2.X/org.apache.logging.log4j-log4j-core-2.24.3 add 21c534f9 Bump commons-codec:commons-codec from 1.16.0 to 1.17.1 add 28ecf930 Merge pull request #50 from apache/dependabot/maven/1.2.X/commons-codec-commons-codec-1.17.1 add 60b93cc9 Fixed nearly 2 000 checksyle errors add aa803eb5 Bump org.slf4j:slf4j-api from 1.7.36 to 2.0.16 This update added new revisions after undoing existing revisions. That is to say, some revisions that were in the old version of the branch are not in the new version. This situation occurs when a user --force pushes a change and generates a repository containing something like this: * -- * -- B -- O -- O -- O (7db51d2b) \ N -- N -- N refs/heads/dependabot/maven/1.2.X/org.slf4j-slf4j-api-2.0.16 (aa803eb5) You should already have received notification emails for all of the O revisions, and so the following emails describe only the N revisions from the common base, B. Any revisions marked "omit" are not gone; other references still refer to them. Any revisions marked "discard" are gone forever. No new revisions were added by this update. Summary of changes: NOTICE.txt | 4 +- core/pom.xml | 6 +- .../apache/ftpserver/ConnectionConfigFactory.java | 12 +- .../ftpserver/DataConnectionConfiguration.java | 12 +- .../DataConnectionConfigurationFactory.java | 36 +-- .../apache/ftpserver/DataConnectionException.java | 6 +- .../main/java/org/apache/ftpserver/FtpServer.java | 14 +- .../ftpserver/FtpServerConfigurationException.java | 7 + .../org/apache/ftpserver/FtpServerFactory.java | 36 +-- .../main/java/org/apache/ftpserver/Version.java | 2 +- .../java/org/apache/ftpserver/command/Command.java | 6 +- .../ftpserver/command/CommandFactoryFactory.java | 24 +- .../ftpserver/command/NotSupportedCommand.java | 2 + .../org/apache/ftpserver/command/impl/ABOR.java | 6 +- .../org/apache/ftpserver/command/impl/ACCT.java | 6 +- .../org/apache/ftpserver/command/impl/APPE.java | 14 +- .../org/apache/ftpserver/command/impl/AUTH.java | 25 +- .../org/apache/ftpserver/command/impl/CDUP.java | 6 +- .../org/apache/ftpserver/command/impl/CWD.java | 6 +- .../org/apache/ftpserver/command/impl/DELE.java | 10 +- .../command/impl/DefaultCommandFactory.java | 6 +- .../org/apache/ftpserver/command/impl/EPRT.java | 10 +- .../org/apache/ftpserver/command/impl/EPSV.java | 4 +- .../org/apache/ftpserver/command/impl/FEAT.java | 7 +- .../org/apache/ftpserver/command/impl/HELP.java | 10 +- .../org/apache/ftpserver/command/impl/LANG.java | 3 +- .../org/apache/ftpserver/command/impl/LIST.java | 16 +- .../org/apache/ftpserver/command/impl/MD5.java | 14 +- .../org/apache/ftpserver/command/impl/MDTM.java | 8 +- .../org/apache/ftpserver/command/impl/MFMT.java | 30 +- .../org/apache/ftpserver/command/impl/MKD.java | 6 +- .../org/apache/ftpserver/command/impl/MLSD.java | 6 +- .../org/apache/ftpserver/command/impl/MLST.java | 6 +- .../org/apache/ftpserver/command/impl/MODE.java | 8 +- .../org/apache/ftpserver/command/impl/NLST.java | 6 +- .../org/apache/ftpserver/command/impl/NOOP.java | 8 +- .../org/apache/ftpserver/command/impl/OPTS.java | 6 +- .../apache/ftpserver/command/impl/OPTS_MLST.java | 21 +- .../apache/ftpserver/command/impl/OPTS_UTF8.java | 4 +- .../org/apache/ftpserver/command/impl/PASS.java | 13 +- .../org/apache/ftpserver/command/impl/PASV.java | 22 +- .../org/apache/ftpserver/command/impl/PBSZ.java | 4 +- .../org/apache/ftpserver/command/impl/PORT.java | 17 +- .../org/apache/ftpserver/command/impl/PROT.java | 12 +- .../org/apache/ftpserver/command/impl/PWD.java | 8 +- .../org/apache/ftpserver/command/impl/QUIT.java | 10 +- .../org/apache/ftpserver/command/impl/REIN.java | 6 +- .../org/apache/ftpserver/command/impl/REST.java | 8 +- .../org/apache/ftpserver/command/impl/RETR.java | 25 +- .../org/apache/ftpserver/command/impl/RMD.java | 20 +- .../org/apache/ftpserver/command/impl/RNFR.java | 8 +- .../org/apache/ftpserver/command/impl/RNTO.java | 10 +- .../org/apache/ftpserver/command/impl/SITE.java | 4 +- .../ftpserver/command/impl/SITE_DESCUSER.java | 4 +- .../apache/ftpserver/command/impl/SITE_HELP.java | 4 +- .../apache/ftpserver/command/impl/SITE_STAT.java | 4 +- .../apache/ftpserver/command/impl/SITE_WHO.java | 4 +- .../apache/ftpserver/command/impl/SITE_ZONE.java | 7 +- .../org/apache/ftpserver/command/impl/SIZE.java | 6 +- .../org/apache/ftpserver/command/impl/STAT.java | 28 +- .../org/apache/ftpserver/command/impl/STOR.java | 14 +- .../org/apache/ftpserver/command/impl/STOU.java | 14 +- .../org/apache/ftpserver/command/impl/STRU.java | 8 +- .../org/apache/ftpserver/command/impl/SYST.java | 8 +- .../org/apache/ftpserver/command/impl/TYPE.java | 10 +- .../org/apache/ftpserver/command/impl/USER.java | 14 +- .../command/impl/listing/DirectoryLister.java | 8 +- .../ftpserver/command/impl/listing/FileFilter.java | 6 +- .../command/impl/listing/FileFormater.java | 4 +- .../command/impl/listing/LISTFileFormater.java | 21 +- .../command/impl/listing/ListArgument.java | 10 +- .../command/impl/listing/ListArgumentParser.java | 4 +- .../command/impl/listing/MLSTFileFormater.java | 6 +- .../command/impl/listing/NLSTFileFormater.java | 6 +- .../command/impl/listing/RegexFileFilter.java | 8 +- .../command/impl/listing/VisibleFileFilter.java | 6 +- .../command/impl/listing/package-info.java | 2 +- .../ftpserver/command/impl/package-info.java | 2 +- .../spring/CommandFactoryBeanDefinitionParser.java | 8 +- .../spring/ListenerBeanDefinitionParser.java | 19 +- .../config/spring/ServerBeanDefinitionParser.java | 15 +- .../apache/ftpserver/config/spring/SpringUtil.java | 22 +- .../spring/UserManagerBeanDefinitionParser.java | 14 +- .../factorybeans/ConnectionConfigFactoryBean.java | 2 +- .../DataConnectionConfigurationFactoryBean.java | 4 +- .../spring/factorybeans/FtpServerFactoryBean.java | 4 +- .../spring/factorybeans/ListenerFactoryBean.java | 2 +- .../factorybeans/SslConfigurationFactoryBean.java | 3 +- .../ftpserver/config/spring/package-info.java | 2 +- .../nativefs/NativeFileSystemFactory.java | 6 +- .../nativefs/impl/NameEqualsFileFilter.java | 5 +- .../nativefs/impl/NativeFileSystemView.java | 49 +-- .../filesystem/nativefs/impl/NativeFtpFile.java | 46 +-- .../filesystem/nativefs/impl/package-info.java | 2 +- .../ftpserver/ftpletcontainer/FtpletContainer.java | 6 +- .../impl/DefaultFtpletContainer.java | 22 +- .../ftpletcontainer/impl/package-info.java | 2 +- .../ftpserver/impl/DefaultConnectionConfig.java | 13 +- .../impl/DefaultDataConnectionConfiguration.java | 35 ++ .../apache/ftpserver/impl/DefaultFtpHandler.java | 30 +- .../apache/ftpserver/impl/DefaultFtpRequest.java | 40 +-- .../apache/ftpserver/impl/DefaultFtpServer.java | 55 ++-- .../ftpserver/impl/DefaultFtpServerContext.java | 29 +- .../apache/ftpserver/impl/DefaultFtpSession.java | 37 +-- .../ftpserver/impl/DefaultFtpStatistics.java | 93 +++--- .../org/apache/ftpserver/impl/FileObserver.java | 19 +- .../java/org/apache/ftpserver/impl/FtpHandler.java | 25 ++ .../org/apache/ftpserver/impl/FtpIoSession.java | 153 ++++----- .../apache/ftpserver/impl/FtpReplyTranslator.java | 360 ++++++++++----------- .../apache/ftpserver/impl/FtpServerContext.java | 13 +- .../apache/ftpserver/impl/IODataConnection.java | 27 +- .../ftpserver/impl/IODataConnectionFactory.java | 145 +++++---- .../impl/LocalizedDataTransferFtpReply.java | 10 +- .../impl/LocalizedFileActionFtpReply.java | 8 +- .../apache/ftpserver/impl/LocalizedFtpReply.java | 4 +- .../ftpserver/impl/LocalizedRenameFtpReply.java | 8 +- .../org/apache/ftpserver/impl/PassivePorts.java | 10 +- .../impl/ServerDataConnectionFactory.java | 22 +- .../apache/ftpserver/impl/ServerFtpStatistics.java | 31 ++ .../apache/ftpserver/impl/StatisticsObserver.java | 8 +- .../org/apache/ftpserver/impl/package-info.java | 2 +- .../apache/ftpserver/ipfilter/IpFilterType.java | 6 +- .../ftpserver/ipfilter/MinaSessionFilter.java | 6 +- .../apache/ftpserver/ipfilter/RemoteIpFilter.java | 16 +- .../apache/ftpserver/ipfilter/SessionFilter.java | 8 +- .../org/apache/ftpserver/listener/Listener.java | 30 +- .../apache/ftpserver/listener/ListenerFactory.java | 56 ++-- .../ftpserver/listener/nio/AbstractListener.java | 43 ++- .../ftpserver/listener/nio/FtpHandlerAdapter.java | 8 +- .../ftpserver/listener/nio/FtpLoggingFilter.java | 16 +- .../ftpserver/listener/nio/FtpResponseEncoder.java | 12 +- .../nio/FtpServerProtocolCodecFactory.java | 10 +- .../apache/ftpserver/listener/nio/NioListener.java | 106 ++++-- .../ftpserver/listener/nio/package-info.java | 2 +- .../java/org/apache/ftpserver/main/AddUser.java | 77 +++-- .../org/apache/ftpserver/main/CommandLine.java | 31 +- .../ftpserver/message/MessageResourceFactory.java | 8 +- .../message/impl/DefaultMessageResource.java | 61 ++-- .../ftpserver/message/impl/package-info.java | 2 +- .../java/org/apache/ftpserver/ssl/ClientAuth.java | 2 +- .../org/apache/ftpserver/ssl/SslConfiguration.java | 26 +- .../ftpserver/ssl/SslConfigurationFactory.java | 126 ++++---- .../apache/ftpserver/ssl/impl/AliasKeyManager.java | 32 +- .../ssl/impl/DefaultSslConfiguration.java | 56 +++- .../ssl/impl/ExtendedAliasKeyManager.java | 36 +-- .../apache/ftpserver/ssl/impl/package-info.java | 2 +- .../usermanager/AnonymousAuthentication.java | 6 +- .../usermanager/ClearTextPasswordEncryptor.java | 11 +- .../usermanager/DbUserManagerFactory.java | 66 ++-- .../usermanager/Md5PasswordEncryptor.java | 4 +- .../ftpserver/usermanager/PasswordEncryptor.java | 4 +- .../usermanager/PropertiesUserManagerFactory.java | 16 +- .../usermanager/SaltedPasswordEncryptor.java | 4 +- .../usermanager/Sha1PasswordEncryptor.java | 4 +- .../usermanager/Sha256PasswordEncryptor.java | 4 +- .../usermanager/Sha512PasswordEncryptor.java | 4 +- .../apache/ftpserver/usermanager/UserFactory.java | 6 +- .../ftpserver/usermanager/UserManagerFactory.java | 5 +- .../UsernamePasswordAuthentication.java | 10 +- .../usermanager/impl/AbstractUserManager.java | 14 +- .../ftpserver/usermanager/impl/BaseUser.java | 43 ++- .../impl/ConcurrentLoginPermission.java | 6 +- .../usermanager/impl/ConcurrentLoginRequest.java | 14 +- .../ftpserver/usermanager/impl/DbUserManager.java | 80 +++-- .../usermanager/impl/PropertiesUserManager.java | 90 ++++-- .../usermanager/impl/TransferRatePermission.java | 6 +- .../usermanager/impl/TransferRateRequest.java | 2 +- .../ftpserver/usermanager/impl/UserMetadata.java | 10 +- .../usermanager/impl/WritePermission.java | 9 +- .../ftpserver/usermanager/impl/WriteRequest.java | 9 +- .../org/apache/ftpserver/util/BaseProperties.java | 84 ++++- .../java/org/apache/ftpserver/util/ClassUtils.java | 2 +- .../java/org/apache/ftpserver/util/DateUtils.java | 35 +- .../org/apache/ftpserver/util/EncryptUtils.java | 40 ++- .../apache/ftpserver/util/FileRegularFilter.java | 13 +- .../util/IllegalInetAddressException.java | 2 +- .../ftpserver/util/IllegalPortException.java | 2 +- .../java/org/apache/ftpserver/util/IoUtils.java | 95 ++++-- .../main/java/org/apache/ftpserver/util/OS.java | 12 +- .../org/apache/ftpserver/util/PasswordUtil.java | 24 +- .../org/apache/ftpserver/util/RegularExpr.java | 18 +- .../ftpserver/util/SocketAddressEncoder.java | 2 +- .../org/apache/ftpserver/util/StringUtils.java | 24 +- .../apache/ftpserver/message/FtpStatus.properties | 2 +- .../ftpserver/message/FtpStatus_en.properties | 2 +- core/src/test/resources/log4j.properties | 6 +- .../org/apache/ftpserver/ftpserver.properties | 4 +- .../resources/spring-config/placeholder.properties | 2 +- examples/ftpserver-example-spring-war/pom.xml | 1 - examples/ftpserver-osgi-ftplet-service/pom.xml | 2 - examples/ftpserver-osgi-spring-service/pom.xml | 3 +- .../osgiservice/impl/FtpServerLifecycle.java | 4 +- .../example/osgiservice/impl}/package-info.java | 2 +- examples/pom.xml | 1 - ftplet-api/pom.xml | 6 - .../ftplet/AuthenticationFailedException.java | 6 +- .../org/apache/ftpserver/ftplet/Authority.java | 10 +- .../apache/ftpserver/ftplet/DataConnection.java | 3 +- .../ftpserver/ftplet/DataConnectionFactory.java | 7 +- .../java/org/apache/ftpserver/ftplet/DataType.java | 2 +- .../apache/ftpserver/ftplet/DefaultFtpReply.java | 28 +- .../org/apache/ftpserver/ftplet/DefaultFtplet.java | 1 - .../ftpserver/ftplet/FileActionFtpReply.java | 10 +- .../apache/ftpserver/ftplet/FileSystemFactory.java | 3 +- .../apache/ftpserver/ftplet/FileSystemView.java | 10 +- .../org/apache/ftpserver/ftplet/FtpException.java | 6 +- .../org/apache/ftpserver/ftplet/FtpRequest.java | 12 +- .../org/apache/ftpserver/ftplet/FtpSession.java | 15 +- .../org/apache/ftpserver/ftplet/FtpStatistics.java | 2 +- .../org/apache/ftpserver/ftplet/FtpletResult.java | 2 +- .../apache/ftpserver/ftplet/RenameFtpReply.java | 13 +- .../org/apache/ftpserver/ftplet/Structure.java | 2 +- .../java/org/apache/ftpserver/ftplet/User.java | 6 +- .../org/apache/ftpserver/ftplet/UserManager.java | 4 +- pom.xml | 128 ++++++-- 215 files changed, 2380 insertions(+), 1687 deletions(-) copy {core/src/main/java/org/apache/ftpserver/filesystem/nativefs => examples/ftpserver-osgi-spring-service/src/main/java/org/apache/ftpserver/example/osgiservice/impl}/package-info.java (94%)