From 4710dd757cbe89a2ac38f07c1fbb977ed570becf Mon Sep 17 00:00:00 2001 From: Piotr Marcinkiewicz Date: Mon, 27 Jul 2020 16:28:52 +0200 Subject: Fix SDK vulnerabilities - Update spring boot dependencies and fix warnings about deprecations. - Update testcontainers version to 1.14.3 - Top up patch version to 1.4.1 Issue-ID: DCAEGEN2-2277 Signed-off-by: Piotr Marcinkiewicz Change-Id: I2173e0160728f2d404c7cf65e1869a642db49ece --- standardization/moher-api/healthstate/pom.xml | 4 ++-- standardization/moher-api/metrics/pom.xml | 4 ++-- standardization/moher-api/pom.xml | 4 ++-- standardization/moher-api/server-adapters/pom.xml | 4 ++-- standardization/moher-api/server-adapters/reactor-netty/pom.xml | 4 ++-- standardization/moher-api/server-adapters/spring-webflux/pom.xml | 4 ++-- .../moher/adapters/springwebflux/HealthController.java | 6 +++--- 7 files changed, 15 insertions(+), 15 deletions(-) (limited to 'standardization/moher-api') diff --git a/standardization/moher-api/healthstate/pom.xml b/standardization/moher-api/healthstate/pom.xml index dc0b9d38..d08ba480 100644 --- a/standardization/moher-api/healthstate/pom.xml +++ b/standardization/moher-api/healthstate/pom.xml @@ -25,7 +25,7 @@ dcaegen2-sdk-moher-api org.onap.dcaegen2.services.sdk - 1.4.0-SNAPSHOT + 1.4.1-SNAPSHOT Monitoring and Healthcheck :: Health state @@ -52,4 +52,4 @@ reactor-core - \ No newline at end of file + diff --git a/standardization/moher-api/metrics/pom.xml b/standardization/moher-api/metrics/pom.xml index 41464f1c..11a23180 100644 --- a/standardization/moher-api/metrics/pom.xml +++ b/standardization/moher-api/metrics/pom.xml @@ -26,7 +26,7 @@ dcaegen2-sdk-moher-api org.onap.dcaegen2.services.sdk - 1.4.0-SNAPSHOT + 1.4.1-SNAPSHOT Monitoring and Healthcheck :: Metrics @@ -63,4 +63,4 @@ test - \ No newline at end of file + diff --git a/standardization/moher-api/pom.xml b/standardization/moher-api/pom.xml index 8408e59a..6b282320 100644 --- a/standardization/moher-api/pom.xml +++ b/standardization/moher-api/pom.xml @@ -26,7 +26,7 @@ dcaegen2-services-sdk-standardization org.onap.dcaegen2.services.sdk - 1.4.0-SNAPSHOT + 1.4.1-SNAPSHOT Monitoring and Healthcheck @@ -39,4 +39,4 @@ healthstate server-adapters - \ No newline at end of file + diff --git a/standardization/moher-api/server-adapters/pom.xml b/standardization/moher-api/server-adapters/pom.xml index 8d495386..91479c13 100644 --- a/standardization/moher-api/server-adapters/pom.xml +++ b/standardization/moher-api/server-adapters/pom.xml @@ -25,7 +25,7 @@ dcaegen2-sdk-moher-api org.onap.dcaegen2.services.sdk - 1.4.0-SNAPSHOT + 1.4.1-SNAPSHOT Monitoring and Healthcheck :: Server Adapters @@ -38,4 +38,4 @@ spring-webflux reactor-netty - \ No newline at end of file + diff --git a/standardization/moher-api/server-adapters/reactor-netty/pom.xml b/standardization/moher-api/server-adapters/reactor-netty/pom.xml index 88288804..f4645120 100644 --- a/standardization/moher-api/server-adapters/reactor-netty/pom.xml +++ b/standardization/moher-api/server-adapters/reactor-netty/pom.xml @@ -25,7 +25,7 @@ dcaegen2-sdk-moher-server-adapters org.onap.dcaegen2.services.sdk - 1.4.0-SNAPSHOT + 1.4.1-SNAPSHOT Monitoring and Healthcheck :: Server Adapters :: Reactor Netty @@ -62,4 +62,4 @@ test - \ No newline at end of file + diff --git a/standardization/moher-api/server-adapters/spring-webflux/pom.xml b/standardization/moher-api/server-adapters/spring-webflux/pom.xml index cca6f00d..227dbc4c 100644 --- a/standardization/moher-api/server-adapters/spring-webflux/pom.xml +++ b/standardization/moher-api/server-adapters/spring-webflux/pom.xml @@ -25,7 +25,7 @@ dcaegen2-sdk-moher-server-adapters org.onap.dcaegen2.services.sdk - 1.4.0-SNAPSHOT + 1.4.1-SNAPSHOT Monitoring and Healthcheck :: Server Adapters :: Spring Webflux @@ -78,4 +78,4 @@ test - \ No newline at end of file + diff --git a/standardization/moher-api/server-adapters/spring-webflux/src/main/java/org/onap/dcaegen2/services/sdk/standardization/moher/adapters/springwebflux/HealthController.java b/standardization/moher-api/server-adapters/spring-webflux/src/main/java/org/onap/dcaegen2/services/sdk/standardization/moher/adapters/springwebflux/HealthController.java index 1f9eb4b0..0fcb331a 100644 --- a/standardization/moher-api/server-adapters/spring-webflux/src/main/java/org/onap/dcaegen2/services/sdk/standardization/moher/adapters/springwebflux/HealthController.java +++ b/standardization/moher-api/server-adapters/spring-webflux/src/main/java/org/onap/dcaegen2/services/sdk/standardization/moher/adapters/springwebflux/HealthController.java @@ -2,7 +2,7 @@ * ============LICENSE_START==================================== * DCAEGEN2-SERVICES-SDK * ========================================================= - * Copyright (C) 2019 Nokia. All rights reserved. + * Copyright (C) 2019-2020 Nokia. All rights reserved. * ========================================================= * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -35,7 +35,7 @@ import org.springframework.web.bind.annotation.RestController; import reactor.core.publisher.Mono; @RestController -@RequestMapping(value = "/health", produces = MediaType.APPLICATION_JSON_UTF8_VALUE) +@RequestMapping(value = "/health", produces = MediaType.APPLICATION_JSON_VALUE) public class HealthController { private final Gson gson; private final HealthProvider healthProvider; @@ -55,7 +55,7 @@ public class HealthController { public Mono> readinessCheck() { return healthProvider.currentHealth() .map(health -> responseStatusForHealth(health) - .contentType(MediaType.APPLICATION_JSON_UTF8) + .contentType(MediaType.APPLICATION_JSON) .body(gson.toJson(health))); } -- cgit 1.2.3-korg