You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@rocketmq.apache.org by du...@apache.org on 2022/09/13 10:36:17 UTC
[rocketmq] branch develop updated: [ISSUE #5056] Bump DLedger to 0.3.0 (#5058)
This is an automated email from the ASF dual-hosted git repository.
duhengforever 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 d97dc78ba [ISSUE #5056] Bump DLedger to 0.3.0 (#5058)
d97dc78ba is described below
commit d97dc78bab55e295df20ad7269a2262448bf7c77
Author: rongtong <ji...@163.com>
AuthorDate: Tue Sep 13 18:36:06 2022 +0800
[ISSUE #5056] Bump DLedger to 0.3.0 (#5058)
* Bump DLedger to 0.3.0
* Add new @Override function
---
controller/pom.xml | 16 ----------------
.../controller/impl/DLedgerControllerStateMachine.java | 6 ++++++
pom.xml | 2 +-
store/pom.xml | 16 ----------------
4 files changed, 7 insertions(+), 33 deletions(-)
diff --git a/controller/pom.xml b/controller/pom.xml
index dc0e7a313..713a8e652 100644
--- a/controller/pom.xml
+++ b/controller/pom.xml
@@ -39,22 +39,6 @@
<groupId>org.apache.rocketmq</groupId>
<artifactId>rocketmq-remoting</artifactId>
</exclusion>
- <exclusion>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-api</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.apache.logging.log4j</groupId>
- <artifactId>log4j-slf4j-impl</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.apache.logging.log4j</groupId>
- <artifactId>log4j-core</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.apache.logging.log4j</groupId>
- <artifactId>log4j-api</artifactId>
- </exclusion>
</exclusions>
</dependency>
<dependency>
diff --git a/controller/src/main/java/org/apache/rocketmq/controller/impl/DLedgerControllerStateMachine.java b/controller/src/main/java/org/apache/rocketmq/controller/impl/DLedgerControllerStateMachine.java
index 207f64684..ef3124166 100644
--- a/controller/src/main/java/org/apache/rocketmq/controller/impl/DLedgerControllerStateMachine.java
+++ b/controller/src/main/java/org/apache/rocketmq/controller/impl/DLedgerControllerStateMachine.java
@@ -69,7 +69,13 @@ public class DLedgerControllerStateMachine implements StateMachine {
return false;
}
+
@Override
public void onShutdown() {
}
+
+ @Override
+ public String getBindDLedgerId() {
+ return dLedgerId;
+ }
}
diff --git a/pom.xml b/pom.xml
index 958c9015a..83f3889de 100644
--- a/pom.xml
+++ b/pom.xml
@@ -121,7 +121,7 @@
<lz4-java.version>1.8.0</lz4-java.version>
<opentracing.version>0.33.0</opentracing.version>
<jaeger.version>1.6.0</jaeger.version>
- <dleger.version>0.2.7</dleger.version>
+ <dleger.version>0.3.0</dleger.version>
<annotations-api.version>6.0.53</annotations-api.version>
<extra-enforcer-rules.version>1.0-beta-4</extra-enforcer-rules.version>
<concurrentlinkedhashmap-lru.version>1.4.2</concurrentlinkedhashmap-lru.version>
diff --git a/store/pom.xml b/store/pom.xml
index 03f6aa93d..37a9c29fa 100644
--- a/store/pom.xml
+++ b/store/pom.xml
@@ -40,22 +40,6 @@
<groupId>org.apache.rocketmq</groupId>
<artifactId>rocketmq-remoting</artifactId>
</exclusion>
- <exclusion>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-api</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.apache.logging.log4j</groupId>
- <artifactId>log4j-slf4j-impl</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.apache.logging.log4j</groupId>
- <artifactId>log4j-core</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.apache.logging.log4j</groupId>
- <artifactId>log4j-api</artifactId>
- </exclusion>
</exclusions>
</dependency>
<dependency>