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 @@ ^git.build.version$ ^git.commit.id$ - ^git.build.time$