Merge remote-tracking branch 'open-core/develop' into RIP-43

# Conflicts:
#	broker/src/main/java/org/apache/rocketmq/broker/BrokerController.java
#	store/src/main/java/org/apache/rocketmq/store/config/MessageStoreConfig.java
This commit is contained in:
傅冲
2022-07-21 15:30:48 +08:00
122 changed files with 10612 additions and 341 deletions
+11
View File
@@ -179,6 +179,7 @@
<module>acl</module>
<module>example</module>
<module>container</module>
<module>controller</module>
<module>proxy</module>
</modules>
@@ -483,6 +484,11 @@
<dependencyManagement>
<dependencies>
<dependency>
<groupId>${project.groupId}</groupId>
<artifactId>rocketmq-controller</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>${project.groupId}</groupId>
<artifactId>rocketmq-proto</artifactId>
@@ -568,6 +574,11 @@
<artifactId>rocketmq-proxy</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>io.openmessaging.storage</groupId>
<artifactId>dledger</artifactId>
<version>${dleger.version}</version>
</dependency>
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-api</artifactId>