diff --git a/gradle.properties b/gradle.properties index 4957dd250c4fc2b5e21abe2c9fabf1831a5a1fd9..0f089207cb4d07ca8de3e1334bf87c00ca4e8613 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 7bf56dc983b77e834ae8abf2b4b2a6cedca32298..a986875c8f5ec6a4c4ea2a52d1096af967f8e10b 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 7d96e729882df8c862f5cd25112a6625ed45146d..38d88f8ce479870063b8b581583b9e5a397b97c9 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;