diff --git a/build.gradle b/build.gradle index f00a9e1140396a7d78c969cea690813f9d250feb..b578177a77d0f570e5f25391be6aed642690ae84 100644 --- a/build.gradle +++ b/build.gradle @@ -44,7 +44,18 @@ jar { def versionPath = "/resources/main/version.json" def versionFile = new File(project.buildDir.toString() + versionPath) def details = versionDetails() - def json = groovy.json.JsonOutput.toJson(details) + def versionInfo = [ + branchName: details.branchName, + commitDistance: details.commitDistance, + gitHash: details.gitHash, + gitHashFull: details.gitHashFull, + isCleanTag: details.isCleanTag, + lastTag: details.lastTag, + projectName: project.name, + version: details.version, + url: 'git config --get remote.origin.url'.execute().text.replace('\n', '') + ] + def json = groovy.json.JsonOutput.toJson(versionInfo) versionFile.write(groovy.json.JsonOutput.prettyPrint(json)) } } diff --git a/src/main/java/gov/usgs/earthquake/nshmp/internal/Version.java b/src/main/java/gov/usgs/earthquake/nshmp/internal/Version.java index 31280f63ad502b9afda8ca9814ca46232e71d50d..4ecd4e44f1c9037284dc810ef3b297eed0a0b559 100644 --- a/src/main/java/gov/usgs/earthquake/nshmp/internal/Version.java +++ b/src/main/java/gov/usgs/earthquake/nshmp/internal/Version.java @@ -4,11 +4,10 @@ import com.google.common.io.Resources; import com.google.gson.Gson; public class Version { - private static final Gson GSON = new Gson(); public static VersionInfo getVersionInfo() throws IllegalArgumentException { var resource = Resources.getResource("version.json"); - return GSON.fromJson(resource.toString(), VersionInfo.class); + return new Gson().fromJson(resource.toString(), VersionInfo.class); } public static class VersionInfo { @@ -18,5 +17,7 @@ public class Version { public String gitHashFull; public boolean isCleanTag; public String lastTag; + public String version; + public String url; } }