From fc29936df32eb2f1e094388d48aa3b68e93b8e2f Mon Sep 17 00:00:00 2001
From: Albumen Kevin <jhq0812@gmail.com>
Date: Tue, 10 Jan 2023 18:36:41 +0800
Subject: [PATCH] bugfix: seata-core dependency transitive conflict in
 seata-dubbo (#5203)

---
 all/pom.xml               | 6 ++++++
 changes/en-us/develop.md  | 2 ++
 changes/zh-cn/develop.md  | 2 ++
 dependencies/pom.xml      | 2 +-
 integration/dubbo/pom.xml | 9 ++++++---
 5 files changed, 17 insertions(+), 4 deletions(-)

diff --git a/all/pom.xml b/all/pom.xml
index b87fe16cec9..e0215683f9e 100644
--- a/all/pom.xml
+++ b/all/pom.xml
@@ -399,6 +399,12 @@
         <dependency>
             <groupId>org.apache.dubbo.extensions</groupId>
             <artifactId>dubbo-filter-seata</artifactId>
+            <exclusions>
+                <exclusion>
+                    <groupId>io.seata</groupId>
+                    <artifactId>seata-core</artifactId>
+                </exclusion>
+            </exclusions>
         </dependency>
         <dependency>
             <groupId>com.google.protobuf</groupId>
diff --git a/changes/en-us/develop.md b/changes/en-us/develop.md
index 6eba3841094..2be0b0db0f3 100644
--- a/changes/en-us/develop.md
+++ b/changes/en-us/develop.md
@@ -8,8 +8,10 @@ Add changes here for all PR submitted to the develop branch.
 ### bugfix:
 - [[#5194](https://github.com/seata/seata/pull/5194)] fix wrong keyword order for oracle when creating a table
 - [[#5021](https://github.com/seata/seata/pull/5201)] Fix JDK Reflection for Spring origin proxy failed in JDK17
+- [[#5023](https://github.com/seata/seata/pull/5203)] Fix `seata-core` dependency transitive conflict in `seata-dubbo`
 - [[#5224](https://github.com/seata/seata/pull/5224)] fix oracle initialize script index_name is duplicate 
 
+
 ### optimize:
 - [[#5208](https://github.com/seata/seata/pull/5208)] optimize throwable getCause once more
 - [[#5212](https://github.com/seata/seata/pull/5212)] optimize log message level
diff --git a/changes/zh-cn/develop.md b/changes/zh-cn/develop.md
index 1f93299345e..3d9b326af77 100644
--- a/changes/zh-cn/develop.md
+++ b/changes/zh-cn/develop.md
@@ -8,8 +8,10 @@
 ### bugfix:
 - [[#5194](https://github.com/seata/seata/pull/5194)] 修复使用Oracle作为服务端DB存储时的建表失败问题
 - [[#5021](https://github.com/seata/seata/pull/5201)] 修复 JDK17 下获取 Spring 原始代理对象失败的问题
+- [[#5023](https://github.com/seata/seata/pull/5203)] 修复 `seata-core` 模块传递依赖冲突
 - [[#5224](https://github.com/seata/seata/pull/5224)] 修复 oracle初始化脚本索引名重复的问题
 
+
 ### optimize:
 - [[#5208](https://github.com/seata/seata/pull/5208)] 优化多次重复获取Throwable#getCause问题
 - [[#5212](https://github.com/seata/seata/pull/5212)] 优化不合理的日志信息级别
diff --git a/dependencies/pom.xml b/dependencies/pom.xml
index 67db5b5a7f0..1b8364aa7a6 100644
--- a/dependencies/pom.xml
+++ b/dependencies/pom.xml
@@ -32,7 +32,7 @@
     <description>dependencies for Seata built with Maven</description>
 
     <properties>
-        <dubbo-seata.version>1.0.0</dubbo-seata.version>
+        <dubbo-seata.version>1.0.2</dubbo-seata.version>
         <brpc.version>2.5.9</brpc.version>
         <hsf.version>1.8.3</hsf.version>
         <bytebuddy.version>1.12.13</bytebuddy.version>
diff --git a/integration/dubbo/pom.xml b/integration/dubbo/pom.xml
index 2138072be8f..c146949ef9e 100644
--- a/integration/dubbo/pom.xml
+++ b/integration/dubbo/pom.xml
@@ -29,13 +29,16 @@
     <name>seata-dubbo ${project.version}</name>
     <description>apache dubbo integration for Seata built with Maven</description>
 
-    <properties>
-        <dubbo-seata.version>1.0.0</dubbo-seata.version>
-    </properties>
     <dependencies>
         <dependency>
             <groupId>org.apache.dubbo.extensions</groupId>
             <artifactId>dubbo-filter-seata</artifactId>
+            <exclusions>
+                <exclusion>
+                    <groupId>io.seata</groupId>
+                    <artifactId>seata-core</artifactId>
+                </exclusion>
+            </exclusions>
         </dependency>
     </dependencies>