From a3ccefb27e990a95531b80135ebad24a45568262 Mon Sep 17 00:00:00 2001
From: wtt <1136220284@qq.com>
Date: Mon, 25 Dec 2023 11:20:22 +0800
Subject: [PATCH] refactor: update jdk21

---
 jcommon/aop/pom.xml                           |  2 +-
 jcommon/codecheck/pom.xml                     |  8 ++++----
 jcommon/codegen/pom.xml                       |  4 ++--
 .../docean-plugin-datasource/pom.xml          |  1 +
 .../docean-plugin/docean-plugin-db/pom.xml    |  1 +
 jcommon/docean-spring-starter/pom.xml         | 10 +++++-----
 jcommon/health/pom.xml                        |  3 ++-
 jcommon/hera/hera-trace/pom.xml               |  1 +
 jcommon/infra-result/pom.xml                  |  3 ++-
 jcommon/mistarter/pom.xml                     |  6 +++---
 jcommon/rcurve/pom.xml                        | 20 +++++++------------
 11 files changed, 29 insertions(+), 30 deletions(-)

diff --git a/jcommon/aop/pom.xml b/jcommon/aop/pom.xml
index de050eb32..bfa30b9a7 100644
--- a/jcommon/aop/pom.xml
+++ b/jcommon/aop/pom.xml
@@ -8,7 +8,7 @@
     <version>1.4-jdk20-SNAPSHOT</version>
   </parent>
   <artifactId>aop</artifactId>
-  <version>1.4-jdk20-SNAPSHOT</version>
+  <version>1.4-jdk21-SNAPSHOT</version>
   <dependencies>
     <dependency>
       <groupId>javax.annotation</groupId>
diff --git a/jcommon/codecheck/pom.xml b/jcommon/codecheck/pom.xml
index 61aa086ac..44fe1a40e 100644
--- a/jcommon/codecheck/pom.xml
+++ b/jcommon/codecheck/pom.xml
@@ -8,7 +8,7 @@
     <version>1.4-jdk20-SNAPSHOT</version>
   </parent>
   <artifactId>codecheck</artifactId>
-  <version>1.4-jdk20-SNAPSHOT</version>
+  <version>1.4-jdk21-SNAPSHOT</version>
   <dependencies>
     <dependency>
       <groupId>dom4j</groupId>
@@ -18,7 +18,7 @@
     <dependency>
       <groupId>run.mone</groupId>
       <artifactId>infra-result</artifactId>
-      <version>1.4-jdk20-SNAPSHOT</version>
+      <version>1.4-jdk21-SNAPSHOT</version>
     </dependency>
     <dependency>
       <groupId>org.apache.commons</groupId>
@@ -33,8 +33,8 @@
         <artifactId>maven-compiler-plugin</artifactId>
         <version>3.11.0</version>
         <configuration>
-          <source>20</source>
-          <target>20</target>
+          <source>21</source>
+          <target>21</target>
           <encoding>UTF-8</encoding>
           <compilerArgs>
             <arg>--add-exports=jdk.compiler/com.sun.tools.javac.file=ALL-UNNAMED</arg>
diff --git a/jcommon/codegen/pom.xml b/jcommon/codegen/pom.xml
index f62fe5559..0498007e6 100644
--- a/jcommon/codegen/pom.xml
+++ b/jcommon/codegen/pom.xml
@@ -8,7 +8,7 @@
     <version>1.4-jdk20-SNAPSHOT</version>
   </parent>
   <artifactId>codegen</artifactId>
-  <version>1.4-jdk20-SNAPSHOT</version>
+  <version>1.4-jdk21-SNAPSHOT</version>
   <dependencies>
     <dependency>
       <groupId>commons-io</groupId>
@@ -36,7 +36,7 @@
     <dependency>
       <groupId>run.mone</groupId>
       <artifactId>infra-result</artifactId>
-      <version>1.4-jdk20-SNAPSHOT</version>
+      <version>1.4-jdk21-SNAPSHOT</version>
       <exclusions>
         <exclusion>
           <artifactId>thrift</artifactId>
diff --git a/jcommon/docean-plugin/docean-plugin-datasource/pom.xml b/jcommon/docean-plugin/docean-plugin-datasource/pom.xml
index 1cf7c14a2..64978c4b8 100644
--- a/jcommon/docean-plugin/docean-plugin-datasource/pom.xml
+++ b/jcommon/docean-plugin/docean-plugin-datasource/pom.xml
@@ -8,6 +8,7 @@
     <version>1.4-jdk20-SNAPSHOT</version>
   </parent>
   <artifactId>docean-plugin-datasource</artifactId>
+  <version>1.4-jdk21-SNAPSHOT</version>
   <dependencies>
     <dependency>
       <groupId>run.mone</groupId>
diff --git a/jcommon/docean-plugin/docean-plugin-db/pom.xml b/jcommon/docean-plugin/docean-plugin-db/pom.xml
index 7d20afb33..c55f09a6f 100644
--- a/jcommon/docean-plugin/docean-plugin-db/pom.xml
+++ b/jcommon/docean-plugin/docean-plugin-db/pom.xml
@@ -8,6 +8,7 @@
     <version>1.4-jdk20-SNAPSHOT</version>
   </parent>
   <artifactId>docean-plugin-db</artifactId>
+  <version>1.4-jdk21-SNAPSHOT</version>
   <dependencies>
     <dependency>
       <groupId>run.mone</groupId>
diff --git a/jcommon/docean-spring-starter/pom.xml b/jcommon/docean-spring-starter/pom.xml
index dcc4f1173..f16f479bc 100644
--- a/jcommon/docean-spring-starter/pom.xml
+++ b/jcommon/docean-spring-starter/pom.xml
@@ -8,6 +8,7 @@
         <artifactId>jcommon</artifactId>
         <version>1.4-jdk20-SNAPSHOT</version>
     </parent>
+    <version>1.4-jdk21-SNAPSHOT</version>
 
     <artifactId>docean-spring-starter</artifactId>
 
@@ -31,7 +32,7 @@
         <dependency>
             <groupId>run.mone</groupId>
             <artifactId>docean</artifactId>
-            <version>1.4-java20-SNAPSHOT</version>
+            <version>1.4-jdk21-SNAPSHOT</version>
             <scope>provided</scope>
         </dependency>
 
@@ -47,12 +48,11 @@
                 <version>3.11.0</version>
                 <configuration>
                     <compilerArgs>
-                        <arg>--add-modules=jdk.incubator.concurrent</arg>
                         <arg>--enable-preview</arg>
                     </compilerArgs>
-                    <compilerVersion>20</compilerVersion>
-                    <source>20</source>
-                    <target>20</target>
+                    <compilerVersion>21</compilerVersion>
+                    <source>21</source>
+                    <target>21</target>
                 </configuration>
             </plugin>
 
diff --git a/jcommon/health/pom.xml b/jcommon/health/pom.xml
index 56aa6531d..f65eea2dc 100644
--- a/jcommon/health/pom.xml
+++ b/jcommon/health/pom.xml
@@ -8,6 +8,7 @@
     <version>1.4-jdk20-SNAPSHOT</version>
   </parent>
   <artifactId>health</artifactId>
+  <version>1.4-jdk21-SNAPSHOT</version>
   <dependencies>
     <dependency>
       <groupId>run.mone</groupId>
@@ -34,7 +35,7 @@
     <dependency>
       <groupId>run.mone</groupId>
       <artifactId>aop</artifactId>
-      <version>1.4-jdk20-SNAPSHOT</version>
+      <version>1.4-jdk21-SNAPSHOT</version>
     </dependency>
   </dependencies>
 </project>
diff --git a/jcommon/hera/hera-trace/pom.xml b/jcommon/hera/hera-trace/pom.xml
index 0cf983252..b5fb4e6eb 100644
--- a/jcommon/hera/hera-trace/pom.xml
+++ b/jcommon/hera/hera-trace/pom.xml
@@ -8,4 +8,5 @@
     <version>1.4-jdk20-SNAPSHOT</version>
   </parent>
   <artifactId>hera-trace</artifactId>
+  <version>1.4-jdk21-SNAPSHOT</version>
 </project>
diff --git a/jcommon/infra-result/pom.xml b/jcommon/infra-result/pom.xml
index 98b418cc5..4c1086b1d 100644
--- a/jcommon/infra-result/pom.xml
+++ b/jcommon/infra-result/pom.xml
@@ -8,11 +8,12 @@
     <version>1.4-jdk20-SNAPSHOT</version>
   </parent>
   <artifactId>infra-result</artifactId>
+  <version>1.4-jdk21-SNAPSHOT</version>
   <dependencies>
     <dependency>
       <groupId>org.projectlombok</groupId>
       <artifactId>lombok</artifactId>
-      <version>1.18.28</version>
+      <version>1.18.30</version>
       <scope>provided</scope>
     </dependency>
     <dependency>
diff --git a/jcommon/mistarter/pom.xml b/jcommon/mistarter/pom.xml
index f0388b14a..e77db26a0 100644
--- a/jcommon/mistarter/pom.xml
+++ b/jcommon/mistarter/pom.xml
@@ -8,12 +8,12 @@
     <version>1.4-jdk20-SNAPSHOT</version>
   </parent>
   <artifactId>mistarter</artifactId>
-  <version>1.6-jdk20-SNAPSHOT</version>
+  <version>1.6-jdk21-SNAPSHOT</version>
   <dependencies>
     <dependency>
       <groupId>run.mone</groupId>
       <artifactId>aop</artifactId>
-      <version>1.4-jdk20-SNAPSHOT</version>
+      <version>1.4-jdk21-SNAPSHOT</version>
     </dependency>
     <dependency>
       <groupId>org.springframework.boot</groupId>
@@ -24,7 +24,7 @@
     <dependency>
       <groupId>run.mone</groupId>
       <artifactId>health</artifactId>
-      <version>1.4-jdk20-SNAPSHOT</version>
+      <version>1.4-jdk21-SNAPSHOT</version>
     </dependency>
     <dependency>
       <groupId>run.mone</groupId>
diff --git a/jcommon/rcurve/pom.xml b/jcommon/rcurve/pom.xml
index 4314e3595..9709316f9 100644
--- a/jcommon/rcurve/pom.xml
+++ b/jcommon/rcurve/pom.xml
@@ -8,12 +8,12 @@
     <version>1.4-jdk20-SNAPSHOT</version>
   </parent>
   <artifactId>rcurve</artifactId>
-  <version>1.4.2-jdk20-jdk20-SNAPSHOT</version>
+  <version>1.4-jdk21-SNAPSHOT</version>
   <dependencies>
     <dependency>
       <groupId>run.mone</groupId>
       <artifactId>hera-trace</artifactId>
-      <version>1.4-jdk20-SNAPSHOT</version>
+      <version>1.4-jdk21-SNAPSHOT</version>
     </dependency>
     <dependency>
       <groupId>io.protostuff</groupId>
@@ -39,7 +39,7 @@
     <dependency>
       <groupId>run.mone</groupId>
       <artifactId>easy</artifactId>
-      <version>1.4-jdk20-SNAPSHOT</version>
+      <version>1.4-jdk21-SNAPSHOT</version>
     </dependency>
     <dependency>
       <groupId>io.netty</groupId>
@@ -49,13 +49,7 @@
     <dependency>
       <groupId>ch.qos.logback</groupId>
       <artifactId>logback-classic</artifactId>
-      <version>1.1.2</version>
-      <scope>provided</scope>
-    </dependency>
-    <dependency>
-      <groupId>ch.qos.logback</groupId>
-      <artifactId>logback-core</artifactId>
-      <version>1.1.2</version>
+      <version>1.2.3</version>
       <scope>provided</scope>
     </dependency>
   </dependencies>
@@ -69,9 +63,9 @@
           <compilerArgs>
             <arg>--enable-preview</arg>
           </compilerArgs>
-          <compilerVersion>20</compilerVersion>
-          <source>20</source>
-          <target>20</target>
+          <compilerVersion>21</compilerVersion>
+          <source>21</source>
+          <target>21</target>
         </configuration>
       </plugin>
     </plugins>