From bf6f8282eaf09531c3a4ca0a4e815cb3c3be9845 Mon Sep 17 00:00:00 2001
From: Brandon Clayton <bclayton@usgs.gov>
Date: Mon, 18 Sep 2023 17:14:53 -0600
Subject: [PATCH] simplify app version
---
.dockerignore | 1 -
gradle.properties | 4 ++--
gradle/app-version.gradle | 8 +-------
3 files changed, 3 insertions(+), 10 deletions(-)
diff --git a/.dockerignore b/.dockerignore
index 9087625..746e375 100644
--- a/.dockerignore
+++ b/.dockerignore
@@ -7,7 +7,6 @@ build
Scratch*.java
tmp
.DS_Store
-.vscode
.apt_generated*
.factorypath
fault-sections
diff --git a/gradle.properties b/gradle.properties
index 2494e54..9a6ff20 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -9,8 +9,8 @@ micronautRxVersion = 2.1.1
nodePluginVersion = 3.0.1
nodeVersion = 16.3.0
nshmFaultSectionsTag = v0.1
-nshmpLibVersion = 1.3.10
-nshmpWsUtilsVersion = 0.3.12
+nshmpLibVersion = 1.4.2
+nshmpWsUtilsVersion = 0.3.14
shadowVersion = 7.1.2
spotbugsVersion = 4.7.0
spotlessVersion = 6.0.4
diff --git a/gradle/app-version.gradle b/gradle/app-version.gradle
index cc62942..a8c0948 100644
--- a/gradle/app-version.gradle
+++ b/gradle/app-version.gradle
@@ -8,14 +8,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,
--
GitLab