From 2948ec26c9e8f9f4dabda83a0a68f077ab98ccb7 Mon Sep 17 00:00:00 2001 From: yuxc <653031404@qq.com> Date: 星期四, 24 八月 2023 18:29:20 +0800 Subject: [PATCH] pom还原 --- Source/UBCS/pom.xml | 1 Source/UBCS/ubcs-service/ubcs-code/pom.xml | 49 ++++++------------------ Source/UBCS/ubcs-service/ubcs-omd/pom.xml | 66 ++++++++------------------------ 3 files changed, 30 insertions(+), 86 deletions(-) diff --git a/Source/UBCS/pom.xml b/Source/UBCS/pom.xml index 5757e07..9a71e3e 100644 --- a/Source/UBCS/pom.xml +++ b/Source/UBCS/pom.xml @@ -41,6 +41,7 @@ <module>ubcs-plugin-api</module> <module>ubcs-service</module> <module>ubcs-service-api</module> + <module>ubcs-codeApply</module> </modules> <dependencyManagement> diff --git a/Source/UBCS/ubcs-service/ubcs-code/pom.xml b/Source/UBCS/ubcs-service/ubcs-code/pom.xml index 7431369..ab5623a 100644 --- a/Source/UBCS/ubcs-service/ubcs-code/pom.xml +++ b/Source/UBCS/ubcs-service/ubcs-code/pom.xml @@ -164,49 +164,24 @@ <build> <plugins> - <!--璁剧疆搴旂敤 Main 鍙傛暟鍚姩渚濊禆鏌ユ壘鐨勫湴鍧�鎸囧悜澶栭儴 lib 鏂囦欢澶�--> <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-jar-plugin</artifactId> + <groupId>com.spotify</groupId> + <artifactId>dockerfile-maven-plugin</artifactId> <configuration> - <archive> - <manifest> - <addClasspath>true</addClasspath> - <!-- 椤圭洰鎵�渚濊禆鐨刯ar浣嶄簬鍚屼竴绾х殑lib鐩綍涓�--> - <classpathPrefix>lib/</classpathPrefix> - </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> - <!--璁剧疆 SpringBoot 鎵撳寘鎻掍欢涓嶅寘鍚换浣� Jar 渚濊禆鍖�--> - <plugin> - <groupId>org.springframework.boot</groupId> - <artifactId>spring-boot-maven-plugin</artifactId> - <configuration> - <includes> - <include> - <groupId>nothing</groupId> - <artifactId>nothing</artifactId> - </include> - </includes> - </configuration> - </plugin> - <!--璁剧疆灏� lib 鎷疯礉鍒板簲鐢� Jar 澶栭潰--> <plugin> <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-dependency-plugin</artifactId> - <executions> - <execution> - <id>copy-dependencies</id> - <phase>prepare-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> 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