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-vfs.git
The following commit(s) were added to refs/heads/master by this push:
new 23974217 Bump ftpserver-core 1.1.2 to 1.2.0
23974217 is described below
commit 239742176cd99e41568fd31e5813c53243f2404e
Author: Gary Gregory <garydgreg...@gmail.com>
AuthorDate: Sat Nov 26 13:43:33 2022 -0500
Bump ftpserver-core 1.1.2 to 1.2.0
---
.../ftps/AbstractFtpsProviderTestCase.java | 38 ++++++++++++----------
.../ftps/NoProtocolSslConfigurationProxy.java | 32 +++++++++---------
pom.xml | 2 +-
3 files changed, 37 insertions(+), 35 deletions(-)
diff --git
a/commons-vfs2/src/test/java/org/apache/commons/vfs2/provider/ftps/AbstractFtpsProviderTestCase.java
b/commons-vfs2/src/test/java/org/apache/commons/vfs2/provider/ftps/AbstractFtpsProviderTestCase.java
index 1f882eda..83f08935 100644
---
a/commons-vfs2/src/test/java/org/apache/commons/vfs2/provider/ftps/AbstractFtpsProviderTestCase.java
+++
b/commons-vfs2/src/test/java/org/apache/commons/vfs2/provider/ftps/AbstractFtpsProviderTestCase.java
@@ -82,7 +82,7 @@ abstract class AbstractFtpsProviderTestCase extends
AbstractProviderTestConfig {
*/
private static String ConnectionUri;
- private static FtpServer Server;
+ private static FtpServer EmbeddedFtpServer;
private static final String TEST_URI = "test.ftps.uri";
@@ -105,15 +105,17 @@ abstract class AbstractFtpsProviderTestCase extends
AbstractProviderTestConfig {
}
/**
- * Creates and starts an embedded Apache FTP Server (MINA).
+ * Creates and starts an embedded Apache FTP EmbeddedFtpServer (MINA).
*
* @param implicit FTPS connection mode
* @throws FtpException
*/
- static void setUpClass(final boolean implicit) throws FtpException {
- if (Server != null) {
+ synchronized static void setUpClass(final boolean implicit) throws
FtpException {
+ if (EmbeddedFtpServer != null) {
return;
}
+ // Let the OS find use an ephemeral port by using 0.
+ SocketPort = 0;
final FtpServerFactory serverFactory = new FtpServerFactory();
final PropertiesUserManagerFactory propertiesUserManagerFactory = new
PropertiesUserManagerFactory();
final URL userPropsResource =
ClassLoader.getSystemClassLoader().getResource(USER_PROPS_RES);
@@ -126,21 +128,21 @@ abstract class AbstractFtpsProviderTestCase extends
AbstractProviderTestConfig {
user.setHomeDirectory(getTestDirectory());
serverFactory.setUserManager(userManager);
final ListenerFactory factory = new ListenerFactory();
- // Let the OS find use an ephemeral port by using 0 here.
- factory.setPort(0);
+ factory.setPort(SocketPort);
// define SSL configuration
final URL serverJksResource =
ClassLoader.getSystemClassLoader().getResource(SERVER_JKS_RES);
Assertions.assertNotNull(serverJksResource, SERVER_JKS_RES);
- final SslConfigurationFactory ssl = new SslConfigurationFactory();
+ // System.out.println("Loading " + serverJksResource);
+ final SslConfigurationFactory sllConfigFactory = new
SslConfigurationFactory();
final File keyStoreFile = FileUtils.toFile(serverJksResource);
Assertions.assertTrue(keyStoreFile.exists(), keyStoreFile.toString());
- ssl.setKeystoreFile(keyStoreFile);
- ssl.setKeystorePassword("password");
+ sllConfigFactory.setKeystoreFile(keyStoreFile);
+ sllConfigFactory.setKeystorePassword("password");
// set the SSL configuration for the listener
- SslConfiguration sslConfiguration = ssl.createSslConfiguration();
- NoProtocolSslConfigurationProxy noProtocolSslConfigurationProxy = new
NoProtocolSslConfigurationProxy(sslConfiguration);
+ final SslConfiguration sslConfiguration =
sllConfigFactory.createSslConfiguration();
+ final NoProtocolSslConfigurationProxy noProtocolSslConfigurationProxy
= new NoProtocolSslConfigurationProxy(sslConfiguration);
factory.setSslConfiguration(noProtocolSslConfigurationProxy);
factory.setImplicitSsl(implicit);
@@ -148,19 +150,19 @@ abstract class AbstractFtpsProviderTestCase extends
AbstractProviderTestConfig {
serverFactory.addListener("default", factory.createListener());
// start the server
- Server = serverFactory.createServer();
- Server.start();
- SocketPort = ((org.apache.ftpserver.impl.DefaultFtpServer)
Server).getListener("default").getPort();
+ EmbeddedFtpServer = serverFactory.createServer();
+ EmbeddedFtpServer.start();
+ SocketPort = ((org.apache.ftpserver.impl.DefaultFtpServer)
EmbeddedFtpServer).getListener("default").getPort();
ConnectionUri = "ftps://test:test@localhost:" + SocketPort;
}
/**
- * Stops the embedded Apache FTP Server (MINA).
+ * Stops the embedded Apache FTP EmbeddedFtpServer (MINA).
*/
static void tearDownClass() {
- if (Server != null) {
- Server.stop();
- Server = null;
+ if (EmbeddedFtpServer != null) {
+ EmbeddedFtpServer.stop();
+ EmbeddedFtpServer = null;
}
}
diff --git
a/commons-vfs2/src/test/java/org/apache/commons/vfs2/provider/ftps/NoProtocolSslConfigurationProxy.java
b/commons-vfs2/src/test/java/org/apache/commons/vfs2/provider/ftps/NoProtocolSslConfigurationProxy.java
index 6d5a8c06..f1771491 100644
---
a/commons-vfs2/src/test/java/org/apache/commons/vfs2/provider/ftps/NoProtocolSslConfigurationProxy.java
+++
b/commons-vfs2/src/test/java/org/apache/commons/vfs2/provider/ftps/NoProtocolSslConfigurationProxy.java
@@ -30,40 +30,40 @@ import org.apache.ftpserver.ssl.SslConfiguration;
*/
public class NoProtocolSslConfigurationProxy implements SslConfiguration {
- @Override
- public String getEnabledProtocol() {
- return null;
- }
-
private final SslConfiguration sslConfiguration;
- public NoProtocolSslConfigurationProxy(SslConfiguration sslConfiguration) {
+ public NoProtocolSslConfigurationProxy(final SslConfiguration
sslConfiguration) {
this.sslConfiguration = sslConfiguration;
}
@Override
- public SSLSocketFactory getSocketFactory() throws GeneralSecurityException
{
- return this.sslConfiguration.getSocketFactory();
+ public ClientAuth getClientAuth() {
+ return this.sslConfiguration.getClientAuth();
}
@Override
- public SSLContext getSSLContext() throws GeneralSecurityException {
- return this.sslConfiguration.getSSLContext();
+ public String[] getEnabledCipherSuites() {
+ return this.sslConfiguration.getEnabledCipherSuites();
}
@Override
- public SSLContext getSSLContext(String protocol) throws
GeneralSecurityException {
- return this.sslConfiguration.getSSLContext(protocol);
+ public String[] getEnabledProtocols() {
+ return null;
}
@Override
- public String[] getEnabledCipherSuites() {
- return this.sslConfiguration.getEnabledCipherSuites();
+ public SSLSocketFactory getSocketFactory() throws GeneralSecurityException
{
+ return this.sslConfiguration.getSocketFactory();
}
@Override
- public ClientAuth getClientAuth() {
- return this.sslConfiguration.getClientAuth();
+ public SSLContext getSSLContext() throws GeneralSecurityException {
+ return this.sslConfiguration.getSSLContext();
+ }
+
+ @Override
+ public SSLContext getSSLContext(final String protocol) throws
GeneralSecurityException {
+ return this.sslConfiguration.getSSLContext(protocol);
}
}
diff --git a/pom.xml b/pom.xml
index f48a70e0..c8a4dd69 100644
--- a/pom.xml
+++ b/pom.xml
@@ -637,7 +637,7 @@
<dependency>
<groupId>org.apache.ftpserver</groupId>
<artifactId>ftpserver-core</artifactId>
- <version>1.1.2</version>
+ <version>1.2.0</version>
</dependency>
<dependency>
<groupId>org.slf4j</groupId>
