From cb387440e01f40d8b4f0a395ac14aa949af4227d Mon Sep 17 00:00:00 2001
From: fit2cloud-chenyw <yawen.chen@fit2cloud.com>
Date: Fri, 24 May 2024 21:19:58 +0800
Subject: [PATCH] =?UTF-8?q?chore:=20=E5=8D=87=E7=BA=A7jdk=E8=87=B321?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 de-xpack                        | 2 +-
 pom.xml                         | 6 +++---
 sdk/api/api-base/pom.xml        | 5 -----
 sdk/api/api-permissions/pom.xml | 5 -----
 sdk/api/api-sync/pom.xml        | 6 ------
 5 files changed, 4 insertions(+), 20 deletions(-)

diff --git a/de-xpack b/de-xpack
index 690faa2e32..7a8f793d47 160000
--- a/de-xpack
+++ b/de-xpack
@@ -1 +1 @@
-Subproject commit 690faa2e32bf71f23fdda04a83c3b7a1ed0d368c
+Subproject commit 7a8f793d47c5c2f63ef852f9f6595e9b876defce
diff --git a/pom.xml b/pom.xml
index 0cbcf650b7..a8b968a507 100644
--- a/pom.xml
+++ b/pom.xml
@@ -20,13 +20,13 @@
 
     <properties>
         <dataease.version>2.6.1</dataease.version>
-        <java.version>17</java.version>
+        <java.version>21</java.version>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <spring-cloud-alibaba.version>2023.0.1.0</spring-cloud-alibaba.version>
         <spring-cloud.version>2023.0.1</spring-cloud.version>
         <spring-boot.version>3.3.0</spring-boot.version>
-        <maven.compiler.source>17</maven.compiler.source>
-        <maven.compiler.target>17</maven.compiler.target>
+        <maven.compiler.source>21</maven.compiler.source>
+        <maven.compiler.target>21</maven.compiler.target>
         <mybatis-plus.version>3.5.6</mybatis-plus.version>
         <h2.version>2.2.220</h2.version>
         <knife4j.version>4.4.0</knife4j.version>
diff --git a/sdk/api/api-base/pom.xml b/sdk/api/api-base/pom.xml
index 7ebba2167d..5dbb3a0bba 100644
--- a/sdk/api/api-base/pom.xml
+++ b/sdk/api/api-base/pom.xml
@@ -11,9 +11,4 @@
 
     <artifactId>api-base</artifactId>
 
-    <properties>
-        <maven.compiler.source>17</maven.compiler.source>
-        <maven.compiler.target>17</maven.compiler.target>
-    </properties>
-
 </project>
\ No newline at end of file
diff --git a/sdk/api/api-permissions/pom.xml b/sdk/api/api-permissions/pom.xml
index 7efab60ca8..b99e29ab5a 100644
--- a/sdk/api/api-permissions/pom.xml
+++ b/sdk/api/api-permissions/pom.xml
@@ -11,9 +11,4 @@
 
     <artifactId>api-permissions</artifactId>
 
-    <properties>
-        <maven.compiler.source>17</maven.compiler.source>
-        <maven.compiler.target>17</maven.compiler.target>
-    </properties>
-
 </project>
\ No newline at end of file
diff --git a/sdk/api/api-sync/pom.xml b/sdk/api/api-sync/pom.xml
index 240a25c022..d334f83552 100644
--- a/sdk/api/api-sync/pom.xml
+++ b/sdk/api/api-sync/pom.xml
@@ -11,10 +11,4 @@
 
     <artifactId>api-sync</artifactId>
 
-    <properties>
-        <maven.compiler.source>17</maven.compiler.source>
-        <maven.compiler.target>17</maven.compiler.target>
-        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-    </properties>
-
 </project>