bugfix: fix some configurations that are not deprecated show "Depreca…

…ted" (apache#5971)
funky-eyes · Oct 30, 2023 · 64c5b8a · 64c5b8a
1 parent 6d4ab48
commit 64c5b8a
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 15 deletions.
diff --git a/changes/en-us/2.0.0.md b/changes/en-us/2.0.0.md
@@ -80,6 +80,7 @@ The version is updated as follows:
 - [[#5881](https://github.com/seata/seata/pull/5880)] fix delete branch table unlock failed
 - [[#5930](https://github.com/seata/seata/pull/5930)] fix the issue of missing sentinel password in store redis mode
 - [[#5958](https://github.com/seata/seata/pull/5958)] required to be unlocked when a re-election occurs in a commit state
+- [[#5971](https://github.com/seata/seata/pull/5971)] fix some configurations that are not deprecated show "Deprecated"
 
 ### optimize：
 - [[#5928](https://github.com/seata/seata/pull/5928)] add Saga statelang semantic validation

diff --git a/changes/zh-cn/2.0.0.md b/changes/zh-cn/2.0.0.md
@@ -79,6 +79,7 @@ Seata 是一款开源的分布式事务解决方案，提供高性能和简单
 - [[#5881](https://github.com/seata/seata/pull/5880)] 修复事务回滚时锁未删除的问题
 - [[#5930](https://github.com/seata/seata/pull/5930)] 修复存储为redis哨兵模式下哨兵密码缺失的问题
 - [[#5958](https://github.com/seata/seata/pull/5958)] 在二阶段提交状态下发生重选时需要进行解除全局锁
+- [[#5971](https://github.com/seata/seata/pull/5971)] 修复某些未弃用的配置显示"已弃用"
 
 ### optimize：
 - [[#5928](https://github.com/seata/seata/pull/5928)] 增加Saga模式状态机语义验证阶段

diff --git a/...oconfigure-core/src/main/resources/META-INF/additional-spring-configuration-metadata.json b/...oconfigure-core/src/main/resources/META-INF/additional-spring-configuration-metadata.json
@@ -104,29 +104,17 @@
     {
       "name": "seata.transport.rpc-rm-request-timeout",
       "type": "java.lang.Long",
-      "sourceType": "io.seata.spring.boot.autoconfigure.properties.TransportProperties",
-      "deprecation": {
-        "level": "error",
-        "reason": "Please configure to 'seata.transport.rpcRmRequestTimeout'."
-      }
+      "sourceType": "io.seata.spring.boot.autoconfigure.properties.TransportProperties"
     },
     {
       "name": "seata.transport.rpc-tm-request-timeout",
       "type": "java.lang.Long",
-      "sourceType": "io.seata.spring.boot.autoconfigure.properties.TransportProperties",
-      "deprecation": {
-        "level": "error",
-        "reason": "Please configure to 'seata.transport.rpcTmRequestTimeout'."
-      }
+      "sourceType": "io.seata.spring.boot.autoconfigure.properties.TransportProperties"
     },
     {
       "name": "seata.transport.rpc-tc-request-timeout",
       "type": "java.lang.Long",
-      "sourceType": "io.seata.spring.boot.autoconfigure.properties.TransportProperties",
-      "deprecation": {
-        "level": "error",
-        "reason": "Please configure to 'seata.transport.rpcTcRequestTimeout'."
-      }
+      "sourceType": "io.seata.spring.boot.autoconfigure.properties.TransportProperties"
     }
   ],
   "hints": [