From 539333922cc1a1b2b5de75a3a5a4dcac90b3b064 Mon Sep 17 00:00:00 2001
From: ludc
Date: 星期二, 30 一月 2024 11:31:12 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
Source/UBCS/pom.xml | 114 +++++++++------------------------------------------------
1 files changed, 18 insertions(+), 96 deletions(-)
diff --git a/Source/UBCS/pom.xml b/Source/UBCS/pom.xml
index 638be2b..e14fb72 100644
--- a/Source/UBCS/pom.xml
+++ b/Source/UBCS/pom.xml
@@ -28,8 +28,7 @@
<docker.password>Harbor12345</docker.password>
<docker.namespace>ubcs</docker.namespace>
<docker.plugin.version>1.4.13</docker.plugin.version>
- <!-- 鍚勫瓙妯″潡鎸夊疄闄呯洰褰曞眰娆″畾涔夌浉瀵规暟鎹紝浣挎墍鏈夋湇鍔℃ā鍧楄緭鍑鸿祫婧愭眹鑱氬埌鐩稿悓鐩綍锛岃瑙佸瓙鐩綍瀹氫箟绀轰緥 -->
- <boot-jar-output>${project.build.directory}</boot-jar-output>
+ <server.lib.path>../../target/libs</server.lib.path>
</properties>
<modules>
@@ -42,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>
@@ -108,6 +107,13 @@
<resources>
<resource>
<directory>src/main/resources</directory>
+ <excludes>
+ <!-- <exclude>bootstrap.yml</exclude>
+ <exclude>application.yml</exclude>
+ <exclude>application-dev.yml</exclude>
+ <exclude>application-test.yml</exclude>
+ <exclude>application-prop.yml</exclude>-->
+ </excludes>
</resource>
<resource>
<directory>src/main/java</directory>
@@ -117,69 +123,6 @@
</resource>
</resources>
<pluginManagement>
- <!--<plugins>
- <plugin>
- <groupId>org.springframework.boot</groupId>
- <artifactId>spring-boot-maven-plugin</artifactId>
- <version>${spring.boot.version}</version>
- <configuration>
- <fork>true</fork>
- <finalName>${project.build.finalName}</finalName>
- </configuration>
- <executions>
- <execution>
- <goals>
- <goal>repackage</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
- <plugin>
- <groupId>com.spotify</groupId>
- <artifactId>dockerfile-maven-plugin</artifactId>
- <version>${docker.plugin.version}</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>
- </configuration>
- <!–瀛愭湇鍔℃坊鍔犲涓嬮厤缃紝杩愯 mvn deploy 鍛戒护渚夸細鑷姩鎵撳寘闀滃儚–>
- <!–<executions>
- <execution>
- <id>default</id>
- <goals>
- <goal>build</goal>
- <goal>push</goal>
- </goals>
- </execution>
- </executions>–>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-antrun-plugin</artifactId>
- <executions>
- <execution>
- <phase>package</phase>
- <goals>
- <goal>run</goal>
- </goals>
- <configuration>
- <tasks>
- <!–suppress UnresolvedMavenProperty –>
- <copy overwrite="true"
- tofile="${session.executionRootDirectory}/target/${project.artifactId}.jar"
- file="${project.build.directory}/${project.artifactId}.jar" />
- </tasks>
- </configuration>
- </execution>
- </executions>
- </plugin>
- </plugins>-->
<plugins>
<plugin>
<groupId>org.springframework.boot</groupId>
@@ -220,7 +163,7 @@
<goal>copy-dependencies</goal>
</goals>
<configuration>
- <outputDirectory>../../target/lib</outputDirectory>
+ <outputDirectory>${server.lib.path}</outputDirectory>
<excludeTransitive>false</excludeTransitive>
<stripVersion>false</stripVersion>
<includeScope>runtime</includeScope>
@@ -254,42 +197,21 @@
<archive>
<manifest>
<addClasspath>true</addClasspath>
- <classpathPrefix>lib/</classpathPrefix>
+ <!--<classpathPrefix>./libs</classpathPrefix>-->
+ <classpathPrefix>/data1/ubcs/ubcs-server/libs</classpathPrefix>
<useUniqueVersions>false</useUniqueVersions>
</manifest>
</archive>
+ <excludes>
+ <exclude>application-dev.yml</exclude>
+ <exclude>application-prod.yml</exclude>
+ <exclude>application.yml</exclude>
+ <exclude>lib/*</exclude>
+ </excludes>
</configuration>
</plugin>
</plugins>
</pluginManagement>
-
- <!--<plugins>
- <plugin>
- <groupId>com.spotify</groupId>
- <artifactId>dockerfile-maven-plugin</artifactId>
- <configuration>
- <skip>true</skip>
- </configuration>
- </plugin>
- <plugin>
- <groupId>org.springframework.boot</groupId>
- <artifactId>spring-boot-maven-plugin</artifactId>
- </plugin>
- <plugin>
- <artifactId>maven-compiler-plugin</artifactId>
- <version>${maven.plugin.version}</version>
- <configuration>
- <source>${java.version}</source>
- <target>${java.version}</target>
- <encoding>UTF-8</encoding>
- <compilerArgs>
- <arg>-parameters</arg>
- </compilerArgs>
- </configuration>
- </plugin>
-
- </plugins>-->
-
</build>
<repositories>
--
Gitblit v1.9.3