From c14fedd8903487457ad0911e8afab47670be754e Mon Sep 17 00:00:00 2001
From: ludc
Date: 星期二, 29 八月 2023 22:15:20 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
Source/UBCS/ubcs-auth/pom.xml | 43 ++++++++++++++++++++++++-------------------
1 files changed, 24 insertions(+), 19 deletions(-)
diff --git a/Source/UBCS/ubcs-auth/pom.xml b/Source/UBCS/ubcs-auth/pom.xml
index a92b9d5..1950919 100644
--- a/Source/UBCS/ubcs-auth/pom.xml
+++ b/Source/UBCS/ubcs-auth/pom.xml
@@ -7,7 +7,7 @@
<parent>
<artifactId>UBCS</artifactId>
- <groupId>org.springblade</groupId>
+ <groupId>com.vci.ubcs</groupId>
<version>3.0.1.RELEASE</version>
</parent>
@@ -19,11 +19,12 @@
<dependencies>
<!--Blade-->
<dependency>
- <groupId>org.springblade</groupId>
+ <groupId>com.vci.ubcs</groupId>
<artifactId>ubcs-common</artifactId>
+ <version>3.0.1.RELEASE</version>
<exclusions>
<exclusion>
- <groupId>org.springblade</groupId>
+ <groupId>com.vci.ubcs</groupId>
<artifactId>ubcs-scope-api</artifactId>
</exclusion>
</exclusions>
@@ -53,14 +54,14 @@
<artifactId>blade-starter-social</artifactId>
</dependency>
<dependency>
- <groupId>org.springblade</groupId>
+ <groupId>com.vci.ubcs</groupId>
<artifactId>ubcs-user-api</artifactId>
- <version>${bladex.project.version}</version>
+ <version>3.0.1.RELEASE</version>
</dependency>
<dependency>
- <groupId>org.springblade</groupId>
+ <groupId>com.vci.ubcs</groupId>
<artifactId>ubcs-system-api</artifactId>
- <version>${bladex.project.version}</version>
+ <version>3.0.1.RELEASE</version>
</dependency>
<!--瀹夊叏妯″潡-->
<dependency>
@@ -99,6 +100,12 @@
<artifactId>orai18n</artifactId>
<version>${orai18n.version}</version>
</dependency>
+ <!--杈炬ⅵ鏁版嵁搴撻┍鍔�-->
+ <dependency>
+ <groupId>com.dameng</groupId>
+ <artifactId>DmJdbcDriver18</artifactId>
+ <optional>true</optional>
+ </dependency>
<!-- 閾捐矾杩借釜銆佹湇鍔＄洃鎺� -->
<!--<dependency>
<groupId>org.springblade</groupId>
@@ -130,23 +137,21 @@
<build>
<plugins>
<plugin>
- <groupId>com.spotify</groupId>
- <artifactId>dockerfile-maven-plugin</artifactId>
+ <groupId>org.springframework.boot</groupId>
+ <artifactId>spring-boot-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>
+ <outputDirectory>../target</outputDirectory>
</configuration>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-antrun-plugin</artifactId>
+ <artifactId>maven-dependency-plugin</artifactId>
+ <configuration>
+ <outputDirectory>./target/libs</outputDirectory>
+ </configuration>
+ </plugin>
+ <plugin>
+ <artifactId>maven-surefire-plugin</artifactId>
</plugin>
</plugins>
</build>
--
Gitblit v1.9.3