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.

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

JPERF-791 Bump ssh-ubuntu to version without vulnerable log4j #26

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
3 changes: 3 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,9 @@ 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

### Changed
- Bump ssh-ubuntu library to version without vulnerable log4j

Comment on lines +21 to +23
Copy link
Contributor

Choose a reason for hiding this comment

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

Suggested change
### Changed
- Bump ssh-ubuntu library to version without vulnerable log4j

It doesn't change anything in the API (including POM). It's only affecting the local dev loop and CI, not consumers.

## [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
6 changes: 4 additions & 2 deletions build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -36,8 +36,10 @@ dependencies {
"core",
"slf4j-impl"
).forEach { compile("org.apache.logging.log4j:log4j-$it:$log4jVersion") }
testCompile("junit:junit:4.12")
testCompile("com.atlassian.performance.tools:ssh-ubuntu:0.1.0")
testCompile("junit:junit:4.13.2")
testCompile("com.atlassian.performance.tools:ssh-ubuntu:0.2.6")
testCompile("net.java.dev.jna:jna:5.8.0")
testCompile("net.java.dev.jna:jna-platform:5.8.0")
}

tasks
Expand Down
4 changes: 1 addition & 3 deletions gradle/dependency-locks/apiDependenciesMetadata.lockfile
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.3
com.hierynomus:sshj:0.23.0
com.jcraft:jzlib:1.1.3
net.i2p.crypto:eddsa:0.2.0
Expand All @@ -15,8 +15,6 @@ 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
4 changes: 1 addition & 3 deletions gradle/dependency-locks/compile.lockfile
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.3
com.hierynomus:sshj:0.23.0
com.jcraft:jzlib:1.1.3
net.i2p.crypto:eddsa:0.2.0
Expand All @@ -15,8 +15,6 @@ 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
4 changes: 1 addition & 3 deletions gradle/dependency-locks/compileClasspath.lockfile
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.3
com.hierynomus:sshj:0.23.0
com.jcraft:jzlib:1.1.3
net.i2p.crypto:eddsa:0.2.0
Expand All @@ -15,8 +15,6 @@ 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
4 changes: 1 addition & 3 deletions gradle/dependency-locks/default.lockfile
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.3
com.hierynomus:sshj:0.23.0
com.jcraft:jzlib:1.1.3
net.i2p.crypto:eddsa:0.2.0
Expand All @@ -15,8 +15,6 @@ 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
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.3
com.hierynomus:sshj:0.23.0
com.jcraft:jzlib:1.1.3
net.i2p.crypto:eddsa:0.2.0
Expand All @@ -15,8 +15,6 @@ 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
4 changes: 1 addition & 3 deletions gradle/dependency-locks/runtime.lockfile
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.3
com.hierynomus:sshj:0.23.0
com.jcraft:jzlib:1.1.3
net.i2p.crypto:eddsa:0.2.0
Expand All @@ -15,8 +15,6 @@ 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
4 changes: 1 addition & 3 deletions gradle/dependency-locks/runtimeClasspath.lockfile
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.3
com.hierynomus:sshj:0.23.0
com.jcraft:jzlib:1.1.3
net.i2p.crypto:eddsa:0.2.0
Expand All @@ -15,8 +15,6 @@ 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
30 changes: 12 additions & 18 deletions gradle/dependency-locks/testApiDependenciesMetadata.lockfile
Original file line number Diff line number Diff line change
Expand Up @@ -2,20 +2,19 @@
# 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:ssh-ubuntu:0.1.0
com.atlassian.performance.tools:jvm-tasks:1.2.3
com.atlassian.performance.tools:ssh-ubuntu:0.2.6
com.fasterxml.jackson.core:jackson-annotations:2.10.3
com.github.docker-java:docker-java-api:3.2.13
com.github.docker-java:docker-java-transport-zerodep:3.2.13
com.github.docker-java:docker-java-transport:3.2.13
com.hierynomus:sshj:0.23.0
com.jcraft:jzlib:1.1.3
com.kohlschutter.junixsocket:junixsocket-common:2.0.4
com.kohlschutter.junixsocket:junixsocket-native-common:2.0.4
javax.activation:javax.activation-api:1.2.0
javax.annotation:javax.annotation-api:1.3.2
javax.xml.bind:jaxb-api:2.3.1
junit:junit:4.12
junit:junit:4.13.2
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
net.java.dev.jna:jna-platform:5.8.0
net.java.dev.jna:jna:5.8.0
org.apache.commons:commons-compress:1.21
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
Expand All @@ -26,13 +25,8 @@ 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.rnorth.duct-tape:duct-tape:1.0.8
org.slf4j:slf4j-api:1.8.0-alpha2
org.testcontainers:testcontainers:1.10.5
org.testcontainers:testcontainers:1.17.3
30 changes: 12 additions & 18 deletions gradle/dependency-locks/testCompile.lockfile
Original file line number Diff line number Diff line change
Expand Up @@ -2,20 +2,19 @@
# 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:ssh-ubuntu:0.1.0
com.atlassian.performance.tools:jvm-tasks:1.2.3
com.atlassian.performance.tools:ssh-ubuntu:0.2.6
com.fasterxml.jackson.core:jackson-annotations:2.10.3
com.github.docker-java:docker-java-api:3.2.13
com.github.docker-java:docker-java-transport-zerodep:3.2.13
com.github.docker-java:docker-java-transport:3.2.13
com.hierynomus:sshj:0.23.0
com.jcraft:jzlib:1.1.3
com.kohlschutter.junixsocket:junixsocket-common:2.0.4
com.kohlschutter.junixsocket:junixsocket-native-common:2.0.4
javax.activation:javax.activation-api:1.2.0
javax.annotation:javax.annotation-api:1.3.2
javax.xml.bind:jaxb-api:2.3.1
junit:junit:4.12
junit:junit:4.13.2
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
net.java.dev.jna:jna-platform:5.8.0
net.java.dev.jna:jna:5.8.0
org.apache.commons:commons-compress:1.21
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
Expand All @@ -26,13 +25,8 @@ 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.rnorth.duct-tape:duct-tape:1.0.8
org.slf4j:slf4j-api:1.8.0-alpha2
org.testcontainers:testcontainers:1.10.5
org.testcontainers:testcontainers:1.17.3
17 changes: 12 additions & 5 deletions gradle/dependency-locks/testCompileClasspath.lockfile
Original file line number Diff line number Diff line change
Expand Up @@ -2,12 +2,19 @@
# 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:ssh-ubuntu:0.1.0
com.atlassian.performance.tools:jvm-tasks:1.2.3
com.atlassian.performance.tools:ssh-ubuntu:0.2.6
com.fasterxml.jackson.core:jackson-annotations:2.10.3
com.github.docker-java:docker-java-api:3.2.13
com.github.docker-java:docker-java-transport-zerodep:3.2.13
com.github.docker-java:docker-java-transport:3.2.13
com.hierynomus:sshj:0.23.0
com.jcraft:jzlib:1.1.3
junit:junit:4.12
junit:junit:4.13.2
net.i2p.crypto:eddsa:0.2.0
net.java.dev.jna:jna-platform:5.8.0
net.java.dev.jna:jna:5.8.0
org.apache.commons:commons-compress:1.21
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
Expand All @@ -18,8 +25,8 @@ 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.8
org.slf4j:slf4j-api:1.8.0-alpha2
org.testcontainers:testcontainers:1.17.3
Original file line number Diff line number Diff line change
Expand Up @@ -2,20 +2,19 @@
# 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:ssh-ubuntu:0.1.0
com.atlassian.performance.tools:jvm-tasks:1.2.3
com.atlassian.performance.tools:ssh-ubuntu:0.2.6
com.fasterxml.jackson.core:jackson-annotations:2.10.3
com.github.docker-java:docker-java-api:3.2.13
com.github.docker-java:docker-java-transport-zerodep:3.2.13
com.github.docker-java:docker-java-transport:3.2.13
com.hierynomus:sshj:0.23.0
com.jcraft:jzlib:1.1.3
com.kohlschutter.junixsocket:junixsocket-common:2.0.4
com.kohlschutter.junixsocket:junixsocket-native-common:2.0.4
javax.activation:javax.activation-api:1.2.0
javax.annotation:javax.annotation-api:1.3.2
javax.xml.bind:jaxb-api:2.3.1
junit:junit:4.12
junit:junit:4.13.2
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
net.java.dev.jna:jna-platform:5.8.0
net.java.dev.jna:jna:5.8.0
org.apache.commons:commons-compress:1.21
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
Expand All @@ -26,13 +25,8 @@ 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.rnorth.duct-tape:duct-tape:1.0.8
org.slf4j:slf4j-api:1.8.0-alpha2
org.testcontainers:testcontainers:1.10.5
org.testcontainers:testcontainers:1.17.3
30 changes: 12 additions & 18 deletions gradle/dependency-locks/testRuntime.lockfile
Original file line number Diff line number Diff line change
Expand Up @@ -2,20 +2,19 @@
# 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:ssh-ubuntu:0.1.0
com.atlassian.performance.tools:jvm-tasks:1.2.3
com.atlassian.performance.tools:ssh-ubuntu:0.2.6
com.fasterxml.jackson.core:jackson-annotations:2.10.3
com.github.docker-java:docker-java-api:3.2.13
com.github.docker-java:docker-java-transport-zerodep:3.2.13
com.github.docker-java:docker-java-transport:3.2.13
com.hierynomus:sshj:0.23.0
com.jcraft:jzlib:1.1.3
com.kohlschutter.junixsocket:junixsocket-common:2.0.4
com.kohlschutter.junixsocket:junixsocket-native-common:2.0.4
javax.activation:javax.activation-api:1.2.0
javax.annotation:javax.annotation-api:1.3.2
javax.xml.bind:jaxb-api:2.3.1
junit:junit:4.12
junit:junit:4.13.2
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
net.java.dev.jna:jna-platform:5.8.0
net.java.dev.jna:jna:5.8.0
org.apache.commons:commons-compress:1.21
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
Expand All @@ -26,13 +25,8 @@ 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.rnorth.duct-tape:duct-tape:1.0.8
org.slf4j:slf4j-api:1.8.0-alpha2
org.testcontainers:testcontainers:1.10.5
org.testcontainers:testcontainers:1.17.3
Loading