From 459502d342e9a9ef08253dddf3a2f340e40438a8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?WangLiang/=E7=8E=8B=E8=89=AF?= <841369634@qq.com>
Date: Tue, 31 Oct 2023 10:40:36 +0800
Subject: [PATCH] test: fixed jedis version for `seata-server` (#5979)

---
 changes/en-us/develop.md                       |  1 +
 changes/zh-cn/develop.md                       |  1 +
 dependencies/pom.xml                           |  8 --------
 ...ditional-spring-configuration-metadata.json | 18 +++---------------
 server/pom.xml                                 |  4 ++++
 5 files changed, 9 insertions(+), 23 deletions(-)

diff --git a/changes/en-us/develop.md b/changes/en-us/develop.md
index a49cfea541a..1ae0e17b54b 100644
--- a/changes/en-us/develop.md
+++ b/changes/en-us/develop.md
@@ -11,6 +11,7 @@ Add changes here for all PR submitted to the develop branch.
 - [[#5884](https://github.com/seata/seata/pull/5884)] fix dm escaped characters for upper and lower case column names
 - [[#5924](https://github.com/seata/seata/pull/5924)] fix zk unit test error
 - [[#5931](https://github.com/seata/seata/pull/5931)] fix the issue of missing sentinel password in store redis mode
+- [[#5970](https://github.com/seata/seata/pull/5970)] fix some configurations that are not deprecated show "Deprecated"
 
 ### optimize:
 - [[#5866](https://github.com/seata/seata/pull/5866)] some minor syntax optimization
diff --git a/changes/zh-cn/develop.md b/changes/zh-cn/develop.md
index c7dbdc2810b..c919f5c16ab 100644
--- a/changes/zh-cn/develop.md
+++ b/changes/zh-cn/develop.md
@@ -11,6 +11,7 @@
 - [[#5884](https://github.com/seata/seata/pull/5884)] 修复达梦前后镜像查询列名都加了引号导致sql异常的问题
 - [[#5924](https://github.com/seata/seata/pull/5924)] 修复zk单元测试错误
 - [[#5931](https://github.com/seata/seata/pull/5931)] 修复存储redis哨兵模式下哨兵密码缺失的问题
+- [[#5970](https://github.com/seata/seata/pull/5970)] 修复某些未弃用的配置显示"已弃用"
 
 ### optimize:
 - [[#5866](https://github.com/seata/seata/pull/5866)] 一些小的语法优化
diff --git a/dependencies/pom.xml b/dependencies/pom.xml
index 56980d6a02a..b7f431cef6e 100644
--- a/dependencies/pom.xml
+++ b/dependencies/pom.xml
@@ -91,9 +91,6 @@
         <logstash-logback-encoder.version>6.5</logstash-logback-encoder.version>
         <kafka-appender.version>0.2.0-RC2</kafka-appender.version>
 
-        <!-- redis -->
-        <jedis.version>3.8.0</jedis.version>
-
         <!-- # for database -->
         <!-- db -->
         <mysql.version>5.1.42</mysql.version>
@@ -390,11 +387,6 @@
                 <artifactId>apollo-client</artifactId>
                 <version>${apollo-client.version}</version>
             </dependency>
-            <dependency>
-                <groupId>redis.clients</groupId>
-                <artifactId>jedis</artifactId>
-                <version>${jedis.version}</version>
-            </dependency>
             <dependency>
                 <groupId>com.github.microwww</groupId>
                 <artifactId>redis-server</artifactId>
diff --git a/seata-spring-autoconfigure/seata-spring-autoconfigure-core/src/main/resources/META-INF/additional-spring-configuration-metadata.json b/seata-spring-autoconfigure/seata-spring-autoconfigure-core/src/main/resources/META-INF/additional-spring-configuration-metadata.json
index 3c17919d667..a23e23bccd7 100644
--- a/seata-spring-autoconfigure/seata-spring-autoconfigure-core/src/main/resources/META-INF/additional-spring-configuration-metadata.json
+++ b/seata-spring-autoconfigure/seata-spring-autoconfigure-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": [
diff --git a/server/pom.xml b/server/pom.xml
index d7f39f9900f..2b24b55ab62 100644
--- a/server/pom.xml
+++ b/server/pom.xml
@@ -32,6 +32,9 @@
         <spring-boot-for-server.version>${spring-boot.version}</spring-boot-for-server.version>
         <spring-framework-for-server.version>${spring-framework.version}</spring-framework-for-server.version>
         <native-build-tools-plugin.version>0.9.20</native-build-tools-plugin.version>
+
+        <!-- jedis version for seata-server -->
+        <jedis.version>3.8.0</jedis.version>
     </properties>
 
     <dependencyManagement>
@@ -202,6 +205,7 @@
         <dependency>
             <groupId>redis.clients</groupId>
             <artifactId>jedis</artifactId>
+            <version>${jedis.version}</version>
         </dependency>
 
         <dependency>