You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@bookkeeper.apache.org by sh...@apache.org on 2024/05/25 06:03:30 UTC
(bookkeeper) branch branch-4.16 updated (2fa28a843f -> 581349580d)
This is an automated email from the ASF dual-hosted git repository.
shoothzj pushed a change to branch branch-4.16
in repository https://gitbox.apache.org/repos/asf/bookkeeper.git
from 2fa28a843f fix OrderedExecutor lost some metric (#4374)
new eb4ce0e85f fix guava shade error in distributedlog (#4319)
new 581349580d fix: miss test log in prometheus-metrics-provider module (#4279)
The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
shaded/distributedlog-core-shaded/pom.xml | 13 +------------
.../prometheus-metrics-provider/pom.xml | 6 ++++++
2 files changed, 7 insertions(+), 12 deletions(-)
(bookkeeper) 02/02: fix: miss test log in prometheus-metrics-provider module (#4279)
Posted by sh...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
shoothzj pushed a commit to branch branch-4.16
in repository https://gitbox.apache.org/repos/asf/bookkeeper.git
commit 581349580d3cbc9bc8ae461ba107f2b1f40e437f
Author: ZhangJian He <sh...@gmail.com>
AuthorDate: Fri Apr 12 17:01:52 2024 +0800
fix: miss test log in prometheus-metrics-provider module (#4279)
Signed-off-by: ZhangJian He <sh...@gmail.com>
(cherry picked from commit a9aae83096f44813961f2f656831c0ab50700164)
---
.../bookkeeper-stats-providers/prometheus-metrics-provider/pom.xml | 6 ++++++
1 file changed, 6 insertions(+)
diff --git a/stats/bookkeeper-stats-providers/prometheus-metrics-provider/pom.xml b/stats/bookkeeper-stats-providers/prometheus-metrics-provider/pom.xml
index a9e82fcf48..2f10aadf03 100644
--- a/stats/bookkeeper-stats-providers/prometheus-metrics-provider/pom.xml
+++ b/stats/bookkeeper-stats-providers/prometheus-metrics-provider/pom.xml
@@ -71,5 +71,11 @@
<artifactId>sketches-core</artifactId>
</dependency>
+ <dependency>
+ <groupId>org.apache.bookkeeper</groupId>
+ <artifactId>testtools</artifactId>
+ <version>${project.parent.version}</version>
+ <scope>test</scope>
+ </dependency>
</dependencies>
</project>
(bookkeeper) 01/02: fix guava shade error in distributedlog (#4319)
Posted by sh...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
shoothzj pushed a commit to branch branch-4.16
in repository https://gitbox.apache.org/repos/asf/bookkeeper.git
commit eb4ce0e85f35b23983db4f728e545a8c32cf336f
Author: ZhangJian He <sh...@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 <sh...@gmail.com>
(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 2a558af6cb..de957d4434 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>