diff --git a/build.gradle.kts b/build.gradle.kts index cf28cc5..fa95bc9 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -16,7 +16,7 @@ configurations.all { eachDependency { when (requested.module.toString()) { "org.jetbrains:annotations" -> useVersion("15.0") - // conflict between jvm-tasks and sshj + // conflict between testcontainers, ssh-ubuntu and sshj "org.slf4j:slf4j-api" -> useVersion("1.7.25") } when (requested.group) { diff --git a/gradle/dependency-locks/apiDependenciesMetadata.lockfile b/gradle/dependency-locks/apiDependenciesMetadata.lockfile index 0a1505d..c6735f6 100644 --- a/gradle/dependency-locks/apiDependenciesMetadata.lockfile +++ b/gradle/dependency-locks/apiDependenciesMetadata.lockfile @@ -2,13 +2,11 @@ # Manual edits can break the build and are not advised. # This file is expected to be part of source control. com.atlassian.performance.tools:io:1.2.0 -com.atlassian.performance.tools:jvm-tasks:1.2.3 +com.atlassian.performance.tools:jvm-tasks:1.2.4 com.hierynomus:sshj:0.23.0 com.jcraft:jzlib:1.1.3 net.i2p.crypto:eddsa:0.2.0 org.apache.logging.log4j:log4j-api:2.20.0 -org.apache.logging.log4j:log4j-core:2.20.0 -org.apache.logging.log4j:log4j-slf4j-impl:2.20.0 org.bouncycastle:bcpkix-jdk15on:1.56 org.bouncycastle:bcprov-jdk15on:1.56 org.glassfish:javax.json:1.1 diff --git a/gradle/dependency-locks/compile.lockfile b/gradle/dependency-locks/compile.lockfile index 0a1505d..c6735f6 100644 --- a/gradle/dependency-locks/compile.lockfile +++ b/gradle/dependency-locks/compile.lockfile @@ -2,13 +2,11 @@ # Manual edits can break the build and are not advised. # This file is expected to be part of source control. com.atlassian.performance.tools:io:1.2.0 -com.atlassian.performance.tools:jvm-tasks:1.2.3 +com.atlassian.performance.tools:jvm-tasks:1.2.4 com.hierynomus:sshj:0.23.0 com.jcraft:jzlib:1.1.3 net.i2p.crypto:eddsa:0.2.0 org.apache.logging.log4j:log4j-api:2.20.0 -org.apache.logging.log4j:log4j-core:2.20.0 -org.apache.logging.log4j:log4j-slf4j-impl:2.20.0 org.bouncycastle:bcpkix-jdk15on:1.56 org.bouncycastle:bcprov-jdk15on:1.56 org.glassfish:javax.json:1.1 diff --git a/gradle/dependency-locks/compileClasspath.lockfile b/gradle/dependency-locks/compileClasspath.lockfile index 0a1505d..c6735f6 100644 --- a/gradle/dependency-locks/compileClasspath.lockfile +++ b/gradle/dependency-locks/compileClasspath.lockfile @@ -2,13 +2,11 @@ # Manual edits can break the build and are not advised. # This file is expected to be part of source control. com.atlassian.performance.tools:io:1.2.0 -com.atlassian.performance.tools:jvm-tasks:1.2.3 +com.atlassian.performance.tools:jvm-tasks:1.2.4 com.hierynomus:sshj:0.23.0 com.jcraft:jzlib:1.1.3 net.i2p.crypto:eddsa:0.2.0 org.apache.logging.log4j:log4j-api:2.20.0 -org.apache.logging.log4j:log4j-core:2.20.0 -org.apache.logging.log4j:log4j-slf4j-impl:2.20.0 org.bouncycastle:bcpkix-jdk15on:1.56 org.bouncycastle:bcprov-jdk15on:1.56 org.glassfish:javax.json:1.1 diff --git a/gradle/dependency-locks/default.lockfile b/gradle/dependency-locks/default.lockfile index 0a1505d..c6735f6 100644 --- a/gradle/dependency-locks/default.lockfile +++ b/gradle/dependency-locks/default.lockfile @@ -2,13 +2,11 @@ # Manual edits can break the build and are not advised. # This file is expected to be part of source control. com.atlassian.performance.tools:io:1.2.0 -com.atlassian.performance.tools:jvm-tasks:1.2.3 +com.atlassian.performance.tools:jvm-tasks:1.2.4 com.hierynomus:sshj:0.23.0 com.jcraft:jzlib:1.1.3 net.i2p.crypto:eddsa:0.2.0 org.apache.logging.log4j:log4j-api:2.20.0 -org.apache.logging.log4j:log4j-core:2.20.0 -org.apache.logging.log4j:log4j-slf4j-impl:2.20.0 org.bouncycastle:bcpkix-jdk15on:1.56 org.bouncycastle:bcprov-jdk15on:1.56 org.glassfish:javax.json:1.1 diff --git a/gradle/dependency-locks/implementationDependenciesMetadata.lockfile b/gradle/dependency-locks/implementationDependenciesMetadata.lockfile index 0a1505d..c6735f6 100644 --- a/gradle/dependency-locks/implementationDependenciesMetadata.lockfile +++ b/gradle/dependency-locks/implementationDependenciesMetadata.lockfile @@ -2,13 +2,11 @@ # Manual edits can break the build and are not advised. # This file is expected to be part of source control. com.atlassian.performance.tools:io:1.2.0 -com.atlassian.performance.tools:jvm-tasks:1.2.3 +com.atlassian.performance.tools:jvm-tasks:1.2.4 com.hierynomus:sshj:0.23.0 com.jcraft:jzlib:1.1.3 net.i2p.crypto:eddsa:0.2.0 org.apache.logging.log4j:log4j-api:2.20.0 -org.apache.logging.log4j:log4j-core:2.20.0 -org.apache.logging.log4j:log4j-slf4j-impl:2.20.0 org.bouncycastle:bcpkix-jdk15on:1.56 org.bouncycastle:bcprov-jdk15on:1.56 org.glassfish:javax.json:1.1 diff --git a/gradle/dependency-locks/runtime.lockfile b/gradle/dependency-locks/runtime.lockfile index 0a1505d..c6735f6 100644 --- a/gradle/dependency-locks/runtime.lockfile +++ b/gradle/dependency-locks/runtime.lockfile @@ -2,13 +2,11 @@ # Manual edits can break the build and are not advised. # This file is expected to be part of source control. com.atlassian.performance.tools:io:1.2.0 -com.atlassian.performance.tools:jvm-tasks:1.2.3 +com.atlassian.performance.tools:jvm-tasks:1.2.4 com.hierynomus:sshj:0.23.0 com.jcraft:jzlib:1.1.3 net.i2p.crypto:eddsa:0.2.0 org.apache.logging.log4j:log4j-api:2.20.0 -org.apache.logging.log4j:log4j-core:2.20.0 -org.apache.logging.log4j:log4j-slf4j-impl:2.20.0 org.bouncycastle:bcpkix-jdk15on:1.56 org.bouncycastle:bcprov-jdk15on:1.56 org.glassfish:javax.json:1.1 diff --git a/gradle/dependency-locks/runtimeClasspath.lockfile b/gradle/dependency-locks/runtimeClasspath.lockfile index 0a1505d..c6735f6 100644 --- a/gradle/dependency-locks/runtimeClasspath.lockfile +++ b/gradle/dependency-locks/runtimeClasspath.lockfile @@ -2,13 +2,11 @@ # Manual edits can break the build and are not advised. # This file is expected to be part of source control. com.atlassian.performance.tools:io:1.2.0 -com.atlassian.performance.tools:jvm-tasks:1.2.3 +com.atlassian.performance.tools:jvm-tasks:1.2.4 com.hierynomus:sshj:0.23.0 com.jcraft:jzlib:1.1.3 net.i2p.crypto:eddsa:0.2.0 org.apache.logging.log4j:log4j-api:2.20.0 -org.apache.logging.log4j:log4j-core:2.20.0 -org.apache.logging.log4j:log4j-slf4j-impl:2.20.0 org.bouncycastle:bcpkix-jdk15on:1.56 org.bouncycastle:bcprov-jdk15on:1.56 org.glassfish:javax.json:1.1 diff --git a/gradle/dependency-locks/testApiDependenciesMetadata.lockfile b/gradle/dependency-locks/testApiDependenciesMetadata.lockfile index 139d581..9bd26a3 100644 --- a/gradle/dependency-locks/testApiDependenciesMetadata.lockfile +++ b/gradle/dependency-locks/testApiDependenciesMetadata.lockfile @@ -2,7 +2,7 @@ # Manual edits can break the build and are not advised. # This file is expected to be part of source control. com.atlassian.performance.tools:io:1.2.0 -com.atlassian.performance.tools:jvm-tasks:1.2.3 +com.atlassian.performance.tools:jvm-tasks:1.2.4 com.atlassian.performance.tools:ssh-ubuntu:0.1.0 com.hierynomus:sshj:0.23.0 com.jcraft:jzlib:1.1.3 diff --git a/gradle/dependency-locks/testCompile.lockfile b/gradle/dependency-locks/testCompile.lockfile index 139d581..9bd26a3 100644 --- a/gradle/dependency-locks/testCompile.lockfile +++ b/gradle/dependency-locks/testCompile.lockfile @@ -2,7 +2,7 @@ # Manual edits can break the build and are not advised. # This file is expected to be part of source control. com.atlassian.performance.tools:io:1.2.0 -com.atlassian.performance.tools:jvm-tasks:1.2.3 +com.atlassian.performance.tools:jvm-tasks:1.2.4 com.atlassian.performance.tools:ssh-ubuntu:0.1.0 com.hierynomus:sshj:0.23.0 com.jcraft:jzlib:1.1.3 diff --git a/gradle/dependency-locks/testCompileClasspath.lockfile b/gradle/dependency-locks/testCompileClasspath.lockfile index 1e42e06..a0a49a8 100644 --- a/gradle/dependency-locks/testCompileClasspath.lockfile +++ b/gradle/dependency-locks/testCompileClasspath.lockfile @@ -2,7 +2,7 @@ # Manual edits can break the build and are not advised. # This file is expected to be part of source control. com.atlassian.performance.tools:io:1.2.0 -com.atlassian.performance.tools:jvm-tasks:1.2.3 +com.atlassian.performance.tools:jvm-tasks:1.2.4 com.atlassian.performance.tools:ssh-ubuntu:0.1.0 com.hierynomus:sshj:0.23.0 com.jcraft:jzlib:1.1.3 @@ -10,7 +10,6 @@ junit:junit:4.12 net.i2p.crypto:eddsa:0.2.0 org.apache.logging.log4j:log4j-api:2.20.0 org.apache.logging.log4j:log4j-core:2.20.0 -org.apache.logging.log4j:log4j-slf4j-impl:2.20.0 org.bouncycastle:bcpkix-jdk15on:1.56 org.bouncycastle:bcprov-jdk15on:1.56 org.glassfish:javax.json:1.1 diff --git a/gradle/dependency-locks/testImplementationDependenciesMetadata.lockfile b/gradle/dependency-locks/testImplementationDependenciesMetadata.lockfile index 139d581..9bd26a3 100644 --- a/gradle/dependency-locks/testImplementationDependenciesMetadata.lockfile +++ b/gradle/dependency-locks/testImplementationDependenciesMetadata.lockfile @@ -2,7 +2,7 @@ # Manual edits can break the build and are not advised. # This file is expected to be part of source control. com.atlassian.performance.tools:io:1.2.0 -com.atlassian.performance.tools:jvm-tasks:1.2.3 +com.atlassian.performance.tools:jvm-tasks:1.2.4 com.atlassian.performance.tools:ssh-ubuntu:0.1.0 com.hierynomus:sshj:0.23.0 com.jcraft:jzlib:1.1.3 diff --git a/gradle/dependency-locks/testRuntime.lockfile b/gradle/dependency-locks/testRuntime.lockfile index 139d581..9bd26a3 100644 --- a/gradle/dependency-locks/testRuntime.lockfile +++ b/gradle/dependency-locks/testRuntime.lockfile @@ -2,7 +2,7 @@ # Manual edits can break the build and are not advised. # This file is expected to be part of source control. com.atlassian.performance.tools:io:1.2.0 -com.atlassian.performance.tools:jvm-tasks:1.2.3 +com.atlassian.performance.tools:jvm-tasks:1.2.4 com.atlassian.performance.tools:ssh-ubuntu:0.1.0 com.hierynomus:sshj:0.23.0 com.jcraft:jzlib:1.1.3 diff --git a/gradle/dependency-locks/testRuntimeClasspath.lockfile b/gradle/dependency-locks/testRuntimeClasspath.lockfile index 139d581..9bd26a3 100644 --- a/gradle/dependency-locks/testRuntimeClasspath.lockfile +++ b/gradle/dependency-locks/testRuntimeClasspath.lockfile @@ -2,7 +2,7 @@ # Manual edits can break the build and are not advised. # This file is expected to be part of source control. com.atlassian.performance.tools:io:1.2.0 -com.atlassian.performance.tools:jvm-tasks:1.2.3 +com.atlassian.performance.tools:jvm-tasks:1.2.4 com.atlassian.performance.tools:ssh-ubuntu:0.1.0 com.hierynomus:sshj:0.23.0 com.jcraft:jzlib:1.1.3