From 886fac0f283d4c273152e8cdc7b735e522408f42 Mon Sep 17 00:00:00 2001
From: mabofu <dev16302@linx-info.com>
Date: Wed, 4 Jan 2023 13:27:32 +0800
Subject: [PATCH] Update pom.xml resource plugin config

---
 dsms-engine-application/pom.xml | 26 ++++++++++++++++++++++++
 dsms-engine-common/pom.xml      | 18 +++++++++--------
 pom.xml                         | 36 ++-------------------------------
 3 files changed, 38 insertions(+), 42 deletions(-)

diff --git a/dsms-engine-application/pom.xml b/dsms-engine-application/pom.xml
index c48627d9..7d3aa567 100644
--- a/dsms-engine-application/pom.xml
+++ b/dsms-engine-application/pom.xml
@@ -46,6 +46,32 @@
 
     <build>
         <plugins>
+            <!--This plugin's configuration is used to copy basedir version file to application module resources.-->
+            <plugin>
+                <artifactId>maven-resources-plugin</artifactId>
+                <version>3.3.0</version>
+                <executions>
+                    <execution>
+                        <id>copy-resources</id>
+                        <phase>validate</phase>
+                        <goals>
+                            <goal>copy-resources</goal>
+                        </goals>
+                        <configuration>
+                            <outputDirectory>${basedir}/target/classes</outputDirectory>
+                            <resources>
+                                <resource>
+                                    <directory>../</directory>
+                                    <includes>
+                                        <include>version</include>
+                                    </includes>
+                                    <filtering>true</filtering>
+                                </resource>
+                            </resources>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
             <!-- This plugin is used to get git commit info. -->
             <plugin>
                 <groupId>pl.project13.maven</groupId>
diff --git a/dsms-engine-common/pom.xml b/dsms-engine-common/pom.xml
index 6c059c61..88d815b1 100644
--- a/dsms-engine-common/pom.xml
+++ b/dsms-engine-common/pom.xml
@@ -29,7 +29,7 @@
 
 
     <dependencies>
-        <!-- web启动器 -->
+        <!-- web dependency -->
         <dependency>
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-starter-web</artifactId>
@@ -44,7 +44,7 @@
             <artifactId>lombok</artifactId>
         </dependency>
 
-        <!--数据层相关依赖-->
+        <!-- dao layer dependency start-->
         <dependency>
             <groupId>com.baomidou</groupId>
             <artifactId>mybatis-plus-boot-starter</artifactId>
@@ -65,6 +65,14 @@
             <scope>runtime</scope>
         </dependency>
 
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-data-redis</artifactId>
+        </dependency>
+
+        <!-- dao layer dependency end-->
+
+
         <dependency>
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-starter-quartz</artifactId>
@@ -97,12 +105,6 @@
             <scope>runtime</scope>
         </dependency>
 
-        <!--redis依赖-->
-        <dependency>
-            <groupId>org.springframework.boot</groupId>
-            <artifactId>spring-boot-starter-data-redis</artifactId>
-        </dependency>
-
         <dependency>
             <groupId>com.alibaba.fastjson2</groupId>
             <artifactId>fastjson2</artifactId>
diff --git a/pom.xml b/pom.xml
index 9ae1f1e1..f4d3c260 100644
--- a/pom.xml
+++ b/pom.xml
@@ -42,7 +42,7 @@
         <maven.compiler.source>${java.version}</maven.compiler.source>
         <maven.compiler.target>${java.version}</maven.compiler.target>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-        <!--技术栈版本-->
+        <!-- dependency version -->
         <spring.boot.version>2.7.5</spring.boot.version>
         <druid.version>1.2.15</druid.version>
         <lombok.version>1.18.24</lombok.version>
@@ -55,7 +55,7 @@
 
     </properties>
 
-    <!-- 统一依赖管理 -->
+    <!-- help manage dependency information across all of its children -->
     <dependencyManagement>
         <dependencies>
             <dependency>
@@ -132,36 +132,4 @@
         </dependency>
     </dependencies>
 
-
-    <build>
-        <plugins>
-            <!--This plugin's configuration is used to copy basedir version file to application module resources.-->
-            <plugin>
-                <artifactId>maven-resources-plugin</artifactId>
-                <version>3.3.0</version>
-                <executions>
-                    <execution>
-                        <id>copy-resources</id>
-                        <phase>validate</phase>
-                        <goals>
-                            <goal>copy-resources</goal>
-                        </goals>
-                        <configuration>
-                            <outputDirectory>dsms-engine-application/target/classes</outputDirectory>
-                            <resources>
-                                <resource>
-                                    <directory>${basedir}</directory>
-                                    <includes>
-                                        <include>version</include>
-                                    </includes>
-                                    <filtering>true</filtering>
-                                </resource>
-                            </resources>
-                        </configuration>
-                    </execution>
-                </executions>
-            </plugin>
-        </plugins>
-    </build>
-
 </project>
\ No newline at end of file
-- 
Gitee