This is an automated email from the ASF dual-hosted git repository.
jianbin pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-seata-samples.git
The following commit(s) were added to refs/heads/master by this push:
new d509ce6e fix: fix seata-spring-boot-starter conflict in pom.xml (#680)
d509ce6e is described below
commit d509ce6e1a19702ec4552053e7507817ad68e226
Author: Jingliu Xiong <[email protected]>
AuthorDate: Tue May 21 10:42:21 2024 +0800
fix: fix seata-spring-boot-starter conflict in pom.xml (#680)
---
.../springboot-feign-seata-business/pom.xml | 6 ++++++
.../springboot-feign-seata-xa/springboot-feign-seata-order/pom.xml | 6 ++++++
2 files changed, 12 insertions(+)
diff --git
a/xa-sample/springboot-feign-seata-xa/springboot-feign-seata-business/pom.xml
b/xa-sample/springboot-feign-seata-xa/springboot-feign-seata-business/pom.xml
index 09cb4fea..8d130019 100644
---
a/xa-sample/springboot-feign-seata-xa/springboot-feign-seata-business/pom.xml
+++
b/xa-sample/springboot-feign-seata-xa/springboot-feign-seata-business/pom.xml
@@ -102,6 +102,12 @@
<groupId>com.alibaba.cloud</groupId>
<artifactId>spring-cloud-starter-alibaba-seata</artifactId>
<version>2021.0.6.0</version>
+ <exclusions>
+ <exclusion>
+ <artifactId>seata-spring-boot-starter</artifactId>
+ <groupId>io.seata</groupId>
+ </exclusion>
+ </exclusions>
</dependency>
</dependencies>
diff --git
a/xa-sample/springboot-feign-seata-xa/springboot-feign-seata-order/pom.xml
b/xa-sample/springboot-feign-seata-xa/springboot-feign-seata-order/pom.xml
index 0f5f49c9..997aad90 100644
--- a/xa-sample/springboot-feign-seata-xa/springboot-feign-seata-order/pom.xml
+++ b/xa-sample/springboot-feign-seata-xa/springboot-feign-seata-order/pom.xml
@@ -102,6 +102,12 @@
<groupId>com.alibaba.cloud</groupId>
<artifactId>spring-cloud-starter-alibaba-seata</artifactId>
<version>2021.0.6.0</version>
+ <exclusions>
+ <exclusion>
+ <artifactId>seata-spring-boot-starter</artifactId>
+ <groupId>io.seata</groupId>
+ </exclusion>
+ </exclusions>
</dependency>
</dependencies>
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
