From 21a694dd555da29e6e52ae8f140aafede4783af6 Mon Sep 17 00:00:00 2001
From: fit2cloud-chenyw <yawen.chen@fit2cloud.com>
Date: Wed, 27 Dec 2023 15:53:42 +0800
Subject: [PATCH] =?UTF-8?q?feat:=20=E5=8D=87=E7=BA=A7=E7=89=88=E6=9C=AC?=
 =?UTF-8?q?=E5=8F=B7=E5=88=B02.2.0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 core/core-backend/pom.xml       | 13 +------------
 core/core-frontend/pom.xml      | 15 ++++-----------
 core/pom.xml                    |  2 +-
 de-xpack                        |  2 +-
 pom.xml                         |  4 ++--
 sdk/api/api-base/pom.xml        |  2 +-
 sdk/api/api-permissions/pom.xml |  2 +-
 sdk/api/pom.xml                 |  2 +-
 sdk/common/pom.xml              |  2 +-
 sdk/distributed/pom.xml         |  2 +-
 sdk/pom.xml                     |  2 +-
 11 files changed, 15 insertions(+), 33 deletions(-)

diff --git a/core/core-backend/pom.xml b/core/core-backend/pom.xml
index 78ff824860..0e20a0bb5f 100644
--- a/core/core-backend/pom.xml
+++ b/core/core-backend/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>core</artifactId>
         <groupId>io.dataease</groupId>
-        <version>2.1.0</version>
+        <version>2.2.0</version>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>
@@ -96,17 +96,6 @@
                     <groupId>com.h2database</groupId>
                     <artifactId>h2</artifactId>
                 </dependency>
-                <dependency>
-                    <groupId>io.dataease</groupId>
-                    <artifactId>xpack-permissions</artifactId>
-                    <version>${project.version}</version>
-                </dependency>
-                <dependency>
-                    <groupId>io.dataease</groupId>
-                    <artifactId>xpack-base</artifactId>
-                    <version>${project.version}</version>
-                </dependency>
-
             </dependencies>
 
             <build>
diff --git a/core/core-frontend/pom.xml b/core/core-frontend/pom.xml
index fefb99318b..39feb12c59 100644
--- a/core/core-frontend/pom.xml
+++ b/core/core-frontend/pom.xml
@@ -5,7 +5,7 @@
   <parent>
     <artifactId>core</artifactId>
     <groupId>io.dataease</groupId>
-    <version>2.1.0</version>
+    <version>2.2.0</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
 
@@ -21,24 +21,17 @@
 
   <build>
     <plugins>
-      <!--<plugin>
+      <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-clean-plugin</artifactId>
-        <version>3.2.0</version>
         <configuration>
           <filesets>
             <fileset>
-              <directory>node_modules</directory>
-            </fileset>
-            <fileset>
-              <directory>./</directory>
-              <includes>
-                <include>*-lock.json</include>
-              </includes>
+              <directory>dist</directory>
             </fileset>
           </filesets>
         </configuration>
-      </plugin>-->
+      </plugin>
       <plugin>
         <groupId>com.github.eirslett</groupId>
         <artifactId>frontend-maven-plugin</artifactId>
diff --git a/core/pom.xml b/core/pom.xml
index 2d279d3294..bebdccc5a4 100644
--- a/core/pom.xml
+++ b/core/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>dataease</artifactId>
         <groupId>io.dataease</groupId>
-        <version>2.1.0</version>
+        <version>2.2.0</version>
     </parent>
     
     <modelVersion>4.0.0</modelVersion>
diff --git a/de-xpack b/de-xpack
index 4a7e966fee..fa7ed70cb7 160000
--- a/de-xpack
+++ b/de-xpack
@@ -1 +1 @@
-Subproject commit 4a7e966feeef921daca1e26f1bb4462bd288c30f
+Subproject commit fa7ed70cb733aff4a15ddef602de4ac2f439b4e9
diff --git a/pom.xml b/pom.xml
index 73803a284f..dd50cdb032 100644
--- a/pom.xml
+++ b/pom.xml
@@ -5,7 +5,7 @@
     <modelVersion>4.0.0</modelVersion>
     <groupId>io.dataease</groupId>
     <artifactId>dataease</artifactId>
-    <version>2.1.0</version>
+    <version>2.2.0</version>
     <packaging>pom</packaging>
 
     <modules>
@@ -13,7 +13,7 @@
     </modules>
 
     <properties>
-        <dataease.version>2.1.0</dataease.version>
+        <dataease.version>2.2.0</dataease.version>
         <java.version>17</java.version>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <spring-cloud-alibaba.version>2022.0.0.0-RC1</spring-cloud-alibaba.version>
diff --git a/sdk/api/api-base/pom.xml b/sdk/api/api-base/pom.xml
index b8de53fce1..5aa9989230 100644
--- a/sdk/api/api-base/pom.xml
+++ b/sdk/api/api-base/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>api</artifactId>
         <groupId>io.dataease</groupId>
-        <version>2.1.0</version>
+        <version>2.2.0</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
diff --git a/sdk/api/api-permissions/pom.xml b/sdk/api/api-permissions/pom.xml
index babfca223f..5c98b7f05e 100644
--- a/sdk/api/api-permissions/pom.xml
+++ b/sdk/api/api-permissions/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>api</artifactId>
         <groupId>io.dataease</groupId>
-        <version>2.1.0</version>
+        <version>2.2.0</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
diff --git a/sdk/api/pom.xml b/sdk/api/pom.xml
index 47c9f4f3b9..cafa0c48dd 100644
--- a/sdk/api/pom.xml
+++ b/sdk/api/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>sdk</artifactId>
         <groupId>io.dataease</groupId>
-        <version>2.1.0</version>
+        <version>2.2.0</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
diff --git a/sdk/common/pom.xml b/sdk/common/pom.xml
index 752247c08c..b77d061fa4 100644
--- a/sdk/common/pom.xml
+++ b/sdk/common/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>sdk</artifactId>
         <groupId>io.dataease</groupId>
-        <version>2.1.0</version>
+        <version>2.2.0</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
diff --git a/sdk/distributed/pom.xml b/sdk/distributed/pom.xml
index 5c4bdb0b85..9216b4b9a4 100644
--- a/sdk/distributed/pom.xml
+++ b/sdk/distributed/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>sdk</artifactId>
         <groupId>io.dataease</groupId>
-        <version>2.1.0</version>
+        <version>2.2.0</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
diff --git a/sdk/pom.xml b/sdk/pom.xml
index 25ff3e080a..d8d4c0ee68 100644
--- a/sdk/pom.xml
+++ b/sdk/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>dataease</artifactId>
         <groupId>io.dataease</groupId>
-        <version>2.1.0</version>
+        <version>2.2.0</version>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>