This is an automated email from the ASF dual-hosted git repository.
jinrongtong pushed a commit to branch develop
in repository https://gitbox.apache.org/repos/asf/rocketmq.git
The following commit(s) were added to refs/heads/develop by this push:
new ff8c4c856 [ISSUE #5890] Fix dledger logging (#5959)
ff8c4c856 is described below
commit ff8c4c856da501959e7e72c0ba86c299b32222c4
Author: Aaron Ai <[email protected]>
AuthorDate: Fri Feb 3 14:12:23 2023 +0800
[ISSUE #5890] Fix dledger logging (#5959)
* Fix dledger logging
* Add bridge into store module
---
container/pom.xml | 6 ------
controller/pom.xml | 4 ++--
pom.xml | 8 ++++----
store/pom.xml | 6 ++++--
4 files changed, 10 insertions(+), 14 deletions(-)
diff --git a/container/pom.xml b/container/pom.xml
index 42ab6e4b8..c0ea9d33d 100644
--- a/container/pom.xml
+++ b/container/pom.xml
@@ -35,11 +35,5 @@
<groupId>org.apache.rocketmq</groupId>
<artifactId>rocketmq-broker</artifactId>
</dependency>
-
- <dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-api</artifactId>
- <scope>test</scope>
- </dependency>
</dependencies>
</project>
diff --git a/controller/pom.xml b/controller/pom.xml
index d89f03193..c2525dbbe 100644
--- a/controller/pom.xml
+++ b/controller/pom.xml
@@ -46,8 +46,8 @@
<artifactId>slf4j-api</artifactId>
</dependency>
<dependency>
- <groupId>ch.qos.logback</groupId>
- <artifactId>logback-classic</artifactId>
+ <groupId>io.github.aliyunmq</groupId>
+ <artifactId>rocketmq-shaded-slf4j-api-bridge</artifactId>
</dependency>
<dependency>
<groupId>${project.groupId}</groupId>
diff --git a/pom.xml b/pom.xml
index f038f8539..9052a54ad 100644
--- a/pom.xml
+++ b/pom.xml
@@ -117,7 +117,7 @@
<commons-codec.version>1.13</commons-codec.version>
<rocketmq-logging.version>1.0.1</rocketmq-logging.version>
<slf4j-api.version>2.0.3</slf4j-api.version>
- <logback-classic.version>1.3.4</logback-classic.version>
+
<rocketmq-shaded-slf4j-api-bridge.version>1.0.0</rocketmq-shaded-slf4j-api-bridge.version>
<commons-validator.version>1.7</commons-validator.version>
<zstd-jni.version>1.5.2-2</zstd-jni.version>
<lz4-java.version>1.8.0</lz4-java.version>
@@ -708,9 +708,9 @@
<version>${slf4j-api.version}</version>
</dependency>
<dependency>
- <groupId>ch.qos.logback</groupId>
- <artifactId>logback-classic</artifactId>
- <version>${logback-classic.version}</version>
+ <groupId>io.github.aliyunmq</groupId>
+ <artifactId>rocketmq-shaded-slf4j-api-bridge</artifactId>
+ <version>${rocketmq-shaded-slf4j-api-bridge.version}</version>
</dependency>
<dependency>
<groupId>io.github.aliyunmq</groupId>
diff --git a/store/pom.xml b/store/pom.xml
index a88e92d2b..c990cbd76 100644
--- a/store/pom.xml
+++ b/store/pom.xml
@@ -58,12 +58,14 @@
<groupId>com.google.guava</groupId>
<artifactId>guava</artifactId>
</dependency>
-
<!-- Required by DLedger -->
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-api</artifactId>
- <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>io.github.aliyunmq</groupId>
+ <artifactId>rocketmq-shaded-slf4j-api-bridge</artifactId>
</dependency>
</dependencies>
</project>
