diff --git a/gradle.properties b/gradle.properties index 3cdb0d0c7d7eb414ff9b02087922d719c86582b7..5bddc7b05171c5e451a565e59a45f9b7b93dd86a 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 433ace6efa13a86b38bbed5a6518835123ba0f22..7147c75fddeff7392ccd4b8e18e0935c92f0115a 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, ]