This repository has been archived by the owner on Mar 21, 2022. It is now read-only.
Relocate guava classes with maven shade plugin #850
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
to avoid class conflicts with other guava versions. Fixes #826
Codecov Report
@@ Coverage Diff @@
## master #850 +/- ##
============================================
+ Coverage 66.37% 66.46% +0.08%
- Complexity 743 745 +2
============================================
Files 166 166
Lines 3138 3140 +2
Branches 357 357
============================================
+ Hits 2083 2087 +4
Misses 898 898
+ Partials 157 155 -2 |
|
@mattnworb What do you think? |
mattnworb
suggested changes
Aug 5, 2017
pom.xml
Outdated
| @@ -338,6 +339,10 @@ | |||
| <pattern>com.fasterxml.jackson</pattern> | |||
| <shadedPattern>com.spotify.docker.client.shaded.com.fasterxml.jackson</shadedPattern> | |||
| </relocation> | |||
| <relocation> | |||
| <pattern>com.google.guava</pattern> | |||
There was a problem hiding this comment.
I think this should be com.google.common
see https://github.com/google/guava/tree/master/guava/src/com/google
pom.xml
Outdated
| @@ -338,6 +339,10 @@ | |||
| <pattern>com.fasterxml.jackson</pattern> | |||
| <shadedPattern>com.spotify.docker.client.shaded.com.fasterxml.jackson</shadedPattern> | |||
| </relocation> | |||
| <relocation> | |||
| <pattern>com.google.guava</pattern> | |||
| <shadedPattern>com.spotify.docker.client.shaded.com.google.guava</shadedPattern> | |||
There was a problem hiding this comment.
same update needed on this line
| @@ -319,6 +319,7 @@ | |||
| <include>org.glassfish.**</include> | |||
| <include>com.github.jnr:*</include> | |||
| <include>org.ow2.asm:*</include> | |||
| <include>com.google.guava:**</include> | |||
There was a problem hiding this comment.
I believe this will include the original Guava classes as-is in the shaded jar.
I tested it out and:
dxia/relocate-guava!docker-client $> unzip -l target/docker-client-8.8.3-SNAPSHOT-shaded.jar | grep GwtCompatible
640 08-05-2017 12:48 com/google/common/annotations/GwtCompatible.class
so I think this line should be removed (although maybe this behavior changes if the relocation/pattern below is corrected? note there is no relocated class present in this output)
mattnworb
approved these changes
Aug 7, 2017
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
to avoid class conflicts with other guava versions.
Fixes #826