From e37f04c97ef893edce5f3f748398424fa17ffc2a Mon Sep 17 00:00:00 2001
From: ludc
Date: 星期三, 18 九月 2024 10:04:17 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
Source/UBCS/ubcs-gateway/pom.xml | 57 +++++++++++++++++++++++++++++++++++++++++++--------------
1 files changed, 43 insertions(+), 14 deletions(-)
diff --git a/Source/UBCS/ubcs-gateway/pom.xml b/Source/UBCS/ubcs-gateway/pom.xml
index c9be5b0..5601eee 100644
--- a/Source/UBCS/ubcs-gateway/pom.xml
+++ b/Source/UBCS/ubcs-gateway/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>
<artifactId>UBCS</artifactId>
- <groupId>org.springblade</groupId>
+ <groupId>com.vci.ubcs</groupId>
<version>3.0.1.RELEASE</version>
</parent>
<modelVersion>4.0.0</modelVersion>
@@ -31,8 +31,9 @@
</exclusions>
</dependency>
<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>
@@ -73,28 +74,56 @@
<groupId>de.codecentric</groupId>
<artifactId>spring-boot-admin-starter-client</artifactId>
</dependency>
+ <!--<dependency>
+ <groupId>org.springblade</groupId>
+ <artifactId>blade-starter-log</artifactId>
+ <exclusions>
+ <exclusion>
+ <groupId>org.springblade</groupId>
+ <artifactId>blade-core-cloud</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>-->
+
</dependencies>
<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-dependency-plugin</artifactId>
+ <configuration>
+ <outputDirectory>./target/libs</outputDirectory>
+ </configuration>
+ </plugin>-->
+ <plugin>
+ <artifactId>maven-surefire-plugin</artifactId>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-antrun-plugin</artifactId>
+ <artifactId>maven-dependency-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>copy-dependencies</id>
+ <phase>package</phase>
+ <goals>
+ <goal>copy-dependencies</goal>
+ </goals>
+ <configuration>
+ <outputDirectory>../target/libs</outputDirectory>
+ <excludeTransitive>false</excludeTransitive>
+ <stripVersion>false</stripVersion>
+ <includeScope>runtime</includeScope>
+ </configuration>
+ </execution>
+ </executions>
</plugin>
</plugins>
</build>
--
Gitblit v1.9.3