From 2a4b9941ffa8b38557af281e95faf5cd8bb799e2 Mon Sep 17 00:00:00 2001
From: 田源 <lastanimals@163.com>
Date: 星期五, 13 十月 2023 16:44:30 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
Source/UBCS/ubcs-service/ubcs-code/pom.xml | 33 ++++++++++++++++++++++-----------
1 files changed, 22 insertions(+), 11 deletions(-)
diff --git a/Source/UBCS/ubcs-service/ubcs-code/pom.xml b/Source/UBCS/ubcs-service/ubcs-code/pom.xml
index aed5804..8099f3d 100644
--- a/Source/UBCS/ubcs-service/ubcs-code/pom.xml
+++ b/Source/UBCS/ubcs-service/ubcs-code/pom.xml
@@ -16,11 +16,6 @@
<modelVersion>4.0.0</modelVersion>
- <properties>
- <!-- 鎸夊悇妯″潡瀹為檯鐩綍灞傛瀹氫箟鐩稿鏁版嵁锛屼娇鎵�鏈夋湇鍔℃ā鍧楄緭鍑鸿祫婧愭眹鑱氬埌鐩稿悓鐩綍 -->
- <boot-jar-output>../devops</boot-jar-output>
- </properties>
-
<dependencies>
<dependency>
<groupId>com.vci.ubcs</groupId>
@@ -96,6 +91,12 @@
<version>3.0.1.RELEASE</version>
<scope>compile</scope>
</dependency>
+ <!--杈炬ⅵ鏁版嵁搴撻┍鍔�-->
+ <!--<dependency>
+ <groupId>com.dameng</groupId>
+ <artifactId>DmJdbcDriver18</artifactId>
+ <optional>true</optional>
+ </dependency>-->
<!--axis2 begin -->
<dependency>
<groupId>org.apache.axis2</groupId>
@@ -142,6 +143,7 @@
<scope>compile</scope>
</dependency>
<!--axis2 end -->
+
<dependency>
<groupId>com.vci.ubcs</groupId>
<artifactId>ubcs-file-api</artifactId>
@@ -153,20 +155,29 @@
<version>3.0.1.RELEASE</version>
<scope>compile</scope>
</dependency>
+
</dependencies>
<build>
<plugins>
<plugin>
- <groupId>org.springframework.boot</groupId>
- <artifactId>spring-boot-maven-plugin</artifactId>
+ <groupId>com.spotify</groupId>
+ <artifactId>dockerfile-maven-plugin</artifactId>
+ <configuration>
+ <username>${docker.username}</username>
+ <password>${docker.password}</password>
+ <repository>${docker.registry.url}/${docker.namespace}/${project.artifactId}</repository>
+ <tag>${project.version}</tag>
+ <useMavenSettingsForAuth>true</useMavenSettingsForAuth>
+ <buildArgs>
+ <JAR_FILE>target/${project.build.finalName}.jar</JAR_FILE>
+ </buildArgs>
+ <skip>false</skip>
+ </configuration>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-dependency-plugin</artifactId>
- </plugin>
- <plugin>
- <artifactId>maven-surefire-plugin</artifactId>
+ <artifactId>maven-antrun-plugin</artifactId>
</plugin>
</plugins>
</build>
--
Gitblit v1.9.3