Skip to content
This repository has been archived by the owner on Jul 23, 2024. It is now read-only.

Commit

Permalink
FLPATH-274 enable spring-cloud-config
Browse files Browse the repository at this point in the history
  • Loading branch information
sergiubodiu committed Apr 10, 2023
1 parent 3f6667e commit 5835a8d
Show file tree
Hide file tree
Showing 8 changed files with 38 additions and 28 deletions.
4 changes: 4 additions & 0 deletions notification-service/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -185,6 +185,10 @@
<artifactId>jackson-databind-nullable</artifactId>
<version>${jackson-databind-nullable-version}</version>
</dependency>
<dependency>
<groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-starter-config</artifactId>
</dependency>
</dependencies>
<dependencyManagement>
<dependencies>
Expand Down
4 changes: 0 additions & 4 deletions notification-service/src/main/resources/application-dev.yml
Original file line number Diff line number Diff line change
Expand Up @@ -32,10 +32,6 @@ spring:
username: postgres
password: postgres

springdoc:
writer-with-order-by-keys: true
writer-with-default-pretty-printer: true

# ===================================================================
# Application specific properties
# Add your own application properties here, see the
Expand Down
9 changes: 5 additions & 4 deletions notification-service/src/main/resources/application-local.yml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# ===================================================================
# Spring Boot configuration for the "dev" profile.
# Spring Boot configuration for the "local" profile.
#
# This configuration overrides the application.yml file and should be
# only used for development purpose.
Expand Down Expand Up @@ -43,9 +43,10 @@ spring:
username: postgres
password: postgres

springdoc:
writer-with-order-by-keys: true
writer-with-default-pretty-printer: true
cloud:
config:
enabled: true
import: optional:configserver:http://localhost:8888

# ===================================================================
# Application specific properties
Expand Down
5 changes: 4 additions & 1 deletion notification-service/src/main/resources/application.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,10 @@ spring:
default-property-inclusion: non_null
main:
lazy-initialization: true
cloud:
config:
enabled: false

springdoc:
writer-with-order-by-keys: true
writer-with-default-pretty-printer: true
writer-with-default-pretty-printer: true
6 changes: 6 additions & 0 deletions workflow-service/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -183,6 +183,12 @@
<artifactId>prebuilt-tasks</artifactId>
<version>${revision}</version>
</dependency>
<!-- START Spring Cloud Config Dependencies -->
<dependency>
<groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-starter-config</artifactId>
</dependency>
<!-- END Spring Cloud Config Dependencies -->
</dependencies>

<dependencyManagement>
Expand Down
4 changes: 1 addition & 3 deletions workflow-service/src/main/resources/application-dev.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,9 +17,7 @@ spring:
managerPassword: "admin"
lifecycle:
timeout-per-shutdown-phase: "25s"
springdoc:
writer-with-order-by-keys: true
writer-with-default-pretty-printer: true

management:
endpoint:
shutdown:
Expand Down
31 changes: 15 additions & 16 deletions workflow-service/src/main/resources/application-local.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,19 +17,18 @@ spring:
managerPassword: null
lifecycle:
timeout-per-shutdown-phase: "25s"
springdoc:
writer-with-order-by-keys: true
writer-with-default-pretty-printer: true
management:
endpoint:
shutdown:
enabled: true
health:
enabled: true
endpoints:
enabled-by-default: false
web:
exposure:
include: "health,shutdown"
server:
shutdown: "graceful"
cloud:
enabled: true
config:
import: optional:configserver:http://localhost:8888

logging:
level:
ROOT: INFO
com.redhat.parodos.workflow: DEBUG

# ===================================================================
# Application specific properties
# Add your own application properties here, see the
# ApplicationProperties class to have type-safe configuration
# ===================================================================
3 changes: 3 additions & 0 deletions workflow-service/src/main/resources/application.yml
Original file line number Diff line number Diff line change
Expand Up @@ -47,6 +47,9 @@ spring:
lifecycle:
timeout-per-shutdown-phase: "25s"

cloud:
config:
enabled: false
management:
endpoint:
shutdown:
Expand Down

0 comments on commit 5835a8d

Please sign in to comment.