diff --git a/build.gradle.kts b/build.gradle.kts index 3638f7f..50d5bf3 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -1,16 +1,16 @@ import org.jetbrains.kotlin.gradle.tasks.KotlinCompile plugins { - kotlin("jvm") version "1.9.25" - kotlin("plugin.spring") version "1.9.25" + kotlin("jvm") version "2.1.0" + kotlin("plugin.spring") version "2.1.0" id("jacoco") - id("org.jmailen.kotlinter") version "4.4.1" + id("org.jmailen.kotlinter") version "5.3.0" id("com.adarshr.test-logger") version "4.0.0" - id("com.github.ben-manes.versions") version "0.51.0" - id("org.springframework.boot") version "3.5.6" + id("com.github.ben-manes.versions") version "0.53.0" + id("org.springframework.boot") version "4.0.1" id("io.spring.dependency-management") version "1.1.7" id("maven-publish") - id("net.thebugmc.gradle.sonatype-central-portal-publisher") version "1.2.3" + id("net.thebugmc.gradle.sonatype-central-portal-publisher") version "1.2.4" } group = "com.valensas" @@ -38,7 +38,7 @@ dependencies { // Ftp implementation("commons-net:commons-net:3.12.0") - implementation("com.jcraft:jsch:0.1.55") + implementation("com.github.mwiede:jsch:2.27.7") implementation("org.apache.sshd:sshd-core:2.16.0") implementation("org.apache.sshd:sshd-common:2.16.0") implementation("org.apache.sshd:sshd-sftp:2.16.0") diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar index a4b76b9..e644113 100644 Binary files a/gradle/wrapper/gradle-wrapper.jar and b/gradle/wrapper/gradle-wrapper.jar differ diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index a441313..23449a2 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-8.8-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-9.2.1-bin.zip networkTimeout=10000 validateDistributionUrl=true zipStoreBase=GRADLE_USER_HOME diff --git a/gradlew b/gradlew index f5feea6..b740cf1 100755 --- a/gradlew +++ b/gradlew @@ -15,8 +15,6 @@ # See the License for the specific language governing permissions and # limitations under the License. # -# SPDX-License-Identifier: Apache-2.0 -# ############################################################################## # @@ -86,8 +84,7 @@ done # shellcheck disable=SC2034 APP_BASE_NAME=${0##*/} # Discard cd standard output in case $CDPATH is set (https://github.com/gradle/gradle/issues/25036) -APP_HOME=$( cd -P "${APP_HOME:-./}" > /dev/null && printf '%s -' "$PWD" ) || exit +APP_HOME=$( cd "${APP_HOME:-./}" > /dev/null && pwd -P ) || exit # Use the maximum available, or set MAX_FD != -1 to use that value. MAX_FD=maximum diff --git a/gradlew.bat b/gradlew.bat index 9b42019..7101f8e 100644 --- a/gradlew.bat +++ b/gradlew.bat @@ -13,8 +13,6 @@ @rem See the License for the specific language governing permissions and @rem limitations under the License. @rem -@rem SPDX-License-Identifier: Apache-2.0 -@rem @if "%DEBUG%"=="" @echo off @rem ########################################################################## diff --git a/src/main/kotlin/com/valensas/ftp/model/SFTPClient.kt b/src/main/kotlin/com/valensas/ftp/model/SFTPClient.kt index 37776da..2ccf167 100644 --- a/src/main/kotlin/com/valensas/ftp/model/SFTPClient.kt +++ b/src/main/kotlin/com/valensas/ftp/model/SFTPClient.kt @@ -30,6 +30,8 @@ class SFTPClient : FTPClient() { session.setPassword(it) } session.setConfig("StrictHostKeyChecking", connectionModel.strictHostKeyChecking) + session.setConfig("server_host_key", session.getConfig("server_host_key") + ",ssh-dss") + session.setConfig("PubkeyAcceptedAlgorithms", session.getConfig("PubkeyAcceptedAlgorithms") + ",ssh-dss") session.connect() channel = session.openChannel("sftp") as ChannelSftp channel.connect()