From 3a8e1524dcf0eeb610d38123d5f0a3ef838379cd Mon Sep 17 00:00:00 2001
From: linzhijie <19970921lzj>
Date: 星期一, 12 四月 2021 15:44:53 +0800
Subject: [PATCH] Merge branch '20210406-maqv2' into 20210412-youhua
---
pom.xml | 25 +++++++++++++++++++++++--
1 files changed, 23 insertions(+), 2 deletions(-)
diff --git a/pom.xml b/pom.xml
index 6896115..a34ca37 100644
--- a/pom.xml
+++ b/pom.xml
@@ -360,14 +360,15 @@
<version>13.0</version>
<scope>compile</scope>
</dependency>
-
<dependency>
<groupId>com.ots</groupId>
<artifactId>tai-ots-framework</artifactId>
<version>1.0</version>
+ <scope>system</scope>
+ <systemPath>${project.basedir}/jar/tai-ots-framework.jar</systemPath>
</dependency>
- </dependencies>
+ </dependencies>
<!-- <build>-->
<!-- <finalName>${project.artifactId}</finalName>-->
@@ -401,8 +402,28 @@
<mainClass>com.ots.OtsApplication</mainClass>
<jvmArguments>-Dfile.encoding=UTF-8</jvmArguments>
<fork>true</fork> <!-- 濡傛灉娌℃湁璇ラ厤缃紝devtools涓嶄細鐢熸晥 -->
+ <includeSystemScope>true</includeSystemScope>
</configuration>
</plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-assembly-plugin</artifactId>
+ <configuration>
+ <finalName>${project.artifactId}</finalName>
+ <descriptors>
+ <descriptor>src/main/assembly/assembly.xml</descriptor>
+ </descriptors>
+ </configuration>
+ <executions>
+ <execution>
+ <id>make-assembly</id>
+ <phase>package</phase>
+ <goals>
+ <goal>single</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
</plugins>
</build>
--
Gitblit v1.9.1