From 148a2f54dabc61bdbdd8f1b88f0bc927618d5525 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=86=B7=E5=86=B7?= <2270033969@qq.com>
Date: Wed, 26 Jun 2024 15:26:21 +0800
Subject: [PATCH] =?UTF-8?q?=E2=AC=86=EF=B8=8F=20git-commit-id-plugin=20?=
 =?UTF-8?q?=E5=AE=9A=E5=88=B6=20git.properties=20=E6=8F=92=E4=BB=B6?=
 =?UTF-8?q?=E8=BE=93=E5=87=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

(cherry picked from commit 031b12cc3f3d2d2b170c2bcc9fb3853576bcfe2e)
---
 pom.xml | 25 ++++++++++++++++++++++---
 1 file changed, 22 insertions(+), 3 deletions(-)

diff --git a/pom.xml b/pom.xml
index 1217d6d33..a10031274 100644
--- a/pom.xml
+++ b/pom.xml
@@ -43,7 +43,7 @@
         <spring.authorization.version>1.3.0</spring.authorization.version>
         <maven.compiler.version>3.11.0</maven.compiler.version>
         <spring.checkstyle.version>0.0.39</spring.checkstyle.version>
-        <git.commit.version>2.2.5</git.commit.version>
+        <git.commit.version>4.9.9</git.commit.version>
         <captcha.version>1.3.0</captcha.version>
         <captcha.image.version>2.2.3</captcha.image.version>
         <cas.sdk.version>3.6.4</cas.sdk.version>
@@ -245,9 +245,28 @@
             </plugin>
             <!--打包关联最新 git commit 信息插件-->
             <plugin>
-                <groupId>pl.project13.maven</groupId>
-                <artifactId>git-commit-id-plugin</artifactId>
+                <groupId>io.github.git-commit-id</groupId>
+                <artifactId>git-commit-id-maven-plugin</artifactId>
                 <version>${git.commit.version}</version>
+                <executions>
+                    <execution>
+                        <id>get-the-git-infos</id>
+                        <goals>
+                            <goal>revision</goal>
+                        </goals>
+                        <phase>validate</phase> <!-- 或者使用 prepare-package -->
+                    </execution>
+                </executions>
+                <configuration>
+                    <failOnNoGitDirectory>false</failOnNoGitDirectory>
+                    <generateGitPropertiesFile>true</generateGitPropertiesFile>
+                    <!--因为项目定制了jackson的日期时间序列化/反序列化格式，因此这里要进行配置,不然通过management.info.git.mode=full进行完整git信息监控时会存在问题-->
+                    <dateFormat>yyyy-MM-dd HH:mm:ss</dateFormat>
+                    <includeOnlyProperties>
+                        <includeOnlyProperty>^git.build.(time|version)$</includeOnlyProperty>
+                        <includeOnlyProperty>^git.commit.(id|message|time).*$</includeOnlyProperty>
+                    </includeOnlyProperties>
+                </configuration>
             </plugin>
         </plugins>
     </build>