From 962df5309c7e51c24c56821ca07015cbc72340a3 Mon Sep 17 00:00:00 2001 From: Rene Pfeuffer Date: Wed, 15 Feb 2023 08:44:30 +0100 Subject: [PATCH] Update SVNKit to 1.10.10-scm1 Fix lockfiles and update slf4j MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Committed-by: Matthias Thieroff Co-authored-by: Florian Scholdei Co-authored-by: René Pfeuffer --- gradle/changelog/update_svnkit.yaml | 2 ++ gradle/dependencies.gradle | 2 +- scm-annotation-processor/gradle.lockfile | 2 +- scm-core/gradle.lockfile | 7 ++++--- scm-dao-xml/gradle.lockfile | 5 +++-- scm-it/gradle.lockfile | 17 ++++++++++------- scm-plugins/scm-git-plugin/gradle.lockfile | 4 ++-- scm-plugins/scm-hg-plugin/gradle.lockfile | 4 ++-- .../scm-integration-test-plugin/gradle.lockfile | 4 ++-- scm-plugins/scm-legacy-plugin/gradle.lockfile | 4 ++-- scm-plugins/scm-svn-plugin/build.gradle | 2 +- scm-plugins/scm-svn-plugin/gradle.lockfile | 13 ++++++++----- scm-test/gradle.lockfile | 5 +++-- scm-webapp/gradle.lockfile | 12 +++++++----- 14 files changed, 48 insertions(+), 35 deletions(-) create mode 100644 gradle/changelog/update_svnkit.yaml diff --git a/gradle/changelog/update_svnkit.yaml b/gradle/changelog/update_svnkit.yaml new file mode 100644 index 0000000000..9954a52802 --- /dev/null +++ b/gradle/changelog/update_svnkit.yaml @@ -0,0 +1,2 @@ +- type: changed + description: Update svnkit to version 1.10.10-scm1 diff --git a/gradle/dependencies.gradle b/gradle/dependencies.gradle index 04fa6104a0..7244e519c1 100644 --- a/gradle/dependencies.gradle +++ b/gradle/dependencies.gradle @@ -1,5 +1,5 @@ ext { - slf4jVersion = '1.7.30' + slf4jVersion = '1.7.36' guiceVersion = '5.0.1' resteasyVersion = '4.7.5.Final' diff --git a/scm-annotation-processor/gradle.lockfile b/scm-annotation-processor/gradle.lockfile index 85fd3d7b6f..516d4194ca 100644 --- a/scm-annotation-processor/gradle.lockfile +++ b/scm-annotation-processor/gradle.lockfile @@ -25,5 +25,5 @@ org.ow2.asm:asm-analysis:9.1=jacocoAntCopy org.ow2.asm:asm-commons:9.1=jacocoAntCopy org.ow2.asm:asm-tree:9.1=jacocoAntCopy org.ow2.asm:asm:9.1=jacocoAntCopy -org.slf4j:slf4j-api:1.7.30=compileClasspath,compileClasspathCopy,default,defaultCopy,runtimeClasspath,runtimeClasspathCopy,testCompileClasspath,testCompileClasspathCopy,testRuntimeClasspath,testRuntimeClasspathCopy +org.slf4j:slf4j-api:1.7.36=compileClasspath,compileClasspathCopy,default,defaultCopy,runtimeClasspath,runtimeClasspathCopy,testCompileClasspath,testCompileClasspathCopy,testRuntimeClasspath,testRuntimeClasspathCopy empty=archives,archivesCopy,testAnnotationProcessor,testAnnotationProcessorCopy diff --git a/scm-core/gradle.lockfile b/scm-core/gradle.lockfile index ceaa5f8145..0e7827d4b2 100644 --- a/scm-core/gradle.lockfile +++ b/scm-core/gradle.lockfile @@ -121,7 +121,8 @@ org.ow2.asm:asm-tree:9.1=jacocoAntCopy org.ow2.asm:asm:9.1=jacocoAntCopy,testCompileClasspath,testCompileClasspathCopy,testRuntimeClasspath,testRuntimeClasspathCopy org.projectlombok:lombok:1.18.10=annotationProcessor,annotationProcessorCopy,compileClasspath,compileClasspathCopy,testAnnotationProcessor,testAnnotationProcessorCopy,testCompileClasspath,testCompileClasspathCopy org.reactivestreams:reactive-streams:1.0.3=testCompileClasspath,testCompileClasspathCopy,testRuntimeClasspath,testRuntimeClasspathCopy -org.slf4j:jcl-over-slf4j:1.7.30=compileClasspath,compileClasspathCopy,default,defaultCopy,runtimeClasspath,runtimeClasspathCopy,testCompileClasspath,testCompileClasspathCopy,testRuntimeClasspath,testRuntimeClasspathCopy -org.slf4j:slf4j-api:1.7.30=annotationProcessor,annotationProcessorCopy,compileClasspath,compileClasspathCopy,default,defaultCopy,runtimeClasspath,runtimeClasspathCopy -org.slf4j:slf4j-api:1.7.32=testCompileClasspath,testCompileClasspathCopy,testRuntimeClasspath,testRuntimeClasspathCopy +org.slf4j:jcl-over-slf4j:1.7.30=default,runtimeClasspath +org.slf4j:jcl-over-slf4j:1.7.36=compileClasspath,compileClasspathCopy,defaultCopy,runtimeClasspathCopy,testCompileClasspath,testCompileClasspathCopy,testRuntimeClasspath,testRuntimeClasspathCopy +org.slf4j:slf4j-api:1.7.30=default,runtimeClasspath +org.slf4j:slf4j-api:1.7.36=annotationProcessor,annotationProcessorCopy,compileClasspath,compileClasspathCopy,defaultCopy,runtimeClasspathCopy,testCompileClasspath,testCompileClasspathCopy,testRuntimeClasspath,testRuntimeClasspathCopy empty=archives,archivesCopy diff --git a/scm-dao-xml/gradle.lockfile b/scm-dao-xml/gradle.lockfile index a362c9e0bc..9e5651b1b5 100644 --- a/scm-dao-xml/gradle.lockfile +++ b/scm-dao-xml/gradle.lockfile @@ -110,6 +110,7 @@ org.ow2.asm:asm-tree:9.1=jacocoAntCopy org.ow2.asm:asm:9.1=jacocoAntCopy,testCompileClasspath,testCompileClasspathCopy,testRuntimeClasspath,testRuntimeClasspathCopy org.projectlombok:lombok:1.18.10=annotationProcessor,annotationProcessorCopy,compileClasspath,compileClasspathCopy org.reactivestreams:reactive-streams:1.0.3=testCompileClasspath,testCompileClasspathCopy,testRuntimeClasspath,testRuntimeClasspathCopy -org.slf4j:jcl-over-slf4j:1.7.30=compileClasspath,compileClasspathCopy,default,defaultCopy,runtimeClasspath,runtimeClasspathCopy,testCompileClasspath,testCompileClasspathCopy,testRuntimeClasspath,testRuntimeClasspathCopy -org.slf4j:slf4j-api:1.7.30=compileClasspath,compileClasspathCopy,default,defaultCopy,runtimeClasspath,runtimeClasspathCopy,testCompileClasspath,testCompileClasspathCopy,testRuntimeClasspath,testRuntimeClasspathCopy +org.slf4j:jcl-over-slf4j:1.7.36=compileClasspath,compileClasspathCopy,default,defaultCopy,runtimeClasspath,runtimeClasspathCopy,testCompileClasspath,testCompileClasspathCopy,testRuntimeClasspath,testRuntimeClasspathCopy +org.slf4j:slf4j-api:1.7.30=default,runtimeClasspath +org.slf4j:slf4j-api:1.7.36=compileClasspath,compileClasspathCopy,defaultCopy,runtimeClasspathCopy,testCompileClasspath,testCompileClasspathCopy,testRuntimeClasspath,testRuntimeClasspathCopy empty=archives,archivesCopy,testAnnotationProcessor,testAnnotationProcessorCopy diff --git a/scm-it/gradle.lockfile b/scm-it/gradle.lockfile index 8a4bcd1353..10efc1daef 100644 --- a/scm-it/gradle.lockfile +++ b/scm-it/gradle.lockfile @@ -39,7 +39,7 @@ com.google.guava:failureaccess:1.0.1=testCompileClasspath,testCompileClasspathCo com.google.guava:guava:30.1-jre=testCompileClasspath,testCompileClasspathCopy,testRuntimeClasspath,testRuntimeClasspathCopy com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=testCompileClasspath,testCompileClasspathCopy,testRuntimeClasspath,testRuntimeClasspathCopy com.google.inject.extensions:guice-assistedinject:5.0.1=testCompileClasspath,testCompileClasspathCopy,testRuntimeClasspath,testRuntimeClasspathCopy -com.google.inject.extensions:guice-multibindings:4.2.2=testRuntimeClasspath,testRuntimeClasspathCopy +com.google.inject.extensions:guice-multibindings:4.2.3=testRuntimeClasspath,testRuntimeClasspathCopy com.google.inject.extensions:guice-servlet:5.0.1=testCompileClasspath,testCompileClasspathCopy,testRuntimeClasspath,testRuntimeClasspathCopy com.google.inject.extensions:guice-throwingproviders:5.0.1=testCompileClasspath,testCompileClasspathCopy,testRuntimeClasspath,testRuntimeClasspathCopy com.google.inject:guice:5.0.1=testCompileClasspath,testCompileClasspathCopy,testRuntimeClasspath,testRuntimeClasspathCopy @@ -108,6 +108,7 @@ joda-time:joda-time:2.10=testCompileClasspath,testCompileClasspathCopy,testRunti junit:junit:4.13.1=testCompileClasspath,testCompileClasspathCopy,testRuntimeClasspath,testRuntimeClasspathCopy net.bytebuddy:byte-buddy-agent:1.10.18=testCompileClasspath,testCompileClasspathCopy,testRuntimeClasspath,testRuntimeClasspathCopy net.bytebuddy:byte-buddy:1.10.18=testCompileClasspath,testCompileClasspathCopy,testRuntimeClasspath,testRuntimeClasspathCopy +net.i2p.crypto:eddsa:0.3.0=testRuntimeClasspath,testRuntimeClasspathCopy net.java.dev.jna:jna-platform:5.6.0=testRuntimeClasspath,testRuntimeClasspathCopy net.java.dev.jna:jna:5.6.0=testRuntimeClasspath,testRuntimeClasspathCopy net.java.dev.jna:platform:3.4.0=testRuntimeClasspath,testRuntimeClasspathCopy @@ -141,6 +142,8 @@ 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 @@ -203,18 +206,18 @@ org.ow2.asm:asm-analysis:9.1=jacocoAntCopy org.ow2.asm:asm-commons:9.1=jacocoAntCopy org.ow2.asm:asm-tree:9.1=jacocoAntCopy org.ow2.asm:asm:9.1=jacocoAntCopy,testCompileClasspath,testCompileClasspathCopy,testRuntimeClasspath,testRuntimeClasspathCopy -org.owasp.encoder:encoder:1.2.2=testRuntimeClasspath,testRuntimeClasspathCopy +org.owasp.encoder:encoder:1.2.3=testRuntimeClasspath,testRuntimeClasspathCopy org.projectlombok:lombok:1.18.10=testRuntimeClasspath,testRuntimeClasspathCopy org.reactivestreams:reactive-streams:1.0.3=testCompileClasspath,testCompileClasspathCopy,testRuntimeClasspath,testRuntimeClasspathCopy -org.slf4j:jcl-over-slf4j:1.7.30=testCompileClasspath,testCompileClasspathCopy,testRuntimeClasspath,testRuntimeClasspathCopy -org.slf4j:slf4j-api:1.7.30=testCompileClasspath,testCompileClasspathCopy,testRuntimeClasspath,testRuntimeClasspathCopy -org.tmatesoft.sqljet:sqljet:1.1.14=testRuntimeClasspath,testRuntimeClasspathCopy +org.slf4j:jcl-over-slf4j:1.7.36=testCompileClasspath,testCompileClasspathCopy,testRuntimeClasspath,testRuntimeClasspathCopy +org.slf4j:slf4j-api:1.7.36=testCompileClasspath,testCompileClasspathCopy,testRuntimeClasspath,testRuntimeClasspathCopy +org.tmatesoft.sqljet:sqljet:1.1.15=testRuntimeClasspath,testRuntimeClasspathCopy sonia.jgit:org.eclipse.jgit.gpg.bc:6.2.0.202206071550-r-scm1=testRuntimeClasspath,testRuntimeClasspathCopy sonia.jgit:org.eclipse.jgit.http.apache:6.2.0.202206071550-r-scm1=testRuntimeClasspath,testRuntimeClasspathCopy sonia.jgit:org.eclipse.jgit.http.server:6.2.0.202206071550-r-scm1=testRuntimeClasspath,testRuntimeClasspathCopy sonia.jgit:org.eclipse.jgit.lfs.server:6.2.0.202206071550-r-scm1=testRuntimeClasspath,testRuntimeClasspathCopy sonia.jgit:org.eclipse.jgit.lfs:6.2.0.202206071550-r-scm1=testRuntimeClasspath,testRuntimeClasspathCopy sonia.jgit:org.eclipse.jgit:6.2.0.202206071550-r-scm1=testCompileClasspath,testCompileClasspathCopy,testRuntimeClasspath,testRuntimeClasspathCopy -sonia.svnkit:svnkit-dav:1.10.3-scm2=testRuntimeClasspath,testRuntimeClasspathCopy -sonia.svnkit:svnkit:1.10.3-scm2=testRuntimeClasspath,testRuntimeClasspathCopy +sonia.svnkit:svnkit-dav:1.10.10-scm1=testRuntimeClasspath,testRuntimeClasspathCopy +sonia.svnkit:svnkit:1.10.10-scm1=testRuntimeClasspath,testRuntimeClasspathCopy empty=annotationProcessor,annotationProcessorCopy,archives,archivesCopy,compileClasspath,compileClasspathCopy,corePlugin,corePluginCopy,default,defaultCopy,itPlugin,itPluginCopy,itWebApp,itWebAppCopy,runtimeClasspath,runtimeClasspathCopy,testAnnotationProcessor,testAnnotationProcessorCopy diff --git a/scm-plugins/scm-git-plugin/gradle.lockfile b/scm-plugins/scm-git-plugin/gradle.lockfile index 0c6da81a2a..cef2258217 100644 --- a/scm-plugins/scm-git-plugin/gradle.lockfile +++ b/scm-plugins/scm-git-plugin/gradle.lockfile @@ -145,9 +145,9 @@ org.ow2.asm:asm:9.1=compileClasspath,runtimeClasspath,runtimePluginElements,scmC org.projectlombok:lombok:1.18.10=compileClasspath,runtimeClasspath,runtimePluginElements,scmCoreDependency,testCompileClasspath,testRuntimeClasspath org.projectlombok:lombok:1.18.12=annotationProcessor,testAnnotationProcessor org.reactivestreams:reactive-streams:1.0.3=compileClasspath,runtimeClasspath,runtimePluginElements,scmCoreDependency,testCompileClasspath,testRuntimeClasspath -org.slf4j:jcl-over-slf4j:1.7.30=compileClasspath,runtimeClasspath,runtimePluginElements,scmCoreDependency,testCompileClasspath,testRuntimeClasspath +org.slf4j:jcl-over-slf4j:1.7.36=compileClasspath,runtimeClasspath,runtimePluginElements,scmCoreDependency,testCompileClasspath,testRuntimeClasspath org.slf4j:slf4j-api:1.7.25=swaggerDeps -org.slf4j:slf4j-api:1.7.30=annotationProcessor,compileClasspath,runtimeClasspath,runtimePluginElements,scmCoreDependency,testCompileClasspath,testRuntimeClasspath +org.slf4j:slf4j-api:1.7.36=annotationProcessor,compileClasspath,runtimeClasspath,runtimePluginElements,scmCoreDependency,testCompileClasspath,testRuntimeClasspath org.yaml:snakeyaml:1.31=swaggerDeps sonia.jgit:org.eclipse.jgit.gpg.bc:6.2.0.202206071550-r-scm1=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath sonia.jgit:org.eclipse.jgit.http.apache:6.2.0.202206071550-r-scm1=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath diff --git a/scm-plugins/scm-hg-plugin/gradle.lockfile b/scm-plugins/scm-hg-plugin/gradle.lockfile index 4c716c0014..0b57c86794 100644 --- a/scm-plugins/scm-hg-plugin/gradle.lockfile +++ b/scm-plugins/scm-hg-plugin/gradle.lockfile @@ -130,8 +130,8 @@ org.ow2.asm:asm:9.1=compileClasspath,runtimeClasspath,runtimePluginElements,scmC org.projectlombok:lombok:1.18.10=compileClasspath,runtimeClasspath,runtimePluginElements,scmCoreDependency,testCompileClasspath,testRuntimeClasspath org.projectlombok:lombok:1.18.12=annotationProcessor,testAnnotationProcessor org.reactivestreams:reactive-streams:1.0.3=compileClasspath,runtimeClasspath,runtimePluginElements,scmCoreDependency,testCompileClasspath,testRuntimeClasspath -org.slf4j:jcl-over-slf4j:1.7.30=compileClasspath,runtimeClasspath,runtimePluginElements,scmCoreDependency,testCompileClasspath,testRuntimeClasspath +org.slf4j:jcl-over-slf4j:1.7.36=compileClasspath,runtimeClasspath,runtimePluginElements,scmCoreDependency,testCompileClasspath,testRuntimeClasspath org.slf4j:slf4j-api:1.7.25=swaggerDeps -org.slf4j:slf4j-api:1.7.30=annotationProcessor,compileClasspath,runtimeClasspath,runtimePluginElements,scmCoreDependency,testCompileClasspath,testRuntimeClasspath +org.slf4j:slf4j-api:1.7.36=annotationProcessor,compileClasspath,runtimeClasspath,runtimePluginElements,scmCoreDependency,testCompileClasspath,testRuntimeClasspath org.yaml:snakeyaml:1.31=swaggerDeps empty=optionalPlugin,plugin diff --git a/scm-plugins/scm-integration-test-plugin/gradle.lockfile b/scm-plugins/scm-integration-test-plugin/gradle.lockfile index 0e23344cb1..14de4f1be9 100644 --- a/scm-plugins/scm-integration-test-plugin/gradle.lockfile +++ b/scm-plugins/scm-integration-test-plugin/gradle.lockfile @@ -127,8 +127,8 @@ org.ow2.asm:asm:9.1=compileClasspath,runtimeClasspath,runtimePluginElements,scmC org.projectlombok:lombok:1.18.10=compileClasspath,runtimeClasspath,runtimePluginElements,scmCoreDependency,testCompileClasspath,testRuntimeClasspath org.projectlombok:lombok:1.18.12=annotationProcessor,testAnnotationProcessor org.reactivestreams:reactive-streams:1.0.3=compileClasspath,runtimeClasspath,runtimePluginElements,scmCoreDependency,testCompileClasspath,testRuntimeClasspath -org.slf4j:jcl-over-slf4j:1.7.30=compileClasspath,runtimeClasspath,runtimePluginElements,scmCoreDependency,testCompileClasspath,testRuntimeClasspath +org.slf4j:jcl-over-slf4j:1.7.36=compileClasspath,runtimeClasspath,runtimePluginElements,scmCoreDependency,testCompileClasspath,testRuntimeClasspath org.slf4j:slf4j-api:1.7.25=swaggerDeps -org.slf4j:slf4j-api:1.7.30=annotationProcessor,compileClasspath,runtimeClasspath,runtimePluginElements,scmCoreDependency,testCompileClasspath,testRuntimeClasspath +org.slf4j:slf4j-api:1.7.36=annotationProcessor,compileClasspath,runtimeClasspath,runtimePluginElements,scmCoreDependency,testCompileClasspath,testRuntimeClasspath org.yaml:snakeyaml:1.31=swaggerDeps empty=optionalPlugin,plugin diff --git a/scm-plugins/scm-legacy-plugin/gradle.lockfile b/scm-plugins/scm-legacy-plugin/gradle.lockfile index 0e23344cb1..14de4f1be9 100644 --- a/scm-plugins/scm-legacy-plugin/gradle.lockfile +++ b/scm-plugins/scm-legacy-plugin/gradle.lockfile @@ -127,8 +127,8 @@ org.ow2.asm:asm:9.1=compileClasspath,runtimeClasspath,runtimePluginElements,scmC org.projectlombok:lombok:1.18.10=compileClasspath,runtimeClasspath,runtimePluginElements,scmCoreDependency,testCompileClasspath,testRuntimeClasspath org.projectlombok:lombok:1.18.12=annotationProcessor,testAnnotationProcessor org.reactivestreams:reactive-streams:1.0.3=compileClasspath,runtimeClasspath,runtimePluginElements,scmCoreDependency,testCompileClasspath,testRuntimeClasspath -org.slf4j:jcl-over-slf4j:1.7.30=compileClasspath,runtimeClasspath,runtimePluginElements,scmCoreDependency,testCompileClasspath,testRuntimeClasspath +org.slf4j:jcl-over-slf4j:1.7.36=compileClasspath,runtimeClasspath,runtimePluginElements,scmCoreDependency,testCompileClasspath,testRuntimeClasspath org.slf4j:slf4j-api:1.7.25=swaggerDeps -org.slf4j:slf4j-api:1.7.30=annotationProcessor,compileClasspath,runtimeClasspath,runtimePluginElements,scmCoreDependency,testCompileClasspath,testRuntimeClasspath +org.slf4j:slf4j-api:1.7.36=annotationProcessor,compileClasspath,runtimeClasspath,runtimePluginElements,scmCoreDependency,testCompileClasspath,testRuntimeClasspath org.yaml:snakeyaml:1.31=swaggerDeps empty=optionalPlugin,plugin diff --git a/scm-plugins/scm-svn-plugin/build.gradle b/scm-plugins/scm-svn-plugin/build.gradle index 622e2edf39..c1ddb61d32 100644 --- a/scm-plugins/scm-svn-plugin/build.gradle +++ b/scm-plugins/scm-svn-plugin/build.gradle @@ -26,7 +26,7 @@ plugins { id 'org.scm-manager.smp' version '0.13.0' } -def svnkitVersion = '1.10.3-scm2' +def svnkitVersion = '1.10.10-scm1' dependencies { implementation("sonia.svnkit:svnkit:${svnkitVersion}") { diff --git a/scm-plugins/scm-svn-plugin/gradle.lockfile b/scm-plugins/scm-svn-plugin/gradle.lockfile index 03d2d23451..ab29859414 100644 --- a/scm-plugins/scm-svn-plugin/gradle.lockfile +++ b/scm-plugins/scm-svn-plugin/gradle.lockfile @@ -84,6 +84,7 @@ joda-time:joda-time:2.10=annotationProcessor,compileClasspath,runtimeClasspath,r junit:junit:4.13.1=compileClasspath,runtimeClasspath,runtimePluginElements,scmCoreDependency,testCompileClasspath,testRuntimeClasspath net.bytebuddy:byte-buddy-agent:1.10.18=compileClasspath,runtimeClasspath,runtimePluginElements,scmCoreDependency,testCompileClasspath,testRuntimeClasspath net.bytebuddy:byte-buddy:1.10.18=compileClasspath,runtimeClasspath,runtimePluginElements,scmCoreDependency,testCompileClasspath,testRuntimeClasspath +net.i2p.crypto:eddsa:0.3.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath net.java.dev.jna:jna-platform:5.6.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath net.java.dev.jna:jna:5.6.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath net.java.dev.jna:platform:3.4.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath @@ -99,6 +100,8 @@ 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 @@ -142,11 +145,11 @@ org.ow2.asm:asm:9.1=compileClasspath,runtimeClasspath,runtimePluginElements,scmC org.projectlombok:lombok:1.18.10=compileClasspath,runtimeClasspath,runtimePluginElements,scmCoreDependency,testCompileClasspath,testRuntimeClasspath org.projectlombok:lombok:1.18.12=annotationProcessor,testAnnotationProcessor org.reactivestreams:reactive-streams:1.0.3=compileClasspath,runtimeClasspath,runtimePluginElements,scmCoreDependency,testCompileClasspath,testRuntimeClasspath -org.slf4j:jcl-over-slf4j:1.7.30=compileClasspath,runtimeClasspath,runtimePluginElements,scmCoreDependency,testCompileClasspath,testRuntimeClasspath +org.slf4j:jcl-over-slf4j:1.7.36=compileClasspath,runtimeClasspath,runtimePluginElements,scmCoreDependency,testCompileClasspath,testRuntimeClasspath org.slf4j:slf4j-api:1.7.25=swaggerDeps -org.slf4j:slf4j-api:1.7.30=annotationProcessor,compileClasspath,runtimeClasspath,runtimePluginElements,scmCoreDependency,testCompileClasspath,testRuntimeClasspath -org.tmatesoft.sqljet:sqljet:1.1.14=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +org.slf4j:slf4j-api:1.7.36=annotationProcessor,compileClasspath,runtimeClasspath,runtimePluginElements,scmCoreDependency,testCompileClasspath,testRuntimeClasspath +org.tmatesoft.sqljet:sqljet:1.1.15=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath org.yaml:snakeyaml:1.31=swaggerDeps -sonia.svnkit:svnkit-dav:1.10.3-scm2=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -sonia.svnkit:svnkit:1.10.3-scm2=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +sonia.svnkit:svnkit-dav:1.10.10-scm1=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +sonia.svnkit:svnkit:1.10.10-scm1=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath empty=optionalPlugin,plugin diff --git a/scm-test/gradle.lockfile b/scm-test/gradle.lockfile index 4ba6a4c179..bca7174acc 100644 --- a/scm-test/gradle.lockfile +++ b/scm-test/gradle.lockfile @@ -107,6 +107,7 @@ org.ow2.asm:asm-commons:9.1=jacocoAntCopy org.ow2.asm:asm-tree:9.1=jacocoAntCopy org.ow2.asm:asm:9.1=compileClasspath,compileClasspathCopy,default,defaultCopy,jacocoAntCopy,runtimeClasspath,runtimeClasspathCopy,testCompileClasspath,testCompileClasspathCopy,testRuntimeClasspath,testRuntimeClasspathCopy org.reactivestreams:reactive-streams:1.0.3=compileClasspath,compileClasspathCopy,default,defaultCopy,runtimeClasspath,runtimeClasspathCopy,testCompileClasspath,testCompileClasspathCopy,testRuntimeClasspath,testRuntimeClasspathCopy -org.slf4j:jcl-over-slf4j:1.7.30=compileClasspath,compileClasspathCopy,default,defaultCopy,runtimeClasspath,runtimeClasspathCopy,testCompileClasspath,testCompileClasspathCopy,testRuntimeClasspath,testRuntimeClasspathCopy -org.slf4j:slf4j-api:1.7.30=compileClasspath,compileClasspathCopy,default,defaultCopy,runtimeClasspath,runtimeClasspathCopy,testCompileClasspath,testCompileClasspathCopy,testRuntimeClasspath,testRuntimeClasspathCopy +org.slf4j:jcl-over-slf4j:1.7.36=compileClasspath,compileClasspathCopy,default,defaultCopy,runtimeClasspath,runtimeClasspathCopy,testCompileClasspath,testCompileClasspathCopy,testRuntimeClasspath,testRuntimeClasspathCopy +org.slf4j:slf4j-api:1.7.30=default,runtimeClasspath +org.slf4j:slf4j-api:1.7.36=compileClasspath,compileClasspathCopy,defaultCopy,runtimeClasspathCopy,testCompileClasspath,testCompileClasspathCopy,testRuntimeClasspath,testRuntimeClasspathCopy empty=annotationProcessor,annotationProcessorCopy,archives,archivesCopy,testAnnotationProcessor,testAnnotationProcessorCopy diff --git a/scm-webapp/gradle.lockfile b/scm-webapp/gradle.lockfile index d98d5dcbb4..e2ddf36ab7 100644 --- a/scm-webapp/gradle.lockfile +++ b/scm-webapp/gradle.lockfile @@ -55,7 +55,8 @@ com.google.guava:failureaccess:1.0.1=annotationProcessor,annotationProcessorCopy com.google.guava:guava:30.1-jre=annotationProcessor,annotationProcessorCopy,compileClasspath,compileClasspathCopy,default,defaultCopy,runtimeClasspath,runtimeClasspathCopy,testCompileClasspath,testCompileClasspathCopy,testRuntimeClasspath,testRuntimeClasspathCopy com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=annotationProcessor,annotationProcessorCopy,compileClasspath,compileClasspathCopy,default,defaultCopy,runtimeClasspath,runtimeClasspathCopy,testCompileClasspath,testCompileClasspathCopy,testRuntimeClasspath,testRuntimeClasspathCopy com.google.inject.extensions:guice-assistedinject:5.0.1=compileClasspath,compileClasspathCopy,default,defaultCopy,runtimeClasspath,runtimeClasspathCopy,testCompileClasspath,testCompileClasspathCopy,testRuntimeClasspath,testRuntimeClasspathCopy -com.google.inject.extensions:guice-multibindings:4.2.2=compileClasspath,compileClasspathCopy,default,defaultCopy,runtimeClasspath,runtimeClasspathCopy,testCompileClasspath,testCompileClasspathCopy,testRuntimeClasspath,testRuntimeClasspathCopy +com.google.inject.extensions:guice-multibindings:4.2.2=default +com.google.inject.extensions:guice-multibindings:4.2.3=compileClasspath,compileClasspathCopy,defaultCopy,runtimeClasspath,runtimeClasspathCopy,testCompileClasspath,testCompileClasspathCopy,testRuntimeClasspath,testRuntimeClasspathCopy com.google.inject.extensions:guice-servlet:5.0.1=compileClasspath,compileClasspathCopy,default,defaultCopy,runtimeClasspath,runtimeClasspathCopy,testCompileClasspath,testCompileClasspathCopy,testRuntimeClasspath,testRuntimeClasspathCopy com.google.inject.extensions:guice-throwingproviders:5.0.1=compileClasspath,compileClasspathCopy,default,defaultCopy,runtimeClasspath,runtimeClasspathCopy,testCompileClasspath,testCompileClasspathCopy,testRuntimeClasspath,testRuntimeClasspathCopy com.google.inject:guice:5.0.1=annotationProcessor,annotationProcessorCopy,compileClasspath,compileClasspathCopy,default,defaultCopy,runtimeClasspath,runtimeClasspathCopy,testCompileClasspath,testCompileClasspathCopy,testRuntimeClasspath,testRuntimeClasspathCopy @@ -203,13 +204,14 @@ org.ow2.asm:asm-analysis:9.1=jacocoAntCopy org.ow2.asm:asm-commons:9.1=jacocoAntCopy org.ow2.asm:asm-tree:9.1=jacocoAntCopy org.ow2.asm:asm:9.1=compileClasspath,compileClasspathCopy,default,defaultCopy,jacocoAntCopy,runtimeClasspath,runtimeClasspathCopy,testCompileClasspath,testCompileClasspathCopy,testRuntimeClasspath,testRuntimeClasspathCopy -org.owasp.encoder:encoder:1.2.2=compileClasspath,compileClasspathCopy,default,defaultCopy,runtimeClasspath,runtimeClasspathCopy,testCompileClasspath,testCompileClasspathCopy,testRuntimeClasspath,testRuntimeClasspathCopy +org.owasp.encoder:encoder:1.2.2=default +org.owasp.encoder:encoder:1.2.3=compileClasspath,compileClasspathCopy,defaultCopy,runtimeClasspath,runtimeClasspathCopy,testCompileClasspath,testCompileClasspathCopy,testRuntimeClasspath,testRuntimeClasspathCopy org.projectlombok:lombok:1.18.10=annotationProcessor,annotationProcessorCopy,compileClasspath,compileClasspathCopy,testAnnotationProcessor,testAnnotationProcessorCopy,testCompileClasspath,testCompileClasspathCopy org.reactivestreams:reactive-streams:1.0.3=compileClasspath,compileClasspathCopy,default,defaultCopy,runtimeClasspath,runtimeClasspathCopy,testCompileClasspath,testCompileClasspathCopy,testRuntimeClasspath,testRuntimeClasspathCopy -org.slf4j:jcl-over-slf4j:1.7.30=compileClasspath,compileClasspathCopy,default,defaultCopy,runtimeClasspath,runtimeClasspathCopy,testCompileClasspath,testCompileClasspathCopy,testRuntimeClasspath,testRuntimeClasspathCopy +org.slf4j:jcl-over-slf4j:1.7.3=default +org.slf4j:jcl-over-slf4j:1.7.36=compileClasspath,compileClasspathCopy,defaultCopy,runtimeClasspath,runtimeClasspathCopy,testCompileClasspath,testCompileClasspathCopy,testRuntimeClasspath,testRuntimeClasspathCopy org.slf4j:slf4j-api:1.7.25=swaggerDeps,swaggerDepsCopy -org.slf4j:slf4j-api:1.7.30=annotationProcessor,annotationProcessorCopy -org.slf4j:slf4j-api:1.7.32=compileClasspath,compileClasspathCopy,default,defaultCopy,runtimeClasspath,runtimeClasspathCopy,testCompileClasspath,testCompileClasspathCopy,testRuntimeClasspath,testRuntimeClasspathCopy +org.slf4j:slf4j-api:1.7.36=annotationProcessor,annotationProcessorCopy,compileClasspath,compileClasspathCopy,default,defaultCopy,runtimeClasspath,runtimeClasspathCopy,testCompileClasspath,testCompileClasspathCopy,testRuntimeClasspath,testRuntimeClasspathCopy org.yaml:snakeyaml:1.27=swaggerDeps,swaggerDepsCopy org.yaml:snakeyaml:1.31=compileClasspath,compileClasspathCopy empty=archives,archivesCopy,assets,assetsCopy,corePlugin,corePluginCopy