From 0cd35ea6b1c5f4fefdd38e651a406a53e22267a5 Mon Sep 17 00:00:00 2001 From: wtt <1136220284@qq.com> Date: Wed, 27 Dec 2023 11:32:44 +0800 Subject: [PATCH 1/2] refactor: update jdk21 docean version --- jcommon/catPlugin/pom.xml | 2 +- .../docean-plugin/docean-plugin-akka/pom.xml | 2 +- .../docean-plugin/docean-plugin-aop/pom.xml | 2 +- .../docean-plugin/docean-plugin-api/pom.xml | 3 +- .../docean-plugin/docean-plugin-cat/pom.xml | 2 +- .../docean-plugin-classloader/pom.xml | 2 +- .../docean-plugin-config/pom.xml | 3 +- .../docean-plugin-configuration/pom.xml | 4 +- .../pom.xml | 4 +- .../docean-plugin-datasource/pom.xml | 5 +-- .../docean-plugin/docean-plugin-db/pom.xml | 5 +-- .../docean-plugin/docean-plugin-dmesh/pom.xml | 10 ++--- .../docean-plugin-dubbo-serverless/pom.xml | 4 +- .../docean-plugin/docean-plugin-dubbo/pom.xml | 4 +- .../docean-plugin-es-antlr4/pom.xml | 4 +- .../docean-plugin/docean-plugin-es/pom.xml | 6 +-- .../docean-plugin/docean-plugin-etcd/pom.xml | 4 +- .../docean-plugin/docean-plugin-grpc/pom.xml | 4 +- .../docean-plugin-http-server/pom.xml | 6 +-- .../docean-plugin/docean-plugin-http/pom.xml | 2 +- .../docean-plugin-influxdb/pom.xml | 4 +- .../docean-plugin/docean-plugin-json/pom.xml | 2 +- .../docean-plugin/docean-plugin-k8s/pom.xml | 4 +- .../docean-plugin/docean-plugin-log/pom.xml | 4 +- .../docean-plugin-mesh-dubbo/pom.xml | 2 +- .../docean-plugin-mongodb/pom.xml | 6 +-- .../docean-plugin/docean-plugin-mvc/pom.xml | 4 +- .../docean-plugin-mybatis-plus/pom.xml | 8 ++-- .../docean-plugin-mybatis/pom.xml | 9 ++-- .../docean-plugin/docean-plugin-nacos/pom.xml | 4 +- .../docean-plugin/docean-plugin-redis/pom.xml | 4 +- .../docean-plugin-rocketmq/pom.xml | 5 +-- .../docean-plugin/docean-plugin-rpc/pom.xml | 6 +-- .../docean-plugin-sentinel/pom.xml | 4 +- .../docean-plugin-shardingSphere/pom.xml | 6 +-- .../docean-plugin-sidecar/pom.xml | 9 ++-- .../docean-plugin-spring/pom.xml | 2 +- .../docean-plugin/docean-plugin-sql/pom.xml | 3 +- .../docean-plugin/docean-plugin-test/pom.xml | 42 +++++++++---------- jcommon/docean-plugin/pom.xml | 4 +- .../xiaomi/youpin/docean/mvc/MvcRunnable.java | 1 + jcommon/es/pom.xml | 16 ++----- jcommon/grpc/pom.xml | 1 + jcommon/pom.xml | 10 +++-- jcommon/rpc-codes/pom.xml | 3 +- jcommon/rpc/pom.xml | 13 ++---- 46 files changed, 118 insertions(+), 136 deletions(-) diff --git a/jcommon/catPlugin/pom.xml b/jcommon/catPlugin/pom.xml index 75123ad29..d9b750c94 100644 --- a/jcommon/catPlugin/pom.xml +++ b/jcommon/catPlugin/pom.xml @@ -5,7 +5,7 @@ run.mone jcommon - 1.4-jdk20-SNAPSHOT + 1.4-jdk21-SNAPSHOT catPlugin diff --git a/jcommon/docean-plugin/docean-plugin-akka/pom.xml b/jcommon/docean-plugin/docean-plugin-akka/pom.xml index 7d219be9a..1a8e5d08b 100644 --- a/jcommon/docean-plugin/docean-plugin-akka/pom.xml +++ b/jcommon/docean-plugin/docean-plugin-akka/pom.xml @@ -5,7 +5,7 @@ run.mone docean-plugin - 1.4-jdk20-SNAPSHOT + 1.4-jdk21-SNAPSHOT docean-plugin-akka diff --git a/jcommon/docean-plugin/docean-plugin-aop/pom.xml b/jcommon/docean-plugin/docean-plugin-aop/pom.xml index 47b11c417..c19ba5632 100644 --- a/jcommon/docean-plugin/docean-plugin-aop/pom.xml +++ b/jcommon/docean-plugin/docean-plugin-aop/pom.xml @@ -5,7 +5,7 @@ run.mone docean-plugin - 1.4-jdk20-SNAPSHOT + 1.4-jdk21-SNAPSHOT docean-plugin-aop diff --git a/jcommon/docean-plugin/docean-plugin-api/pom.xml b/jcommon/docean-plugin/docean-plugin-api/pom.xml index a44285f02..b40699f2d 100644 --- a/jcommon/docean-plugin/docean-plugin-api/pom.xml +++ b/jcommon/docean-plugin/docean-plugin-api/pom.xml @@ -5,8 +5,7 @@ run.mone docean-plugin - 1.4-jdk20-SNAPSHOT + 1.4-jdk21-SNAPSHOT docean-plugin-api - 1.4-jdk21-SNAPSHOT diff --git a/jcommon/docean-plugin/docean-plugin-cat/pom.xml b/jcommon/docean-plugin/docean-plugin-cat/pom.xml index b549d08ec..446f9c85a 100644 --- a/jcommon/docean-plugin/docean-plugin-cat/pom.xml +++ b/jcommon/docean-plugin/docean-plugin-cat/pom.xml @@ -5,7 +5,7 @@ run.mone docean-plugin - 1.4-jdk20-SNAPSHOT + 1.4-jdk21-SNAPSHOT docean-plugin-cat diff --git a/jcommon/docean-plugin/docean-plugin-classloader/pom.xml b/jcommon/docean-plugin/docean-plugin-classloader/pom.xml index 3e6addcb2..2912a792a 100644 --- a/jcommon/docean-plugin/docean-plugin-classloader/pom.xml +++ b/jcommon/docean-plugin/docean-plugin-classloader/pom.xml @@ -5,7 +5,7 @@ run.mone docean-plugin - 1.4-jdk20-SNAPSHOT + 1.4-jdk21-SNAPSHOT docean-plugin-classloader diff --git a/jcommon/docean-plugin/docean-plugin-config/pom.xml b/jcommon/docean-plugin/docean-plugin-config/pom.xml index 7918ef5cd..05963f094 100644 --- a/jcommon/docean-plugin/docean-plugin-config/pom.xml +++ b/jcommon/docean-plugin/docean-plugin-config/pom.xml @@ -5,8 +5,7 @@ run.mone docean-plugin - 1.4-jdk20-SNAPSHOT + 1.4-jdk21-SNAPSHOT docean-plugin-config - 1.4-jdk21-SNAPSHOT diff --git a/jcommon/docean-plugin/docean-plugin-configuration/pom.xml b/jcommon/docean-plugin/docean-plugin-configuration/pom.xml index 49345c7a3..ad4d759ea 100644 --- a/jcommon/docean-plugin/docean-plugin-configuration/pom.xml +++ b/jcommon/docean-plugin/docean-plugin-configuration/pom.xml @@ -5,7 +5,7 @@ run.mone docean-plugin - 1.4-jdk20-SNAPSHOT + 1.4-jdk21-SNAPSHOT docean-plugin-configuration @@ -16,7 +16,7 @@ run.mone docean-plugin-config - 1.4-jdk20-SNAPSHOT + 1.4-jdk21-SNAPSHOT compile diff --git a/jcommon/docean-plugin/docean-plugin-datasource-serverless/pom.xml b/jcommon/docean-plugin/docean-plugin-datasource-serverless/pom.xml index fe323b51c..247518d2d 100644 --- a/jcommon/docean-plugin/docean-plugin-datasource-serverless/pom.xml +++ b/jcommon/docean-plugin/docean-plugin-datasource-serverless/pom.xml @@ -5,7 +5,7 @@ run.mone docean-plugin - 1.4-jdk20-SNAPSHOT + 1.4-jdk21-SNAPSHOT docean-plugin-datasource-serverless @@ -16,7 +16,7 @@ run.mone docean-plugin-config - 1.4-jdk20-SNAPSHOT + 1.4-jdk21-SNAPSHOT diff --git a/jcommon/docean-plugin/docean-plugin-datasource/pom.xml b/jcommon/docean-plugin/docean-plugin-datasource/pom.xml index 64978c4b8..2a8925722 100644 --- a/jcommon/docean-plugin/docean-plugin-datasource/pom.xml +++ b/jcommon/docean-plugin/docean-plugin-datasource/pom.xml @@ -5,15 +5,14 @@ run.mone docean-plugin - 1.4-jdk20-SNAPSHOT + 1.4-jdk21-SNAPSHOT docean-plugin-datasource - 1.4-jdk21-SNAPSHOT run.mone docean-plugin-config - 1.4-jdk20-SNAPSHOT + 1.4-jdk21-SNAPSHOT com.mchange diff --git a/jcommon/docean-plugin/docean-plugin-db/pom.xml b/jcommon/docean-plugin/docean-plugin-db/pom.xml index c7819ed20..928e87fea 100644 --- a/jcommon/docean-plugin/docean-plugin-db/pom.xml +++ b/jcommon/docean-plugin/docean-plugin-db/pom.xml @@ -5,15 +5,14 @@ run.mone docean-plugin - 1.4-jdk20-SNAPSHOT + 1.4-jdk21-SNAPSHOT docean-plugin-db - 1.4-jdk21-SNAPSHOT run.mone docean-plugin-config - 1.4-jdk20-SNAPSHOT + 1.4-jdk21-SNAPSHOT run.mone diff --git a/jcommon/docean-plugin/docean-plugin-dmesh/pom.xml b/jcommon/docean-plugin/docean-plugin-dmesh/pom.xml index 245b8fb16..57a4529b5 100644 --- a/jcommon/docean-plugin/docean-plugin-dmesh/pom.xml +++ b/jcommon/docean-plugin/docean-plugin-dmesh/pom.xml @@ -5,7 +5,7 @@ run.mone docean-plugin - 1.4-jdk20-SNAPSHOT + 1.4-jdk21-SNAPSHOT docean-plugin-dmesh @@ -24,17 +24,17 @@ run.mone docean - 1.4-SNAPSHOT + 1.4-jdk21-SNAPSHOT run.mone docean-plugin-api - 1.4-jdk20-SNAPSHOT + 1.4-jdk21-SNAPSHOT run.mone docean-plugin-config - 1.4-jdk20-SNAPSHOT + 1.4-jdk21-SNAPSHOT run.mone @@ -50,7 +50,7 @@ run.mone docean-plugin-db - 1.4-jdk20-SNAPSHOT + 1.4-jdk21-SNAPSHOT provided diff --git a/jcommon/docean-plugin/docean-plugin-dubbo-serverless/pom.xml b/jcommon/docean-plugin/docean-plugin-dubbo-serverless/pom.xml index 223eb070d..2673792e8 100644 --- a/jcommon/docean-plugin/docean-plugin-dubbo-serverless/pom.xml +++ b/jcommon/docean-plugin/docean-plugin-dubbo-serverless/pom.xml @@ -5,7 +5,7 @@ run.mone docean-plugin - 1.4-jdk20-SNAPSHOT + 1.4-jdk21-SNAPSHOT docean-plugin-dubbo-serverless @@ -16,7 +16,7 @@ run.mone docean-plugin-config - 1.4-jdk20-SNAPSHOT + 1.4-jdk21-SNAPSHOT run.mone diff --git a/jcommon/docean-plugin/docean-plugin-dubbo/pom.xml b/jcommon/docean-plugin/docean-plugin-dubbo/pom.xml index 638eeea1e..c6dc8fe75 100644 --- a/jcommon/docean-plugin/docean-plugin-dubbo/pom.xml +++ b/jcommon/docean-plugin/docean-plugin-dubbo/pom.xml @@ -5,14 +5,14 @@ run.mone docean-plugin - 1.4-jdk20-SNAPSHOT + 1.4-jdk21-SNAPSHOT docean-plugin-dubbo run.mone docean-plugin-config - 1.4-jdk20-SNAPSHOT + 1.4-jdk21-SNAPSHOT run.mone diff --git a/jcommon/docean-plugin/docean-plugin-es-antlr4/pom.xml b/jcommon/docean-plugin/docean-plugin-es-antlr4/pom.xml index 85cb70b96..5f1458c1f 100644 --- a/jcommon/docean-plugin/docean-plugin-es-antlr4/pom.xml +++ b/jcommon/docean-plugin/docean-plugin-es-antlr4/pom.xml @@ -5,7 +5,7 @@ run.mone docean-plugin - 1.4-jdk20-SNAPSHOT + 1.4-jdk21-SNAPSHOT docean-plugin-es-antlr4 @@ -22,7 +22,7 @@ run.mone es - 1.4-SNAPSHOT + 1.5-jdk21-SNAPSHOT compile diff --git a/jcommon/docean-plugin/docean-plugin-es/pom.xml b/jcommon/docean-plugin/docean-plugin-es/pom.xml index 032313bd2..706fc7b9e 100644 --- a/jcommon/docean-plugin/docean-plugin-es/pom.xml +++ b/jcommon/docean-plugin/docean-plugin-es/pom.xml @@ -5,19 +5,19 @@ run.mone docean-plugin - 1.4-jdk20-SNAPSHOT + 1.4-jdk21-SNAPSHOT docean-plugin-es run.mone docean-plugin-config - 1.4-jdk20-SNAPSHOT + 1.4-jdk21-SNAPSHOT run.mone es - 1.5-jdk20-SNAPSHOT + 1.5-jdk21-SNAPSHOT compile diff --git a/jcommon/docean-plugin/docean-plugin-etcd/pom.xml b/jcommon/docean-plugin/docean-plugin-etcd/pom.xml index 255dfead6..916f9b470 100644 --- a/jcommon/docean-plugin/docean-plugin-etcd/pom.xml +++ b/jcommon/docean-plugin/docean-plugin-etcd/pom.xml @@ -5,14 +5,14 @@ run.mone docean-plugin - 1.4-jdk20-SNAPSHOT + 1.4-jdk21-SNAPSHOT docean-plugin-etcd run.mone docean-plugin-config - 1.4-jdk20-SNAPSHOT + 1.4-jdk21-SNAPSHOT io.etcd diff --git a/jcommon/docean-plugin/docean-plugin-grpc/pom.xml b/jcommon/docean-plugin/docean-plugin-grpc/pom.xml index f55c317d1..b430e6456 100644 --- a/jcommon/docean-plugin/docean-plugin-grpc/pom.xml +++ b/jcommon/docean-plugin/docean-plugin-grpc/pom.xml @@ -5,7 +5,7 @@ run.mone docean-plugin - 1.4-jdk20-SNAPSHOT + 1.4-jdk21-SNAPSHOT docean-plugin-grpc @@ -27,7 +27,7 @@ run.mone docean-plugin-config - 1.4-jdk20-SNAPSHOT + 1.4-jdk21-SNAPSHOT diff --git a/jcommon/docean-plugin/docean-plugin-http-server/pom.xml b/jcommon/docean-plugin/docean-plugin-http-server/pom.xml index 0b811a0fc..06de21ffc 100644 --- a/jcommon/docean-plugin/docean-plugin-http-server/pom.xml +++ b/jcommon/docean-plugin/docean-plugin-http-server/pom.xml @@ -5,7 +5,7 @@ run.mone docean-plugin - 1.4-jdk20-SNAPSHOT + 1.4-jdk21-SNAPSHOT docean-plugin-http-server @@ -16,12 +16,12 @@ run.mone docean-plugin-config - 1.4-jdk20-SNAPSHOT + 1.4-jdk21-SNAPSHOT run.mone docean - 1.4-jdk20-SNAPSHOT + 1.4-jdk21-SNAPSHOT diff --git a/jcommon/docean-plugin/docean-plugin-http/pom.xml b/jcommon/docean-plugin/docean-plugin-http/pom.xml index d5d842f81..1b404281b 100644 --- a/jcommon/docean-plugin/docean-plugin-http/pom.xml +++ b/jcommon/docean-plugin/docean-plugin-http/pom.xml @@ -5,7 +5,7 @@ run.mone docean-plugin - 1.4-jdk20-SNAPSHOT + 1.4-jdk21-SNAPSHOT docean-plugin-http diff --git a/jcommon/docean-plugin/docean-plugin-influxdb/pom.xml b/jcommon/docean-plugin/docean-plugin-influxdb/pom.xml index 8a00a904c..8db10237f 100644 --- a/jcommon/docean-plugin/docean-plugin-influxdb/pom.xml +++ b/jcommon/docean-plugin/docean-plugin-influxdb/pom.xml @@ -5,7 +5,7 @@ run.mone docean-plugin - 1.4-jdk20-SNAPSHOT + 1.4-jdk21-SNAPSHOT docean-plugin-influxdb @@ -17,7 +17,7 @@ run.mone docean-plugin-config - 1.4-jdk20-SNAPSHOT + 1.4-jdk21-SNAPSHOT diff --git a/jcommon/docean-plugin/docean-plugin-json/pom.xml b/jcommon/docean-plugin/docean-plugin-json/pom.xml index 2f799d4d3..a8b17d950 100644 --- a/jcommon/docean-plugin/docean-plugin-json/pom.xml +++ b/jcommon/docean-plugin/docean-plugin-json/pom.xml @@ -5,7 +5,7 @@ run.mone docean-plugin - 1.4-jdk20-SNAPSHOT + 1.4-jdk21-SNAPSHOT docean-plugin-json diff --git a/jcommon/docean-plugin/docean-plugin-k8s/pom.xml b/jcommon/docean-plugin/docean-plugin-k8s/pom.xml index 4562b60e8..369a947e7 100644 --- a/jcommon/docean-plugin/docean-plugin-k8s/pom.xml +++ b/jcommon/docean-plugin/docean-plugin-k8s/pom.xml @@ -5,7 +5,7 @@ run.mone docean-plugin - 1.4-jdk20-SNAPSHOT + 1.4-jdk21-SNAPSHOT docean-plugin-k8s @@ -17,7 +17,7 @@ run.mone docean-plugin-config - 1.4-jdk20-SNAPSHOT + 1.4-jdk21-SNAPSHOT io.fabric8 diff --git a/jcommon/docean-plugin/docean-plugin-log/pom.xml b/jcommon/docean-plugin/docean-plugin-log/pom.xml index 144362d37..56cb73511 100644 --- a/jcommon/docean-plugin/docean-plugin-log/pom.xml +++ b/jcommon/docean-plugin/docean-plugin-log/pom.xml @@ -5,14 +5,14 @@ run.mone docean-plugin - 1.4-jdk20-SNAPSHOT + 1.4-jdk21-SNAPSHOT docean-plugin-log run.mone docean-plugin-config - 1.4-jdk20-SNAPSHOT + 1.4-jdk21-SNAPSHOT com.lmax diff --git a/jcommon/docean-plugin/docean-plugin-mesh-dubbo/pom.xml b/jcommon/docean-plugin/docean-plugin-mesh-dubbo/pom.xml index bb9529711..39544699c 100644 --- a/jcommon/docean-plugin/docean-plugin-mesh-dubbo/pom.xml +++ b/jcommon/docean-plugin/docean-plugin-mesh-dubbo/pom.xml @@ -5,7 +5,7 @@ run.mone docean-plugin - 1.4-jdk20-SNAPSHOT + 1.4-jdk21-SNAPSHOT docean-plugin-mesh-dubbo diff --git a/jcommon/docean-plugin/docean-plugin-mongodb/pom.xml b/jcommon/docean-plugin/docean-plugin-mongodb/pom.xml index 34f0a8396..f1d5f0fb6 100644 --- a/jcommon/docean-plugin/docean-plugin-mongodb/pom.xml +++ b/jcommon/docean-plugin/docean-plugin-mongodb/pom.xml @@ -5,14 +5,14 @@ run.mone docean-plugin - 1.4-jdk20-SNAPSHOT + 1.4-jdk21-SNAPSHOT docean-plugin-mongodb run.mone docean-plugin-config - 1.4-jdk20-SNAPSHOT + 1.4-jdk21-SNAPSHOT org.mongodb @@ -22,7 +22,7 @@ run.mone catPlugin - 1.4-jdk20-SNAPSHOT + 1.4-jdk21-SNAPSHOT diff --git a/jcommon/docean-plugin/docean-plugin-mvc/pom.xml b/jcommon/docean-plugin/docean-plugin-mvc/pom.xml index 32773fe1e..da153dd0a 100644 --- a/jcommon/docean-plugin/docean-plugin-mvc/pom.xml +++ b/jcommon/docean-plugin/docean-plugin-mvc/pom.xml @@ -5,14 +5,14 @@ run.mone docean-plugin - 1.4-jdk20-SNAPSHOT + 1.4-jdk21-SNAPSHOT docean-plugin-mvc run.mone docean-plugin-nacos - 1.4-jdk20-SNAPSHOT + 1.4-jdk21-SNAPSHOT diff --git a/jcommon/docean-plugin/docean-plugin-mybatis-plus/pom.xml b/jcommon/docean-plugin/docean-plugin-mybatis-plus/pom.xml index 9ff84cf46..148aa9fd8 100644 --- a/jcommon/docean-plugin/docean-plugin-mybatis-plus/pom.xml +++ b/jcommon/docean-plugin/docean-plugin-mybatis-plus/pom.xml @@ -5,7 +5,7 @@ run.mone docean-plugin - 1.4-jdk20-SNAPSHOT + 1.4-jdk21-SNAPSHOT docean-plugin-mybatis-plus @@ -16,17 +16,17 @@ run.mone docean-plugin-datasource - 1.4-jdk20-SNAPSHOT + 1.4-jdk21-SNAPSHOT run.mone docean-plugin-cat - 1.4-jdk20-SNAPSHOT + 1.4-jdk21-SNAPSHOT run.mone docean-plugin-config - 1.4-jdk20-SNAPSHOT + 1.4-jdk21-SNAPSHOT com.mchange diff --git a/jcommon/docean-plugin/docean-plugin-mybatis/pom.xml b/jcommon/docean-plugin/docean-plugin-mybatis/pom.xml index 6ec75d217..8a3ac817e 100644 --- a/jcommon/docean-plugin/docean-plugin-mybatis/pom.xml +++ b/jcommon/docean-plugin/docean-plugin-mybatis/pom.xml @@ -5,10 +5,9 @@ run.mone docean-plugin - 1.4-jdk20-SNAPSHOT + 1.4-jdk21-SNAPSHOT docean-plugin-mybatis - 1.4.8-jdk20-SNAPSHOT com.alibaba @@ -19,18 +18,18 @@ run.mone docean-plugin-datasource - 1.4-jdk20-SNAPSHOT + 1.4-jdk21-SNAPSHOT provided run.mone docean-plugin-cat - 1.4-jdk20-SNAPSHOT + 1.4-jdk21-SNAPSHOT run.mone docean-plugin-config - 1.4-jdk20-SNAPSHOT + 1.4-jdk21-SNAPSHOT org.mybatis diff --git a/jcommon/docean-plugin/docean-plugin-nacos/pom.xml b/jcommon/docean-plugin/docean-plugin-nacos/pom.xml index bd87309df..095189f06 100644 --- a/jcommon/docean-plugin/docean-plugin-nacos/pom.xml +++ b/jcommon/docean-plugin/docean-plugin-nacos/pom.xml @@ -5,14 +5,14 @@ run.mone docean-plugin - 1.4-jdk20-SNAPSHOT + 1.4-jdk21-SNAPSHOT docean-plugin-nacos run.mone docean-plugin-config - 1.4-jdk20-SNAPSHOT + 1.4-jdk21-SNAPSHOT run.mone diff --git a/jcommon/docean-plugin/docean-plugin-redis/pom.xml b/jcommon/docean-plugin/docean-plugin-redis/pom.xml index ea847443a..c314a0113 100644 --- a/jcommon/docean-plugin/docean-plugin-redis/pom.xml +++ b/jcommon/docean-plugin/docean-plugin-redis/pom.xml @@ -5,7 +5,7 @@ run.mone docean-plugin - 1.4-jdk20-SNAPSHOT + 1.4-jdk21-SNAPSHOT docean-plugin-redis @@ -18,7 +18,7 @@ run.mone docean-plugin-config - 1.4-jdk20-SNAPSHOT + 1.4-jdk21-SNAPSHOT redis.clients diff --git a/jcommon/docean-plugin/docean-plugin-rocketmq/pom.xml b/jcommon/docean-plugin/docean-plugin-rocketmq/pom.xml index 8d738804a..ec26a793e 100644 --- a/jcommon/docean-plugin/docean-plugin-rocketmq/pom.xml +++ b/jcommon/docean-plugin/docean-plugin-rocketmq/pom.xml @@ -5,15 +5,14 @@ run.mone docean-plugin - 1.4-jdk20-SNAPSHOT + 1.4-jdk21-SNAPSHOT docean-plugin-rocketmq - 1.4.1-jdk20-SNAPSHOT run.mone docean-plugin-config - 1.4-jdk20-SNAPSHOT + 1.4-jdk21-SNAPSHOT com.alibaba diff --git a/jcommon/docean-plugin/docean-plugin-rpc/pom.xml b/jcommon/docean-plugin/docean-plugin-rpc/pom.xml index 16ec0e0fc..291ef2348 100644 --- a/jcommon/docean-plugin/docean-plugin-rpc/pom.xml +++ b/jcommon/docean-plugin/docean-plugin-rpc/pom.xml @@ -5,7 +5,7 @@ run.mone docean-plugin - 1.4-jdk20-SNAPSHOT + 1.4-jdk21-SNAPSHOT docean-plugin-rpc @@ -16,12 +16,12 @@ run.mone rpc - 1.7-jdk20-SNAPSHOT + 1.4-jdk21-SNAPSHOT run.mone docean-plugin-config - 1.4-jdk20-SNAPSHOT + 1.4-jdk21-SNAPSHOT diff --git a/jcommon/docean-plugin/docean-plugin-sentinel/pom.xml b/jcommon/docean-plugin/docean-plugin-sentinel/pom.xml index afb4d7ff5..6b98a5a12 100644 --- a/jcommon/docean-plugin/docean-plugin-sentinel/pom.xml +++ b/jcommon/docean-plugin/docean-plugin-sentinel/pom.xml @@ -5,14 +5,14 @@ run.mone docean-plugin - 1.4-jdk20-SNAPSHOT + 1.4-jdk21-SNAPSHOT docean-plugin-sentinel run.mone docean-plugin-config - 1.4-jdk20-SNAPSHOT + 1.4-jdk21-SNAPSHOT run.mone diff --git a/jcommon/docean-plugin/docean-plugin-shardingSphere/pom.xml b/jcommon/docean-plugin/docean-plugin-shardingSphere/pom.xml index 2f1bd0628..76f2d7a32 100644 --- a/jcommon/docean-plugin/docean-plugin-shardingSphere/pom.xml +++ b/jcommon/docean-plugin/docean-plugin-shardingSphere/pom.xml @@ -5,19 +5,19 @@ run.mone docean-plugin - 1.4-jdk20-SNAPSHOT + 1.4-jdk21-SNAPSHOT docean-plugin-shardingSphere run.mone docean-plugin-config - 1.4-jdk20-SNAPSHOT + 1.4-jdk21-SNAPSHOT run.mone docean-plugin-datasource - 1.4-jdk20-SNAPSHOT + 1.4-jdk21-SNAPSHOT run.mone diff --git a/jcommon/docean-plugin/docean-plugin-sidecar/pom.xml b/jcommon/docean-plugin/docean-plugin-sidecar/pom.xml index 86dc31f19..b0a171491 100644 --- a/jcommon/docean-plugin/docean-plugin-sidecar/pom.xml +++ b/jcommon/docean-plugin/docean-plugin-sidecar/pom.xml @@ -5,11 +5,10 @@ run.mone jcommon - 1.4-jdk20-SNAPSHOT + 1.4-jdk21-SNAPSHOT ../../pom.xml docean-plugin-sidecar - 1.4.2-jdk20-SNAPSHOT 8 8 @@ -18,7 +17,7 @@ run.mone docean-plugin-config - 1.4-jdk20-SNAPSHOT + 1.4-jdk21-SNAPSHOT run.mone @@ -28,7 +27,7 @@ run.mone grpc - 1.4-jdk20-SNAPSHOT + 1.4-jdk21-SNAPSHOT api @@ -39,7 +38,7 @@ run.mone infra-result - 1.4-jdk20-SNAPSHOT + 1.4-jdk21-SNAPSHOT provided diff --git a/jcommon/docean-plugin/docean-plugin-spring/pom.xml b/jcommon/docean-plugin/docean-plugin-spring/pom.xml index 9b9670c1c..ef7b75c55 100644 --- a/jcommon/docean-plugin/docean-plugin-spring/pom.xml +++ b/jcommon/docean-plugin/docean-plugin-spring/pom.xml @@ -5,7 +5,7 @@ run.mone docean-plugin - 1.4-jdk20-SNAPSHOT + 1.4-jdk21-SNAPSHOT docean-plugin-spring diff --git a/jcommon/docean-plugin/docean-plugin-sql/pom.xml b/jcommon/docean-plugin/docean-plugin-sql/pom.xml index 0f53b34ca..899309638 100644 --- a/jcommon/docean-plugin/docean-plugin-sql/pom.xml +++ b/jcommon/docean-plugin/docean-plugin-sql/pom.xml @@ -5,10 +5,9 @@ run.mone docean-plugin - 1.4-jdk20-SNAPSHOT + 1.4-jdk21-SNAPSHOT docean-plugin-sql - 1.4-jdk21-SNAPSHOT run.mone diff --git a/jcommon/docean-plugin/docean-plugin-test/pom.xml b/jcommon/docean-plugin/docean-plugin-test/pom.xml index acff05178..c43d03cd7 100644 --- a/jcommon/docean-plugin/docean-plugin-test/pom.xml +++ b/jcommon/docean-plugin/docean-plugin-test/pom.xml @@ -5,14 +5,14 @@ run.mone docean-plugin - 1.4-jdk20-SNAPSHOT + 1.4-jdk21-SNAPSHOT docean-plugin-test run.mone docean - 1.4-jdk20-SNAPSHOT + 1.4-jdk21-SNAPSHOT org.msgpack @@ -22,12 +22,12 @@ run.mone docean-plugin-api - 1.4-jdk20-SNAPSHOT + 1.4-jdk21-SNAPSHOT run.mone docean-plugin-config - 1.4-jdk20-SNAPSHOT + 1.4-jdk21-SNAPSHOT run.mone @@ -37,87 +37,87 @@ run.mone docean-plugin-spring - 1.4-jdk20-SNAPSHOT + 1.4-jdk21-SNAPSHOT run.mone docean-plugin-rpc - 1.4-jdk20-SNAPSHOT + 1.4-jdk21-SNAPSHOT run.mone docean-plugin-dubbo - 1.4-jdk20-SNAPSHOT + 1.4-jdk21-SNAPSHOT run.mone docean-plugin-nacos - 1.4-jdk20-SNAPSHOT + 1.4-jdk21-SNAPSHOT run.mone docean-plugin-http - 1.4-jdk20-SNAPSHOT + 1.4-jdk21-SNAPSHOT run.mone docean-plugin-rocketmq - 1.4.1-jdk20-SNAPSHOT + 1.4-jdk21-SNAPSHOT run.mone docean-plugin-sql - 1.4-jdk20-SNAPSHOT + 1.4-jdk21-SNAPSHOT run.mone docean-plugin-aop - 1.4-jdk20-SNAPSHOT + 1.4-jdk21-SNAPSHOT run.mone docean-plugin-json - 1.4-jdk20-SNAPSHOT + 1.4-jdk21-SNAPSHOT run.mone docean-plugin-redis - 1.4-jdk20-SNAPSHOT + 1.4-jdk21-SNAPSHOT run.mone docean-plugin-mybatis - 1.4-SNAPSHOT + 1.4-jdk21-SNAPSHOT run.mone docean-plugin-datasource - 1.4-jdk20-SNAPSHOT + 1.4-jdk21-SNAPSHOT run.mone docean-plugin-log - 1.4-jdk20-SNAPSHOT + 1.4-jdk21-SNAPSHOT run.mone docean-plugin-mvc - 1.4-jdk20-SNAPSHOT + 1.4-jdk21-SNAPSHOT run.mone docean-plugin-dmesh - 1.4-jdk20-SNAPSHOT + 1.4-jdk21-SNAPSHOT run.mone docean-plugin-sidecar - 1.4-SNAPSHOT + 1.4-jdk21-SNAPSHOT run.mone docean-plugin-http-server - 1.4-jdk20-SNAPSHOT + 1.4-jdk21-SNAPSHOT diff --git a/jcommon/docean-plugin/pom.xml b/jcommon/docean-plugin/pom.xml index e66643554..9ecc0a8cb 100644 --- a/jcommon/docean-plugin/pom.xml +++ b/jcommon/docean-plugin/pom.xml @@ -8,7 +8,7 @@ 1.4-jdk20-SNAPSHOT docean-plugin - 1.4-jdk20-SNAPSHOT + 1.4-jdk21-SNAPSHOT pom docean-plugin-aop @@ -52,7 +52,7 @@ run.mone docean - 1.4-SNAPSHOT + 1.4-jdk21-SNAPSHOT diff --git a/jcommon/docean/src/main/java/com/xiaomi/youpin/docean/mvc/MvcRunnable.java b/jcommon/docean/src/main/java/com/xiaomi/youpin/docean/mvc/MvcRunnable.java index b34b2b5d0..20a94e674 100644 --- a/jcommon/docean/src/main/java/com/xiaomi/youpin/docean/mvc/MvcRunnable.java +++ b/jcommon/docean/src/main/java/com/xiaomi/youpin/docean/mvc/MvcRunnable.java @@ -59,6 +59,7 @@ public MvcRunnable(Mvc mvc, HttpServerConfig config, ChannelHandlerContext ctx, this.request.setUri(httpRequest.uri()); this.context.setHeaders(this.request.getHeaders()); this.context.setVirtualThread(mvc.getMvcConfig().isVirtualThread()); + this.context.setPath(path); this.request.setMethod(method); this.request.setPath(path); this.request.setBody(body); diff --git a/jcommon/es/pom.xml b/jcommon/es/pom.xml index 734d620d9..c3a69291f 100644 --- a/jcommon/es/pom.xml +++ b/jcommon/es/pom.xml @@ -8,17 +8,7 @@ 1.4-jdk20-SNAPSHOT es - 1.5-jdk20-SNAPSHOT - - - ossrh - https://s01.oss.sonatype.org/service/local/staging/deploy/maven2/ - - - ossrh - https://s01.oss.sonatype.org/content/repositories/snapshots - - + 1.5-jdk21-SNAPSHOT org.elasticsearch.client @@ -72,8 +62,8 @@ maven-compiler-plugin 3.11.0 - 20 - 20 + 21 + 21 true UTF-8 diff --git a/jcommon/grpc/pom.xml b/jcommon/grpc/pom.xml index e08a05607..282275f55 100644 --- a/jcommon/grpc/pom.xml +++ b/jcommon/grpc/pom.xml @@ -8,6 +8,7 @@ 1.4-jdk20-SNAPSHOT grpc + 1.4-jdk21-SNAPSHOT javax.annotation diff --git a/jcommon/pom.xml b/jcommon/pom.xml index e6bf86c2c..639f36378 100644 --- a/jcommon/pom.xml +++ b/jcommon/pom.xml @@ -89,12 +89,14 @@ - ossrh - https://s01.oss.sonatype.org/service/local/staging/deploy/maven2/ + central + maven-release-virtual + https://pkgs.d.xiaomi.net/artifactory/maven-release-virtual - ossrh - https://s01.oss.sonatype.org/content/repositories/snapshots + snapshots + snapshots + https://pkgs.d.xiaomi.net/artifactory/snapshots diff --git a/jcommon/rpc-codes/pom.xml b/jcommon/rpc-codes/pom.xml index f230abf0a..85189989b 100644 --- a/jcommon/rpc-codes/pom.xml +++ b/jcommon/rpc-codes/pom.xml @@ -8,6 +8,7 @@ 1.4-jdk20-SNAPSHOT rpc-codes + 1.4-jdk21-SNAPSHOT UTF-8 8 @@ -33,7 +34,7 @@ run.mone easy - 1.4-jdk20-SNAPSHOT + 1.4-jdk21-SNAPSHOT io.netty diff --git a/jcommon/rpc/pom.xml b/jcommon/rpc/pom.xml index 1762b485c..06cc19bbb 100644 --- a/jcommon/rpc/pom.xml +++ b/jcommon/rpc/pom.xml @@ -8,7 +8,7 @@ 1.4-jdk20-SNAPSHOT rpc - 1.7-jdk20-SNAPSHOT + 1.4-jdk21-SNAPSHOT javax.annotation @@ -19,12 +19,7 @@ ch.qos.logback logback-classic - 1.1.2 - - - ch.qos.logback - logback-core - 1.1.2 + 1.2.3 io.netty @@ -50,12 +45,12 @@ run.mone easy - 1.4-jdk20-SNAPSHOT + 1.4-jdk21-SNAPSHOT run.mone rpc-codes - 1.4-jdk20-SNAPSHOT + 1.4-jdk21-SNAPSHOT From 88ea4bb69b23f10a60b51369022ac32228d1bfa6 Mon Sep 17 00:00:00 2001 From: wtt <1136220284@qq.com> Date: Wed, 27 Dec 2023 11:38:50 +0800 Subject: [PATCH 2/2] refactor: update maven version --- jcommon/pom.xml | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/jcommon/pom.xml b/jcommon/pom.xml index 639f36378..e6bf86c2c 100644 --- a/jcommon/pom.xml +++ b/jcommon/pom.xml @@ -89,14 +89,12 @@ - central - maven-release-virtual - https://pkgs.d.xiaomi.net/artifactory/maven-release-virtual + ossrh + https://s01.oss.sonatype.org/service/local/staging/deploy/maven2/ - snapshots - snapshots - https://pkgs.d.xiaomi.net/artifactory/snapshots + ossrh + https://s01.oss.sonatype.org/content/repositories/snapshots