From e1feed4fb9f3a7722eb0cd646e73e6573bdfb6e1 Mon Sep 17 00:00:00 2001
From: 田源 <lastanimals@163.com>
Date: 星期二, 16 四月 2024 20:56:05 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 Source/UBCS/ubcs-service/ubcs-desk/pom.xml |   34 +++++++++++++---------------------
 1 files changed, 13 insertions(+), 21 deletions(-)

diff --git a/Source/UBCS/ubcs-service/ubcs-desk/pom.xml b/Source/UBCS/ubcs-service/ubcs-desk/pom.xml
index 6342eb2..a4db87f 100644
--- a/Source/UBCS/ubcs-service/ubcs-desk/pom.xml
+++ b/Source/UBCS/ubcs-service/ubcs-desk/pom.xml
@@ -4,7 +4,7 @@
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
 
     <parent>
-        <groupId>org.springblade</groupId>
+        <groupId>com.vci.ubcs</groupId>
         <artifactId>ubcs-service</artifactId>
         <version>3.0.1.RELEASE</version>
     </parent>
@@ -26,19 +26,19 @@
             <artifactId>blade-starter-swagger</artifactId>
         </dependency>
         <dependency>
-            <groupId>org.springblade</groupId>
+            <groupId>com.vci.ubcs</groupId>
             <artifactId>ubcs-desk-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-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-flow-api</artifactId>
-            <version>${bladex.project.version}</version>
+            <version>3.0.1.RELEASE</version>
         </dependency>
         <!--Oss-->
         <dependency>
@@ -73,23 +73,15 @@
     <build>
         <plugins>
             <plugin>
-                <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>
+                <groupId>org.springframework.boot</groupId>
+                <artifactId>spring-boot-maven-plugin</artifactId>
             </plugin>
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-antrun-plugin</artifactId>
+                <artifactId>maven-dependency-plugin</artifactId>
+            </plugin>
+            <plugin>
+                <artifactId>maven-surefire-plugin</artifactId>
             </plugin>
         </plugins>
     </build>

--
Gitblit v1.9.3