This is an automated email from the ASF dual-hosted git repository.
shenlin pushed a commit to branch runtimer
in repository https://gitbox.apache.org/repos/asf/rocketmq-eventbridge.git
The following commit(s) were added to refs/heads/runtimer by this push:
new 4c349b9 solve rmq conflict
4c349b9 is described below
commit 4c349b9be963aaf11b0aa8e0918e6860361087ef
Author: changfeng <[email protected]>
AuthorDate: Fri Apr 14 17:48:27 2023 +0800
solve rmq conflict
---
adapter/persistence/pom.xml | 3 ---
adapter/rpc/pom.xml | 2 --
adapter/runtimer/pom.xml | 2 --
pom.xml | 18 ++++++++++++++++++
4 files changed, 18 insertions(+), 7 deletions(-)
diff --git a/adapter/persistence/pom.xml b/adapter/persistence/pom.xml
index 7535850..e3e0047 100644
--- a/adapter/persistence/pom.xml
+++ b/adapter/persistence/pom.xml
@@ -23,7 +23,6 @@
<properties>
<mysql-connector-java.version>8.0.28</mysql-connector-java.version>
- <rocketmq.version>4.9.2</rocketmq.version>
<flyway.version>8.5.7</flyway.version>
</properties>
<dependencies>
@@ -58,12 +57,10 @@
<dependency>
<groupId>org.apache.rocketmq</groupId>
<artifactId>rocketmq-client</artifactId>
- <version>${rocketmq.version}</version>
</dependency>
<dependency>
<groupId>org.apache.rocketmq</groupId>
<artifactId>rocketmq-tools</artifactId>
- <version>${rocketmq.version}</version>
</dependency>
<dependency>
<groupId>org.flywaydb</groupId>
diff --git a/adapter/rpc/pom.xml b/adapter/rpc/pom.xml
index 7f26f61..a1e981e 100644
--- a/adapter/rpc/pom.xml
+++ b/adapter/rpc/pom.xml
@@ -21,7 +21,6 @@
<artifactId>rocketmq-eventbridge-adapter-rpc</artifactId>
<properties>
- <rocketmq.version>4.9.2</rocketmq.version>
<httpclient.version>4.5.13</httpclient.version>
<reactor.version>3.1.7.RELEASE</reactor.version>
</properties>
@@ -54,7 +53,6 @@
<dependency>
<groupId>org.apache.rocketmq</groupId>
<artifactId>rocketmq-client</artifactId>
- <version>${rocketmq.version}</version>
</dependency>
<dependency>
<groupId>org.apache.httpcomponents</groupId>
diff --git a/adapter/runtimer/pom.xml b/adapter/runtimer/pom.xml
index dd8a653..20a8ee6 100644
--- a/adapter/runtimer/pom.xml
+++ b/adapter/runtimer/pom.xml
@@ -40,13 +40,11 @@
<dependency>
<groupId>org.apache.rocketmq</groupId>
<artifactId>rocketmq-client</artifactId>
- <version>5.1.0</version>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>org.apache.rocketmq</groupId>
<artifactId>rocketmq-acl</artifactId>
- <version>5.1.0</version>
<scope>compile</scope>
</dependency>
<dependency>
diff --git a/pom.xml b/pom.xml
index 7e319aa..7137ee1 100644
--- a/pom.xml
+++ b/pom.xml
@@ -94,6 +94,7 @@
<fastjson.version>1.2.76</fastjson.version>
<jacoco-maven-plugin.version>0.8.5</jacoco-maven-plugin.version>
<maven-surefire-plugin.version>2.19.1</maven-surefire-plugin.version>
+ <rocketmq.version>5.1.0</rocketmq.version>
</properties>
<modules>
@@ -266,6 +267,23 @@
<version>${logback.version}</version>
</dependency>
+ <!-- RocketMQ -->
+ <dependency>
+ <groupId>org.apache.rocketmq</groupId>
+ <artifactId>rocketmq-client</artifactId>
+ <version>${rocketmq.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.rocketmq</groupId>
+ <artifactId>rocketmq-tools</artifactId>
+ <version>${rocketmq.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.rocketmq</groupId>
+ <artifactId>rocketmq-acl</artifactId>
+ <version>${rocketmq.version}</version>
+ </dependency>
+
<!--TEST-->
<dependency>
<groupId>junit</groupId>
