Update sshd

cli/build.gradle

@@ -13,7 +13,7 @@ dependencies {
     implementation 'org.codehaus.groovy:groovy-cli-commons:3.0.23'
 
     testImplementation project(':server-integration-test')
-    testImplementation 'org.apache.sshd:sshd-core:2.2.0'
+    testImplementation 'org.apache.sshd:sshd-core:2.15.0'
     testImplementation platform("org.spockframework:spock-bom:2.3-groovy-3.0")
     testImplementation "org.spockframework:spock-core"
     testImplementation "org.spockframework:spock-junit4"

server-integration-test/build.gradle

@@ -8,9 +8,9 @@ repositories {
 
 dependencies {
     implementation project(':core')
-    implementation 'org.apache.sshd:sshd-core:2.2.0'
-    implementation 'org.apache.sshd:sshd-sftp:2.2.0'
-    implementation 'org.apache.sshd:sshd-scp:2.2.0'
+    implementation 'org.apache.sshd:sshd-core:2.15.0'
+    implementation 'org.apache.sshd:sshd-sftp:2.15.0'
+    implementation 'org.apache.sshd:sshd-scp:2.15.0'
 
     runtimeOnly 'org.bouncycastle:bcpkix-jdk15on:1.70'
 

server-integration-test/src/test/groovy/org/hidetake/groovy/ssh/test/server/ScpSpec.groovy

@@ -1,7 +1,8 @@
 package org.hidetake.groovy.ssh.test.server
 
-import org.apache.sshd.server.scp.ScpCommandFactory
+import org.apache.sshd.scp.server.ScpCommandFactory
 import org.hidetake.groovy.ssh.session.transfer.FileTransferMethod
+
 import spock.lang.Timeout
 
 @Timeout(10)

server-integration-test/src/test/groovy/org/hidetake/groovy/ssh/test/server/SftpRemoveSpec.groovy

@@ -2,11 +2,12 @@ package org.hidetake.groovy.ssh.test.server
 
 import org.apache.sshd.server.SshServer
 import org.apache.sshd.server.auth.password.PasswordAuthenticator
-import org.apache.sshd.server.subsystem.sftp.SftpSubsystemFactory
+import org.apache.sshd.sftp.server.SftpSubsystemFactory
 import org.hidetake.groovy.ssh.Ssh
 import org.hidetake.groovy.ssh.core.Service
 import org.junit.ClassRule
 import org.junit.rules.TemporaryFolder
+
 import spock.lang.Shared
 import spock.lang.Specification
 import spock.util.concurrent.PollingConditions

server-integration-test/src/test/groovy/org/hidetake/groovy/ssh/test/server/SftpSpec.groovy

@@ -1,6 +1,6 @@
 package org.hidetake.groovy.ssh.test.server
 
-import org.apache.sshd.server.subsystem.sftp.SftpSubsystemFactory
+import org.apache.sshd.sftp.server.SftpSubsystemFactory
 import org.hidetake.groovy.ssh.operation.SftpException
 
 import static org.hidetake.groovy.ssh.test.server.FilenameUtils.toUnixPath

server-integration-test/src/test/groovy/org/hidetake/groovy/ssh/test/server/TimeoutSpec.groovy

@@ -1,13 +1,15 @@
 package org.hidetake.groovy.ssh.test.server
 
 import com.jcraft.jsch.JSchException
+
 import org.apache.sshd.common.Factory
 import org.apache.sshd.server.SshServer
 import org.apache.sshd.server.auth.password.PasswordAuthenticator
 import org.apache.sshd.server.command.CommandFactory
-import org.apache.sshd.server.subsystem.sftp.SftpSubsystemFactory
+import org.apache.sshd.sftp.server.SftpSubsystemFactory
 import org.hidetake.groovy.ssh.Ssh
 import org.hidetake.groovy.ssh.core.Service
+
 import spock.lang.Shared
 import spock.lang.Specification
 import spock.lang.Timeout