You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@commons.apache.org by gg...@apache.org on 2025/02/13 22:52:09 UTC

(commons-net) branch master updated: [tests] Bump org.apache.ftpserver:ftpserver-core from 1.2.0 to 1.2.1

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 5417b1e0 [tests] Bump org.apache.ftpserver:ftpserver-core from 1.2.0 to 1.2.1
5417b1e0 is described below

commit 5417b1e0051a1b8a013e88ee7e46d0bfc3281971
Author: Gary D. Gregory <ga...@gmail.com>
AuthorDate: Thu Feb 13 17:52:04 2025 -0500

    [tests] Bump org.apache.ftpserver:ftpserver-core from 1.2.0 to 1.2.1
---
 pom.xml                                                               | 2 +-
 src/changes/changes.xml                                               | 1 +
 src/test/java/org/apache/commons/net/ftp/AbstractFtpsTest.java        | 3 +++
 .../java/org/apache/commons/net/ftp/FTPClientTransferModeTest.java    | 3 +++
 .../org/apache/commons/net/ftp/NoProtocolSslConfigurationProxy.java   | 4 ++--
 5 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/pom.xml b/pom.xml
index 4a610fc6..00f3990b 100644
--- a/pom.xml
+++ b/pom.xml
@@ -123,7 +123,7 @@ Supported protocols include Echo, Finger, FTP, NNTP, NTP, POP3(S), SMTP(S), Teln
         <dependency>
             <groupId>org.apache.ftpserver</groupId>
             <artifactId>ftpserver-core</artifactId>
-            <version>1.2.0</version>
+            <version>1.2.1</version>
             <scope>test</scope>
         </dependency>
         <dependency>
diff --git a/src/changes/changes.xml b/src/changes/changes.xml
index 58e8e4e2..5ca64e85 100644
--- a/src/changes/changes.xml
+++ b/src/changes/changes.xml
@@ -94,6 +94,7 @@ The <action> type attribute can be add,update,fix,remove.
       <action type="update" dev="ggregory" due-to="Gary Gregory, Dependabot">Bump org.apache.commons:commons-lang3 from 3.14.0 to 3.17.0 #268, #273, #281.</action>
       <action type="update" dev="ggregory" due-to="Gary Gregory, Dependabot">Bump commons-io:commons-io from 2.16.1 to 2.18.0 #286, #308.</action>
       <action type="update" dev="ggregory" due-to="Gary Gregory, Dependabot">Bump org.apache.commons:commons-collections4 from 4.5.0-M2 to 4.5.0-M3 #314.</action>
+      <action type="update" dev="ggregory" due-to="Gary Gregory">Bump org.apache.ftpserver:ftpserver-core from 1.2.0 to 1.2.1.</action>
     </release>
     <release version="3.11.1" date="2024-06-07" description="This is a feature and maintenance release. Java 8 or later is required.">
       <!-- FIX -->
diff --git a/src/test/java/org/apache/commons/net/ftp/AbstractFtpsTest.java b/src/test/java/org/apache/commons/net/ftp/AbstractFtpsTest.java
index 88d7553e..7cb18142 100644
--- a/src/test/java/org/apache/commons/net/ftp/AbstractFtpsTest.java
+++ b/src/test/java/org/apache/commons/net/ftp/AbstractFtpsTest.java
@@ -36,6 +36,7 @@ import org.apache.ftpserver.ftplet.UserManager;
 import org.apache.ftpserver.listener.ListenerFactory;
 import org.apache.ftpserver.ssl.SslConfiguration;
 import org.apache.ftpserver.ssl.SslConfigurationFactory;
+import org.apache.ftpserver.usermanager.Md5PasswordEncryptor;
 import org.apache.ftpserver.usermanager.PropertiesUserManagerFactory;
 import org.apache.ftpserver.usermanager.impl.BaseUser;
 import org.junit.Assert;
@@ -90,6 +91,8 @@ public abstract class AbstractFtpsTest {
         SocketPort = 0;
         final FtpServerFactory serverFactory = new FtpServerFactory();
         final PropertiesUserManagerFactory propertiesUserManagerFactory = new PropertiesUserManagerFactory();
+        // TODO Update to SHA512
+        propertiesUserManagerFactory.setPasswordEncryptor(new Md5PasswordEncryptor());
         final URL userPropsResource = ClassLoader.getSystemClassLoader().getResource(userPropertiesResource);
         Assert.assertNotNull(userPropertiesResource, userPropsResource);
         propertiesUserManagerFactory.setUrl(userPropsResource);
diff --git a/src/test/java/org/apache/commons/net/ftp/FTPClientTransferModeTest.java b/src/test/java/org/apache/commons/net/ftp/FTPClientTransferModeTest.java
index 0bcd58bf..535c348e 100644
--- a/src/test/java/org/apache/commons/net/ftp/FTPClientTransferModeTest.java
+++ b/src/test/java/org/apache/commons/net/ftp/FTPClientTransferModeTest.java
@@ -40,6 +40,7 @@ import org.apache.ftpserver.ftplet.FtpException;
 import org.apache.ftpserver.ftplet.UserManager;
 import org.apache.ftpserver.listener.Listener;
 import org.apache.ftpserver.listener.ListenerFactory;
+import org.apache.ftpserver.usermanager.Md5PasswordEncryptor;
 import org.apache.ftpserver.usermanager.PropertiesUserManagerFactory;
 import org.apache.ftpserver.usermanager.impl.BaseUser;
 import org.apache.ftpserver.usermanager.impl.WritePermission;
@@ -71,6 +72,8 @@ public class FTPClientTransferModeTest {
     private static UserManager initUserManager(final String username, final String password) throws FtpException {
 
         final PropertiesUserManagerFactory propertiesUserManagerFactory = new PropertiesUserManagerFactory();
+        // TODO Update to SHA512
+        propertiesUserManagerFactory.setPasswordEncryptor(new Md5PasswordEncryptor());
         final UserManager userManager = propertiesUserManagerFactory.createUserManager();
         final BaseUser user = new BaseUser();
         user.setName(username);
diff --git a/src/test/java/org/apache/commons/net/ftp/NoProtocolSslConfigurationProxy.java b/src/test/java/org/apache/commons/net/ftp/NoProtocolSslConfigurationProxy.java
index f30db8c3..eaf3351b 100644
--- a/src/test/java/org/apache/commons/net/ftp/NoProtocolSslConfigurationProxy.java
+++ b/src/test/java/org/apache/commons/net/ftp/NoProtocolSslConfigurationProxy.java
@@ -50,8 +50,8 @@ public class NoProtocolSslConfigurationProxy implements SslConfiguration {
     }
 
     @Override
-    public String[] getEnabledProtocols() {
-        return null;
+    public String getEnabledProtocol() {
+        return DEFAULT_ENABLED_PROTOCOL;
     }
 
     @Override