From e87219ead4f06ed307f204fec993f97f61b94e3e Mon Sep 17 00:00:00 2001
From: Brandon Clayton <bclayton@usgs.gov>
Date: Mon, 18 Sep 2023 16:50:42 -0600
Subject: [PATCH] simplify app version
---
gradle.properties | 4 ++--
gradle/app-version.gradle | 8 +-------
.../java/gov/usgs/earthquake/nshmp/www/HazVersion.java | 10 ++--------
3 files changed, 5 insertions(+), 17 deletions(-)
diff --git a/gradle.properties b/gradle.properties
index 4957dd25..0f089207 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -12,8 +12,8 @@ micronautVersion = 3.2.3
micronautRxVersion = 2.1.1
nodePluginVersion = 3.0.1
nodeVersion = 16.3.0
-nshmpLibVersion = 1.4.1
-nshmpWsUtilsVersion = 0.3.13
+nshmpLibVersion = 1.4.2
+nshmpWsUtilsVersion = 0.3.14
openApiVersion = 4.0.0
shadowVersion = 7.1.2
spotbugsVersion = 4.7.0
diff --git a/gradle/app-version.gradle b/gradle/app-version.gradle
index 7bf56dc9..a986875c 100644
--- a/gradle/app-version.gradle
+++ b/gradle/app-version.gradle
@@ -9,14 +9,8 @@ tasks.withType(JavaCompile) {
try {
def details = versionDetails()
def ciProjectUrl = System.getenv("CI_PROJECT_URL")
- def branch = System.getenv("CI_COMMIT_BRANCH")
def versionInfo = [
- branchName: branch ? branch : details.branchName,
- commitDistance: details.commitDistance,
- gitHash: details.gitHash,
- gitHashFull: details.gitHashFull,
- isCleanTag: details.isCleanTag,
- lastTag: details.lastTag,
+ gitHash: details.gitHashFull,
projectName: project.name,
url: ciProjectUrl ? ciProjectUrl : "git config --get remote.origin.url".execute().text.replace("\n", ""),
version: details.version,
diff --git a/src/main/java/gov/usgs/earthquake/nshmp/www/HazVersion.java b/src/main/java/gov/usgs/earthquake/nshmp/www/HazVersion.java
index 7d96e729..38d88f8c 100644
--- a/src/main/java/gov/usgs/earthquake/nshmp/www/HazVersion.java
+++ b/src/main/java/gov/usgs/earthquake/nshmp/www/HazVersion.java
@@ -46,7 +46,6 @@ public class HazVersion implements AppVersion {
try {
var git = Git.open(modelPath.toFile());
var repo = git.getRepository();
- var hash = repo.getRefDatabase().findRef("HEAD").getObjectId().name();
var url = repo
.getConfig()
.getString("remote", "origin", "url")
@@ -56,14 +55,9 @@ public class HazVersion implements AppVersion {
return VersionInfo.builder()
.projectName(projectName)
- .url(repo.getConfig().getString("remote", "origin", "url"))
+ .url(url)
.version(git.describe().call())
- .branchName(repo.getBranch())
- .commitDistance(0)
- .gitHash(hash.substring(0, 10))
- .gitHashFull(hash)
- .isCleanTag(git.status().call().isClean())
- .lastTag("")
+ .gitHash(repo.getRefDatabase().findRef("HEAD").getObjectId().name())
.build();
} catch (Exception e) {
return null;
--
GitLab