Skip to content

Commit

Permalink
JPERF-570: Harvest log4j fix from jvm-tasks:1.2.4
Browse files Browse the repository at this point in the history 
It only cleans up local locks. It has no bearing on the POM.
  • Loading branch information
@dagguh
dagguh committed Mar 21, 2023
1 parent 020fb89 commit b9b31bb
Show file tree
Hide file tree
Showing 14 changed files with 14 additions and 29 deletions.
2 changes: 1 addition & 1 deletion build.gradle.kts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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) {
Expand Down
4 changes: 1 addition & 3 deletions gradle/dependency-locks/apiDependenciesMetadata.lockfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 1 addition & 3 deletions gradle/dependency-locks/compile.lockfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 1 addition & 3 deletions gradle/dependency-locks/compileClasspath.lockfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 1 addition & 3 deletions gradle/dependency-locks/default.lockfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 1 addition & 3 deletions gradle/dependency-locks/implementationDependenciesMetadata.lockfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 1 addition & 3 deletions gradle/dependency-locks/runtime.lockfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 1 addition & 3 deletions gradle/dependency-locks/runtimeClasspath.lockfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion gradle/dependency-locks/testApiDependenciesMetadata.lockfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion gradle/dependency-locks/testCompile.lockfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
3 changes: 1 addition & 2 deletions gradle/dependency-locks/testCompileClasspath.lockfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion gradle/dependency-locks/testImplementationDependenciesMetadata.lockfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion gradle/dependency-locks/testRuntime.lockfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion gradle/dependency-locks/testRuntimeClasspath.lockfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down

0 comments on commit b9b31bb

Please sign in to comment.