From 10cb5c49464ddd0c9fedb7213e8ebf9c673c34e0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thierry=20G=C3=B6ckel?= <thierry.goeckel@iqser.com>
Date: Thu, 22 Oct 2020 10:03:00 +0200
Subject: [PATCH] Add missing metric dependency and streamline actuator
 settings

---
 redaction-report-service-v1/pom.xml                      | 2 +-
 .../redaction-report-service-server-v1/pom.xml           | 8 ++++++--
 .../service/redaction/report/v1/server/Application.java  | 2 +-
 .../src/main/resources/application.yml                   | 1 +
 .../src/main/resources/bootstrap.yml                     | 9 +++------
 5 files changed, 12 insertions(+), 10 deletions(-)

diff --git a/redaction-report-service-v1/pom.xml b/redaction-report-service-v1/pom.xml
index 9183672..1a020cd 100644
--- a/redaction-report-service-v1/pom.xml
+++ b/redaction-report-service-v1/pom.xml
@@ -26,7 +26,7 @@
             <dependency>
                 <groupId>com.iqser.red</groupId>
                 <artifactId>platform-commons-dependency</artifactId>
-                <version>1.0.0</version>
+                <version>1.1.1</version>
                 <scope>import</scope>
                 <type>pom</type>
             </dependency>
diff --git a/redaction-report-service-v1/redaction-report-service-server-v1/pom.xml b/redaction-report-service-v1/redaction-report-service-server-v1/pom.xml
index ca9d1ef..e67d37a 100644
--- a/redaction-report-service-v1/redaction-report-service-server-v1/pom.xml
+++ b/redaction-report-service-v1/redaction-report-service-server-v1/pom.xml
@@ -35,17 +35,21 @@
             <version>4.1.2</version>
         </dependency>
         <dependency>
-            <groupId>com.iqser.gin4.commons</groupId>
+            <groupId>com.iqser.red.commons</groupId>
             <artifactId>spring-commons</artifactId>
         </dependency>
         <dependency>
             <groupId>org.springframework.cloud</groupId>
             <artifactId>spring-cloud-starter-openfeign</artifactId>
         </dependency>
+        <dependency>
+            <groupId>com.iqser.red.commons</groupId>
+            <artifactId>metric-commons</artifactId>
+        </dependency>
 
         <!-- Test -->
         <dependency>
-            <groupId>com.iqser.gin4.commons</groupId>
+            <groupId>com.iqser.red.commons</groupId>
             <artifactId>test-commons</artifactId>
             <scope>test</scope>
         </dependency>
diff --git a/redaction-report-service-v1/redaction-report-service-server-v1/src/main/java/com/iqser/red/service/redaction/report/v1/server/Application.java b/redaction-report-service-v1/redaction-report-service-server-v1/src/main/java/com/iqser/red/service/redaction/report/v1/server/Application.java
index abff3c2..85b8175 100644
--- a/redaction-report-service-v1/redaction-report-service-server-v1/src/main/java/com/iqser/red/service/redaction/report/v1/server/Application.java
+++ b/redaction-report-service-v1/redaction-report-service-server-v1/src/main/java/com/iqser/red/service/redaction/report/v1/server/Application.java
@@ -9,7 +9,7 @@ import org.springframework.cloud.openfeign.EnableFeignClients;
 import org.springframework.context.annotation.Import;
 import org.springframework.scheduling.annotation.EnableAsync;
 
-import com.iqser.gin4.commons.spring.DefaultWebMvcConfiguration;
+import com.iqser.red.commons.spring.DefaultWebMvcConfiguration;
 import com.iqser.red.service.redaction.report.v1.server.settings.RedactionReportSettings;
 
 @EnableAsync
diff --git a/redaction-report-service-v1/redaction-report-service-server-v1/src/main/resources/application.yml b/redaction-report-service-v1/redaction-report-service-server-v1/src/main/resources/application.yml
index c5a0648..fd788ad 100644
--- a/redaction-report-service-v1/redaction-report-service-server-v1/src/main/resources/application.yml
+++ b/redaction-report-service-v1/redaction-report-service-server-v1/src/main/resources/application.yml
@@ -15,5 +15,6 @@ management:
   endpoint:
     metrics.enabled: ${monitoring.enabled:false}
     prometheus.enabled: ${monitoring.enabled:false}
+    health.enabled: true
   endpoints.web.exposure.include: prometheus, health
   metrics.export.prometheus.enabled: ${monitoring.enabled:false}
\ No newline at end of file
diff --git a/redaction-report-service-v1/redaction-report-service-server-v1/src/main/resources/bootstrap.yml b/redaction-report-service-v1/redaction-report-service-server-v1/src/main/resources/bootstrap.yml
index 156ac85..cbcd1dd 100644
--- a/redaction-report-service-v1/redaction-report-service-server-v1/src/main/resources/bootstrap.yml
+++ b/redaction-report-service-v1/redaction-report-service-server-v1/src/main/resources/bootstrap.yml
@@ -2,9 +2,6 @@ spring:
   application:
     name: redaction-report-service-v1
 
-management:
-  endpoints:
-    web:
-      base-path: /
-      path-mapping:
-        health: "health"
\ No newline at end of file
+management.endpoints:
+  web.base-path: /
+  enabled-by-default: false
\ No newline at end of file