You are viewing a plain text version of this content. The canonical link for it is here.
Posted to notifications@skywalking.apache.org by wu...@apache.org on 2022/04/22 14:17:16 UTC
[skywalking] branch master updated: Remove build time from the OAP version (#8934)
This is an automated email from the ASF dual-hosted git repository.
wusheng pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/skywalking.git
The following commit(s) were added to refs/heads/master by this push:
new 210f26b7df Remove build time from the OAP version (#8934)
210f26b7df is described below
commit 210f26b7df4486dbf51c8fc1f8d215d0df8d8eb7
Author: kezhenxu94 <ke...@apache.org>
AuthorDate: Fri Apr 22 22:17:04 2022 +0800
Remove build time from the OAP version (#8934)
---
docs/en/changes/changes.md | 1 +
.../org/apache/skywalking/oap/server/core/version/Version.java | 7 ++-----
oap-server/server-starter/pom.xml | 1 -
3 files changed, 3 insertions(+), 6 deletions(-)
diff --git a/docs/en/changes/changes.md b/docs/en/changes/changes.md
index 689f69bdc5..5d22d10b95 100644
--- a/docs/en/changes/changes.md
+++ b/docs/en/changes/changes.md
@@ -26,6 +26,7 @@
* [Critical] Revert [**Enhance DataCarrier#MultipleChannelsConsumer to add
priority**](https://github.com/apache/skywalking/pull/8664) to avoid consuming issues.
* Fix the problem that some configurations (such as group.id) did not take effect due to the override order when using the kafkaConsumerConfig property to extend the configuration in Kafka Fetcher.
+* Remove build time from the OAP version.
#### UI
diff --git a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/version/Version.java b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/version/Version.java
index 0acb44e3ac..026d9ec876 100644
--- a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/version/Version.java
+++ b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/version/Version.java
@@ -28,7 +28,6 @@ public enum Version {
CURRENT;
private final String buildVersion;
- private final String buildTime;
private final String commitId;
private final Properties properties = new Properties();
@@ -38,7 +37,6 @@ public enum Version {
properties.load(Version.class.getClassLoader()
.getResourceAsStream("version.properties"));
buildVersion = properties.getProperty("git.build.version");
- buildTime = properties.getProperty("git.build.time");
commitId = properties.getProperty("git.commit.id");
} catch (IOException e) {
throw new ExceptionInInitializerError(e);
@@ -48,10 +46,9 @@ public enum Version {
@Override
public String toString() {
return String.format(
- "%s-%s (%s)",
+ "%s-%s",
buildVersion,
- Strings.left(commitId, 7),
- buildTime
+ Strings.left(commitId, 7)
);
}
}
diff --git a/oap-server/server-starter/pom.xml b/oap-server/server-starter/pom.xml
index 51f6a8e5cc..38f12172fe 100644
--- a/oap-server/server-starter/pom.xml
+++ b/oap-server/server-starter/pom.xml
@@ -357,7 +357,6 @@
<includeOnlyProperties>
<includeOnlyProperty>^git.build.version$</includeOnlyProperty>
<includeOnlyProperty>^git.commit.id$</includeOnlyProperty>
- <includeOnlyProperty>^git.build.time$</includeOnlyProperty>
</includeOnlyProperties>
</configuration>
</plugin>