From 22687ff3bf09afec08e15cdc0e3f3387b11e7fa1 Mon Sep 17 00:00:00 2001 From: Maciej Malewski Date: Thu, 18 Mar 2021 11:46:48 +0100 Subject: [DCAEGEN2] vescollector upgrade versions: crypt-password from 1.3.5 to 1.8.0 micrometer-registry-prometheus from 1.4.2 to 1.6.5 spring-boot-dependencies from 2.2.2.RELEASE to 2.4.3 json-schema-validator from 1.0.29 to 1.0.49 gson from 3.8.5 to 3.8.6 json from 20160810 to 20210307 vavr from 0.9.2 to 0.10.3 spring-boot-starter-log4j2 from 2.1.5.RELEASE to 2.4.3 mockito-junit-jupiter from 2.23.0 to 3.8.0 assertj-core from 3.8.0 to 3.19.0 jimfs from 1.1 to 1.2 wiremock-standalone 2.17.0 to 2.27.2 spring-security-test from 5.1.1.RELEASE to 5.4.5 api-custom-header from 1.1.4 to 1.8.0 functionaljava from 4.8.1 to 4.9 dcaegen2-services-sdk-services-external-schema-manager from 1.4.3 to 1.8.0 cbs-client from 1.4.2 to 1.8.0 Issue-ID: DCAEGEN2-2682 Signed-off-by: Maciej Malewski Change-Id: I043ef1a8eb2a068d63c0248afe3bdf140d2570f5 --- Changelog.md | 3 +- pom.xml | 40 +++++++++++----------- .../org/onap/dcae/common/SSLContextCreator.java | 3 +- .../onap/dcae/restapi/ApiAuthInterceptionTest.java | 4 +-- version.properties | 2 +- 5 files changed, 27 insertions(+), 25 deletions(-) diff --git a/Changelog.md b/Changelog.md index bca08338..563a860d 100644 --- a/Changelog.md +++ b/Changelog.md @@ -48,4 +48,5 @@ and this project adheres to [Semantic Versioning](http://semver.org/). ## [1.8.0] - 24/02/2021 - [DCAEGEN2-2477](https://jira.onap.org/browse/DCAEGEN2-2477) - Update VESCollector CommonEventSchema to ONAP/Honolulu version Use updated CommonEventSchema to validate IP in VES Collector - +## [1.9.0] - 18/03/2021 + - [DCAEGEN2-2682](https://jira.onap.org/browse/DCAEGEN2-2682) - Update libraries diff --git a/pom.xml b/pom.xml index d1d07833..044fcbe1 100644 --- a/pom.xml +++ b/pom.xml @@ -2,7 +2,7 @@ - 1.3.5 - 1.4.2 - 2.2.2.RELEASE + 1.8.0 + 1.6.5 + 2.4.3 3.1.0 3.0.1 2.9 3.0.0-M1 1.2.0 1.1.1 - 1.0.29 - 2.8.5 - 20160810 + 1.0.49 + 2.8.6 + 20210307 0.0.1 1.4.9 3.2.2 1.10 - 0.9.2 - 2.1.5.RELEASE + 0.10.3 + 2.4.3 3.0.0 5.7.1 - 2.23.0 - 3.8.0 - 1.1 - 2.17.0 - 5.1.1.RELEASE + 3.8.0 + 3.19.0 + 1.2 + 2.27.2 + 5.4.5 2.2.13.RELEASE - 1.1.4 - 4.8.1 - 1.4.3 - 1.4.2 + 1.8.0 + 4.9 + 1.8.0 + 1.8.0 30.1-jre diff --git a/src/main/java/org/onap/dcae/common/SSLContextCreator.java b/src/main/java/org/onap/dcae/common/SSLContextCreator.java index 898e5d55..d28d5c46 100644 --- a/src/main/java/org/onap/dcae/common/SSLContextCreator.java +++ b/src/main/java/org/onap/dcae/common/SSLContextCreator.java @@ -3,6 +3,7 @@ * PROJECT * ================================================================================ * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved. + * Copyright (c) 2020-2021 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. @@ -56,7 +57,7 @@ public class SSLContextCreator { private void configureKeyStore(final Ssl ssl) { final String keyStore = keyStoreFile.toAbsolutePath().toString(); ssl.setKeyStore(keyStore); - ssl.setKeyPassword(keyStorePassword); + ssl.setKeyStorePassword(keyStorePassword); ssl.setKeyAlias(certAlias); } diff --git a/src/test/java/org/onap/dcae/restapi/ApiAuthInterceptionTest.java b/src/test/java/org/onap/dcae/restapi/ApiAuthInterceptionTest.java index 67193617..9df0c694 100644 --- a/src/test/java/org/onap/dcae/restapi/ApiAuthInterceptionTest.java +++ b/src/test/java/org/onap/dcae/restapi/ApiAuthInterceptionTest.java @@ -2,7 +2,7 @@ * ============LICENSE_START======================================================= * org.onap.dcaegen2.collectors.ves * ================================================================================ - * Copyright (C) 2018 - 2019 Nokia. All rights reserved. + * Copyright (C) 2018 - 2021 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. @@ -131,7 +131,7 @@ public class ApiAuthInterceptionTest { private HttpServletRequest createEmptyRequest() { return MockMvcRequestBuilders - .post("") + .post("/") .buildRequest(null); } diff --git a/version.properties b/version.properties index 6db90f27..a1653f6b 100644 --- a/version.properties +++ b/version.properties @@ -1,5 +1,5 @@ major=1 -minor=8 +minor=9 patch=0 base_version=${major}.${minor}.${patch} release_version=${base_version} -- cgit 1.2.3-korg