diff --git a/gradle/dependencies.gradle b/gradle/dependencies.gradle index 7244e519c1..9162b388ec 100644 --- a/gradle/dependencies.gradle +++ b/gradle/dependencies.gradle @@ -1,7 +1,7 @@ ext { slf4jVersion = '1.7.36' guiceVersion = '5.0.1' - resteasyVersion = '4.7.5.Final' + resteasyVersion = '4.7.9.Final' jacksonVersion = '2.13.4' diff --git a/scm-core/gradle.lockfile b/scm-core/gradle.lockfile index 0e7827d4b2..8f6106e42d 100644 --- a/scm-core/gradle.lockfile +++ b/scm-core/gradle.lockfile @@ -87,8 +87,8 @@ org.jacoco:org.jacoco.core:0.8.7=jacocoAntCopy org.jacoco:org.jacoco.report:0.8.7=jacocoAntCopy org.jboss.logging:jboss-logging:3.3.2.Final=compileClasspath,compileClasspathCopy,default,defaultCopy,runtimeClasspath,runtimeClasspathCopy org.jboss.logging:jboss-logging:3.4.2.Final=testCompileClasspath,testCompileClasspathCopy,testRuntimeClasspath,testRuntimeClasspathCopy -org.jboss.resteasy:resteasy-core-spi:4.7.5.Final=testCompileClasspath,testCompileClasspathCopy,testRuntimeClasspath,testRuntimeClasspathCopy -org.jboss.resteasy:resteasy-core:4.7.5.Final=testCompileClasspath,testCompileClasspathCopy,testRuntimeClasspath,testRuntimeClasspathCopy +org.jboss.resteasy:resteasy-core-spi:4.7.9.Final=testCompileClasspath,testCompileClasspathCopy,testRuntimeClasspath,testRuntimeClasspathCopy +org.jboss.resteasy:resteasy-core:4.7.9.Final=testCompileClasspath,testCompileClasspathCopy,testRuntimeClasspath,testRuntimeClasspathCopy org.jboss.spec.javax.annotation:jboss-annotations-api_1.3_spec:2.0.1.Final=testCompileClasspath,testCompileClasspathCopy,testRuntimeClasspath,testRuntimeClasspathCopy org.jboss.spec.javax.ws.rs:jboss-jaxrs-api_2.1_spec:2.0.1.Final=testCompileClasspath,testCompileClasspathCopy,testRuntimeClasspath,testRuntimeClasspathCopy org.jboss.spec.javax.xml.bind:jboss-jaxb-api_2.3_spec:2.0.0.Final=testCompileClasspath,testCompileClasspathCopy,testRuntimeClasspath,testRuntimeClasspathCopy diff --git a/scm-dao-xml/gradle.lockfile b/scm-dao-xml/gradle.lockfile index 9e5651b1b5..43325edcf0 100644 --- a/scm-dao-xml/gradle.lockfile +++ b/scm-dao-xml/gradle.lockfile @@ -84,9 +84,9 @@ org.jacoco:org.jacoco.core:0.8.7=jacocoAntCopy org.jacoco:org.jacoco.report:0.8.7=jacocoAntCopy org.jboss.logging:jboss-logging:3.3.2.Final=compileClasspath,compileClasspathCopy,default,defaultCopy,runtimeClasspath,runtimeClasspathCopy org.jboss.logging:jboss-logging:3.4.2.Final=testCompileClasspath,testCompileClasspathCopy,testRuntimeClasspath,testRuntimeClasspathCopy -org.jboss.resteasy:resteasy-core-spi:4.7.5.Final=testCompileClasspath,testCompileClasspathCopy,testRuntimeClasspath,testRuntimeClasspathCopy -org.jboss.resteasy:resteasy-core:4.7.5.Final=testCompileClasspath,testCompileClasspathCopy,testRuntimeClasspath,testRuntimeClasspathCopy -org.jboss.resteasy:resteasy-validator-provider:4.7.5.Final=testCompileClasspath,testCompileClasspathCopy,testRuntimeClasspath,testRuntimeClasspathCopy +org.jboss.resteasy:resteasy-core-spi:4.7.9.Final=testCompileClasspath,testCompileClasspathCopy,testRuntimeClasspath,testRuntimeClasspathCopy +org.jboss.resteasy:resteasy-core:4.7.9.Final=testCompileClasspath,testCompileClasspathCopy,testRuntimeClasspath,testRuntimeClasspathCopy +org.jboss.resteasy:resteasy-validator-provider:4.7.9.Final=testCompileClasspath,testCompileClasspathCopy,testRuntimeClasspath,testRuntimeClasspathCopy org.jboss.spec.javax.annotation:jboss-annotations-api_1.3_spec:2.0.1.Final=testCompileClasspath,testCompileClasspathCopy,testRuntimeClasspath,testRuntimeClasspathCopy org.jboss.spec.javax.ws.rs:jboss-jaxrs-api_2.1_spec:2.0.1.Final=testCompileClasspath,testCompileClasspathCopy,testRuntimeClasspath,testRuntimeClasspathCopy org.jboss.spec.javax.xml.bind:jboss-jaxb-api_2.3_spec:2.0.0.Final=testCompileClasspath,testCompileClasspathCopy,testRuntimeClasspath,testRuntimeClasspathCopy diff --git a/scm-it/gradle.lockfile b/scm-it/gradle.lockfile index 3de5082c65..080408da94 100644 --- a/scm-it/gradle.lockfile +++ b/scm-it/gradle.lockfile @@ -67,7 +67,7 @@ commons-codec:commons-codec:1.15=testRuntimeClasspath,testRuntimeClasspathCopy commons-codec:commons-codec:1.9=testCompileClasspath,testCompileClasspathCopy commons-collections:commons-collections:3.2.2=testCompileClasspath,testCompileClasspathCopy,testRuntimeClasspath,testRuntimeClasspathCopy commons-httpclient:commons-httpclient:3.1=testCompileClasspath,testCompileClasspathCopy,testRuntimeClasspath,testRuntimeClasspathCopy -commons-io:commons-io:2.9.0=testRuntimeClasspath,testRuntimeClasspathCopy +commons-io:commons-io:2.11.0=testRuntimeClasspath,testRuntimeClasspathCopy commons-lang:commons-lang:2.6=testCompileClasspath,testCompileClasspathCopy,testRuntimeClasspath,testRuntimeClasspathCopy commons-logging:commons-logging:1.2=testCompileClasspath,testCompileClasspathCopy,testRuntimeClasspath,testRuntimeClasspathCopy de.otto.edison:edison-hal:2.1.0=testCompileClasspath,testCompileClasspathCopy,testRuntimeClasspath,testRuntimeClasspathCopy @@ -120,9 +120,9 @@ org.apache.httpcomponents:httpclient:4.5.3=testCompileClasspath,testCompileClass org.apache.httpcomponents:httpcore:4.4.14=testRuntimeClasspath,testRuntimeClasspathCopy org.apache.httpcomponents:httpcore:4.4.6=testCompileClasspath,testCompileClasspathCopy org.apache.httpcomponents:httpmime:4.5.3=testCompileClasspath,testCompileClasspathCopy,testRuntimeClasspath,testRuntimeClasspathCopy -org.apache.james:apache-mime4j-core:0.8.3=testRuntimeClasspath,testRuntimeClasspathCopy -org.apache.james:apache-mime4j-dom:0.8.3=testRuntimeClasspath,testRuntimeClasspathCopy -org.apache.james:apache-mime4j-storage:0.8.3=testRuntimeClasspath,testRuntimeClasspathCopy +org.apache.james:apache-mime4j-core:0.8.9=testRuntimeClasspath,testRuntimeClasspathCopy +org.apache.james:apache-mime4j-dom:0.8.9=testRuntimeClasspath,testRuntimeClasspathCopy +org.apache.james:apache-mime4j-storage:0.8.9=testRuntimeClasspath,testRuntimeClasspathCopy org.apache.lucene:lucene-analyzers-common:8.9.0=testRuntimeClasspath,testRuntimeClasspathCopy org.apache.lucene:lucene-core:8.9.0=testRuntimeClasspath,testRuntimeClasspathCopy org.apache.lucene:lucene-highlighter:8.9.0=testRuntimeClasspath,testRuntimeClasspathCopy @@ -171,16 +171,16 @@ org.jacoco:org.jacoco.core:0.8.7=jacocoAntCopy org.jacoco:org.jacoco.report:0.8.7=jacocoAntCopy org.javahg:javahg:1.0.0=testRuntimeClasspath,testRuntimeClasspathCopy org.jboss.logging:jboss-logging:3.4.2.Final=testCompileClasspath,testCompileClasspathCopy,testRuntimeClasspath,testRuntimeClasspathCopy -org.jboss.resteasy:resteasy-client-api:4.7.5.Final=testRuntimeClasspath,testRuntimeClasspathCopy -org.jboss.resteasy:resteasy-client:4.7.5.Final=testRuntimeClasspath,testRuntimeClasspathCopy -org.jboss.resteasy:resteasy-core-spi:4.7.5.Final=testCompileClasspath,testCompileClasspathCopy,testRuntimeClasspath,testRuntimeClasspathCopy -org.jboss.resteasy:resteasy-core:4.7.5.Final=testCompileClasspath,testCompileClasspathCopy,testRuntimeClasspath,testRuntimeClasspathCopy -org.jboss.resteasy:resteasy-guice:4.7.5.Final=testRuntimeClasspath,testRuntimeClasspathCopy -org.jboss.resteasy:resteasy-jackson2-provider:4.7.5.Final=testRuntimeClasspath,testRuntimeClasspathCopy -org.jboss.resteasy:resteasy-jaxb-provider:4.7.5.Final=testRuntimeClasspath,testRuntimeClasspathCopy -org.jboss.resteasy:resteasy-multipart-provider:4.7.5.Final=testRuntimeClasspath,testRuntimeClasspathCopy -org.jboss.resteasy:resteasy-servlet-initializer:4.7.5.Final=testRuntimeClasspath,testRuntimeClasspathCopy -org.jboss.resteasy:resteasy-validator-provider:4.7.5.Final=testCompileClasspath,testCompileClasspathCopy,testRuntimeClasspath,testRuntimeClasspathCopy +org.jboss.resteasy:resteasy-client-api:4.7.9.Final=testRuntimeClasspath,testRuntimeClasspathCopy +org.jboss.resteasy:resteasy-client:4.7.9.Final=testRuntimeClasspath,testRuntimeClasspathCopy +org.jboss.resteasy:resteasy-core-spi:4.7.9.Final=testCompileClasspath,testCompileClasspathCopy,testRuntimeClasspath,testRuntimeClasspathCopy +org.jboss.resteasy:resteasy-core:4.7.9.Final=testCompileClasspath,testCompileClasspathCopy,testRuntimeClasspath,testRuntimeClasspathCopy +org.jboss.resteasy:resteasy-guice:4.7.9.Final=testRuntimeClasspath,testRuntimeClasspathCopy +org.jboss.resteasy:resteasy-jackson2-provider:4.7.9.Final=testRuntimeClasspath,testRuntimeClasspathCopy +org.jboss.resteasy:resteasy-jaxb-provider:4.7.9.Final=testRuntimeClasspath,testRuntimeClasspathCopy +org.jboss.resteasy:resteasy-multipart-provider:4.7.9.Final=testRuntimeClasspath,testRuntimeClasspathCopy +org.jboss.resteasy:resteasy-servlet-initializer:4.7.9.Final=testRuntimeClasspath,testRuntimeClasspathCopy +org.jboss.resteasy:resteasy-validator-provider:4.7.9.Final=testCompileClasspath,testCompileClasspathCopy,testRuntimeClasspath,testRuntimeClasspathCopy org.jboss.spec.javax.annotation:jboss-annotations-api_1.3_spec:2.0.1.Final=testCompileClasspath,testCompileClasspathCopy,testRuntimeClasspath,testRuntimeClasspathCopy org.jboss.spec.javax.ws.rs:jboss-jaxrs-api_2.1_spec:2.0.1.Final=testCompileClasspath,testCompileClasspathCopy,testRuntimeClasspath,testRuntimeClasspathCopy org.jboss.spec.javax.xml.bind:jboss-jaxb-api_2.3_spec:2.0.0.Final=testCompileClasspath,testCompileClasspathCopy,testRuntimeClasspath,testRuntimeClasspathCopy diff --git a/scm-plugins/scm-git-plugin/gradle.lockfile b/scm-plugins/scm-git-plugin/gradle.lockfile index cef2258217..f7985a7e8d 100644 --- a/scm-plugins/scm-git-plugin/gradle.lockfile +++ b/scm-plugins/scm-git-plugin/gradle.lockfile @@ -118,11 +118,11 @@ org.hdrhistogram:HdrHistogram:2.1.12=compileClasspath,runtimeClasspath,runtimePl org.hibernate.validator:hibernate-validator:6.1.6.Final=compileClasspath,runtimeClasspath,runtimePluginElements,scmCoreDependency,testCompileClasspath,testRuntimeClasspath org.javassist:javassist:3.22.0-GA=swaggerDeps org.jboss.logging:jboss-logging:3.4.2.Final=compileClasspath,runtimeClasspath,runtimePluginElements,scmCoreDependency,testCompileClasspath,testRuntimeClasspath -org.jboss.resteasy:resteasy-core-spi:4.7.5.Final=compileClasspath,runtimeClasspath,runtimePluginElements,scmCoreDependency,testCompileClasspath,testRuntimeClasspath -org.jboss.resteasy:resteasy-core:4.7.5.Final=compileClasspath,runtimeClasspath,runtimePluginElements,scmCoreDependency,testCompileClasspath,testRuntimeClasspath +org.jboss.resteasy:resteasy-core-spi:4.7.9.Final=compileClasspath,runtimeClasspath,runtimePluginElements,scmCoreDependency,testCompileClasspath,testRuntimeClasspath +org.jboss.resteasy:resteasy-core:4.7.9.Final=compileClasspath,runtimeClasspath,runtimePluginElements,scmCoreDependency,testCompileClasspath,testRuntimeClasspath org.jboss.resteasy:resteasy-jackson2-provider:4.5.3.Final=testCompileClasspath,testRuntimeClasspath org.jboss.resteasy:resteasy-jaxb-provider:4.5.3.Final=testCompileClasspath,testRuntimeClasspath -org.jboss.resteasy:resteasy-validator-provider:4.7.5.Final=compileClasspath,runtimeClasspath,runtimePluginElements,scmCoreDependency,testCompileClasspath,testRuntimeClasspath +org.jboss.resteasy:resteasy-validator-provider:4.7.9.Final=compileClasspath,runtimeClasspath,runtimePluginElements,scmCoreDependency,testCompileClasspath,testRuntimeClasspath org.jboss.spec.javax.annotation:jboss-annotations-api_1.3_spec:2.0.1.Final=compileClasspath,runtimeClasspath,runtimePluginElements,scmCoreDependency,testCompileClasspath,testRuntimeClasspath org.jboss.spec.javax.ws.rs:jboss-jaxrs-api_2.1_spec:2.0.1.Final=compileClasspath,runtimeClasspath,runtimePluginElements,scmCoreDependency,testCompileClasspath,testRuntimeClasspath org.jboss.spec.javax.xml.bind:jboss-jaxb-api_2.3_spec:2.0.0.Final=compileClasspath,runtimeClasspath,runtimePluginElements,scmCoreDependency,testCompileClasspath,testRuntimeClasspath diff --git a/scm-plugins/scm-hg-plugin/gradle.lockfile b/scm-plugins/scm-hg-plugin/gradle.lockfile index 0b57c86794..74012ef1ac 100644 --- a/scm-plugins/scm-hg-plugin/gradle.lockfile +++ b/scm-plugins/scm-hg-plugin/gradle.lockfile @@ -103,11 +103,11 @@ org.hibernate.validator:hibernate-validator:6.1.6.Final=compileClasspath,runtime org.javahg:javahg:1.0.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath org.javassist:javassist:3.22.0-GA=swaggerDeps org.jboss.logging:jboss-logging:3.4.2.Final=compileClasspath,runtimeClasspath,runtimePluginElements,scmCoreDependency,testCompileClasspath,testRuntimeClasspath -org.jboss.resteasy:resteasy-core-spi:4.7.5.Final=compileClasspath,runtimeClasspath,runtimePluginElements,scmCoreDependency,testCompileClasspath,testRuntimeClasspath -org.jboss.resteasy:resteasy-core:4.7.5.Final=compileClasspath,runtimeClasspath,runtimePluginElements,scmCoreDependency,testCompileClasspath,testRuntimeClasspath +org.jboss.resteasy:resteasy-core-spi:4.7.9.Final=compileClasspath,runtimeClasspath,runtimePluginElements,scmCoreDependency,testCompileClasspath,testRuntimeClasspath +org.jboss.resteasy:resteasy-core:4.7.9.Final=compileClasspath,runtimeClasspath,runtimePluginElements,scmCoreDependency,testCompileClasspath,testRuntimeClasspath org.jboss.resteasy:resteasy-jackson2-provider:4.5.3.Final=testCompileClasspath,testRuntimeClasspath org.jboss.resteasy:resteasy-jaxb-provider:4.5.3.Final=testCompileClasspath,testRuntimeClasspath -org.jboss.resteasy:resteasy-validator-provider:4.7.5.Final=compileClasspath,runtimeClasspath,runtimePluginElements,scmCoreDependency,testCompileClasspath,testRuntimeClasspath +org.jboss.resteasy:resteasy-validator-provider:4.7.9.Final=compileClasspath,runtimeClasspath,runtimePluginElements,scmCoreDependency,testCompileClasspath,testRuntimeClasspath org.jboss.spec.javax.annotation:jboss-annotations-api_1.3_spec:2.0.1.Final=compileClasspath,runtimeClasspath,runtimePluginElements,scmCoreDependency,testCompileClasspath,testRuntimeClasspath org.jboss.spec.javax.ws.rs:jboss-jaxrs-api_2.1_spec:2.0.1.Final=compileClasspath,runtimeClasspath,runtimePluginElements,scmCoreDependency,testCompileClasspath,testRuntimeClasspath org.jboss.spec.javax.xml.bind:jboss-jaxb-api_2.3_spec:2.0.0.Final=compileClasspath,runtimeClasspath,runtimePluginElements,scmCoreDependency,testCompileClasspath,testRuntimeClasspath diff --git a/scm-plugins/scm-integration-test-plugin/gradle.lockfile b/scm-plugins/scm-integration-test-plugin/gradle.lockfile index 14de4f1be9..01eddd32f5 100644 --- a/scm-plugins/scm-integration-test-plugin/gradle.lockfile +++ b/scm-plugins/scm-integration-test-plugin/gradle.lockfile @@ -100,11 +100,11 @@ org.hdrhistogram:HdrHistogram:2.1.12=compileClasspath,runtimeClasspath,runtimePl org.hibernate.validator:hibernate-validator:6.1.6.Final=compileClasspath,runtimeClasspath,runtimePluginElements,scmCoreDependency,testCompileClasspath,testRuntimeClasspath org.javassist:javassist:3.22.0-GA=swaggerDeps org.jboss.logging:jboss-logging:3.4.2.Final=compileClasspath,runtimeClasspath,runtimePluginElements,scmCoreDependency,testCompileClasspath,testRuntimeClasspath -org.jboss.resteasy:resteasy-core-spi:4.7.5.Final=compileClasspath,runtimeClasspath,runtimePluginElements,scmCoreDependency,testCompileClasspath,testRuntimeClasspath -org.jboss.resteasy:resteasy-core:4.7.5.Final=compileClasspath,runtimeClasspath,runtimePluginElements,scmCoreDependency,testCompileClasspath,testRuntimeClasspath +org.jboss.resteasy:resteasy-core-spi:4.7.9.Final=compileClasspath,runtimeClasspath,runtimePluginElements,scmCoreDependency,testCompileClasspath,testRuntimeClasspath +org.jboss.resteasy:resteasy-core:4.7.9.Final=compileClasspath,runtimeClasspath,runtimePluginElements,scmCoreDependency,testCompileClasspath,testRuntimeClasspath org.jboss.resteasy:resteasy-jackson2-provider:4.5.3.Final=testCompileClasspath,testRuntimeClasspath org.jboss.resteasy:resteasy-jaxb-provider:4.5.3.Final=testCompileClasspath,testRuntimeClasspath -org.jboss.resteasy:resteasy-validator-provider:4.7.5.Final=compileClasspath,runtimeClasspath,runtimePluginElements,scmCoreDependency,testCompileClasspath,testRuntimeClasspath +org.jboss.resteasy:resteasy-validator-provider:4.7.9.Final=compileClasspath,runtimeClasspath,runtimePluginElements,scmCoreDependency,testCompileClasspath,testRuntimeClasspath org.jboss.spec.javax.annotation:jboss-annotations-api_1.3_spec:2.0.1.Final=compileClasspath,runtimeClasspath,runtimePluginElements,scmCoreDependency,testCompileClasspath,testRuntimeClasspath org.jboss.spec.javax.ws.rs:jboss-jaxrs-api_2.1_spec:2.0.1.Final=compileClasspath,runtimeClasspath,runtimePluginElements,scmCoreDependency,testCompileClasspath,testRuntimeClasspath org.jboss.spec.javax.xml.bind:jboss-jaxb-api_2.3_spec:2.0.0.Final=compileClasspath,runtimeClasspath,runtimePluginElements,scmCoreDependency,testCompileClasspath,testRuntimeClasspath diff --git a/scm-plugins/scm-legacy-plugin/gradle.lockfile b/scm-plugins/scm-legacy-plugin/gradle.lockfile index 14de4f1be9..01eddd32f5 100644 --- a/scm-plugins/scm-legacy-plugin/gradle.lockfile +++ b/scm-plugins/scm-legacy-plugin/gradle.lockfile @@ -100,11 +100,11 @@ org.hdrhistogram:HdrHistogram:2.1.12=compileClasspath,runtimeClasspath,runtimePl org.hibernate.validator:hibernate-validator:6.1.6.Final=compileClasspath,runtimeClasspath,runtimePluginElements,scmCoreDependency,testCompileClasspath,testRuntimeClasspath org.javassist:javassist:3.22.0-GA=swaggerDeps org.jboss.logging:jboss-logging:3.4.2.Final=compileClasspath,runtimeClasspath,runtimePluginElements,scmCoreDependency,testCompileClasspath,testRuntimeClasspath -org.jboss.resteasy:resteasy-core-spi:4.7.5.Final=compileClasspath,runtimeClasspath,runtimePluginElements,scmCoreDependency,testCompileClasspath,testRuntimeClasspath -org.jboss.resteasy:resteasy-core:4.7.5.Final=compileClasspath,runtimeClasspath,runtimePluginElements,scmCoreDependency,testCompileClasspath,testRuntimeClasspath +org.jboss.resteasy:resteasy-core-spi:4.7.9.Final=compileClasspath,runtimeClasspath,runtimePluginElements,scmCoreDependency,testCompileClasspath,testRuntimeClasspath +org.jboss.resteasy:resteasy-core:4.7.9.Final=compileClasspath,runtimeClasspath,runtimePluginElements,scmCoreDependency,testCompileClasspath,testRuntimeClasspath org.jboss.resteasy:resteasy-jackson2-provider:4.5.3.Final=testCompileClasspath,testRuntimeClasspath org.jboss.resteasy:resteasy-jaxb-provider:4.5.3.Final=testCompileClasspath,testRuntimeClasspath -org.jboss.resteasy:resteasy-validator-provider:4.7.5.Final=compileClasspath,runtimeClasspath,runtimePluginElements,scmCoreDependency,testCompileClasspath,testRuntimeClasspath +org.jboss.resteasy:resteasy-validator-provider:4.7.9.Final=compileClasspath,runtimeClasspath,runtimePluginElements,scmCoreDependency,testCompileClasspath,testRuntimeClasspath org.jboss.spec.javax.annotation:jboss-annotations-api_1.3_spec:2.0.1.Final=compileClasspath,runtimeClasspath,runtimePluginElements,scmCoreDependency,testCompileClasspath,testRuntimeClasspath org.jboss.spec.javax.ws.rs:jboss-jaxrs-api_2.1_spec:2.0.1.Final=compileClasspath,runtimeClasspath,runtimePluginElements,scmCoreDependency,testCompileClasspath,testRuntimeClasspath org.jboss.spec.javax.xml.bind:jboss-jaxb-api_2.3_spec:2.0.0.Final=compileClasspath,runtimeClasspath,runtimePluginElements,scmCoreDependency,testCompileClasspath,testRuntimeClasspath diff --git a/scm-plugins/scm-svn-plugin/gradle.lockfile b/scm-plugins/scm-svn-plugin/gradle.lockfile index 3618461fbf..bba6789769 100644 --- a/scm-plugins/scm-svn-plugin/gradle.lockfile +++ b/scm-plugins/scm-svn-plugin/gradle.lockfile @@ -115,11 +115,11 @@ org.hdrhistogram:HdrHistogram:2.1.12=compileClasspath,runtimeClasspath,runtimePl org.hibernate.validator:hibernate-validator:6.1.6.Final=compileClasspath,runtimeClasspath,runtimePluginElements,scmCoreDependency,testCompileClasspath,testRuntimeClasspath org.javassist:javassist:3.22.0-GA=swaggerDeps org.jboss.logging:jboss-logging:3.4.2.Final=compileClasspath,runtimeClasspath,runtimePluginElements,scmCoreDependency,testCompileClasspath,testRuntimeClasspath -org.jboss.resteasy:resteasy-core-spi:4.7.5.Final=compileClasspath,runtimeClasspath,runtimePluginElements,scmCoreDependency,testCompileClasspath,testRuntimeClasspath -org.jboss.resteasy:resteasy-core:4.7.5.Final=compileClasspath,runtimeClasspath,runtimePluginElements,scmCoreDependency,testCompileClasspath,testRuntimeClasspath +org.jboss.resteasy:resteasy-core-spi:4.7.9.Final=compileClasspath,runtimeClasspath,runtimePluginElements,scmCoreDependency,testCompileClasspath,testRuntimeClasspath +org.jboss.resteasy:resteasy-core:4.7.9.Final=compileClasspath,runtimeClasspath,runtimePluginElements,scmCoreDependency,testCompileClasspath,testRuntimeClasspath org.jboss.resteasy:resteasy-jackson2-provider:4.5.3.Final=testCompileClasspath,testRuntimeClasspath org.jboss.resteasy:resteasy-jaxb-provider:4.5.3.Final=testCompileClasspath,testRuntimeClasspath -org.jboss.resteasy:resteasy-validator-provider:4.7.5.Final=compileClasspath,runtimeClasspath,runtimePluginElements,scmCoreDependency,testCompileClasspath,testRuntimeClasspath +org.jboss.resteasy:resteasy-validator-provider:4.7.9.Final=compileClasspath,runtimeClasspath,runtimePluginElements,scmCoreDependency,testCompileClasspath,testRuntimeClasspath org.jboss.spec.javax.annotation:jboss-annotations-api_1.3_spec:2.0.1.Final=compileClasspath,runtimeClasspath,runtimePluginElements,scmCoreDependency,testCompileClasspath,testRuntimeClasspath org.jboss.spec.javax.ws.rs:jboss-jaxrs-api_2.1_spec:2.0.1.Final=compileClasspath,runtimeClasspath,runtimePluginElements,scmCoreDependency,testCompileClasspath,testRuntimeClasspath org.jboss.spec.javax.xml.bind:jboss-jaxb-api_2.3_spec:2.0.0.Final=compileClasspath,runtimeClasspath,runtimePluginElements,scmCoreDependency,testCompileClasspath,testRuntimeClasspath diff --git a/scm-test/gradle.lockfile b/scm-test/gradle.lockfile index bca7174acc..30ed03c289 100644 --- a/scm-test/gradle.lockfile +++ b/scm-test/gradle.lockfile @@ -82,9 +82,9 @@ org.jacoco:org.jacoco.ant:0.8.7=jacocoAntCopy org.jacoco:org.jacoco.core:0.8.7=jacocoAntCopy org.jacoco:org.jacoco.report:0.8.7=jacocoAntCopy org.jboss.logging:jboss-logging:3.4.2.Final=compileClasspath,compileClasspathCopy,default,defaultCopy,runtimeClasspath,runtimeClasspathCopy,testCompileClasspath,testCompileClasspathCopy,testRuntimeClasspath,testRuntimeClasspathCopy -org.jboss.resteasy:resteasy-core-spi:4.7.5.Final=compileClasspath,compileClasspathCopy,default,defaultCopy,runtimeClasspath,runtimeClasspathCopy,testCompileClasspath,testCompileClasspathCopy,testRuntimeClasspath,testRuntimeClasspathCopy -org.jboss.resteasy:resteasy-core:4.7.5.Final=compileClasspath,compileClasspathCopy,default,defaultCopy,runtimeClasspath,runtimeClasspathCopy,testCompileClasspath,testCompileClasspathCopy,testRuntimeClasspath,testRuntimeClasspathCopy -org.jboss.resteasy:resteasy-validator-provider:4.7.5.Final=compileClasspath,compileClasspathCopy,default,defaultCopy,runtimeClasspath,runtimeClasspathCopy,testCompileClasspath,testCompileClasspathCopy,testRuntimeClasspath,testRuntimeClasspathCopy +org.jboss.resteasy:resteasy-core-spi:4.7.9.Final=compileClasspath,compileClasspathCopy,default,defaultCopy,runtimeClasspath,runtimeClasspathCopy,testCompileClasspath,testCompileClasspathCopy,testRuntimeClasspath,testRuntimeClasspathCopy +org.jboss.resteasy:resteasy-core:4.7.9.Final=compileClasspath,compileClasspathCopy,default,defaultCopy,runtimeClasspath,runtimeClasspathCopy,testCompileClasspath,testCompileClasspathCopy,testRuntimeClasspath,testRuntimeClasspathCopy +org.jboss.resteasy:resteasy-validator-provider:4.7.9.Final=compileClasspath,compileClasspathCopy,default,defaultCopy,runtimeClasspath,runtimeClasspathCopy,testCompileClasspath,testCompileClasspathCopy,testRuntimeClasspath,testRuntimeClasspathCopy org.jboss.spec.javax.annotation:jboss-annotations-api_1.3_spec:2.0.1.Final=compileClasspath,compileClasspathCopy,default,defaultCopy,runtimeClasspath,runtimeClasspathCopy,testCompileClasspath,testCompileClasspathCopy,testRuntimeClasspath,testRuntimeClasspathCopy org.jboss.spec.javax.ws.rs:jboss-jaxrs-api_2.1_spec:2.0.1.Final=compileClasspath,compileClasspathCopy,default,defaultCopy,runtimeClasspath,runtimeClasspathCopy,testCompileClasspath,testCompileClasspathCopy,testRuntimeClasspath,testRuntimeClasspathCopy org.jboss.spec.javax.xml.bind:jboss-jaxb-api_2.3_spec:2.0.0.Final=compileClasspath,compileClasspathCopy,default,defaultCopy,runtimeClasspath,runtimeClasspathCopy,testCompileClasspath,testCompileClasspathCopy,testRuntimeClasspath,testRuntimeClasspathCopy diff --git a/scm-webapp/gradle.lockfile b/scm-webapp/gradle.lockfile index e2ddf36ab7..fc37d54bed 100644 --- a/scm-webapp/gradle.lockfile +++ b/scm-webapp/gradle.lockfile @@ -69,7 +69,8 @@ com.sun.mail:jakarta.mail:1.6.5=compileClasspath,compileClasspathCopy,default,de commons-beanutils:commons-beanutils:1.9.4=compileClasspath,compileClasspathCopy,default,defaultCopy,runtimeClasspath,runtimeClasspathCopy,testCompileClasspath,testCompileClasspathCopy,testRuntimeClasspath,testRuntimeClasspathCopy commons-codec:commons-codec:1.15=compileClasspath,compileClasspathCopy,default,defaultCopy,runtimeClasspath,runtimeClasspathCopy,testCompileClasspath,testCompileClasspathCopy,testRuntimeClasspath,testRuntimeClasspathCopy commons-collections:commons-collections:3.2.2=compileClasspath,compileClasspathCopy,default,defaultCopy,runtimeClasspath,runtimeClasspathCopy,testCompileClasspath,testCompileClasspathCopy,testRuntimeClasspath,testRuntimeClasspathCopy -commons-io:commons-io:2.9.0=compileClasspath,compileClasspathCopy,default,defaultCopy,runtimeClasspath,runtimeClasspathCopy,testCompileClasspath,testCompileClasspathCopy,testRuntimeClasspath,testRuntimeClasspathCopy +commons-io:commons-io:2.11.0=compileClasspath,compileClasspathCopy,defaultCopy,runtimeClasspath,runtimeClasspathCopy,testCompileClasspath,testCompileClasspathCopy,testRuntimeClasspath,testRuntimeClasspathCopy +commons-io:commons-io:2.9.0=default commons-lang:commons-lang:2.6=compileClasspath,compileClasspathCopy,default,defaultCopy,runtimeClasspath,runtimeClasspathCopy,testCompileClasspath,testCompileClasspathCopy,testRuntimeClasspath,testRuntimeClasspathCopy commons-logging:commons-logging:1.2=compileClasspath,compileClasspathCopy,default,defaultCopy,runtimeClasspath,runtimeClasspathCopy,testCompileClasspath,testCompileClasspathCopy,testRuntimeClasspath,testRuntimeClasspathCopy de.otto.edison:edison-hal:2.1.0=compileClasspath,compileClasspathCopy,default,defaultCopy,runtimeClasspath,runtimeClasspathCopy,testCompileClasspath,testCompileClasspathCopy,testRuntimeClasspath,testRuntimeClasspathCopy @@ -116,9 +117,12 @@ org.apache.commons:commons-compress:1.20=compileClasspath,compileClasspathCopy,d org.apache.commons:commons-lang3:3.7=compileClasspath,compileClasspathCopy,swaggerDeps,swaggerDepsCopy org.apache.httpcomponents:httpclient:4.5.13=compileClasspath,compileClasspathCopy,default,defaultCopy,runtimeClasspath,runtimeClasspathCopy,testCompileClasspath,testCompileClasspathCopy,testRuntimeClasspath,testRuntimeClasspathCopy org.apache.httpcomponents:httpcore:4.4.13=compileClasspath,compileClasspathCopy,default,defaultCopy,runtimeClasspath,runtimeClasspathCopy,testCompileClasspath,testCompileClasspathCopy,testRuntimeClasspath,testRuntimeClasspathCopy -org.apache.james:apache-mime4j-core:0.8.3=compileClasspath,compileClasspathCopy,default,defaultCopy,runtimeClasspath,runtimeClasspathCopy,testCompileClasspath,testCompileClasspathCopy,testRuntimeClasspath,testRuntimeClasspathCopy -org.apache.james:apache-mime4j-dom:0.8.3=compileClasspath,compileClasspathCopy,default,defaultCopy,runtimeClasspath,runtimeClasspathCopy,testCompileClasspath,testCompileClasspathCopy,testRuntimeClasspath,testRuntimeClasspathCopy -org.apache.james:apache-mime4j-storage:0.8.3=compileClasspath,compileClasspathCopy,default,defaultCopy,runtimeClasspath,runtimeClasspathCopy,testCompileClasspath,testCompileClasspathCopy,testRuntimeClasspath,testRuntimeClasspathCopy +org.apache.james:apache-mime4j-core:0.8.3=default +org.apache.james:apache-mime4j-core:0.8.9=compileClasspath,compileClasspathCopy,defaultCopy,runtimeClasspath,runtimeClasspathCopy,testCompileClasspath,testCompileClasspathCopy,testRuntimeClasspath,testRuntimeClasspathCopy +org.apache.james:apache-mime4j-dom:0.8.3=default +org.apache.james:apache-mime4j-dom:0.8.9=compileClasspath,compileClasspathCopy,defaultCopy,runtimeClasspath,runtimeClasspathCopy,testCompileClasspath,testCompileClasspathCopy,testRuntimeClasspath,testRuntimeClasspathCopy +org.apache.james:apache-mime4j-storage:0.8.3=default +org.apache.james:apache-mime4j-storage:0.8.9=compileClasspath,compileClasspathCopy,defaultCopy,runtimeClasspath,runtimeClasspathCopy,testCompileClasspath,testCompileClasspathCopy,testRuntimeClasspath,testRuntimeClasspathCopy org.apache.lucene:lucene-analyzers-common:8.9.0=compileClasspath,compileClasspathCopy,default,defaultCopy,runtimeClasspath,runtimeClasspathCopy,testCompileClasspath,testCompileClasspathCopy,testRuntimeClasspath,testRuntimeClasspathCopy org.apache.lucene:lucene-core:8.9.0=compileClasspath,compileClasspathCopy,default,defaultCopy,runtimeClasspath,runtimeClasspathCopy,testCompileClasspath,testCompileClasspathCopy,testRuntimeClasspath,testRuntimeClasspathCopy org.apache.lucene:lucene-highlighter:8.9.0=compileClasspath,compileClasspathCopy,default,defaultCopy,runtimeClasspath,runtimeClasspathCopy,testCompileClasspath,testCompileClasspathCopy,testRuntimeClasspath,testRuntimeClasspathCopy @@ -162,16 +166,16 @@ org.jacoco:org.jacoco.report:0.8.7=jacocoAntCopy org.javassist:javassist:3.25.0-GA=compileClasspath,compileClasspathCopy,swaggerDeps,swaggerDepsCopy org.javassist:javassist:3.27.0-GA=default org.jboss.logging:jboss-logging:3.4.2.Final=compileClasspath,compileClasspathCopy,default,defaultCopy,runtimeClasspath,runtimeClasspathCopy,testCompileClasspath,testCompileClasspathCopy,testRuntimeClasspath,testRuntimeClasspathCopy -org.jboss.resteasy:resteasy-client-api:4.7.5.Final=compileClasspath,compileClasspathCopy,default,defaultCopy,runtimeClasspath,runtimeClasspathCopy,testCompileClasspath,testCompileClasspathCopy,testRuntimeClasspath,testRuntimeClasspathCopy -org.jboss.resteasy:resteasy-client:4.7.5.Final=compileClasspath,compileClasspathCopy,default,defaultCopy,runtimeClasspath,runtimeClasspathCopy,testCompileClasspath,testCompileClasspathCopy,testRuntimeClasspath,testRuntimeClasspathCopy -org.jboss.resteasy:resteasy-core-spi:4.7.5.Final=compileClasspath,compileClasspathCopy,default,defaultCopy,runtimeClasspath,runtimeClasspathCopy,testCompileClasspath,testCompileClasspathCopy,testRuntimeClasspath,testRuntimeClasspathCopy -org.jboss.resteasy:resteasy-core:4.7.5.Final=compileClasspath,compileClasspathCopy,default,defaultCopy,runtimeClasspath,runtimeClasspathCopy,testCompileClasspath,testCompileClasspathCopy,testRuntimeClasspath,testRuntimeClasspathCopy -org.jboss.resteasy:resteasy-guice:4.7.5.Final=compileClasspath,compileClasspathCopy,default,defaultCopy,runtimeClasspath,runtimeClasspathCopy,testCompileClasspath,testCompileClasspathCopy,testRuntimeClasspath,testRuntimeClasspathCopy -org.jboss.resteasy:resteasy-jackson2-provider:4.7.5.Final=compileClasspath,compileClasspathCopy,default,defaultCopy,runtimeClasspath,runtimeClasspathCopy,testCompileClasspath,testCompileClasspathCopy,testRuntimeClasspath,testRuntimeClasspathCopy -org.jboss.resteasy:resteasy-jaxb-provider:4.7.5.Final=compileClasspath,compileClasspathCopy,default,defaultCopy,runtimeClasspath,runtimeClasspathCopy,testCompileClasspath,testCompileClasspathCopy,testRuntimeClasspath,testRuntimeClasspathCopy -org.jboss.resteasy:resteasy-multipart-provider:4.7.5.Final=compileClasspath,compileClasspathCopy,default,defaultCopy,runtimeClasspath,runtimeClasspathCopy,testCompileClasspath,testCompileClasspathCopy,testRuntimeClasspath,testRuntimeClasspathCopy -org.jboss.resteasy:resteasy-servlet-initializer:4.7.5.Final=compileClasspath,compileClasspathCopy,default,defaultCopy,runtimeClasspath,runtimeClasspathCopy,testCompileClasspath,testCompileClasspathCopy,testRuntimeClasspath,testRuntimeClasspathCopy -org.jboss.resteasy:resteasy-validator-provider:4.7.5.Final=compileClasspath,compileClasspathCopy,default,defaultCopy,runtimeClasspath,runtimeClasspathCopy,testCompileClasspath,testCompileClasspathCopy,testRuntimeClasspath,testRuntimeClasspathCopy +org.jboss.resteasy:resteasy-client-api:4.7.9.Final=compileClasspath,compileClasspathCopy,default,defaultCopy,runtimeClasspath,runtimeClasspathCopy,testCompileClasspath,testCompileClasspathCopy,testRuntimeClasspath,testRuntimeClasspathCopy +org.jboss.resteasy:resteasy-client:4.7.9.Final=compileClasspath,compileClasspathCopy,default,defaultCopy,runtimeClasspath,runtimeClasspathCopy,testCompileClasspath,testCompileClasspathCopy,testRuntimeClasspath,testRuntimeClasspathCopy +org.jboss.resteasy:resteasy-core-spi:4.7.9.Final=compileClasspath,compileClasspathCopy,default,defaultCopy,runtimeClasspath,runtimeClasspathCopy,testCompileClasspath,testCompileClasspathCopy,testRuntimeClasspath,testRuntimeClasspathCopy +org.jboss.resteasy:resteasy-core:4.7.9.Final=compileClasspath,compileClasspathCopy,default,defaultCopy,runtimeClasspath,runtimeClasspathCopy,testCompileClasspath,testCompileClasspathCopy,testRuntimeClasspath,testRuntimeClasspathCopy +org.jboss.resteasy:resteasy-guice:4.7.9.Final=compileClasspath,compileClasspathCopy,default,defaultCopy,runtimeClasspath,runtimeClasspathCopy,testCompileClasspath,testCompileClasspathCopy,testRuntimeClasspath,testRuntimeClasspathCopy +org.jboss.resteasy:resteasy-jackson2-provider:4.7.9.Final=compileClasspath,compileClasspathCopy,default,defaultCopy,runtimeClasspath,runtimeClasspathCopy,testCompileClasspath,testCompileClasspathCopy,testRuntimeClasspath,testRuntimeClasspathCopy +org.jboss.resteasy:resteasy-jaxb-provider:4.7.9.Final=compileClasspath,compileClasspathCopy,default,defaultCopy,runtimeClasspath,runtimeClasspathCopy,testCompileClasspath,testCompileClasspathCopy,testRuntimeClasspath,testRuntimeClasspathCopy +org.jboss.resteasy:resteasy-multipart-provider:4.7.9.Final=compileClasspath,compileClasspathCopy,default,defaultCopy,runtimeClasspath,runtimeClasspathCopy,testCompileClasspath,testCompileClasspathCopy,testRuntimeClasspath,testRuntimeClasspathCopy +org.jboss.resteasy:resteasy-servlet-initializer:4.7.9.Final=compileClasspath,compileClasspathCopy,default,defaultCopy,runtimeClasspath,runtimeClasspathCopy,testCompileClasspath,testCompileClasspathCopy,testRuntimeClasspath,testRuntimeClasspathCopy +org.jboss.resteasy:resteasy-validator-provider:4.7.9.Final=compileClasspath,compileClasspathCopy,default,defaultCopy,runtimeClasspath,runtimeClasspathCopy,testCompileClasspath,testCompileClasspathCopy,testRuntimeClasspath,testRuntimeClasspathCopy org.jboss.spec.javax.annotation:jboss-annotations-api_1.3_spec:2.0.1.Final=compileClasspath,compileClasspathCopy,default,defaultCopy,runtimeClasspath,runtimeClasspathCopy,testCompileClasspath,testCompileClasspathCopy,testRuntimeClasspath,testRuntimeClasspathCopy org.jboss.spec.javax.ws.rs:jboss-jaxrs-api_2.1_spec:2.0.1.Final=compileClasspath,compileClasspathCopy,default,defaultCopy,runtimeClasspath,runtimeClasspathCopy,testCompileClasspath,testCompileClasspathCopy,testRuntimeClasspath,testRuntimeClasspathCopy org.jboss.spec.javax.xml.bind:jboss-jaxb-api_2.3_spec:2.0.0.Final=compileClasspath,compileClasspathCopy,default,defaultCopy,runtimeClasspath,runtimeClasspathCopy,testCompileClasspath,testCompileClasspathCopy,testRuntimeClasspath,testRuntimeClasspathCopy diff --git a/scm-webapp/src/test/java/sonia/scm/api/FailureExceptionMapperTest.java b/scm-webapp/src/test/java/sonia/scm/api/FailureExceptionMapperTest.java index 90e295f96d..bf545692e2 100644 --- a/scm-webapp/src/test/java/sonia/scm/api/FailureExceptionMapperTest.java +++ b/scm-webapp/src/test/java/sonia/scm/api/FailureExceptionMapperTest.java @@ -48,6 +48,7 @@ import java.io.IOException; import java.net.URISyntaxException; import static org.assertj.core.api.Assertions.assertThat; +import static org.mockito.Mockito.lenient; import static org.mockito.Mockito.when; @ExtendWith(MockitoExtension.class) @@ -98,7 +99,7 @@ class FailureExceptionMapperTest { } private MockHttpResponse dispatch(MockHttpRequest request) { - when(this.request.getMethod()).thenReturn(request.getHttpMethod()); + lenient().when(this.request.getMethod()).thenReturn(request.getHttpMethod()); MockHttpResponse response = new MockHttpResponse(); dispatcher.invoke(request, response); return response;