From 2cdc5015446128a4ac719917fa727c36dce0198d Mon Sep 17 00:00:00 2001 From: Simon Hirtreiter Date: Tue, 5 Mar 2024 08:19:00 +0100 Subject: [PATCH] pom update maven filtering vars (#1412) --- .../src/main/resources/application.yml | 6 +++--- .../src/main/resources/application.yml | 4 ++-- digiwf-gateway/src/main/resources/application.yml | 5 +++-- .../src/main/resources/application.yml | 2 +- .../src/main/resources/application.yml | 6 +++--- .../src/main/resources/application.yml | 2 +- .../src/main/resources/application.yml | 2 +- .../src/main/resources/application.yml | 2 +- .../src/main/resources/application.yml | 6 +++--- .../src/main/resources/application.yml | 6 +++--- .../src/main/resources/application.yml | 2 +- 11 files changed, 22 insertions(+), 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 index 3aa9c3490f..407e1af143 100644 --- 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 index d2e5a7584b..0e196d1aa5 100644 --- 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 index 073fdfeffe..4ec6b656fc 100644 --- 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/digiwf-integrations/digiwf-address-integration/digiwf-address-integration-service/src/main/resources/application.yml b/digiwf-integrations/digiwf-address-integration/digiwf-address-integration-service/src/main/resources/application.yml index 98829378d5..1b41da7c35 100644 --- a/digiwf-integrations/digiwf-address-integration/digiwf-address-integration-service/src/main/resources/application.yml +++ b/digiwf-integrations/digiwf-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-integrations/digiwf-alw-integration/digiwf-alw-integration-service/src/main/resources/application.yml b/digiwf-integrations/digiwf-alw-integration/digiwf-alw-integration-service/src/main/resources/application.yml index d7b3bbeb2f..a5eb3a0d75 100644 --- a/digiwf-integrations/digiwf-alw-integration/digiwf-alw-integration-service/src/main/resources/application.yml +++ b/digiwf-integrations/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/digiwf-integrations/digiwf-cosys-integration/digiwf-cosys-integration-service/src/main/resources/application.yml b/digiwf-integrations/digiwf-cosys-integration/digiwf-cosys-integration-service/src/main/resources/application.yml index bb78268dc5..b81822e5b5 100644 --- a/digiwf-integrations/digiwf-cosys-integration/digiwf-cosys-integration-service/src/main/resources/application.yml +++ b/digiwf-integrations/digiwf-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-integrations/digiwf-dms-integration/digiwf-dms-integration-service/src/main/resources/application.yml b/digiwf-integrations/digiwf-dms-integration/digiwf-dms-integration-service/src/main/resources/application.yml index 858dcab785..dfb0be8ba7 100644 --- a/digiwf-integrations/digiwf-dms-integration/digiwf-dms-integration-service/src/main/resources/application.yml +++ b/digiwf-integrations/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/digiwf-integrations/digiwf-email-integration/digiwf-email-integration-service/src/main/resources/application.yml b/digiwf-integrations/digiwf-email-integration/digiwf-email-integration-service/src/main/resources/application.yml index 40d5676d93..4f8a53be17 100644 --- a/digiwf-integrations/digiwf-email-integration/digiwf-email-integration-service/src/main/resources/application.yml +++ b/digiwf-integrations/digiwf-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/digiwf-integrations/digiwf-s3-integration/digiwf-s3-integration-service/src/main/resources/application.yml b/digiwf-integrations/digiwf-s3-integration/digiwf-s3-integration-service/src/main/resources/application.yml index 902417cb8e..8b692de68c 100644 --- a/digiwf-integrations/digiwf-s3-integration/digiwf-s3-integration-service/src/main/resources/application.yml +++ b/digiwf-integrations/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/digiwf-integrations/digiwf-ticket-integration/digiwf-ticket-integration-service/src/main/resources/application.yml b/digiwf-integrations/digiwf-ticket-integration/digiwf-ticket-integration-service/src/main/resources/application.yml index f95a368dce..9fdb318863 100644 --- a/digiwf-integrations/digiwf-ticket-integration/digiwf-ticket-integration-service/src/main/resources/application.yml +++ b/digiwf-integrations/digiwf-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 index a940b54435..ad275d59e0 100644 --- 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: