Skip to content

JPERF-570: clean up log4j deps #28

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
dagguh merged 2 commits into from
Jun 21, 2023
Merged

JPERF-570: clean up log4j deps #28

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
020fb89
JPERF-570: Cleanup log4j in POM
dagguh Mar 21, 2023
b9b31bb
JPERF-570: Harvest log4j fix from jvm-tasks:1.2.4
dagguh Mar 21, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 6 additions & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,12 @@ The API consists of all public Kotlin types from `com.atlassian.performance.tool
## [Unreleased]
[Unreleased]: https://github.com/atlassian/ssh/compare/release-2.4.3...master

### Fixed
- Drop `log4j-core` and `slf4j-impl` from POM. Fix [JPERF-570].
- Relax `log4j-api` to a SemVer range.

[JPERF-570]: https://ecosystem.atlassian.net/browse/JPERF-570

## [2.4.3] - 2022-06-23
[2.4.3]: https://github.com/atlassian/ssh/compare/release-2.4.2...release-2.4.3

Expand Down
16 changes: 8 additions & 8 deletions build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,8 @@
import org.jetbrains.kotlin.gradle.tasks.KotlinCompile

val kotlinVersion = "1.2.70"
val log4jVersion = "2.17.1"
val log4jVersion = "[2.0.0, 2.999.999)"
val log4jGroup = "org.apache.logging.log4j"

plugins {
kotlin("jvm").version("1.2.70")
Expand All @@ -14,12 +15,14 @@ configurations.all {
failOnVersionConflict()
eachDependency {
when (requested.module.toString()) {
"org.slf4j:slf4j-api" -> useVersion("1.8.0-alpha2")
"org.jetbrains:annotations" -> useVersion("15.0")
// conflict between testcontainers, ssh-ubuntu and sshj
"org.slf4j:slf4j-api" -> useVersion("1.7.25")
}
when (requested.group) {
"org.jetbrains.kotlin" -> useVersion(kotlinVersion)
"org.apache.logging.log4j" -> useVersion(log4jVersion)
// conflict between jvm-tasks and ssh-ubuntu
log4jGroup -> useVersion(log4jVersion)
}
}
}
Expand All @@ -31,11 +34,8 @@ dependencies {
compile("org.jetbrains.kotlin:kotlin-stdlib-jdk8:$kotlinVersion")
compile("org.glassfish:javax.json:1.1")
compile("com.hierynomus:sshj:0.23.0")
listOf(
"api",
"core",
"slf4j-impl"
).forEach { compile("org.apache.logging.log4j:log4j-$it:$log4jVersion") }
api("$log4jGroup:log4j-api:$log4jVersion")
testImplementation("$log4jGroup:log4j-core:$log4jVersion")
testCompile("junit:junit:4.12")
testCompile("com.atlassian.performance.tools:ssh-ubuntu:0.1.0")
}
Expand Down
10 changes: 3 additions & 7 deletions gradle/dependency-locks/apiDependenciesMetadata.lockfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,21 +2,17 @@
# 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.0.0
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.17.1
org.apache.logging.log4j:log4j-core:2.17.1
org.apache.logging.log4j:log4j-slf4j-impl:2.17.1
org.apache.logging.log4j:log4j-api:2.20.0
org.bouncycastle:bcpkix-jdk15on:1.56
org.bouncycastle:bcprov-jdk15on:1.56
org.glassfish:javax.json:1.1
org.jetbrains.kotlin:kotlin-stdlib-common:1.2.70
org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.2.70
org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.2.70
org.jetbrains.kotlin:kotlin-stdlib-jre7:1.2.70
org.jetbrains.kotlin:kotlin-stdlib-jre8:1.2.70
org.jetbrains.kotlin:kotlin-stdlib:1.2.70
org.jetbrains:annotations:15.0
org.slf4j:slf4j-api:1.8.0-alpha2
org.slf4j:slf4j-api:1.7.25
10 changes: 3 additions & 7 deletions gradle/dependency-locks/compile.lockfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,21 +2,17 @@
# 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.0.0
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.17.1
org.apache.logging.log4j:log4j-core:2.17.1
org.apache.logging.log4j:log4j-slf4j-impl:2.17.1
org.apache.logging.log4j:log4j-api:2.20.0
org.bouncycastle:bcpkix-jdk15on:1.56
org.bouncycastle:bcprov-jdk15on:1.56
org.glassfish:javax.json:1.1
org.jetbrains.kotlin:kotlin-stdlib-common:1.2.70
org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.2.70
org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.2.70
org.jetbrains.kotlin:kotlin-stdlib-jre7:1.2.70
org.jetbrains.kotlin:kotlin-stdlib-jre8:1.2.70
org.jetbrains.kotlin:kotlin-stdlib:1.2.70
org.jetbrains:annotations:15.0
org.slf4j:slf4j-api:1.8.0-alpha2
org.slf4j:slf4j-api:1.7.25
10 changes: 3 additions & 7 deletions gradle/dependency-locks/compileClasspath.lockfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,21 +2,17 @@
# 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.0.0
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.17.1
org.apache.logging.log4j:log4j-core:2.17.1
org.apache.logging.log4j:log4j-slf4j-impl:2.17.1
org.apache.logging.log4j:log4j-api:2.20.0
org.bouncycastle:bcpkix-jdk15on:1.56
org.bouncycastle:bcprov-jdk15on:1.56
org.glassfish:javax.json:1.1
org.jetbrains.kotlin:kotlin-stdlib-common:1.2.70
org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.2.70
org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.2.70
org.jetbrains.kotlin:kotlin-stdlib-jre7:1.2.70
org.jetbrains.kotlin:kotlin-stdlib-jre8:1.2.70
org.jetbrains.kotlin:kotlin-stdlib:1.2.70
org.jetbrains:annotations:15.0
org.slf4j:slf4j-api:1.8.0-alpha2
org.slf4j:slf4j-api:1.7.25
10 changes: 3 additions & 7 deletions gradle/dependency-locks/default.lockfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,21 +2,17 @@
# 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.0.0
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.17.1
org.apache.logging.log4j:log4j-core:2.17.1
org.apache.logging.log4j:log4j-slf4j-impl:2.17.1
org.apache.logging.log4j:log4j-api:2.20.0
org.bouncycastle:bcpkix-jdk15on:1.56
org.bouncycastle:bcprov-jdk15on:1.56
org.glassfish:javax.json:1.1
org.jetbrains.kotlin:kotlin-stdlib-common:1.2.70
org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.2.70
org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.2.70
org.jetbrains.kotlin:kotlin-stdlib-jre7:1.2.70
org.jetbrains.kotlin:kotlin-stdlib-jre8:1.2.70
org.jetbrains.kotlin:kotlin-stdlib:1.2.70
org.jetbrains:annotations:15.0
org.slf4j:slf4j-api:1.8.0-alpha2
org.slf4j:slf4j-api:1.7.25
10 changes: 3 additions & 7 deletions gradle/dependency-locks/implementationDependenciesMetadata.lockfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,21 +2,17 @@
# 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.0.0
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.17.1
org.apache.logging.log4j:log4j-core:2.17.1
org.apache.logging.log4j:log4j-slf4j-impl:2.17.1
org.apache.logging.log4j:log4j-api:2.20.0
org.bouncycastle:bcpkix-jdk15on:1.56
org.bouncycastle:bcprov-jdk15on:1.56
org.glassfish:javax.json:1.1
org.jetbrains.kotlin:kotlin-stdlib-common:1.2.70
org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.2.70
org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.2.70
org.jetbrains.kotlin:kotlin-stdlib-jre7:1.2.70
org.jetbrains.kotlin:kotlin-stdlib-jre8:1.2.70
org.jetbrains.kotlin:kotlin-stdlib:1.2.70
org.jetbrains:annotations:15.0
org.slf4j:slf4j-api:1.8.0-alpha2
org.slf4j:slf4j-api:1.7.25
10 changes: 3 additions & 7 deletions gradle/dependency-locks/runtime.lockfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,21 +2,17 @@
# 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.0.0
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.17.1
org.apache.logging.log4j:log4j-core:2.17.1
org.apache.logging.log4j:log4j-slf4j-impl:2.17.1
org.apache.logging.log4j:log4j-api:2.20.0
org.bouncycastle:bcpkix-jdk15on:1.56
org.bouncycastle:bcprov-jdk15on:1.56
org.glassfish:javax.json:1.1
org.jetbrains.kotlin:kotlin-stdlib-common:1.2.70
org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.2.70
org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.2.70
org.jetbrains.kotlin:kotlin-stdlib-jre7:1.2.70
org.jetbrains.kotlin:kotlin-stdlib-jre8:1.2.70
org.jetbrains.kotlin:kotlin-stdlib:1.2.70
org.jetbrains:annotations:15.0
org.slf4j:slf4j-api:1.8.0-alpha2
org.slf4j:slf4j-api:1.7.25
10 changes: 3 additions & 7 deletions gradle/dependency-locks/runtimeClasspath.lockfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,21 +2,17 @@
# 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.0.0
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.17.1
org.apache.logging.log4j:log4j-core:2.17.1
org.apache.logging.log4j:log4j-slf4j-impl:2.17.1
org.apache.logging.log4j:log4j-api:2.20.0
org.bouncycastle:bcpkix-jdk15on:1.56
org.bouncycastle:bcprov-jdk15on:1.56
org.glassfish:javax.json:1.1
org.jetbrains.kotlin:kotlin-stdlib-common:1.2.70
org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.2.70
org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.2.70
org.jetbrains.kotlin:kotlin-stdlib-jre7:1.2.70
org.jetbrains.kotlin:kotlin-stdlib-jre8:1.2.70
org.jetbrains.kotlin:kotlin-stdlib:1.2.70
org.jetbrains:annotations:15.0
org.slf4j:slf4j-api:1.8.0-alpha2
org.slf4j:slf4j-api:1.7.25
12 changes: 5 additions & 7 deletions gradle/dependency-locks/testApiDependenciesMetadata.lockfile
View file
Open in desktop
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.0.0
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 All @@ -16,23 +16,21 @@ net.i2p.crypto:eddsa:0.2.0
net.java.dev.jna:jna-platform:5.2.0
net.java.dev.jna:jna:5.2.0
org.apache.commons:commons-compress:1.18
org.apache.logging.log4j:log4j-api:2.17.1
org.apache.logging.log4j:log4j-core:2.17.1
org.apache.logging.log4j:log4j-slf4j-impl:2.17.1
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
org.hamcrest:hamcrest-core:1.3
org.jetbrains.kotlin:kotlin-stdlib-common:1.2.70
org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.2.70
org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.2.70
org.jetbrains.kotlin:kotlin-stdlib-jre7:1.2.70
org.jetbrains.kotlin:kotlin-stdlib-jre8:1.2.70
org.jetbrains.kotlin:kotlin-stdlib:1.2.70
org.jetbrains:annotations:15.0
org.rnorth.duct-tape:duct-tape:1.0.7
org.rnorth.visible-assertions:visible-assertions:2.1.2
org.rnorth:tcp-unix-socket-proxy:1.0.2
org.scijava:native-lib-loader:2.0.2
org.slf4j:slf4j-api:1.8.0-alpha2
org.slf4j:slf4j-api:1.7.25
org.testcontainers:testcontainers:1.10.5
12 changes: 5 additions & 7 deletions gradle/dependency-locks/testCompile.lockfile
View file
Open in desktop
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.0.0
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 All @@ -16,23 +16,21 @@ net.i2p.crypto:eddsa:0.2.0
net.java.dev.jna:jna-platform:5.2.0
net.java.dev.jna:jna:5.2.0
org.apache.commons:commons-compress:1.18
org.apache.logging.log4j:log4j-api:2.17.1
org.apache.logging.log4j:log4j-core:2.17.1
org.apache.logging.log4j:log4j-slf4j-impl:2.17.1
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
org.hamcrest:hamcrest-core:1.3
org.jetbrains.kotlin:kotlin-stdlib-common:1.2.70
org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.2.70
org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.2.70
org.jetbrains.kotlin:kotlin-stdlib-jre7:1.2.70
org.jetbrains.kotlin:kotlin-stdlib-jre8:1.2.70
org.jetbrains.kotlin:kotlin-stdlib:1.2.70
org.jetbrains:annotations:15.0
org.rnorth.duct-tape:duct-tape:1.0.7
org.rnorth.visible-assertions:visible-assertions:2.1.2
org.rnorth:tcp-unix-socket-proxy:1.0.2
org.scijava:native-lib-loader:2.0.2
org.slf4j:slf4j-api:1.8.0-alpha2
org.slf4j:slf4j-api:1.7.25
org.testcontainers:testcontainers:1.10.5
11 changes: 4 additions & 7 deletions gradle/dependency-locks/testCompileClasspath.lockfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,24 +2,21 @@
# 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.0.0
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.17.1
org.apache.logging.log4j:log4j-core:2.17.1
org.apache.logging.log4j:log4j-slf4j-impl:2.17.1
org.apache.logging.log4j:log4j-api:2.20.0
org.apache.logging.log4j:log4j-core:2.20.0
org.bouncycastle:bcpkix-jdk15on:1.56
org.bouncycastle:bcprov-jdk15on:1.56
org.glassfish:javax.json:1.1
org.hamcrest:hamcrest-core:1.3
org.jetbrains.kotlin:kotlin-stdlib-common:1.2.70
org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.2.70
org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.2.70
org.jetbrains.kotlin:kotlin-stdlib-jre7:1.2.70
org.jetbrains.kotlin:kotlin-stdlib-jre8:1.2.70
org.jetbrains.kotlin:kotlin-stdlib:1.2.70
org.jetbrains:annotations:15.0
org.slf4j:slf4j-api:1.8.0-alpha2
org.slf4j:slf4j-api:1.7.25
12 changes: 5 additions & 7 deletions gradle/dependency-locks/testImplementationDependenciesMetadata.lockfile
View file
Open in desktop
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.0.0
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 All @@ -16,23 +16,21 @@ net.i2p.crypto:eddsa:0.2.0
net.java.dev.jna:jna-platform:5.2.0
net.java.dev.jna:jna:5.2.0
org.apache.commons:commons-compress:1.18
org.apache.logging.log4j:log4j-api:2.17.1
org.apache.logging.log4j:log4j-core:2.17.1
org.apache.logging.log4j:log4j-slf4j-impl:2.17.1
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
org.hamcrest:hamcrest-core:1.3
org.jetbrains.kotlin:kotlin-stdlib-common:1.2.70
org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.2.70
org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.2.70
org.jetbrains.kotlin:kotlin-stdlib-jre7:1.2.70
org.jetbrains.kotlin:kotlin-stdlib-jre8:1.2.70
org.jetbrains.kotlin:kotlin-stdlib:1.2.70
org.jetbrains:annotations:15.0
org.rnorth.duct-tape:duct-tape:1.0.7
org.rnorth.visible-assertions:visible-assertions:2.1.2
org.rnorth:tcp-unix-socket-proxy:1.0.2
org.scijava:native-lib-loader:2.0.2
org.slf4j:slf4j-api:1.8.0-alpha2
org.slf4j:slf4j-api:1.7.25
org.testcontainers:testcontainers:1.10.5
Loading