Skip to content

Commit

Permalink
NIFI-12188 Upgraded Commons Net from 3.9.0 to 3.10.0
Browse files Browse the repository at this point in the history
- Removed ProxyFTPClient extension of standard FTPClient no longer required following changes implemented in NET-650

Signed-off-by: Pierre Villard <pierre.villard.fr@gmail.com>

This closes #7855.
  • Loading branch information
exceptionfactory authored and pvillard31 committed Oct 9, 2023
1 parent ef90e2a commit b27b849
Show file tree
Hide file tree
Showing 4 changed files with 4 additions and 139 deletions.

This file was deleted.

Original file line number Diff line number Diff line change
Expand Up @@ -172,12 +172,10 @@ private FTPClient createClient(final PropertyContext context) {

final Proxy.Type proxyType = proxyConfiguration.getProxyType();

FTPClient client;
if (Proxy.Type.DIRECT == proxyType) {
client = new FTPClient();
} else {
final FTPClient client = new FTPClient();
if (Proxy.Type.HTTP == proxyType || Proxy.Type.SOCKS == proxyType) {
final SocketFactory socketFactory = SOCKET_FACTORY_PROVIDER.getSocketFactory(proxyConfiguration);
client = new ProxyFTPClient(socketFactory);
client.setSocketFactory(socketFactory);
// Disable NAT workaround for proxy connections
client.setPassiveNatWorkaroundStrategy(null);
}
Expand Down

This file was deleted.

2 changes: 1 addition & 1 deletion pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -114,7 +114,7 @@
<org.apache.commons.codec.version>1.16.0</org.apache.commons.codec.version>
<org.apache.commons.compress.version>1.24.0</org.apache.commons.compress.version>
<org.apache.commons.lang3.version>3.13.0</org.apache.commons.lang3.version>
<org.apache.commons.net.version>3.9.0</org.apache.commons.net.version>
<org.apache.commons.net.version>3.10.0</org.apache.commons.net.version>
<org.apache.commons.io.version>2.14.0</org.apache.commons.io.version>
<org.apache.commons.text.version>1.10.0</org.apache.commons.text.version>
<org.apache.httpcomponents.httpclient.version>4.5.14</org.apache.httpcomponents.httpclient.version>
Expand Down

0 comments on commit b27b849

Please sign in to comment.