You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hbase.apache.org by sy...@apache.org on 2015/12/15 18:43:29 UTC

[15/26] hbase git commit: HBASE-14745 Shade the last few dependencies in hbase-shaded-client

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


Project: http://git-wip-us.apache.org/repos/asf/hbase/repo
Commit: http://git-wip-us.apache.org/repos/asf/hbase/commit/abb2e95f
Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/abb2e95f
Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/abb2e95f

Branch: refs/heads/hbase-12439
Commit: abb2e95f66191588971c6bba800f6b0dcbd7ad37
Parents: 48e217a
Author: Elliott Clark <ec...@apache.org>
Authored: Wed Nov 4 13:40:46 2015 -0800
Committer: Elliott Clark <ec...@apache.org>
Committed: Thu Dec 10 18:44:12 2015 -0800

----------------------------------------------------------------------
 hbase-shaded/pom.xml | 28 ++++++++++++++++++++++++++++
 pom.xml              |  2 ++
 2 files changed, 30 insertions(+)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/hbase/blob/abb2e95f/hbase-shaded/pom.xml
----------------------------------------------------------------------
diff --git a/hbase-shaded/pom.xml b/hbase-shaded/pom.xml
index 78b8270..4e38c88 100644
--- 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.

http://git-wip-us.apache.org/repos/asf/hbase/blob/abb2e95f/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 1ee5784..3f21cd4 100644
--- 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>