[AMORO-2813] Improve the version info about the project (#2821)

* [AMORO-2813] Improve the version info about the project Before this commit, there will only show the version about the project in the topbar, but this may not enough for some cases, in this commit we enahcned the version info by including the abbrev. * fixup! [AMORO-2813] Improve the version info about the project
apache · May 10, 2024 · 5b90227 · 5b90227
1 parent bdd780b
commit 5b90227
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 3 deletions.
diff --git a/amoro-ams/amoro-ams-server/pom.xml b/amoro-ams/amoro-ams-server/pom.xml
@@ -375,7 +375,7 @@
                     <dotGitDirectory>${project.basedir}/.git</dotGitDirectory>
                     <generateGitPropertiesFile>true</generateGitPropertiesFile>
                     <generateGitPropertiesFilename>
-                        ${project.build.outputDirectory}/arctic/git.properties
+                        ${project.build.outputDirectory}/amoro/git.properties
                     </generateGitPropertiesFilename>
                     <includeOnlyProperties>
                         <includeOnlyProperty>^git.build.(time|version)$</includeOnlyProperty>

diff --git a/...-server/src/main/java/org/apache/amoro/server/dashboard/controller/VersionController.java b/...-server/src/main/java/org/apache/amoro/server/dashboard/controller/VersionController.java
@@ -35,21 +35,23 @@ public class VersionController {
   public void getVersionInfo(Context ctx) {
     Properties prop = new Properties();
     InputStream is =
-        VersionController.class.getClassLoader().getResourceAsStream("arctic/git.properties");
+        VersionController.class.getClassLoader().getResourceAsStream("amoro/git.properties");
     String version = "UNKNOWN";
     String commitTime = "UNKNOWN";
+    String abbrev = "UNKNOWN";
     if (is != null) {
       try {
         prop.load(is);
         version = prop.getProperty("git.build.version");
+        abbrev = prop.getProperty("git.commit.id.abbrev");
         commitTime = prop.getProperty("git.commit.time");
       } catch (Exception e) {
         LOG.warn("Failed to find git.properties.");
       }
     }
 
     VersionInfo versionInfo = new VersionInfo();
-    versionInfo.setVersion(version);
+    versionInfo.setVersion(String.format("%s(%s)", version, abbrev));
     versionInfo.setCommitTime(commitTime);
     ctx.json(OkResponse.of(versionInfo));
   }