(bookkeeper) branch master updated: fix guava shade error in distributedlog (#4319)

[shoothzj]

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

shoothzj pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/bookkeeper.git


The following commit(s) were added to refs/heads/master by this push:
     new 459d440fa0 fix guava shade error in distributedlog (#4319)
459d440fa0 is described below

commit 459d440fa02170b757528311d41cf4a880f4ecb9
Author: ZhangJian He <shoot...@gmail.com>
AuthorDate: Sun Apr 28 15:40:23 2024 +0800

    fix guava shade error in distributedlog (#4319)
    
    Fix #2700
    
    ## Changes
    
    - shade jar should include com.google.guava:failureaccess.
    - remove unused exclude dependency now.
    Signed-off-by: ZhangJian He <shoot...@gmail.com>
---
 shaded/distributedlog-core-shaded/pom.xml | 13 +------------
 1 file changed, 1 insertion(+), 12 deletions(-)

diff --git a/shaded/distributedlog-core-shaded/pom.xml 
b/shaded/distributedlog-core-shaded/pom.xml
index f80144b355..36e18f6b64 100644
--- a/shaded/distributedlog-core-shaded/pom.xml
+++ b/shaded/distributedlog-core-shaded/pom.xml
@@ -35,22 +35,10 @@
       <artifactId>distributedlog-core</artifactId>
       <version>${project.version}</version>
       <exclusions>
-        <exclusion>
-          <groupId>org.slf4j</groupId>
-          <artifactId>slf4j-log4j12</artifactId>
-        </exclusion>
-        <exclusion>
-          <groupId>org.slf4j</groupId>
-          <artifactId>slf4j-reload4j</artifactId>
-        </exclusion>
         <exclusion>
           <groupId>log4j</groupId>
           <artifactId>log4j</artifactId>
         </exclusion>
-        <exclusion>
-          <groupId>ch.qos.reload4j</groupId>
-          <artifactId>reload4j</artifactId>
-        </exclusion>
         <exclusion>
           <groupId>io.netty</groupId>
           <artifactId>netty-buffer</artifactId>
@@ -83,6 +71,7 @@
                   <include>com.fasterxml.jackson.core:jackson-core</include>
                   
<include>com.fasterxml.jackson.core:jackson-databind</include>
                   
<include>com.fasterxml.jackson.core:jackson-annotations</include>
+                  <include>com.google.guava:failureaccess</include>
                   <include>com.google.guava:guava</include>
                   <include>com.google.protobuf:protobuf-java</include>
                   <include>net.jpountz.lz4:lz4</include>