Skip to content

Commit 54fe04d

Browse files
committed
Bump org.apache.ftpserver:ftpserver-core from 1.2.0 to 1.2.1
Bump org.apache.mina:mina-core from 1.2.0 to 1.2.1
1 parent 6837fa8 commit 54fe04d

File tree

5 files changed

+13
-4
lines changed

5 files changed

+13
-4
lines changed

commons-vfs2/src/test/java/org/apache/commons/vfs2/provider/ftp/FtpProviderTestCase.java

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -39,6 +39,7 @@
3939
import org.apache.ftpserver.ftplet.FtpException;
4040
import org.apache.ftpserver.ftplet.UserManager;
4141
import org.apache.ftpserver.listener.ListenerFactory;
42+
import org.apache.ftpserver.usermanager.Md5PasswordEncryptor;
4243
import org.apache.ftpserver.usermanager.PropertiesUserManagerFactory;
4344
import org.apache.ftpserver.usermanager.impl.BaseUser;
4445
import org.junit.jupiter.api.Assertions;
@@ -88,6 +89,8 @@ static void setUpClass(final String rootDirectory, final FileSystemFactory fileS
8889
}
8990
final FtpServerFactory serverFactory = new FtpServerFactory();
9091
final PropertiesUserManagerFactory propertiesUserManagerFactory = new PropertiesUserManagerFactory();
92+
// TODO Update to SHA512
93+
propertiesUserManagerFactory.setPasswordEncryptor(new Md5PasswordEncryptor());
9194
final URL userPropsResource = ClassLoader.getSystemClassLoader().getResource(USER_PROPS_RES);
9295
Assertions.assertNotNull(userPropsResource, USER_PROPS_RES);
9396
propertiesUserManagerFactory.setUrl(userPropsResource);

commons-vfs2/src/test/java/org/apache/commons/vfs2/provider/ftps/AbstractFtpsProviderTestCase.java

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -36,6 +36,7 @@
3636
import org.apache.ftpserver.listener.ListenerFactory;
3737
import org.apache.ftpserver.ssl.SslConfiguration;
3838
import org.apache.ftpserver.ssl.SslConfigurationFactory;
39+
import org.apache.ftpserver.usermanager.Md5PasswordEncryptor;
3940
import org.apache.ftpserver.usermanager.PropertiesUserManagerFactory;
4041
import org.apache.ftpserver.usermanager.impl.BaseUser;
4142
import org.junit.jupiter.api.Assertions;
@@ -119,6 +120,8 @@ synchronized static void setUpClass(final boolean implicit) throws FtpException
119120
socketPort = 0;
120121
final FtpServerFactory serverFactory = new FtpServerFactory();
121122
final PropertiesUserManagerFactory propertiesUserManagerFactory = new PropertiesUserManagerFactory();
123+
// TODO Update to SHA512
124+
propertiesUserManagerFactory.setPasswordEncryptor(new Md5PasswordEncryptor());
122125
final URL userPropsResource = ClassLoader.getSystemClassLoader().getResource(USER_PROPS_RES);
123126
Assertions.assertNotNull(userPropsResource, USER_PROPS_RES);
124127
propertiesUserManagerFactory.setUrl(userPropsResource);
@@ -163,6 +166,7 @@ synchronized static void setUpClass(final boolean implicit) throws FtpException
163166
}
164167
socketPort = ((org.apache.ftpserver.impl.DefaultFtpServer) embeddedFtpServer).getListener(LISTENER_NAME).getPort();
165168
// System.out.println("Using port " + SocketPort);
169+
// System.out.printf("jdk.tls.disabledAlgorithms = %s%n", System.getProperty("jdk.tls.disabledAlgorithms"));
166170
connectionUri = "ftps://test:test@localhost:" + socketPort;
167171
}
168172

commons-vfs2/src/test/java/org/apache/commons/vfs2/provider/ftps/NoProtocolSslConfigurationProxy.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -48,8 +48,8 @@ public String[] getEnabledCipherSuites() {
4848
}
4949

5050
@Override
51-
public String[] getEnabledProtocols() {
52-
return null;
51+
public String getEnabledProtocol() {
52+
return DEFAULT_ENABLED_PROTOCOL;
5353
}
5454

5555
@Override

pom.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -495,7 +495,7 @@
495495
<dependency>
496496
<groupId>org.apache.ftpserver</groupId>
497497
<artifactId>ftpserver-core</artifactId>
498-
<version>1.2.0</version>
498+
<version>1.2.1</version>
499499
</dependency>
500500
<dependency>
501501
<groupId>org.slf4j</groupId>
@@ -516,7 +516,7 @@
516516
<dependency>
517517
<groupId>org.apache.mina</groupId>
518518
<artifactId>mina-core</artifactId>
519-
<version>2.1.10</version>
519+
<version>2.2.4</version>
520520
</dependency>
521521
<dependency>
522522
<groupId>org.bouncycastle</groupId>

src/changes/changes.xml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -49,6 +49,8 @@ The <action> type attribute can be add,update,fix,remove.
4949
<!-- FIX -->
5050
<!-- ADD -->
5151
<!-- UPDATE -->
52+
<action dev="ggregory" type="update" due-to="Gary Gregory">Bump org.apache.ftpserver:ftpserver-core from 1.2.0 to 1.2.1.</action>
53+
<action dev="ggregory" type="update" due-to="Gary Gregory">Bump org.apache.mina:mina-core from 1.2.0 to 1.2.1.</action>
5254
</release>
5355
<release version="2.10.0" date="2025-02-01" description="This is a feature and maintenance release. Java 8 or later is required.">
5456
<!-- FIX -->

0 commit comments

Comments
 (0)