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

Exclude hamcrest from testcontainers #25222

Merged

Conversation

rsvoboda
Copy link
Member

Exclude hamcrest from testcontainers to avoid collision with hamcrest from rest-assured

Fixes #25171

I did local verification with 2.8.2.Final and 999-SNAPSHOT

2.8.2.Final

[INFO] +- io.rest-assured:rest-assured:jar:4.5.1:test
[INFO] |  +- org.codehaus.groovy:groovy:jar:3.0.9:test
[INFO] |  +- org.codehaus.groovy:groovy-xml:jar:3.0.9:test
[INFO] |  +- org.apache.httpcomponents:httpclient:jar:4.5.13:test
[INFO] |  |  +- org.apache.httpcomponents:httpcore:jar:4.4.15:test
[INFO] |  |  \- commons-codec:commons-codec:jar:1.15:test
[INFO] |  +- org.apache.httpcomponents:httpmime:jar:4.5.13:test
[INFO] |  +- org.hamcrest:hamcrest:jar:2.1:test             <== HERE
[INFO] |  +- org.ccil.cowan.tagsoup:tagsoup:jar:1.2.1:test
[INFO] |  +- io.rest-assured:json-path:jar:4.5.1:test
[INFO] |  |  +- org.codehaus.groovy:groovy-json:jar:3.0.9:test
[INFO] |  |  \- io.rest-assured:rest-assured-common:jar:4.5.1:test
[INFO] |  \- io.rest-assured:xml-path:jar:4.5.1:test
[INFO] |     \- org.apache.commons:commons-lang3:jar:3.12.0:test
[INFO] \- org.testcontainers:testcontainers:jar:1.17.1:test
[INFO]    +- junit:junit:jar:4.13.2:test
[INFO]    |  \- org.hamcrest:hamcrest-core:jar:1.3:test             <== and HERE
[INFO]    +- org.slf4j:slf4j-api:jar:1.7.36:compile
[INFO]    +- org.apache.commons:commons-compress:jar:1.21:test
[INFO]    +- org.rnorth.duct-tape:duct-tape:jar:1.0.8:test
[INFO]    |  \- org.jetbrains:annotations:jar:17.0.0:test
[INFO]    +- com.github.docker-java:docker-java-api:jar:3.2.13:test
[INFO]    |  \- com.fasterxml.jackson.core:jackson-annotations:jar:2.13.2:test
[INFO]    \- com.github.docker-java:docker-java-transport-zerodep:jar:3.2.13:test
[INFO]       +- com.github.docker-java:docker-java-transport:jar:3.2.13:test
[INFO]       \- net.java.dev.jna:jna:jar:5.8.0:test

999-SNAPSHOT

NFO] +- io.rest-assured:rest-assured:jar:4.5.1:test
[INFO] |  +- org.codehaus.groovy:groovy:jar:3.0.9:test
[INFO] |  +- org.codehaus.groovy:groovy-xml:jar:3.0.9:test
[INFO] |  +- org.apache.httpcomponents:httpclient:jar:4.5.13:test
[INFO] |  |  +- org.apache.httpcomponents:httpcore:jar:4.4.15:test
[INFO] |  |  \- commons-codec:commons-codec:jar:1.15:test
[INFO] |  +- org.apache.httpcomponents:httpmime:jar:4.5.13:test
[INFO] |  +- org.hamcrest:hamcrest:jar:2.1:test             <== just HERE
[INFO] |  +- org.ccil.cowan.tagsoup:tagsoup:jar:1.2.1:test
[INFO] |  +- io.rest-assured:json-path:jar:4.5.1:test
[INFO] |  |  +- org.codehaus.groovy:groovy-json:jar:3.0.9:test
[INFO] |  |  \- io.rest-assured:rest-assured-common:jar:4.5.1:test
[INFO] |  \- io.rest-assured:xml-path:jar:4.5.1:test
[INFO] |     \- org.apache.commons:commons-lang3:jar:3.12.0:test
[INFO] \- org.testcontainers:testcontainers:jar:1.17.1:test
[INFO]    +- junit:junit:jar:4.13.2:test
[INFO]    +- org.slf4j:slf4j-api:jar:1.7.36:compile
[INFO]    +- org.apache.commons:commons-compress:jar:1.21:test
[INFO]    +- org.rnorth.duct-tape:duct-tape:jar:1.0.8:test
[INFO]    |  \- org.jetbrains:annotations:jar:17.0.0:test
[INFO]    +- com.github.docker-java:docker-java-api:jar:3.2.13:test
[INFO]    |  \- com.fasterxml.jackson.core:jackson-annotations:jar:2.13.2:test
[INFO]    \- com.github.docker-java:docker-java-transport-zerodep:jar:3.2.13:test
[INFO]       +- com.github.docker-java:docker-java-transport:jar:3.2.13:test
[INFO]       \- net.java.dev.jna:jna:jar:5.8.0:test

to avoid collision with hamcrest from rest-assured
@rsvoboda rsvoboda requested a review from gsmet April 28, 2022 11:30
@quarkus-bot quarkus-bot bot added the area/dependencies Pull requests that update a dependency file label Apr 28, 2022
Copy link
Contributor

@gastaldi gastaldi left a comment

Choose a reason for hiding this comment

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

LGTM,

Ideally we'd like to remove the dependency on JUnit 4, but since that is not possible with TestContainers (unless we include an artifact that has only the JUnit 4 classes that TestContainers depends on) that should do it

Copy link
Member

@gsmet gsmet left a comment

Choose a reason for hiding this comment

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

I agree on the principle if CI doesn't complain loudly.

@rsvoboda
Copy link
Member Author

@gastaldi I've created testcontainers/testcontainers-java#5287 few hours ago to see if there are plans to avoid JUnit4 dependency

@quarkus-bot

This comment has been minimized.

@quarkus-bot

This comment has been minimized.

@gsmet gsmet merged commit c3390ca into quarkusio:main May 2, 2022
@quarkus-bot quarkus-bot bot added this to the 2.10 - main milestone May 2, 2022
@gsmet gsmet modified the milestones: 2.10 - main, 2.9.0.Final May 3, 2022
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
area/dependencies Pull requests that update a dependency file kind/bugfix
Projects
None yet
Development

Successfully merging this pull request may close these issues.

testcontainers:1.17.1 and rest-assured:4.5.1 collision on hamcrest/hamcrest-core
3 participants