From 8b2cc240e1ea3132f585f17d38bf60db9814ca47 Mon Sep 17 00:00:00 2001
From: wang1 <844966816@qq.com>
Date: 星期五, 11 八月 2023 16:30:12 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
Source/UBCS/ubcs-service/ubcs-code/pom.xml | 22 +++++++++++++++++++---
1 files changed, 19 insertions(+), 3 deletions(-)
diff --git a/Source/UBCS/ubcs-service/ubcs-code/pom.xml b/Source/UBCS/ubcs-service/ubcs-code/pom.xml
index a6f8417..319b461 100644
--- a/Source/UBCS/ubcs-service/ubcs-code/pom.xml
+++ b/Source/UBCS/ubcs-service/ubcs-code/pom.xml
@@ -16,6 +16,11 @@
<modelVersion>4.0.0</modelVersion>
+ <properties>
+ <!-- 鎸夊悇妯″潡瀹為檯鐩綍灞傛瀹氫箟鐩稿鏁版嵁锛屼娇鎵�鏈夋湇鍔℃ā鍧楄緭鍑鸿祫婧愭眹鑱氬埌鐩稿悓鐩綍 -->
+ <boot-jar-output>../devops</boot-jar-output>
+ </properties>
+
<dependencies>
<dependency>
<groupId>com.vci.ubcs</groupId>
@@ -97,7 +102,6 @@
<artifactId>DmJdbcDriver18</artifactId>
<optional>true</optional>
</dependency>-->
-
<!--axis2 begin -->
<dependency>
<groupId>org.apache.axis2</groupId>
@@ -123,10 +127,10 @@
<groupId>javax.servlet</groupId>
<artifactId>servlet-api</artifactId>
</exclusion>
- <exclusion>
+ <!--<exclusion>
<artifactId>commons-io</artifactId>
<groupId>commons-io</groupId>
- </exclusion>
+ </exclusion>-->
<exclusion>
<artifactId>geronimo-activation_1.1_spec</artifactId>
<groupId>org.apache.geronimo.specs</groupId>
@@ -137,8 +141,20 @@
</exclusion>
</exclusions>
</dependency>
+ <dependency>
+ <groupId>com.vci.ubcs</groupId>
+ <artifactId>ubcs-flow-api</artifactId>
+ <version>3.0.1.RELEASE</version>
+ <scope>compile</scope>
+ </dependency>
<!--axis2 end -->
+ <dependency>
+ <groupId>com.vci.ubcs</groupId>
+ <artifactId>ubcs-file-api</artifactId>
+ <version>3.0.1.RELEASE</version>
+ </dependency>
+
</dependencies>
<build>
--
Gitblit v1.9.3