diff --git a/amoro-ams/amoro-ams-server/pom.xml b/amoro-ams/amoro-ams-server/pom.xml index bdf6650703..b3c0efcb2e 100644 --- a/amoro-ams/amoro-ams-server/pom.xml +++ b/amoro-ams/amoro-ams-server/pom.xml @@ -375,7 +375,7 @@ ${project.basedir}/.git true - ${project.build.outputDirectory}/arctic/git.properties + ${project.build.outputDirectory}/amoro/git.properties ^git.build.(time|version)$ diff --git a/amoro-ams/amoro-ams-server/src/main/java/org/apache/amoro/server/dashboard/controller/VersionController.java b/amoro-ams/amoro-ams-server/src/main/java/org/apache/amoro/server/dashboard/controller/VersionController.java index e7a75a8150..2fad7f7f41 100644 --- a/amoro-ams/amoro-ams-server/src/main/java/org/apache/amoro/server/dashboard/controller/VersionController.java +++ b/amoro-ams/amoro-ams-server/src/main/java/org/apache/amoro/server/dashboard/controller/VersionController.java @@ -35,13 +35,15 @@ 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."); @@ -49,7 +51,7 @@ public void getVersionInfo(Context ctx) { } VersionInfo versionInfo = new VersionInfo(); - versionInfo.setVersion(version); + versionInfo.setVersion(String.format("%s(%s)", version, abbrev)); versionInfo.setCommitTime(commitTime); ctx.json(OkResponse.of(versionInfo)); }