From d29cfbf3eed577d4cee3dfaa859ab3f1c83951fb Mon Sep 17 00:00:00 2001
From: huangfeng <huangfeng@xinyingpower.com>
Date: Fri, 21 Jun 2024 13:23:14 +0800
Subject: [PATCH] =?UTF-8?q?build:=20=E5=8D=87=E7=BA=A7=E4=BE=9D=E8=B5=96?=
 =?UTF-8?q?=E5=BA=93=E7=89=88=E6=9C=AC?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pom.xml                 | 9 +++++----
 xymanager_admin/pom.xml | 3 +--
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/pom.xml b/pom.xml
index 54a70dc..409905f 100644
--- a/pom.xml
+++ b/pom.xml
@@ -20,20 +20,21 @@
         <java.version>1.8</java.version>
         <xymanager.version>1.0.0</xymanager.version>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-        <spring-boot-dependencies.version>2.5.6</spring-boot-dependencies.version>
+        <spring-boot-dependencies.version>2.5.15</spring-boot-dependencies.version>
         <mysql.version>8.0.33</mysql.version>
         <swagger.version>3.0.0</swagger.version>
         <knife4j-spring-boot.version>3.0.2</knife4j-spring-boot.version>
         <swagger-annotations.version>1.5.21</swagger-annotations.version>
         <swagger-models.version>1.5.21</swagger-models.version>
         <fastjson.version>1.2.83</fastjson.version>
-        <druid.version>1.2.22</druid.version>
+        <druid.version>1.2.23</druid.version>
         <mybatis-spring-boot.version>2.2.2</mybatis-spring-boot.version>
         <pagehelper.boot.version>1.4.7</pagehelper.boot.version>
         <commons.fileupload.version>1.5</commons.fileupload.version>
         <jwt.version>0.9.0</jwt.version>
         <mybatisplus.version>3.2.0</mybatisplus.version>
-        <easyexcel.version>3.3.3</easyexcel.version>
+        <easyexcel.version>3.3.4</easyexcel.version>
+        <jackson.version>2.17.1</jackson.version>
     </properties>
 
     <dependencyManagement>
@@ -225,7 +226,7 @@
             <plugin>
                 <groupId>org.springframework.boot</groupId>
                 <artifactId>spring-boot-maven-plugin</artifactId>
-                <version>2.5.6</version>
+                <version>${spring-boot-dependencies.version}</version>
             </plugin>
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
diff --git a/xymanager_admin/pom.xml b/xymanager_admin/pom.xml
index 28fbfce..1115b74 100644
--- a/xymanager_admin/pom.xml
+++ b/xymanager_admin/pom.xml
@@ -16,7 +16,6 @@
     <packaging>war</packaging>
     <properties>
         <java.version>1.8</java.version>
-        <jackson.version>2.16.2</jackson.version>
     </properties>
     <dependencies>
 
@@ -38,7 +37,7 @@
                 </exclusion>
             </exclusions>
             <scope>test</scope>
-            <version>2.5.6</version>
+            <version>${spring-boot-dependencies.version}</version>
         </dependency>
 
         <dependency>