summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorMaciej Malewski <maciej.malewski@nokia.com>2021-03-18 11:46:48 +0100
committerMaciej Malewski <maciej.malewski@nokia.com>2021-03-21 16:54:46 +0100
commit22687ff3bf09afec08e15cdc0e3f3387b11e7fa1 (patch)
tree8e810c815914ef371071fcebcdd5f8d01745374c /src
parent93c47d51a8873482a655e84aba9781ebb7392847 (diff)
[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 <maciej.malewski@nokia.com> Change-Id: I043ef1a8eb2a068d63c0248afe3bdf140d2570f5
Diffstat (limited to 'src')
-rw-r--r--src/main/java/org/onap/dcae/common/SSLContextCreator.java3
-rw-r--r--src/test/java/org/onap/dcae/restapi/ApiAuthInterceptionTest.java4
2 files changed, 4 insertions, 3 deletions
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);
}