Skip to content
Merged
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
11 changes: 5 additions & 6 deletions core/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -62,9 +62,8 @@ tasks.japicmp {

configurations.all {
resolutionStrategy {
// use lower Jackson version
force 'com.fasterxml.jackson.core:jackson-databind:2.8.8'
force 'com.fasterxml.jackson.datatype:jackson-datatype-jsr310:2.8.8'
force 'com.fasterxml.jackson.core:jackson-databind:2.18.4'
force 'com.fasterxml.jackson.datatype:jackson-datatype-jsr310:2.18.4'
}
}

Expand All @@ -88,8 +87,8 @@ dependencies {

shaded 'org.awaitility:awaitility:4.3.0'

api platform('com.github.docker-java:docker-java-bom:3.4.2')
shaded platform('com.github.docker-java:docker-java-bom:3.4.2')
api platform('com.github.docker-java:docker-java-bom:3.5.3')
shaded platform('com.github.docker-java:docker-java-bom:3.5.3')

api "com.github.docker-java:docker-java-api"

Expand All @@ -100,7 +99,7 @@ dependencies {
api 'com.github.docker-java:docker-java-transport-zerodep'

shaded 'com.google.guava:guava:33.3.1-jre'
shaded "org.yaml:snakeyaml:1.33"
shaded "org.yaml:snakeyaml:2.4"

shaded 'org.glassfish.main.external:trilead-ssh2-repackaged:4.1.2'

Expand Down
6 changes: 2 additions & 4 deletions modules/k3s/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -3,10 +3,8 @@ description = "Testcontainers :: K3S"
dependencies {
api project(":testcontainers")

// https://youtu.be/otCpCn0l4Wo
// The core module depends on jackson-databind 2.8.x for backward compatibility.
// Any >2.8 version here is not compatible with jackson-databind 2.8.x.
shaded 'com.fasterxml.jackson.dataformat:jackson-dataformat-yaml:2.8.8'
// Synchronize with the jackson version, must match major and minor version
shaded 'com.fasterxml.jackson.dataformat:jackson-dataformat-yaml:2.18.4'

testImplementation 'io.fabric8:kubernetes-client:7.3.1'
testImplementation 'io.kubernetes:client-java:24.0.0-legacy'
Expand Down
Loading