shading everything in jcloud (#4037)

### Motivation Shade all transitive dependencies in module jcloud-shaded. This is needed to get offloaders working nicely with presto and pulsar in the pulsar presto plugin. I will have a subsequent PR for that. Not sure why we don't shade all transitive dependencies for jcloud anyways like we do for other modules.
streamnative · Apr 13, 2019 · 3d8c2ef · 3d8c2ef
1 parent 6544be5
commit 3d8c2ef
Show file tree

Hide file tree

Showing 2 changed files with 38 additions and 3 deletions.
diff --git a/jclouds-shaded/pom.xml b/jclouds-shaded/pom.xml
@@ -72,14 +72,50 @@
                   <include>com.google.inject.extensions:guice-assistedinject</include>
                   <include>com.google.inject:guice</include>
                   <include>com.google.inject.extensions:guice-multibindings</include>
+                  <include>javax.ws.rs:*</include>
+                  <include>com.jamesmurty.utils:*</include>
+                  <include>net.iharder:*</include>
+                  <include>aopalliance:*</include>
+                  <include>javax.inject:*</include>
+                  <include>javax.annotation:*</include>
+                  <inlude>com.google.errorprone:*</inlude>
                 </includes>
               </artifactSet>
 
               <relocations>
                 <relocation>
                   <pattern>com.google</pattern>
-                  <shadedPattern>org.apache.pulsar.shaded.com.google</shadedPattern>
+                  <shadedPattern>org.apache.pulsar.jcloud.shade.com.google</shadedPattern>
                 </relocation>
+                <relocation>
+                <pattern>javax.ws</pattern>
+                <shadedPattern>org.apache.pulsar.jcloud.shade.javax.ws</shadedPattern>
+              </relocation>
+                <relocation>
+                  <pattern>com.jamesmurty.utils</pattern>
+                  <shadedPattern>org.apache.pulsar.jcloud.shade.com.jamesmurty.utils</shadedPattern>
+                </relocation>
+                <relocation>
+                  <pattern>aopalliance</pattern>
+                  <shadedPattern>org.apache.pulsar.jcloud.shade.aopalliance</shadedPattern>
+                </relocation>
+                <relocation>
+                  <pattern>net.iharder</pattern>
+                  <shadedPattern>org.apache.pulsar.jcloud.shade.net.iharder</shadedPattern>
+                </relocation>
+                <relocation>
+                  <pattern>javax.inject</pattern>
+                  <shadedPattern>org.apache.pulsar.jcloud.shade.javax.inject</shadedPattern>
+                </relocation>
+                <relocation>
+                  <pattern>javax.annotation</pattern>
+                  <shadedPattern>org.apache.pulsar.jcloud.shade.javax.annotation</shadedPattern>
+                </relocation>
+                <relocation>
+                  <pattern>com.google.errorprone</pattern>
+                  <shadedPattern>org.apache.pulsar.jcloud.shade.com.google.errorprone</shadedPattern>
+                </relocation>
+
               </relocations>
               <transformers>
                 <transformer implementation="org.apache.maven.plugins.shade.resource.ServicesResourceTransformer" />

diff --git a/tiered-storage/pom.xml b/tiered-storage/pom.xml
@@ -33,8 +33,7 @@
   <name>Apache Pulsar :: Tiered Storage :: Parent</name>
 
   <properties>
-    <!-- pin the jclouds-shaded version to make the pulsar build friendly to intellij -->
-    <pulsar.jclouds.shaded.version>2.3.0</pulsar.jclouds.shaded.version>
+    <pulsar.jclouds.shaded.version>${project.version}</pulsar.jclouds.shaded.version>
   </properties>
 
   <modules>