This is an automated email from the ASF dual-hosted git repository. lhotari pushed a commit to branch branch-4.15 in repository https://gitbox.apache.org/repos/asf/bookkeeper.git
commit 3a78a6fbbd564dd83d06efff796d40330157f0ca Author: ZhangJian He <[email protected]> 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 <[email protected]> (cherry picked from commit 459d440fa02170b757528311d41cf4a880f4ecb9) --- 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 8a4b2118c0..112ba8994e 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> @@ -84,6 +72,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.java.dev.jna:jna</include>
