Merge branch 'version-info' into 'main'

Version info

See merge request !148

.dockerignore

@@ -7,7 +7,6 @@ build
 Scratch*.java
 tmp
 .DS_Store
-.vscode
 .apt_generated*
 .factorypath
 swagger-files

.gitlab-ci.yml

@@ -57,10 +57,7 @@ default:
 .production-env: &production-env
   if: >
     $CI_PROJECT_PATH == $UPSTREAM_PATH
-    && (
-      $CI_COMMIT_BRANCH == 'production'
-      || ( $CI_COMMIT_TAG && $CI_COMMIT_TAG != '' )
-    )
+    && ( $CI_COMMIT_TAG && $CI_COMMIT_TAG != '' )
   variables:
     ENVIRONMENT: production
 

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

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,
       ]