From b8356e9be672fb94c4ec4a642ed820c67972bdbe Mon Sep 17 00:00:00 2001
From: yuxc <653031404@qq.com>
Date: 星期四, 24 八月 2023 17:25:15 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
Source/UBCS/ubcs-service/ubcs-omd/pom.xml | 73 ++++++++++++++++++++++++++++++------
1 files changed, 61 insertions(+), 12 deletions(-)
diff --git a/Source/UBCS/ubcs-service/ubcs-omd/pom.xml b/Source/UBCS/ubcs-service/ubcs-omd/pom.xml
index 8281b52..151429a 100644
--- a/Source/UBCS/ubcs-service/ubcs-omd/pom.xml
+++ b/Source/UBCS/ubcs-service/ubcs-omd/pom.xml
@@ -30,6 +30,11 @@
<artifactId>ubcs-omd-api</artifactId>
<version>3.0.1.RELEASE</version>
</dependency>
+ <dependency>
+ <groupId>com.vci.ubcs</groupId>
+ <artifactId>ubcs-util-api</artifactId>
+ <version>3.0.1.RELEASE</version>
+ </dependency>
<!-- <dependency>-->
<!-- <groupId>com.vci.ubcs</groupId>-->
<!-- <artifactId>ubcs-flow-api</artifactId>-->
@@ -64,29 +69,73 @@
<artifactId>orai18n</artifactId>
<version>${orai18n.version}</version>
</dependency>
+ <dependency>
+ <groupId>com.vci.ubcs</groupId>
+ <artifactId>ubcs-code-api</artifactId>
+ <version>3.0.1.RELEASE</version>
+ <scope>compile</scope>
+ </dependency>
+ <dependency>
+ <groupId>com.vci.ubcs</groupId>
+ <artifactId>ubcs-user-api</artifactId>
+ <version>3.0.1.RELEASE</version>
+ <scope>compile</scope>
+ </dependency>
</dependencies>
<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>-->
+<!-- </plugin>-->
+<!-- <plugin>-->
+<!-- <groupId>org.apache.maven.plugins</groupId>-->
+<!-- <artifactId>maven-antrun-plugin</artifactId>-->
+<!-- </plugin>-->
<plugin>
- <groupId>com.spotify</groupId>
- <artifactId>dockerfile-maven-plugin</artifactId>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-jar-plugin</artifactId>
+ <version>2.6</version>
<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>
+ <archive>
+ <manifest>
+ <addClasspath>true</addClasspath>
+ <classpathPrefix>lib/</classpathPrefix>
+ <mainClass>com.vci.ubcs.omd.OmdApplication</mainClass>
+ </manifest>
+ </archive>
</configuration>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-antrun-plugin</artifactId>
+ <artifactId>maven-dependency-plugin</artifactId>
+ <version>2.10</version>
+ <executions>
+ <execution>
+ <id>copy-dependencies</id>
+ <phase>package</phase>
+ <goals>
+ <goal>copy-dependencies</goal>
+ </goals>
+ <configuration>
+ <outputDirectory>${project.build.directory}/lib</outputDirectory>
+ </configuration>
+ </execution>
+ </executions>
</plugin>
+
</plugins>
</build>
--
Gitblit v1.10.0