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

Fix Guava shading in jdbc module #399

Merged
merged 2 commits into from
Jul 10, 2017
Merged

Fix Guava shading in jdbc module #399

merged 2 commits into from
Jul 10, 2017

Conversation

bsideup
Copy link
Member

@bsideup bsideup commented Jul 10, 2017

1.4.0 introduced a bug in jdbc module. The shading was removed from it in #390, and Guava was in provided scope.

@bsideup bsideup added this to the 1.4.1 milestone Jul 10, 2017
@bsideup bsideup requested a review from rnorth July 10, 2017 09:58
@@ -16,6 +16,18 @@

<dependencies>
<dependency>
<groupId>junit</groupId>
Copy link
Member Author

Choose a reason for hiding this comment

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

I moved it here, otherwise Maven would add it to every module as compile dependency. However, modules should use it from testcontainers dependency as a transitive.

@@ -22,8 +22,53 @@
<groupId>com.google.guava</groupId>
<artifactId>guava</artifactId>
<version>18.0</version>
<scope>provided</scope>
Copy link
Member Author

Choose a reason for hiding this comment

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

Damn!

<include>com.google.guava:*</include>
</includes>
</artifactSet>
<promoteTransitiveDependencies>false</promoteTransitiveDependencies>
Copy link
Member Author

Choose a reason for hiding this comment

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

This flag must be set to false to avoid including testcontainers' dependencies

Copy link
Member

@rnorth rnorth left a comment

Choose a reason for hiding this comment

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

This looks fine for a quick fix. Still - I think we could probably quite easily remove the use of Guava altogether. Maybe something to do when we have a bit more time though.

@bsideup bsideup merged commit 22339fc into master Jul 10, 2017
@bsideup bsideup deleted the fix_guava_in_jdbc branch July 10, 2017 11:03
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants