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

narrower shading #3568

Merged
merged 4 commits into from
Aug 20, 2018
Merged

narrower shading #3568

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
eee9661
narrower shading
jean-philippe-martin Aug 16, 2018
80c660c
use include for a shorter pom.xml
jean-philippe-martin Aug 16, 2018
931c9f6
remove _stuff prefix from shadedPattern
jean-philippe-martin Aug 17, 2018
2006991
update google-cloud-nio-examples README. It works.
jean-philippe-martin Aug 17, 2018
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
4 changes: 2 additions & 2 deletions google-cloud-clients/google-cloud-contrib/google-cloud-nio-examples/README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,12 +23,12 @@ To run this example:

[//]: # ({x-version-update-start:google-cloud-nio:current})
```
java -cp google-cloud-contrib/google-cloud-nio/target/google-cloud-nio-0.58.1-alpha-SNAPSHOT.jar:google-cloud-contrib/google-cloud-nio-examples/target/google-cloud-nio-examples-0.58.1-alpha-SNAPSHOT.jar com.google.cloud.nio.examples.ListFilesystems
java -cp google-cloud-clients/google-cloud-contrib/google-cloud-nio/target/google-cloud-nio-0.58.1-alpha-SNAPSHOT-shaded.jar:google-cloud-clients/google-cloud-contrib/google-cloud-nio-examples/target/google-cloud-nio-examples-0.58.1-alpha-SNAPSHOT.jar com.google.cloud.nio.examples.ListFilesystems
```

Notice that it lists Google Cloud Storage, which it wouldn't if you ran it without the NIO jar:
```
java -cp google-cloud-contrib/google-cloud-nio-examples/target/google-cloud-nio-examples-0.58.1-alpha-SNAPSHOT.jar com.google.cloud.nio.examples.ListFilesystems
java -cp google-cloud-clients/google-cloud-contrib/google-cloud-nio-examples/target/google-cloud-nio-examples-0.58.1-alpha-SNAPSHOT.jar com.google.cloud.nio.examples.ListFilesystems
```
[//]: # ({x-version-update-end})

Expand Down
14 changes: 14 additions & 0 deletions google-cloud-clients/google-cloud-contrib/google-cloud-nio/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -99,6 +99,10 @@
<relocation>
<pattern>com</pattern>
<shadedPattern>shaded.cloud_nio.com</shadedPattern>
<includes>
<include>com.google.**</include>
<include>com.fasterxml.**</include>
</includes>
<excludes>
<exclude>com.google.cloud.**</exclude>
<exclude>com.google.auto.**</exclude>
Expand All @@ -107,10 +111,20 @@
<relocation>
<pattern>org</pattern>
<shadedPattern>shaded.cloud_nio.org</shadedPattern>
<includes>
<include>org.joda.**</include>
<include>org.apache.**</include>
<include>org.threeten.**</include>
<include>org.codehaus.**</include>
</includes>
</relocation>
<relocation>
<pattern>io</pattern>
<shadedPattern>shaded.cloud_nio.io</shadedPattern>
<includes>
<include>io.opencensus.**</include>
<include>io.grpc.**</include>
</includes>
</relocation>
<relocation>
<pattern>okio</pattern>
Expand Down