From 1e866f80b78054cadc3717011702aa6071fdc89f Mon Sep 17 00:00:00 2001
From: Brandon Clayton <bclayton@usgs.gov>
Date: Mon, 18 Sep 2023 17:30:39 -0600
Subject: [PATCH] simplify app version
---
gradle.properties | 4 ++--
gradle/app-version.gradle | 10 ++--------
2 files changed, 4 insertions(+), 10 deletions(-)
diff --git a/gradle.properties b/gradle.properties
index 3cdb0d0..5bddc7b 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -7,8 +7,8 @@ micronautRxVersion = 2.1.1
netcdfVersion = 5.5.2
nodePluginVersion = 3.0.1
nodeVersion = 16.3.0
-nshmpLibVersion = 1.3.10
-nshmpWsUtilsVersion = 0.3.12
+nshmpLibVersion = 1.4.2
+nshmpWsUtilsVersion = 0.3.14
openApiVersion = 4.0.0
shadowVersion = 7.1.1
slfVersion = 1.7.30
diff --git a/gradle/app-version.gradle b/gradle/app-version.gradle
index 433ace6..7147c75 100644
--- a/gradle/app-version.gradle
+++ b/gradle/app-version.gradle
@@ -8,15 +8,9 @@ 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,
- projectName: project.name,
+ gitHash: details.gitHashFull,
+ projectName: "nshmp-ws-static",
url: ciProjectUrl ? ciProjectUrl : "git config --get remote.origin.url".execute().text.replace("\n", ""),
version: details.version,
]
--
GitLab