JPERF-570: Harvest log4j fix from jvm-tasks:1.2.4

dagguh · dagguh · commit eecaca55f211 · 2023-06-21T13:04:26.000+02:00
It only cleans up local locks. It has no bearing on the POM.
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -2,15 +2,14 @@
 # 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
 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
@@ -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
@@ -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
@@ -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

Original file line number	Diff line number	Diff line change
`@@ -16,7 +16,7 @@ configurations.all {`
`16`	`16`	`eachDependency {`
`17`	`17`	`when (requested.module.toString()) {`
`18`	`18`	`"org.jetbrains:annotations" -> useVersion("15.0")`
`19`		`- // conflict between jvm-tasks and sshj`
	`19`	`+ // conflict between testcontainers, ssh-ubuntu and sshj`
`20`	`20`	`"org.slf4j:slf4j-api" -> useVersion("1.7.25")`
`21`	`21`	`}`
`22`	`22`	`when (requested.group) {`