Nemcio/SCM-Manager
1
0
Fork 0
mirror of https://github.com/scm-manager/scm-manager.git synced 2026-03-02 02:10:53 +01:00
Code Issues Packages Projects Releases Activity

Remove sshd dependency

Browse Source 
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 <konstantin.schaper@cloudogu.com>
Co-authored-by: René Pfeuffer <rene.pfeuffer@cloudogu.com>
This commit is contained in:
Rene Pfeuffer
2023-02-16 14:02:56 +01:00
committed by SCM-Manager
parent 13929aab5e
commit 9f3519ecce
4 changed files with 8 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
gradle/changelog/sshd.yaml Normal file
View File

@@ -0,0 +1,2 @@
- type: fixed
description: Remove sshd dependency that may cause an injection failure on server startup with installed ssh plugin

2
scm-it/gradle.lockfile
View File

@@ -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

7
scm-plugins/scm-svn-plugin/build.gradle
View File

@@ -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
}

2
scm-plugins/scm-svn-plugin/gradle.lockfile
View File

@@ -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