From 3c3758573580e5da96ff501f111b038cb1fd8bc2 Mon Sep 17 00:00:00 2001
From: xiejun <xj@2023>
Date: 星期四, 24 八月 2023 18:49:01 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
Source/UBCS/ubcs-service/ubcs-omd/pom.xml | 66 ++++++++------------------------
1 files changed, 17 insertions(+), 49 deletions(-)
diff --git a/Source/UBCS/ubcs-service/ubcs-omd/pom.xml b/Source/UBCS/ubcs-service/ubcs-omd/pom.xml
index 151429a..327b1f6 100644
--- a/Source/UBCS/ubcs-service/ubcs-omd/pom.xml
+++ b/Source/UBCS/ubcs-service/ubcs-omd/pom.xml
@@ -35,11 +35,11 @@
<artifactId>ubcs-util-api</artifactId>
<version>3.0.1.RELEASE</version>
</dependency>
-<!-- <dependency>-->
-<!-- <groupId>com.vci.ubcs</groupId>-->
-<!-- <artifactId>ubcs-flow-api</artifactId>-->
-<!-- <version>3.0.1.RELEASE</version>-->
-<!-- </dependency>-->
+ <!-- <dependency>-->
+ <!-- <groupId>com.vci.ubcs</groupId>-->
+ <!-- <artifactId>ubcs-flow-api</artifactId>-->
+ <!-- <version>3.0.1.RELEASE</version>-->
+ <!-- </dependency>-->
<!--Oss-->
<dependency>
@@ -85,57 +85,25 @@
<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>org.apache.maven.plugins</groupId>
- <artifactId>maven-jar-plugin</artifactId>
- <version>2.6</version>
+ <groupId>com.spotify</groupId>
+ <artifactId>dockerfile-maven-plugin</artifactId>
<configuration>
- <archive>
- <manifest>
- <addClasspath>true</addClasspath>
- <classpathPrefix>lib/</classpathPrefix>
- <mainClass>com.vci.ubcs.omd.OmdApplication</mainClass>
- </manifest>
- </archive>
+ <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>
- <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>
+ <artifactId>maven-antrun-plugin</artifactId>
</plugin>
-
</plugins>
</build>
--
Gitblit v1.9.3