From 178b680deee3da2370181a476ff361a42d924f32 Mon Sep 17 00:00:00 2001
From: huangfeng <huangfeng@xinyingpower.com>
Date: Mon, 30 Sep 2024 09:22:28 +0800
Subject: [PATCH] =?UTF-8?q?build:=20=E4=BF=AE=E6=AD=A3=E5=8C=85=E5=90=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 xymanager_admin/pom.xml | 11 ++---------
 1 file changed, 2 insertions(+), 9 deletions(-)

diff --git a/xymanager_admin/pom.xml b/xymanager_admin/pom.xml
index 035cc79..3685f67 100644
--- a/xymanager_admin/pom.xml
+++ b/xymanager_admin/pom.xml
@@ -14,7 +14,6 @@
     <description>Demo project for Spring Boot</description>
 
     <packaging>war</packaging>
-<!--    <packaging>jar</packaging>-->
     <properties>
         <java.version>1.8</java.version>
     </properties>
@@ -38,7 +37,7 @@
                 </exclusion>
             </exclusions>
             <scope>test</scope>
-            <version>2.5.6</version>
+            <version>${spring-boot-dependencies.version}</version>
         </dependency>
 
         <dependency>
@@ -89,15 +88,9 @@
         <resources>
             <resource>
                 <directory>src/main/resources</directory>
-<!--                打包时排除src/main/resources下的所有以.properties .yml .xml为后缀的配置文件-->
-<!--                <excludes>-->
-<!--                    <exclude>**/*.properties</exclude>-->
-<!--                    <exclude>**/*.yml</exclude>-->
-<!--                    <exclude>**/*.xml</exclude>-->
-<!--                </excludes>-->
             </resource>
         </resources>
-        <finalName>xymanager-admin</finalName>
+        <finalName>xymanager</finalName>
 
     </build>
 </project>