From 7a63427264af5c70af7b2697218abd69ab864bfa Mon Sep 17 00:00:00 2001 From: xingfudeshi Date: Thu, 18 Jan 2024 13:46:11 +0800 Subject: [PATCH 1/2] unifty the git information --- build/pom.xml | 2 ++ server/pom.xml | 6 ++++++ 2 files changed, 8 insertions(+) diff --git a/build/pom.xml b/build/pom.xml index 39aa9f10a79..7ba3de3e805 100644 --- a/build/pom.xml +++ b/build/pom.xml @@ -224,6 +224,8 @@ true ${project.build.outputDirectory}/seata-git.properties + git.commit.message.full + git.remote.origin.url git.branch ^git.build.(time|version)$ ^git.commit.(id|time)$ diff --git a/server/pom.xml b/server/pom.xml index ceed1303e07..61e114dba82 100644 --- a/server/pom.xml +++ b/server/pom.xml @@ -352,8 +352,14 @@ seata-server + ${git.commit.message.full} + ${git.remote.origin.url} ${git.commit.id} ${git.commit.time} + ${git.branch} + ${git.build.time} + ${git.build.version} + ${git.dirty} ${project.version} USE_CURRENT_TIMESTAMP From e0abcdf2d2cc9fd36f8a347b3c6854c5a6dd3c8e Mon Sep 17 00:00:00 2001 From: xingfudeshi Date: Thu, 18 Jan 2024 13:54:57 +0800 Subject: [PATCH 2/2] update changes --- changes/en-us/2.x.md | 1 + changes/zh-cn/2.x.md | 2 ++ 2 files changed, 3 insertions(+) diff --git a/changes/en-us/2.x.md b/changes/en-us/2.x.md index 62c5dead0f5..18806da87f8 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 ### security: - [[#6069](https://github.com/apache/incubator-seata/pull/6069)] Upgrade Guava dependencies to fix security vulnerabilities diff --git a/changes/zh-cn/2.x.md b/changes/zh-cn/2.x.md index 3384abfc921..107e4f1fcc5 100644 --- a/changes/zh-cn/2.x.md +++ b/changes/zh-cn/2.x.md @@ -60,6 +60,8 @@ - [[#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信息 + ### security: - [[#6069](https://github.com/apache/incubator-seata/pull/6069)] 升级Guava依赖版本,修复安全漏洞