From 1f6ff03df42388413846fb4b2571d6b010ef3306 Mon Sep 17 00:00:00 2001
From: liriming <1343021927@qq.com>
Date: 星期一, 23 九月 2024 08:35:12 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
iailab-module-model/iailab-module-model-biz/pom.xml | 55 +++++++++++++++++++++++++++++++++++--------------------
1 files changed, 35 insertions(+), 20 deletions(-)
diff --git a/iailab-module-model/iailab-module-model-biz/pom.xml b/iailab-module-model/iailab-module-model-biz/pom.xml
index d04cd7a..6395271 100644
--- a/iailab-module-model/iailab-module-model-biz/pom.xml
+++ b/iailab-module-model/iailab-module-model-biz/pom.xml
@@ -58,11 +58,6 @@
<groupId>com.iailab</groupId>
<artifactId>iailab-common-monitor</artifactId>
</dependency>
- <!-- Job 定时任务相关 -->
- <dependency>
- <groupId>com.iailab</groupId>
- <artifactId>iailab-common-job</artifactId>
- </dependency>
<dependency>
<groupId>com.iailab</groupId>
<artifactId>iailab-common-biz-data-permission</artifactId>
@@ -188,23 +183,43 @@
<plugins>
<!-- 打包 -->
<plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-compiler-plugin</artifactId>
- <version>3.1</version>
+ <groupId>org.springframework.boot</groupId>
+ <artifactId>spring-boot-maven-plugin</artifactId>
+ <version>${spring.boot.version}</version>
+ <executions>
+ <execution>
+ <goals>
+ <goal>repackage</goal> <!-- 将引入的 jar 打入其中 -->
+ </goals>
+ </execution>
+ </executions>
</plugin>
- <!-- <plugin>-->
- <!-- <groupId>org.springframework.boot</groupId>-->
- <!-- <artifactId>spring-boot-maven-plugin</artifactId>-->
- <!-- <version>${spring.boot.version}</version>-->
- <!-- <executions>-->
- <!-- <execution>-->
- <!-- <goals>-->
- <!-- <goal>repackage</goal> <!– 将引入的 jar 打入其中 –>-->
- <!-- </goals>-->
- <!-- </execution>-->
- <!-- </executions>-->
- <!-- </plugin>-->
+ <plugin>
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>flatten-maven-plugin</artifactId>
+ <version>1.1.0</version>
+ <configuration>
+ <updatePomFile>true</updatePomFile>
+ <flattenMode>resolveCiFriendliesOnly</flattenMode>
+ </configuration>
+ <executions>
+ <execution>
+ <id>flatten</id>
+ <phase>process-resources</phase>
+ <goals>
+ <goal>flatten</goal>
+ </goals>
+ </execution>
+ <execution>
+ <id>flatten.clean</id>
+ <phase>clean</phase>
+ <goals>
+ <goal>clean</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
</plugins>
</build>
--
Gitblit v1.9.3