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.

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

Jump to bottom

fix: prevent relocating urls that start with com like /computeMetadata/ #511

Merged
merged 1 commit into from Jun 16, 2021
Merged

fix: prevent relocating urls that start with com like /computeMetadata/ #511

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
16 changes: 8 additions & 8 deletions pom.xml
View file
Open in desktop
Expand Up @@ -333,26 +333,26 @@
<configuration>
<relocations>
<relocation>
<pattern>com</pattern>
<shadedPattern>com.google.cloud.spanner.jdbc.shaded.com</shadedPattern>
<pattern>com.</pattern>
<shadedPattern>com.google.cloud.spanner.jdbc.shaded.com.</shadedPattern>
<excludes>
<exclude>com.google.cloud.spanner.**</exclude>
</excludes>
</relocation>
<relocation>
<pattern>android</pattern>
<shadedPattern>com.google.cloud.spanner.jdbc.shaded.android</shadedPattern>
<pattern>android.</pattern>
<shadedPattern>com.google.cloud.spanner.jdbc.shaded.android.</shadedPattern>
</relocation>
<relocation>
<pattern>io</pattern>
<shadedPattern>com.google.cloud.spanner.jdbc.shaded.io</shadedPattern>
<pattern>io.</pattern>
<shadedPattern>com.google.cloud.spanner.jdbc.shaded.io.</shadedPattern>
<excludes>
<exclude>io.grpc.netty.shaded.**</exclude>
Copy link
Collaborator

Choose a reason for hiding this comment

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

Would you mind elaborating a little bit on why this change is needed? The PR description mentions 'errors on service provider...'. Could you add the specific error message that you are getting?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

I couldn't replicate the error. so I've rolled back netty related fix. If I encounter again, I open a separate ticket. Sorry for the mess.

Copy link
Collaborator

Choose a reason for hiding this comment

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

No worries. Thanks for the detailed analysis and fix for the shading problem.

</excludes>
</relocation>
<relocation>
<pattern>org</pattern>
<shadedPattern>com.google.cloud.spanner.jdbc.shaded.org</shadedPattern>
<pattern>org.</pattern>
<shadedPattern>com.google.cloud.spanner.jdbc.shaded.org.</shadedPattern>
<excludes>
<exclude>org.conscrypt.**</exclude>
</excludes>
Expand Down