Display SHA-1 hash in --version command

srozange · Aug 26, 2023 · 4eb4bce · 4eb4bce
1 parent ec58028
commit 4eb4bce
Show file tree

Hide file tree

Showing 3 changed files with 46 additions and 4 deletions.
diff --git a/pom.xml b/pom.xml
@@ -16,6 +16,7 @@
         <maven.compiler.parameters>true</maven.compiler.parameters>
         <maven.compiler.source>17</maven.compiler.source>
         <maven.compiler.target>17</maven.compiler.target>
+        <maven.buildNumber.shortRevisionLength>7</maven.buildNumber.shortRevisionLength>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
         <quarkus.platform.artifact-id>quarkus-bom</quarkus.platform.artifact-id>
@@ -46,6 +47,13 @@
         </license>
     </licenses>
 
+    <scm>
+        <connection>scm:git:[email protected]/srozange/yupf.git</connection>
+        <developerConnection>scm:git:ssh://[email protected]/srozange/yupd.git</developerConnection>
+        <url>https://github.com/srozange/yupd/</url>
+        <tag>HEAD</tag>
+    </scm>
+
     <dependencyManagement>
         <dependencies>
             <dependency>
@@ -107,14 +115,19 @@
         </dependency>
     </dependencies>
     <build>
+        <resources>
+            <resource>
+                <directory>src/main/resources</directory>
+                <filtering>true</filtering>
+            </resource>
+        </resources>
         <extensions>
             <extension>
                 <groupId>kr.motd.maven</groupId>
                 <artifactId>os-maven-plugin</artifactId>
                 <version>${os-plugin.version}</version>
             </extension>
         </extensions>
-
         <plugins>
             <plugin>
                 <groupId>${quarkus.platform.group-id}</groupId>
@@ -189,6 +202,19 @@
                     </execution>
                 </executions>
             </plugin>
+            <plugin>
+                <groupId>org.codehaus.mojo</groupId>
+                <artifactId>buildnumber-maven-plugin</artifactId>
+                <version>3.1.0</version>
+                <executions>
+                    <execution>
+                        <phase>validate</phase>
+                        <goals>
+                            <goal>create</goal>
+                        </goals>
+                    </execution>
+                </executions>
+            </plugin>
         </plugins>
     </build>
     <profiles>

diff --git a/src/main/java/io/github/yupd/command/YupdVersionProvider.java b/src/main/java/io/github/yupd/command/YupdVersionProvider.java
@@ -4,12 +4,26 @@
 import org.eclipse.microprofile.config.ConfigProvider;
 import picocli.CommandLine;
 
+import java.util.Optional;
+
+import static io.github.yupd.infrastructure.utils.StringUtils.isNotEmpty;
+
 public class YupdVersionProvider implements CommandLine.IVersionProvider {
 
     @Override
     public String[] getVersion() {
-        Config cf = ConfigProvider.getConfig(getClass().getClassLoader());
-        return new String[] { cf.getValue("quarkus.application.version", String.class) };
+        String appVersion = getPropertyValue("quarkus.application.version");
+        String commitVersion = getPropertyValue("commit.version");
+        return new String[] { "v" + appVersion + (isNotEmpty(commitVersion) ? " (" + commitVersion + ")" : "") };
+    }
+
+    private String getPropertyValue(String property) {
+        var config = ConfigProvider.getConfig(getClass().getClassLoader());
+        try {
+            return config.getValue(property, String.class);
+        } catch (java.util.NoSuchElementException e) {
+            return null;
+        }
     }
 
-}
+}
diff --git a/src/main/resources/application.properties b/src/main/resources/application.properties
@@ -1,3 +1,5 @@
+commit.version=${buildNumber}
+
 # log
 quarkus.banner.enabled=false
 quarkus.log.category."io.quarkus".level=ERROR