From d79aa1842273db3b18744122d534329b37e25b4a Mon Sep 17 00:00:00 2001
From: fit2cloud-chenyw <yawen.chen@fit2cloud.com>
Date: Thu, 25 Apr 2024 17:14:14 +0800
Subject: [PATCH] =?UTF-8?q?perf(X-Pack):=20guava=E4=BE=9D=E8=B5=96?=
 =?UTF-8?q?=E5=86=B2=E7=AA=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 core/core-backend/pom.xml | 49 ++++++++++++++++++++++++---------------
 de-xpack                  |  2 +-
 pom.xml                   |  8 ++++++-
 3 files changed, 38 insertions(+), 21 deletions(-)

diff --git a/core/core-backend/pom.xml b/core/core-backend/pom.xml
index 0371189a4b..57843d7e3d 100644
--- a/core/core-backend/pom.xml
+++ b/core/core-backend/pom.xml
@@ -13,6 +13,27 @@
     <artifactId>core-backend</artifactId>
 
     <dependencies>
+        <dependency>
+            <groupId>com.google.guava</groupId>
+            <artifactId>guava</artifactId>
+            <version>${guava.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>org.seleniumhq.selenium</groupId>
+            <artifactId>selenium-java</artifactId>
+            <version>${selenium-java.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>org.eclipse.angus</groupId>
+            <artifactId>angus-mail</artifactId>
+            <version>${angus-mail.version}</version>
+            <exclusions>
+                <exclusion>
+                    <groupId>org.eclipse.angus</groupId>
+                    <artifactId>angus-activation</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
         <dependency>
             <groupId>io.dataease</groupId>
             <artifactId>api-base</artifactId>
@@ -37,6 +58,12 @@
             <groupId>org.apache.calcite</groupId>
             <artifactId>calcite-core</artifactId>
             <version>${calcite-core.version}</version>
+            <exclusions>
+                <exclusion>
+                    <groupId>com.google.guava</groupId>
+                    <artifactId>guava</artifactId>
+                </exclusion>
+            </exclusions>
             <classifier>de</classifier>
         </dependency>
         <dependency>
@@ -97,22 +124,6 @@
             </properties>
 
             <dependencies>
-                <dependency>
-                    <groupId>org.seleniumhq.selenium</groupId>
-                    <artifactId>selenium-java</artifactId>
-                    <version>${selenium-java.version}</version>
-                </dependency>
-                <dependency>
-                    <groupId>org.eclipse.angus</groupId>
-                    <artifactId>angus-mail</artifactId>
-                    <version>${angus-mail.version}</version>
-                    <exclusions>
-                        <exclusion>
-                            <groupId>org.eclipse.angus</groupId>
-                            <artifactId>angus-activation</artifactId>
-                        </exclusion>
-                    </exclusions>
-                </dependency>
                 <dependency>
                     <groupId>com.h2database</groupId>
                     <artifactId>h2</artifactId>
@@ -135,7 +146,7 @@
                             </filesets>
                         </configuration>
                     </plugin>
-                    <plugin>
+                    <!--<plugin>
                         <groupId>org.apache.maven.plugins</groupId>
                         <artifactId>maven-antrun-plugin</artifactId>
                         <executions>
@@ -156,7 +167,7 @@
                                 </goals>
                             </execution>
                         </executions>
-                    </plugin>
+                    </plugin>-->
                 </plugins>
             </build>
         </profile>
@@ -287,7 +298,7 @@
                 <groupId>org.springframework.boot</groupId>
                 <artifactId>spring-boot-maven-plugin</artifactId>
                 <configuration>
-                    <finalName>CoreApplication</finalName>
+                    <!--<finalName>CoreApplication</finalName>-->
                     <layout>ZIP</layout>
                 </configuration>
                 <executions>
diff --git a/de-xpack b/de-xpack
index 188b57250c..b47df7a291 160000
--- a/de-xpack
+++ b/de-xpack
@@ -1 +1 @@
-Subproject commit 188b57250c4220e1972ee15da0bf416d6ce3e1fc
+Subproject commit b47df7a291dd595400397c3e089037cc41658ad7
diff --git a/pom.xml b/pom.xml
index c40ca23b0d..fe9ab09581 100644
--- a/pom.xml
+++ b/pom.xml
@@ -42,9 +42,10 @@
         <flatten-maven.version>1.3.0</flatten-maven.version>
         <maven.resources.version>3.3.1</maven.resources.version>
         <maven.exec.version>3.1.0</maven.exec.version>
-        <guava.version>31.1-jre</guava.version>
+        <guava.version>33.0.0-jre</guava.version>
         <selenium-java.version>4.19.1</selenium-java.version>
         <angus-mail.version>2.0.3</angus-mail.version>
+        <mysql-connector-j.version>8.2.0</mysql-connector-j.version>
     </properties>
 
     <dependencyManagement>
@@ -109,6 +110,11 @@
                 <artifactId>easyexcel</artifactId>
                 <version>${easyexcel.version}</version>
             </dependency>
+            <dependency>
+                <groupId>com.mysql</groupId>
+                <artifactId>mysql-connector-j</artifactId>
+                <version>${mysql-connector-j.version}</version>
+            </dependency>
 
         </dependencies>