pom update maven filtering vars (#1412)

it-at-m · Mar 5, 2024 · 2cdc501 · 2cdc501
1 parent 546343b
commit 2cdc501
Show file tree

Hide file tree

Showing 11 changed files with 22 additions and 21 deletions.
diff --git a/digiwf-engine/digiwf-engine-rest-service/src/main/resources/application.yml b/digiwf-engine/digiwf-engine-rest-service/src/main/resources/application.yml
@@ -1,7 +1,7 @@
 info:
   application:
-    name: @project.artifactId@
-    version: 0.1.0
+    name: '@project.artifactId@'
+    version: '@project.version@'
 
 camunda:
   bpm:
@@ -38,7 +38,7 @@ server:
     whitelabel:
       enabled: false
   shutdown: graceful
-      
+
 spring:
   application:
     name: ${info.application.name}

diff --git a/digiwf-engine/digiwf-engine-service/src/main/resources/application.yml b/digiwf-engine/digiwf-engine-service/src/main/resources/application.yml
@@ -1,7 +1,7 @@
 info:
   application:
-    name: @project.artifactId@
-    version: 0.1.0
+    name: '@project.artifactId@'
+    version: '@project.version@'
 camunda:
   bpm:
     authorization:

diff --git a/digiwf-gateway/src/main/resources/application.yml b/digiwf-gateway/src/main/resources/application.yml
@@ -1,12 +1,13 @@
 info:
   application:
-    name: ${spring.application.name}
+    name: '@project.artifactId@'
+    version: '@project.version@'
     stage:
       color: ${STAGE_COLOR:#FFCC00}
       displayName: ${STAGE_DISPLAY_NAME:${DIGIWF_ENV}}
 spring:
   application:
-    name: @project.artifactId@
+    name: ${info.application.name}
   main:
     web-application-type: reactive
   jackson:

diff --git a/...address-integration/digiwf-address-integration-service/src/main/resources/application.yml b/...address-integration/digiwf-address-integration-service/src/main/resources/application.yml
@@ -25,7 +25,7 @@ server:
   shutdown: graceful
 spring:
   application:
-    name: @project.artifactId@
+    name: '@project.artifactId@'
   lifecycle:
     timeout-per-shutdown-phase: 1m
   cloud:

diff --git a/.../digiwf-alw-integration/digiwf-alw-integration-service/src/main/resources/application.yml b/.../digiwf-alw-integration/digiwf-alw-integration-service/src/main/resources/application.yml
@@ -22,11 +22,11 @@ io:
 
 info:
   application:
-    name: @project.artifactId@
-    version: @project.version@
+    name: '@project.artifactId@'
+    version: '@project.version@'
 
 spring:
-  application.name: @project.artifactId@
+  application.name: ${info.application.name}
   banner.location: banner.txt
   cloud:
     stream:

diff --git a/...iwf-cosys-integration/digiwf-cosys-integration-service/src/main/resources/application.yml b/...iwf-cosys-integration/digiwf-cosys-integration-service/src/main/resources/application.yml
@@ -1,6 +1,6 @@
 spring:
   application:
-    name: @project.artifactId@
+    name: '@project.artifactId@'
 
 io:
   muenchendigital:

diff --git a/.../digiwf-dms-integration/digiwf-dms-integration-service/src/main/resources/application.yml b/.../digiwf-dms-integration/digiwf-dms-integration-service/src/main/resources/application.yml
@@ -3,7 +3,7 @@ server:
   shutdown: graceful
 spring:
   application:
-    name: @project.artifactId@
+    name: '@project.artifactId@'
   cloud:
     stream:
       bindings:

diff --git a/...iwf-email-integration/digiwf-email-integration-service/src/main/resources/application.yml b/...iwf-email-integration/digiwf-email-integration-service/src/main/resources/application.yml
@@ -3,7 +3,7 @@ server:
   shutdown: graceful
 spring:
   application:
-    name: @project.artifactId@
+    name: '@project.artifactId@'
   cloud:
     stream:
       bindings:

diff --git a/...ns/digiwf-s3-integration/digiwf-s3-integration-service/src/main/resources/application.yml b/...ns/digiwf-s3-integration/digiwf-s3-integration-service/src/main/resources/application.yml
@@ -1,11 +1,11 @@
 info:
   application:
-    name: @project.artifactId@
-    version: @project.version@
+    name: '@project.artifactId@'
+    version: '@project.version@'
 
 spring:
   application:
-    name: @project.artifactId@
+    name: ${info.application.name}
   # Spring JPA
   datasource:
     url: '${S3INTEGRATION_DATASOURCE_URL}'

diff --git a/...f-ticket-integration/digiwf-ticket-integration-service/src/main/resources/application.yml b/...f-ticket-integration/digiwf-ticket-integration-service/src/main/resources/application.yml
@@ -18,11 +18,11 @@ io:
 
 info:
   application:
-    name: @project.artifactId@
-    version: @project.version@
+    name: '@project.artifactId@'
+    version: '@project.version@'
 
 spring:
-  application.name: @project.artifactId@
+  application.name: ${info.application.name}
   banner.location: banner.txt
   cloud:
     stream:

diff --git a/digiwf-task/digiwf-tasklist-service/src/main/resources/application.yml b/digiwf-task/digiwf-tasklist-service/src/main/resources/application.yml
@@ -2,7 +2,7 @@ server:
   port: ${TASKSERVICE_SERVER_PORT}
   shutdown: graceful
 spring:
-  application.name: @project.artifactId@
+  application.name: '@project.artifactId@'
   profiles:
     active: no-ldap # this profile is activating mock group resolution and should be replaced by the LDAP-aware client on production
   datasource: