NIFI-9939 Upgraded SSHJ from 0.32.0 to 0.33.0

- Removed PatchedSFTPEngine with resolution of SFTP renaming in SSHJ 0.33.0 Signed-off-by: Pierre Villard <pierre.villard.fr@gmail.com> This closes apache#5982.
influxdata · May 17, 2022 · 061a336 · 061a336
1 parent 12ecf91
commit 061a336
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 75 deletions.
diff --git a/...d-processors/src/main/java/org/apache/nifi/processors/standard/ssh/PatchedSFTPEngine.java b/...d-processors/src/main/java/org/apache/nifi/processors/standard/ssh/PatchedSFTPEngine.java
diff --git a/...ndard-processors/src/main/java/org/apache/nifi/processors/standard/util/SFTPTransfer.java b/...ndard-processors/src/main/java/org/apache/nifi/processors/standard/util/SFTPTransfer.java
@@ -26,6 +26,7 @@
 import net.schmizz.sshj.sftp.RemoteResourceInfo;
 import net.schmizz.sshj.sftp.Response;
 import net.schmizz.sshj.sftp.SFTPClient;
+import net.schmizz.sshj.sftp.SFTPEngine;
 import net.schmizz.sshj.sftp.SFTPException;
 import net.schmizz.sshj.xfer.FilePermission;
 import net.schmizz.sshj.xfer.LocalSourceFile;
@@ -42,7 +43,6 @@
 import org.apache.nifi.processor.ProcessSession;
 import org.apache.nifi.processor.exception.ProcessException;
 import org.apache.nifi.processor.util.StandardValidators;
-import org.apache.nifi.processors.standard.ssh.PatchedSFTPEngine;
 import org.apache.nifi.processors.standard.ssh.SSHClientProvider;
 import org.apache.nifi.processors.standard.ssh.StandardSSHClientProvider;
 import org.apache.nifi.proxy.ProxyConfiguration;
@@ -596,7 +596,7 @@ protected SFTPClient getSFTPClient(final FlowFile flowFile) throws IOException {
 
         final Map<String, String> attributes = flowFile == null ? Collections.emptyMap() : flowFile.getAttributes();
         this.sshClient = SSH_CLIENT_PROVIDER.getClient(ctx, attributes);
-        this.sftpClient = new SFTPClient(new PatchedSFTPEngine(sshClient).init());
+        this.sftpClient = new SFTPClient(new SFTPEngine(sshClient).init());
         this.closed = false;
 
         // Configure timeout for sftp operations

diff --git a/nifi-nar-bundles/nifi-standard-bundle/pom.xml b/nifi-nar-bundles/nifi-standard-bundle/pom.xml
@@ -181,7 +181,7 @@
             <dependency>
                 <groupId>com.hierynomus</groupId>
                 <artifactId>sshj</artifactId>
-                <version>0.32.0</version>
+                <version>0.33.0</version>
             </dependency>
             <dependency>
                 <groupId>jakarta.activation</groupId>