You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hbase.apache.org by bu...@apache.org on 2019/09/10 19:14:01 UTC

[hbase] branch branch-2 updated: HBASE-23007 UnsatisfiedLinkError when using hbase-shaded packages under linux (#604)

This is an automated email from the ASF dual-hosted git repository.

busbey pushed a commit to branch branch-2
in repository https://gitbox.apache.org/repos/asf/hbase.git


The following commit(s) were added to refs/heads/branch-2 by this push:
     new 492a66d  HBASE-23007 UnsatisfiedLinkError when using hbase-shaded packages under linux (#604)
492a66d is described below

commit 492a66da0a339422b2ef60d9141fa825f29da1d6
Author: Balazs Meszaros <ba...@cloudera.com>
AuthorDate: Tue Sep 10 19:24:38 2019 +0200

    HBASE-23007 UnsatisfiedLinkError when using hbase-shaded packages under linux (#604)
    
    * Relocation rule "net" has been changed to "net/" because "netty"
    matches the former rule.
    * Added jackson dependencies for WebHdfs.
    
    Signed-off-by: Sean Busbey <bu...@apache.org>
    (cherry picked from commit 63db1d69a1d6f05731d8593228d6bd561419a3e0)
---
 hbase-shaded/hbase-shaded-testing-util/pom.xml | 4 ++--
 hbase-shaded/pom.xml                           | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/hbase-shaded/hbase-shaded-testing-util/pom.xml b/hbase-shaded/hbase-shaded-testing-util/pom.xml
index 40d8ed4..451328c 100644
--- a/hbase-shaded/hbase-shaded-testing-util/pom.xml
+++ b/hbase-shaded/hbase-shaded-testing-util/pom.xml
@@ -133,9 +133,9 @@
         </dependency>
         <dependency>
             <groupId>org.codehaus.jackson</groupId>
-            <artifactId>jackson-mapper-asl</artifactId>
+            <artifactId>jackson-jaxrs</artifactId>
             <version>1.9.13</version>
-            <scope>test</scope>
+            <scope>compile</scope>
         </dependency>
 
         <dependency>
diff --git a/hbase-shaded/pom.xml b/hbase-shaded/pom.xml
index 4ab5101..742acbd 100644
--- a/hbase-shaded/pom.xml
+++ b/hbase-shaded/pom.xml
@@ -437,8 +437,8 @@
 
                                     <!-- top level net-->
                                     <relocation>
-                                        <pattern>net</pattern>
-                                        <shadedPattern>${shaded.prefix}.net</shadedPattern>
+                                        <pattern>net/</pattern>
+                                        <shadedPattern>${shaded.prefix}.net.</shadedPattern>
                                     </relocation>
 
                                 </relocations>