HBASE-14745 Shade the last few dependencies in hbase-shaded-client

puchka · Dec 11, 2015 · abb2e95 · abb2e95
1 parent 48e217a
commit abb2e95
Show file tree

Hide file tree

Showing 2 changed files with 30 additions and 0 deletions.
diff --git a/hbase-shaded/pom.xml b/hbase-shaded/pom.xml
@@ -294,12 +294,40 @@
                                         <pattern>org.apache.commons.el</pattern>
                                         <shadedPattern>org.apache.hadoop.hbase.shaded.org.apache.commons.el</shadedPattern>
                                     </relocation>
+                                    <relocation>
+                                        <pattern>org.apache.commons.httpclient</pattern>
+                                        <shadedPattern>org.apache.hadoop.hbase.shaded.org.apache.commons.httpclient</shadedPattern>
+                                    </relocation>
+                                    <relocation>
+                                        <pattern>org.apache.commons.compress</pattern>
+                                        <shadedPattern>org.apache.hadoop.hbase.shaded.org.apache.commons.compress</shadedPattern>
+                                    </relocation>
+                                    <relocation>
+                                        <pattern>org.apache.commons.digester</pattern>
+                                        <shadedPattern>org.apache.hadoop.hbase.shaded.org.apache.commons.digester</shadedPattern>
+                                    </relocation>
+                                    <relocation>
+                                        <pattern>org.apache.commons.codec</pattern>
+                                        <shadedPattern>org.apache.hadoop.hbase.shaded.org.apache.commons.codec</shadedPattern>
+                                    </relocation>
 
                                     <!-- top level net-->
                                     <relocation>
                                         <pattern>net.iharder</pattern>
                                         <shadedPattern>org.apache.hadoop.hbase.shaded.net.iharder</shadedPattern>
                                     </relocation>
+
+                                    <!-- junit -->
+                                    <relocation>
+                                        <pattern>junit</pattern>
+                                        <shadedPattern>org.apache.hadoop.hbase.shaded.junit</shadedPattern>
+                                    </relocation>
+                                    <relocation>
+                                        <pattern>org.junit</pattern>
+                                        <shadedPattern>org.apache.hadoop.hbase.shaded.org.junit</shadedPattern>
+                                    </relocation>
+
+
                                 </relocations>
                                 <transformers>
                                   <!-- Need to filter out some extraneous license files.

diff --git a/pom.xml b/pom.xml
@@ -822,6 +822,8 @@
               <exclude>**/.settings/**</exclude>
               <exclude>**/patchprocess/**</exclude>
               <exclude>src/main/site/resources/repo/**</exclude>
+              <exclude>**/dependency-reduced-pom.xml</exclude>
+              <exclude>**/rat.txt</exclude>
             </excludes>
           </configuration>
         </plugin>