diff --git a/.dockerignore b/.dockerignore index 90876251d3b1316f5f265cd81a49a78befc91fed..746e375f3c5c92aeacb6af86f3af3be450137cbe 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 2494e54f6ced794a7693b986273a1a53ce44dc44..9a6ff2035b0a7e3ddbc918a45288f5aca65967f3 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 cc629420a65ed68ee09786ed32296b934e177be6..a8c09481445c9375d7357a9b6585494982ebcbf6 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,