From 7575eaa766eb186a0eb3717ddfd10d8831847207 Mon Sep 17 00:00:00 2001
From: xiejun <xj@2023>
Date: 星期四, 12 十月 2023 09:48:23 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
Source/UBCS/pom.xml | 64 ++-----------------------------
1 files changed, 5 insertions(+), 59 deletions(-)
diff --git a/Source/UBCS/pom.xml b/Source/UBCS/pom.xml
index fea5180..6dd5829 100644
--- a/Source/UBCS/pom.xml
+++ b/Source/UBCS/pom.xml
@@ -10,6 +10,7 @@
<properties>
<bladex.project.version>3.0.1.RELEASE</bladex.project.version>
+
<java.version>1.8</java.version>
<maven.plugin.version>3.8.0</maven.plugin.version>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
@@ -40,7 +41,7 @@
<module>ubcs-plugin-api</module>
<module>ubcs-service</module>
<module>ubcs-service-api</module>
-<!-- <module>ubcs-codeApply</module>-->
+ <module>ubcs-codeApply</module>
</modules>
<dependencyManagement>
@@ -106,11 +107,11 @@
<resources>
<resource>
<directory>src/main/resources</directory>
- <excludes>
+ <!-- <excludes>
<exclude>bootstrap.yml</exclude>
<exclude>application.yml</exclude>
- <exclude>application-prop.yml</exclude>
- </excludes>
+ <exclude>application-prod.yml</exclude>
+ </excludes>-->
</resource>
<resource>
<directory>src/main/java</directory>
@@ -208,61 +209,6 @@
</compilerArgs>
</configuration>
</plugin>
-
- <!-- 鎵撳寘鏃跺墧闄ar锛屾斁缃湪lib褰撲腑 -->
- <!-- <plugin>
- <groupId>org.springframework.boot</groupId>
- <artifactId>spring-boot-maven-plugin</artifactId>
- <version>${spring.boot.version}</version> <!– 濡傛灉 spring.boot.version 鐗堟湰淇敼锛屽垯杩欓噷涔熻璺熺潃淇敼 –>
- <configuration>
- <fork>true</fork>
- <!–瑙e喅windows鍛戒护琛岀獥鍙d腑鏂囦贡鐮�–>
- <jvmArguments>-Dfile.encoding=UTF-8</jvmArguments>
- <!– 鎷嗗紑渚濊禆–>
- <mainClass>cn.iocoder.qingning.server.QingningServerApplication</mainClass>
- <layout>ZIP</layout>
- <includes>
- <include>
- <!– 鎺掗櫎鎵�鏈塉ar –>
- <groupId>nothing</groupId>
- <artifactId>nothing</artifactId>
- </include>
- </includes>
- </configuration>
- <executions>
- <execution>
- <goals>
- <goal>repackage</goal> <!– 灏嗗紩鍏ョ殑 jar 鎵撳叆鍏朵腑 –>
- </goals>
- </execution>
- </executions>
- </plugin>
- <!–姝ゆ彃浠剁敤浜庡皢渚濊禆鍖呮娊鍑�–>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-dependency-plugin</artifactId>
- <executions>
- <execution>
- <id>copy-dependencies</id>
- <phase>package</phase>
- <goals>
- <goal>copy-dependencies</goal>
- </goals>
- <configuration>
- <outputDirectory>../target/lib</outputDirectory>
- <excludeTransitive>false</excludeTransitive>
- <stripVersion>false</stripVersion>
- <includeScope>runtime</includeScope>
- </configuration>
- </execution>
- </executions>
- </plugin>
- <plugin>
- <artifactId>maven-surefire-plugin</artifactId>
- <configuration>
- <skip>true</skip>
- </configuration>
- </plugin>-->
</plugins>
</build>
--
Gitblit v1.9.3