Skip to content

Exclude org.testcontainers.shaded.* package and upgrade deps #5775

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
merged 2 commits into from
Aug 27, 2022
Merged

Exclude org.testcontainers.shaded.* package and upgrade deps #5775

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
515af10
Exclude `org.testcontainers.shaded.*` package and upgrade deps
eddumelendez Aug 26, 2022
559dee7
Move packageExcludes to japicmp.gradle
eddumelendez Aug 26, 2022
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 gradle/japicmp.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,9 @@ tasks.japicmp {

onlyBinaryIncompatibleModified = true
htmlOutputFile = file("$buildDir/reports/japi.html")
packageExcludes = [
"org.testcontainers.shaded.*",
]
}
// do not run on Windows by default
// TODO investigate zip issue on Windows
Expand Down
2 changes: 1 addition & 1 deletion modules/azure/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ description = "Testcontainers :: Azure"
dependencies {
api project(':testcontainers')
// TODO use JDK's HTTP client and/or Apache HttpClient5
shaded 'com.squareup.okhttp3:okhttp:3.14.9'
shaded 'com.squareup.okhttp3:okhttp:4.10.0'

testImplementation 'org.assertj:assertj-core:3.23.1'
testImplementation 'com.azure:azure-cosmos:4.34.0'
Expand Down
2 changes: 1 addition & 1 deletion modules/couchbase/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ description = "Testcontainers :: Couchbase"
dependencies {
api project(':testcontainers')
// TODO use JDK's HTTP client and/or Apache HttpClient5
shaded 'com.squareup.okhttp3:okhttp:3.14.9'
shaded 'com.squareup.okhttp3:okhttp:4.10.0'

testImplementation 'com.couchbase.client:java-client:3.3.3'
testImplementation 'org.awaitility:awaitility:4.2.0'
Expand Down
4 changes: 2 additions & 2 deletions modules/hivemq/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,10 +6,10 @@ dependencies {

shaded("org.apache.commons:commons-lang3:3.12.0")
shaded("commons-io:commons-io:2.11.0")
shaded("org.javassist:javassist:3.28.0-GA")
shaded("org.javassist:javassist:3.29.0-GA")
shaded("org.jboss.shrinkwrap:shrinkwrap-api:1.2.6")
shaded("org.jboss.shrinkwrap:shrinkwrap-impl-base:1.2.6")
shaded("net.lingala.zip4j:zip4j:2.10.0")
shaded("net.lingala.zip4j:zip4j:2.11.1")

testImplementation("org.junit.jupiter:junit-jupiter-api:5.9.0")
testImplementation(project(":junit-jupiter"))
Expand Down
2 changes: 1 addition & 1 deletion modules/k3s/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ dependencies {
// 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'

testImplementation 'io.fabric8:kubernetes-client:5.12.2'
testImplementation 'io.fabric8:kubernetes-client:6.0.0'
testImplementation 'io.kubernetes:client-java:16.0.0'
testImplementation 'org.assertj:assertj-core:3.23.1'
}
4 changes: 2 additions & 2 deletions modules/k3s/src/test/java/org/testcontainers/k3s/Fabric8K3sContainerTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
import io.fabric8.kubernetes.api.model.ProbeBuilder;
import io.fabric8.kubernetes.client.Config;
import io.fabric8.kubernetes.client.DefaultKubernetesClient;
import io.fabric8.kubernetes.client.dsl.Readiable;
import io.fabric8.kubernetes.client.dsl.Resource;
import lombok.extern.slf4j.Slf4j;
import org.junit.Test;
import org.testcontainers.containers.output.Slf4jLogConsumer;
Expand Down Expand Up @@ -55,7 +55,7 @@ public void shouldStartAndHaveListableNode() {
client.pods().inNamespace("default").withName("helloworld").waitUntilReady(30, TimeUnit.SECONDS);

assertThat(client.pods().inNamespace("default").withName("helloworld"))
.extracting(Readiable::isReady)
.extracting(Resource::isReady)
.isEqualTo(true);
}
}
Expand Down
2 changes: 1 addition & 1 deletion modules/mockserver/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,6 @@ description = "Testcontainers :: MockServer"
dependencies {
api project(':testcontainers')

testImplementation 'org.mock-server:mockserver-client-java:5.5.4'
testImplementation 'org.mock-server:mockserver-client-java:5.13.2'
testImplementation 'org.assertj:assertj-core:3.23.1'
}
2 changes: 1 addition & 1 deletion ...s/mockserver/src/test/java/org/testcontainers/containers/MockServerContainerRuleTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
public class MockServerContainerRuleTest {

public static final DockerImageName MOCKSERVER_IMAGE = DockerImageName.parse(
"jamesdbloom/mockserver:mockserver-5.5.4"
"jamesdbloom/mockserver:mockserver-5.13.2"
Copy link
Member

@bsideup bsideup Aug 27, 2022

Choose a reason for hiding this comment

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

Just curious why we had to update this one?

Copy link
Member Author

@eddumelendez eddumelendez Aug 27, 2022 •
edited
Loading

Choose a reason for hiding this comment

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

mockserver dependency expects two additional fields that are not provided by an old image. I remember that it is recommended to use the same version for the jar and docker image

this is the reason

object instance has properties which are not allowed by the schema: ["id","priority"]

);

// creatingProxy {
Expand Down
2 changes: 1 addition & 1 deletion modules/solr/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ description = "Testcontainers :: Solr"
dependencies {
api project(':testcontainers')
// TODO use JDK's HTTP client and/or Apache HttpClient5
shaded 'com.squareup.okhttp3:okhttp:4.9.3'
shaded 'com.squareup.okhttp3:okhttp:4.10.0'

testImplementation 'org.apache.solr:solr-solrj:8.11.1'
testImplementation 'org.assertj:assertj-core:3.23.1'
Expand Down