From 9f3519ecce06e71547e0a538dc5d689b7fef08f3 Mon Sep 17 00:00:00 2001 From: Rene Pfeuffer Date: Thu, 16 Feb 2023 14:02:56 +0100 Subject: [PATCH] Remove sshd dependency MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit The sshd dependency in version 2.8.0 that came with SvnKIT 1.10.10 may cause an injection failure in bouncy castle due to incompatible sshd versions on server startup when the ssh plugin is installed (the ssh plugin uses version 2.9.0 of apache sshd). Committed-by: Konstantin Schaper Co-authored-by: René Pfeuffer --- gradle/changelog/sshd.yaml | 2 ++ scm-it/gradle.lockfile | 2 -- scm-plugins/scm-svn-plugin/build.gradle | 7 ++++++- scm-plugins/scm-svn-plugin/gradle.lockfile | 2 -- 4 files changed, 8 insertions(+), 5 deletions(-) create mode 100644 gradle/changelog/sshd.yaml diff --git a/gradle/changelog/sshd.yaml b/gradle/changelog/sshd.yaml new file mode 100644 index 0000000000..f807ab1c3b --- /dev/null +++ b/gradle/changelog/sshd.yaml @@ -0,0 +1,2 @@ +- type: fixed + description: Remove sshd dependency that may cause an injection failure on server startup with installed ssh plugin diff --git a/scm-it/gradle.lockfile b/scm-it/gradle.lockfile index 10efc1daef..3de5082c65 100644 --- a/scm-it/gradle.lockfile +++ b/scm-it/gradle.lockfile @@ -142,8 +142,6 @@ org.apache.shiro:shiro-guice:1.10.0=testRuntimeClasspath,testRuntimeClasspathCop org.apache.shiro:shiro-lang:1.10.0=testCompileClasspath,testCompileClasspathCopy,testRuntimeClasspath,testRuntimeClasspathCopy org.apache.shiro:shiro-web:1.10.0=testRuntimeClasspath,testRuntimeClasspathCopy org.apache.sling:org.apache.sling.javax.activation:0.1.0=testCompileClasspath,testCompileClasspathCopy,testRuntimeClasspath,testRuntimeClasspathCopy -org.apache.sshd:sshd-common:2.8.0=testRuntimeClasspath,testRuntimeClasspathCopy -org.apache.sshd:sshd-core:2.8.0=testRuntimeClasspath,testRuntimeClasspathCopy org.apache.tika:tika-core:1.25=testRuntimeClasspath,testRuntimeClasspathCopy org.apiguardian:apiguardian-api:1.1.0=testCompileClasspath,testCompileClasspathCopy,testRuntimeClasspath,testRuntimeClasspathCopy org.assertj:assertj-core:3.18.1=testCompileClasspath,testCompileClasspathCopy,testRuntimeClasspath,testRuntimeClasspathCopy diff --git a/scm-plugins/scm-svn-plugin/build.gradle b/scm-plugins/scm-svn-plugin/build.gradle index c1ddb61d32..7510e7d306 100644 --- a/scm-plugins/scm-svn-plugin/build.gradle +++ b/scm-plugins/scm-svn-plugin/build.gradle @@ -31,8 +31,13 @@ def svnkitVersion = '1.10.10-scm1' dependencies { implementation("sonia.svnkit:svnkit:${svnkitVersion}") { exclude group: 'org.tmatesoft.svnkit', module: 'trilead-ssh2' + exclude group: 'org.apache.sshd', module: 'sshd-core' + exclude group: 'org.apache.sshd', module: 'sshd-common' + } + implementation ("sonia.svnkit:svnkit-dav:${svnkitVersion}") { + exclude group: 'org.apache.sshd', module: 'sshd-core' + exclude group: 'org.apache.sshd', module: 'sshd-common' } - implementation "sonia.svnkit:svnkit-dav:${svnkitVersion}" testImplementation libraries.shiroUnit } diff --git a/scm-plugins/scm-svn-plugin/gradle.lockfile b/scm-plugins/scm-svn-plugin/gradle.lockfile index ab29859414..3618461fbf 100644 --- a/scm-plugins/scm-svn-plugin/gradle.lockfile +++ b/scm-plugins/scm-svn-plugin/gradle.lockfile @@ -100,8 +100,6 @@ org.apache.shiro:shiro-crypto-core:1.10.0=compileClasspath,runtimeClasspath,runt org.apache.shiro:shiro-crypto-hash:1.10.0=compileClasspath,runtimeClasspath,runtimePluginElements,scmCoreDependency,testCompileClasspath,testRuntimeClasspath org.apache.shiro:shiro-event:1.10.0=compileClasspath,runtimeClasspath,runtimePluginElements,scmCoreDependency,testCompileClasspath,testRuntimeClasspath org.apache.shiro:shiro-lang:1.10.0=compileClasspath,runtimeClasspath,runtimePluginElements,scmCoreDependency,testCompileClasspath,testRuntimeClasspath -org.apache.sshd:sshd-common:2.8.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -org.apache.sshd:sshd-core:2.8.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath org.apiguardian:apiguardian-api:1.1.0=compileClasspath,runtimeClasspath,runtimePluginElements,scmCoreDependency,testCompileClasspath,testRuntimeClasspath org.assertj:assertj-core:3.18.1=compileClasspath,runtimeClasspath,runtimePluginElements,scmCoreDependency,testCompileClasspath,testRuntimeClasspath org.checkerframework:checker-qual:3.5.0=compileClasspath,runtimeClasspath,runtimePluginElements,scmCoreDependency,testCompileClasspath,testRuntimeClasspath