Skip to content
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

Jump to bottom

JPERF-570: Remove log4j dependencies #34

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

JPERF-570: Remove log4j dependencies #34

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
5 changes: 5 additions & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,11 @@ Dropping a requirement of a major version of a dependency is a new contract.
## [Unreleased]
[Unreleased]: https://github.com/atlassian/ssh-ubuntu/compare/release-0.3.0...master

### Fixed
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
### Fixed
### Added

- Remove all `log4j` dependencies from POM. Fix [JPERF-570].

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

## [0.3.0] - 2022-11-07
[0.3.0]: https://github.com/atlassian/ssh-ubuntu/compare/release-0.2.6...release-0.3.0

Expand Down
16 changes: 2 additions & 14 deletions build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
val kotlinVersion = "1.2.70"
val log4jVersion = "2.17.1"

plugins {
kotlin("jvm").version("1.2.70")
Expand All @@ -15,12 +14,12 @@ configurations.all {
eachDependency {
when (requested.module.toString()) {
"org.jetbrains:annotations" -> useVersion("13.0")
"org.slf4j:slf4j-api" -> useVersion("1.7.25")
// conflict between testcontainers, docker-java and sshj
"org.slf4j:slf4j-api" -> useVersion("1.7.36")
"net.java.dev.jna:jna" -> useVersion("5.5.0")
}
when (requested.group) {
"org.jetbrains.kotlin" -> useVersion(kotlinVersion)
"org.apache.logging.log4j" -> useVersion(log4jVersion)
}
}
}
Expand All @@ -30,21 +29,10 @@ dependencies {
implementation("org.jetbrains.kotlin:kotlin-stdlib-jdk8:$kotlinVersion")
api("com.atlassian.performance.tools:ssh:[2.0.0,3.0.0)")
api("org.testcontainers:testcontainers:1.17.3")
log4j(
"api",
"core",
"slf4j-impl"
).forEach { implementation(it) }
testCompile("junit:junit:4.13.+")
testCompile("org.assertj:assertj-core:3.11.1")
}

fun log4j(
vararg modules: String
): List<String> = modules.map { module ->
"org.apache.logging.log4j:log4j-$module:$log4jVersion"
}

tasks.getByName("wrapper", Wrapper::class).apply {
gradleVersion = "5.0"
distributionType = Wrapper.DistributionType.ALL
Expand Down
4 changes: 2 additions & 2 deletions gradle/dependency-locks/apiDependenciesMetadata.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.2.3
com.atlassian.performance.tools:jvm-tasks:1.2.4
com.atlassian.performance.tools:ssh:2.4.3
com.fasterxml.jackson.core:jackson-annotations:2.10.3
com.github.docker-java:docker-java-api:3.2.13
Expand All @@ -27,5 +27,5 @@ org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.2.70
org.jetbrains.kotlin:kotlin-stdlib:1.2.70
org.jetbrains:annotations:13.0
org.rnorth.duct-tape:duct-tape:1.0.8
org.slf4j:slf4j-api:1.7.25
org.slf4j:slf4j-api:1.7.36
org.testcontainers:testcontainers:1.17.3
4 changes: 2 additions & 2 deletions gradle/dependency-locks/compileClasspath.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.2.3
com.atlassian.performance.tools:jvm-tasks:1.2.4
com.atlassian.performance.tools:ssh:2.4.3
com.fasterxml.jackson.core:jackson-annotations:2.10.3
com.github.docker-java:docker-java-api:3.2.13
Expand All @@ -27,5 +27,5 @@ org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.2.70
org.jetbrains.kotlin:kotlin-stdlib:1.2.70
org.jetbrains:annotations:13.0
org.rnorth.duct-tape:duct-tape:1.0.8
org.slf4j:slf4j-api:1.7.25
org.slf4j:slf4j-api:1.7.36
org.testcontainers:testcontainers:1.17.3
4 changes: 2 additions & 2 deletions gradle/dependency-locks/default.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.2.3
com.atlassian.performance.tools:jvm-tasks:1.2.4
com.atlassian.performance.tools:ssh:2.4.3
com.fasterxml.jackson.core:jackson-annotations:2.10.3
com.github.docker-java:docker-java-api:3.2.13
Expand All @@ -27,5 +27,5 @@ org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.2.70
org.jetbrains.kotlin:kotlin-stdlib:1.2.70
org.jetbrains:annotations:13.0
org.rnorth.duct-tape:duct-tape:1.0.8
org.slf4j:slf4j-api:1.7.25
org.slf4j:slf4j-api:1.7.36
org.testcontainers:testcontainers:1.17.3
2 changes: 1 addition & 1 deletion gradle/dependency-locks/dockerJava.lockfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,5 +3,5 @@
# This file is expected to be part of source control.
com.aries:docker-java-shaded:3.1.0-rc-7
javax.activation:activation:1.1.1
org.slf4j:slf4j-api:1.7.25
org.slf4j:slf4j-api:1.7.36
org.slf4j:slf4j-simple:1.7.5
4 changes: 2 additions & 2 deletions gradle/dependency-locks/implementationDependenciesMetadata.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.2.3
com.atlassian.performance.tools:jvm-tasks:1.2.4
com.atlassian.performance.tools:ssh:2.4.3
com.fasterxml.jackson.core:jackson-annotations:2.10.3
com.github.docker-java:docker-java-api:3.2.13
Expand All @@ -27,5 +27,5 @@ org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.2.70
org.jetbrains.kotlin:kotlin-stdlib:1.2.70
org.jetbrains:annotations:13.0
org.rnorth.duct-tape:duct-tape:1.0.8
org.slf4j:slf4j-api:1.7.25
org.slf4j:slf4j-api:1.7.36
org.testcontainers:testcontainers:1.17.3
4 changes: 2 additions & 2 deletions gradle/dependency-locks/runtimeClasspath.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.2.3
com.atlassian.performance.tools:jvm-tasks:1.2.4
com.atlassian.performance.tools:ssh:2.4.3
com.fasterxml.jackson.core:jackson-annotations:2.10.3
com.github.docker-java:docker-java-api:3.2.13
Expand All @@ -27,5 +27,5 @@ org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.2.70
org.jetbrains.kotlin:kotlin-stdlib:1.2.70
org.jetbrains:annotations:13.0
org.rnorth.duct-tape:duct-tape:1.0.8
org.slf4j:slf4j-api:1.7.25
org.slf4j:slf4j-api:1.7.36
org.testcontainers:testcontainers:1.17.3
4 changes: 2 additions & 2 deletions gradle/dependency-locks/testCompileClasspath.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.2.3
com.atlassian.performance.tools:jvm-tasks:1.2.4
com.atlassian.performance.tools:ssh:2.4.3
com.fasterxml.jackson.core:jackson-annotations:2.10.3
com.github.docker-java:docker-java-api:3.2.13
Expand All @@ -28,5 +28,5 @@ org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.2.70
org.jetbrains.kotlin:kotlin-stdlib:1.2.70
org.jetbrains:annotations:13.0
org.rnorth.duct-tape:duct-tape:1.0.8
org.slf4j:slf4j-api:1.7.25
org.slf4j:slf4j-api:1.7.36
org.testcontainers:testcontainers:1.17.3
4 changes: 2 additions & 2 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.2.3
com.atlassian.performance.tools:jvm-tasks:1.2.4
com.atlassian.performance.tools:ssh:2.4.3
com.fasterxml.jackson.core:jackson-annotations:2.10.3
com.github.docker-java:docker-java-api:3.2.13
Expand All @@ -28,5 +28,5 @@ org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.2.70
org.jetbrains.kotlin:kotlin-stdlib:1.2.70
org.jetbrains:annotations:13.0
org.rnorth.duct-tape:duct-tape:1.0.8
org.slf4j:slf4j-api:1.7.25
org.slf4j:slf4j-api:1.7.36
org.testcontainers:testcontainers:1.17.3
4 changes: 2 additions & 2 deletions gradle/dependency-locks/testRuntimeClasspath.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.2.3
com.atlassian.performance.tools:jvm-tasks:1.2.4
com.atlassian.performance.tools:ssh:2.4.3
com.fasterxml.jackson.core:jackson-annotations:2.10.3
com.github.docker-java:docker-java-api:3.2.13
Expand All @@ -28,5 +28,5 @@ org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.2.70
org.jetbrains.kotlin:kotlin-stdlib:1.2.70
org.jetbrains:annotations:13.0
org.rnorth.duct-tape:duct-tape:1.0.8
org.slf4j:slf4j-api:1.7.25
org.slf4j:slf4j-api:1.7.36
org.testcontainers:testcontainers:1.17.3