From c9529bd19a8d61666b71824dd751682c1e9dc288 Mon Sep 17 00:00:00 2001
From: songhuangfeng123 <shf18767906695@163.com>
Date: 星期一, 15 八月 2022 10:39:31 +0800
Subject: [PATCH] Merge branches 'genchuang' and 'master' of https://sinanoaq.cn:8888/r/safePlatform-out into master
---
pom.xml | 28 +++++++++++++++++++++++-----
1 files changed, 23 insertions(+), 5 deletions(-)
diff --git a/pom.xml b/pom.xml
index 26eefb3..44d62fc 100644
--- a/pom.xml
+++ b/pom.xml
@@ -14,6 +14,10 @@
<module>goal-manage/goal-manage-rpc-provider</module>
<module>emergency/emergency-service</module>
<module>emergency/emergency-rpc-provider</module>
+ <module>equipment/equipment-service</module>
+ <module>equipment/equipment-rpc-provider</module>
+ <module>incident-manage/incident-manage-service</module>
+ <module>incident-manage/incident-manage-rpc-provider</module>
<module>safePlatfrom-out-web</module>
</modules>
@@ -128,6 +132,13 @@
<version>${com.alibaba.cloud.version}</version>
</dependency>
+
+ <dependency>
+ <groupId>commons-beanutils</groupId>
+ <artifactId>commons-beanutils</artifactId>
+ <version>${commons.utils.version}</version>
+ </dependency>
+
</dependencies>
</dependencyManagement>
@@ -184,11 +195,6 @@
<version>${poi.version}</version>
</dependency>
- <dependency>
- <groupId>commons-beanutils</groupId>
- <artifactId>commons-beanutils</artifactId>
- <version>${commons.utils.version}</version>
- </dependency>
<!-- redis连接 -->
<dependency>
@@ -251,6 +257,11 @@
<build>
<plugins>
+ <!-- 修改打包插件
+ 修改打包方式jar为pom后
+ 默认打包方式为spring-boot-maven-plugin
+ 等到后期打包的时候他会一直提示你，你引入的依赖不存在
+ -->
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
@@ -260,6 +271,13 @@
<target>1.8</target>
</configuration>
</plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-surefire-plugin</artifactId>
+ <configuration>
+ <skipTests>true</skipTests> <!--默认关掉单元测试 -->
+ </configuration>
+ </plugin>
</plugins>
</build>
--
Gitblit v1.9.2