From eee96610e03432bd3a2490350403007d58d0ab9b Mon Sep 17 00:00:00 2001
From: Jean-Philippe Martin <jpmartin@google.com>
Date: Thu, 16 Aug 2018 14:53:26 -0700
Subject: [PATCH 1/4] narrower shading

---
 .../google-cloud-nio/pom.xml                  | 32 +++++++++++++++----
 1 file changed, 26 insertions(+), 6 deletions(-)

diff --git a/google-cloud-clients/google-cloud-contrib/google-cloud-nio/pom.xml b/google-cloud-clients/google-cloud-contrib/google-cloud-nio/pom.xml
index b7c277b2e260..bc5101f2642d 100644
--- a/google-cloud-clients/google-cloud-contrib/google-cloud-nio/pom.xml
+++ b/google-cloud-clients/google-cloud-contrib/google-cloud-nio/pom.xml
@@ -97,20 +97,40 @@
           <shadedArtifactAttached>true</shadedArtifactAttached>
           <relocations>
             <relocation>
-              <pattern>com</pattern>
-              <shadedPattern>shaded.cloud_nio.com</shadedPattern>
+              <pattern>com.google</pattern>
+              <shadedPattern>shaded.cloud_nio.com.google</shadedPattern>
               <excludes>
                 <exclude>com.google.cloud.**</exclude>
                 <exclude>com.google.auto.**</exclude>
               </excludes>
             </relocation>
             <relocation>
-              <pattern>org</pattern>
-              <shadedPattern>shaded.cloud_nio.org</shadedPattern>
+              <pattern>com.fasterxml</pattern>
+              <shadedPattern>shaded.cloud_nio.com.fasterxml</shadedPattern>
             </relocation>
             <relocation>
-              <pattern>io</pattern>
-              <shadedPattern>shaded.cloud_nio.io</shadedPattern>
+              <pattern>org.joda</pattern>
+              <shadedPattern>shaded.cloud_nio.org.joda</shadedPattern>
+            </relocation>
+            <relocation>
+              <pattern>org.apache</pattern>
+              <shadedPattern>shaded.cloud_nio.org.apache</shadedPattern>
+            </relocation>
+            <relocation>
+              <pattern>org.threeten</pattern>
+              <shadedPattern>shaded.cloud_nio.org.threeten</shadedPattern>
+            </relocation>
+            <relocation>
+              <pattern>org.codehaus</pattern>
+              <shadedPattern>shaded.cloud_nio.org.codehaus</shadedPattern>
+            </relocation>
+            <relocation>
+              <pattern>io.opencensus</pattern>
+              <shadedPattern>shaded.cloud_nio.io.opencensus</shadedPattern>
+            </relocation>
+            <relocation>
+              <pattern>io.grpc</pattern>
+              <shadedPattern>shaded.cloud_nio.io.grpc</shadedPattern>
             </relocation>
             <relocation>
               <pattern>okio</pattern>

From 80c660cf428bedec3cc6110eba9ea28ec9d815a2 Mon Sep 17 00:00:00 2001
From: Jean-Philippe Martin <jpmartin@google.com>
Date: Thu, 16 Aug 2018 16:54:51 -0700
Subject: [PATCH 2/4] use include for a shorter pom.xml

---
 .../google-cloud-nio/pom.xml                  | 46 ++++++++-----------
 1 file changed, 20 insertions(+), 26 deletions(-)

diff --git a/google-cloud-clients/google-cloud-contrib/google-cloud-nio/pom.xml b/google-cloud-clients/google-cloud-contrib/google-cloud-nio/pom.xml
index bc5101f2642d..003c4fbd1912 100644
--- a/google-cloud-clients/google-cloud-contrib/google-cloud-nio/pom.xml
+++ b/google-cloud-clients/google-cloud-contrib/google-cloud-nio/pom.xml
@@ -97,40 +97,34 @@
           <shadedArtifactAttached>true</shadedArtifactAttached>
           <relocations>
             <relocation>
-              <pattern>com.google</pattern>
-              <shadedPattern>shaded.cloud_nio.com.google</shadedPattern>
+              <pattern>com</pattern>
+              <shadedPattern>shaded.cloud_nio.com_stuff</shadedPattern>
+              <includes>
+                <include>com.google.**</include>
+                <include>com.fasterxml.**</include>
+              </includes>
               <excludes>
                 <exclude>com.google.cloud.**</exclude>
                 <exclude>com.google.auto.**</exclude>
               </excludes>
             </relocation>
             <relocation>
-              <pattern>com.fasterxml</pattern>
-              <shadedPattern>shaded.cloud_nio.com.fasterxml</shadedPattern>
+              <pattern>org</pattern>
+              <shadedPattern>shaded.cloud_nio.org_stuff</shadedPattern>
+              <includes>
+                <include>org.joda.**</include>
+                <include>org.apache.**</include>
+                <include>org.threeten.**</include>
+                <include>org.codehaus.**</include>
+              </includes>
             </relocation>
             <relocation>
-              <pattern>org.joda</pattern>
-              <shadedPattern>shaded.cloud_nio.org.joda</shadedPattern>
-            </relocation>
-            <relocation>
-              <pattern>org.apache</pattern>
-              <shadedPattern>shaded.cloud_nio.org.apache</shadedPattern>
-            </relocation>
-            <relocation>
-              <pattern>org.threeten</pattern>
-              <shadedPattern>shaded.cloud_nio.org.threeten</shadedPattern>
-            </relocation>
-            <relocation>
-              <pattern>org.codehaus</pattern>
-              <shadedPattern>shaded.cloud_nio.org.codehaus</shadedPattern>
-            </relocation>
-            <relocation>
-              <pattern>io.opencensus</pattern>
-              <shadedPattern>shaded.cloud_nio.io.opencensus</shadedPattern>
-            </relocation>
-            <relocation>
-              <pattern>io.grpc</pattern>
-              <shadedPattern>shaded.cloud_nio.io.grpc</shadedPattern>
+              <pattern>io</pattern>
+              <shadedPattern>shaded.cloud_nio.io_stuff</shadedPattern>
+              <includes>
+                <include>io.opencensus.**</include>
+                <include>io.grpc.**</include>
+              </includes>
             </relocation>
             <relocation>
               <pattern>okio</pattern>

From 931c9f640236b9af649414012ebc72b305ba4fa1 Mon Sep 17 00:00:00 2001
From: Jean-Philippe Martin <jpmartin@google.com>
Date: Fri, 17 Aug 2018 10:03:17 -0700
Subject: [PATCH 3/4] remove _stuff prefix from shadedPattern

---
 .../google-cloud-contrib/google-cloud-nio/pom.xml           | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/google-cloud-clients/google-cloud-contrib/google-cloud-nio/pom.xml b/google-cloud-clients/google-cloud-contrib/google-cloud-nio/pom.xml
index 003c4fbd1912..91ef9031d91a 100644
--- a/google-cloud-clients/google-cloud-contrib/google-cloud-nio/pom.xml
+++ b/google-cloud-clients/google-cloud-contrib/google-cloud-nio/pom.xml
@@ -98,7 +98,7 @@
           <relocations>
             <relocation>
               <pattern>com</pattern>
-              <shadedPattern>shaded.cloud_nio.com_stuff</shadedPattern>
+              <shadedPattern>shaded.cloud_nio.com</shadedPattern>
               <includes>
                 <include>com.google.**</include>
                 <include>com.fasterxml.**</include>
@@ -110,7 +110,7 @@
             </relocation>
             <relocation>
               <pattern>org</pattern>
-              <shadedPattern>shaded.cloud_nio.org_stuff</shadedPattern>
+              <shadedPattern>shaded.cloud_nio.org</shadedPattern>
               <includes>
                 <include>org.joda.**</include>
                 <include>org.apache.**</include>
@@ -120,7 +120,7 @@
             </relocation>
             <relocation>
               <pattern>io</pattern>
-              <shadedPattern>shaded.cloud_nio.io_stuff</shadedPattern>
+              <shadedPattern>shaded.cloud_nio.io</shadedPattern>
               <includes>
                 <include>io.opencensus.**</include>
                 <include>io.grpc.**</include>

From 200699157352e23499db0ee4c9a986dc2f112da1 Mon Sep 17 00:00:00 2001
From: Jean-Philippe Martin <jpmartin@google.com>
Date: Fri, 17 Aug 2018 10:23:34 -0700
Subject: [PATCH 4/4] update google-cloud-nio-examples README. It works.

---
 .../google-cloud-contrib/google-cloud-nio-examples/README.md  | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/google-cloud-clients/google-cloud-contrib/google-cloud-nio-examples/README.md b/google-cloud-clients/google-cloud-contrib/google-cloud-nio-examples/README.md
index 0b5f6fa07af6..5a9ddf999466 100644
--- a/google-cloud-clients/google-cloud-contrib/google-cloud-nio-examples/README.md
+++ b/google-cloud-clients/google-cloud-contrib/google-cloud-nio-examples/README.md
@@ -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})