You are viewing a plain text version of this content. The canonical link for it is here.
Posted to notifications@seata.apache.org by ji...@apache.org on 2024/01/18 09:30:52 UTC

(incubator-seata) branch 2.x updated: optimize: unifty the git information (#6271)

This is an automated email from the ASF dual-hosted git repository.

jimin pushed a commit to branch 2.x
in repository https://gitbox.apache.org/repos/asf/incubator-seata.git


The following commit(s) were added to refs/heads/2.x by this push:
     new daf642f0da optimize: unifty the git information (#6271)
daf642f0da is described below

commit daf642f0da453598752f971daf184b8766832058
Author: xingfudeshi <xi...@gmail.com>
AuthorDate: Thu Jan 18 17:30:46 2024 +0800

    optimize: unifty the git information (#6271)
---
 build/pom.xml        | 2 ++
 changes/en-us/2.x.md | 1 +
 changes/zh-cn/2.x.md | 1 +
 server/pom.xml       | 6 ++++++
 4 files changed, 10 insertions(+)

diff --git a/build/pom.xml b/build/pom.xml
index 39aa9f10a7..7ba3de3e80 100644
--- a/build/pom.xml
+++ b/build/pom.xml
@@ -224,6 +224,8 @@
                         <generateGitPropertiesFile>true</generateGitPropertiesFile>
                         <generateGitPropertiesFilename>${project.build.outputDirectory}/seata-git.properties</generateGitPropertiesFilename>
                         <includeOnlyProperties>
+                            <includeOnlyProperty>git.commit.message.full</includeOnlyProperty>
+                            <includeOnlyProperty>git.remote.origin.url</includeOnlyProperty>
                             <includeOnlyProperty>git.branch</includeOnlyProperty>
                             <includeOnlyProperty>^git.build.(time|version)$</includeOnlyProperty>
                             <includeOnlyProperty>^git.commit.(id|time)$</includeOnlyProperty>
diff --git a/changes/en-us/2.x.md b/changes/en-us/2.x.md
index 11114bdb65..73b5fe9b51 100644
--- a/changes/en-us/2.x.md
+++ b/changes/en-us/2.x.md
@@ -62,6 +62,7 @@ Add changes here for all PR submitted to the 2.x branch.
 - [[#6259](https://github.com/apache/incubator-seata/pull/6259)] modify error message which is global session size more than config
 - [[#6264](https://github.com/apache/incubator-seata/pull/6264)] fix jib-maven-plugin build failed
 - [[#6246](https://github.com/apache/incubator-seata/pull/6246)] build the frontend at the same time as the maven build
+- [[#6271](https://github.com/apache/incubator-seata/pull/6271)] unifty the git information
 - [[#6265](https://github.com/apache/incubator-seata/pull/6265)] optimization fails to build frontend on arm64
 - [[#6267](https://github.com/apache/incubator-seata/pull/6267)] add Server deserialization validation
 
diff --git a/changes/zh-cn/2.x.md b/changes/zh-cn/2.x.md
index 76e98e3abe..4b2080a276 100644
--- a/changes/zh-cn/2.x.md
+++ b/changes/zh-cn/2.x.md
@@ -60,6 +60,7 @@
 - [[#6259](https://github.com/apache/incubator-seata/pull/6259)] 修改全局会话大小超过配置的错误消息
 - [[#6264](https://github.com/apache/incubator-seata/pull/6264)] 修复 jib-maven-plugin 编译失败问题
 - [[#6246](https://github.com/apache/incubator-seata/pull/6246)] 在maven打包的同时打包前端资源
+- [[#6271](https://github.com/apache/incubator-seata/pull/6271)] 统一git信息
 - [[#6265](https://github.com/apache/incubator-seata/pull/6265)] 优化在 arm64 上构建前端失败的问题
 - [[#6267](https://github.com/apache/incubator-seata/pull/6267)] 增加 Server 反序列化校验
 
diff --git a/server/pom.xml b/server/pom.xml
index ceed1303e0..61e114dba8 100644
--- a/server/pom.xml
+++ b/server/pom.xml
@@ -352,8 +352,14 @@
                         </ports>
                         <labels>
                             <name>seata-server</name>
+                            <git.commit.message.full>${git.commit.message.full}</git.commit.message.full>
+                            <git.remote.origin.url>${git.remote.origin.url}</git.remote.origin.url>
                             <git.commit.id>${git.commit.id}</git.commit.id>
                             <git.commit.time>${git.commit.time}</git.commit.time>
+                            <git.branch>${git.branch}</git.branch>
+                            <git.build.time>${git.build.time}</git.build.time>
+                            <git.build.version>${git.build.version}</git.build.version>
+                            <git.dirty>${git.dirty}</git.dirty>
                             <mvn.build.version>${project.version}</mvn.build.version>
                         </labels>
                         <creationTime>USE_CURRENT_TIMESTAMP</creationTime>


---------------------------------------------------------------------
To unsubscribe, e-mail: notifications-unsubscribe@seata.apache.org
For additional commands, e-mail: notifications-help@seata.apache.org