From 32fbd46994ceed312d49292c1570a4ff1f937aca Mon Sep 17 00:00:00 2001 From: abilan Date: Fri, 14 Jul 2023 15:53:20 -0400 Subject: [PATCH] Upgrade to MINA SSHD 2.10.0 * Remove trailing slashes from remote dirs to create in SFTP tests --- build.gradle | 2 +- .../springframework/integration/sftp/SftpTestSupport.java | 2 +- .../sftp/session/SftpRemoteFileTemplateTests.java | 8 ++++---- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/build.gradle b/build.gradle index b38332b2c1f..c2de629f10b 100644 --- a/build.gradle +++ b/build.gradle @@ -47,7 +47,7 @@ ext { modifiedFiles = files(grgit.status().unstaged.modified).filter { f -> f.name.endsWith('.java') || f.name.endsWith('.kt') } - apacheSshdVersion = '2.9.2' + apacheSshdVersion = '2.10.0' artemisVersion = '2.29.0' aspectjVersion = '1.9.19' assertjVersion = '3.24.2' diff --git a/spring-integration-sftp/src/test/java/org/springframework/integration/sftp/SftpTestSupport.java b/spring-integration-sftp/src/test/java/org/springframework/integration/sftp/SftpTestSupport.java index 91344b8aa6e..aa93bede590 100644 --- a/spring-integration-sftp/src/test/java/org/springframework/integration/sftp/SftpTestSupport.java +++ b/spring-integration-sftp/src/test/java/org/springframework/integration/sftp/SftpTestSupport.java @@ -1,5 +1,5 @@ /* - * Copyright 2016-2022 the original author or authors. + * Copyright 2016-2023 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-integration-sftp/src/test/java/org/springframework/integration/sftp/session/SftpRemoteFileTemplateTests.java b/spring-integration-sftp/src/test/java/org/springframework/integration/sftp/session/SftpRemoteFileTemplateTests.java index 621b80f14ed..d44f2446529 100644 --- a/spring-integration-sftp/src/test/java/org/springframework/integration/sftp/session/SftpRemoteFileTemplateTests.java +++ b/spring-integration-sftp/src/test/java/org/springframework/integration/sftp/session/SftpRemoteFileTemplateTests.java @@ -77,8 +77,8 @@ public void testINT3412AppendStatRmdir() { template.afterPropertiesSet(); template.execute(session -> { - session.mkdir("/foo/"); - return session.mkdir("/foo/bar/"); + session.mkdir("/foo"); + return session.mkdir("/foo/bar"); }); template.append(new GenericMessage<>("foo")); template.append(new GenericMessage<>("bar")); @@ -93,10 +93,10 @@ public void testINT3412AppendStatRmdir() { } }); template.execute((SessionCallbackWithoutResult) session -> { - SftpClient.DirEntry[] files = session.list("/foo/"); + SftpClient.DirEntry[] files = session.list("/foo"); assertThat(files.length).isEqualTo(4); assertThat(session.remove("/foo/foobar.txt")).isTrue(); - assertThat(session.rmdir("/foo/bar/")).isTrue(); + assertThat(session.rmdir("/foo/bar")).isTrue(); files = session.list("/foo"); assertThat(files.length).isEqualTo(2); List fileNames = Arrays.stream(files).map(SftpClient.DirEntry::getFilename).toList();