summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--Changelog.md3
-rw-r--r--pom.xml40
-rw-r--r--src/main/java/org/onap/dcae/common/SSLContextCreator.java3
-rw-r--r--src/test/java/org/onap/dcae/restapi/ApiAuthInterceptionTest.java4
-rw-r--r--version.properties2
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 @@
<!--
================================================================================
Copyright (c) 2017-2019 AT&T Intellectual Property. All rights reserved.
- Copyright (c) 2020 Nokia. 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. You may obtain a copy
@@ -19,12 +19,12 @@
<parent>
<groupId>org.onap.oparent</groupId>
<artifactId>oparent</artifactId>
- <version>2.0.0</version>
+ <version>3.2.0</version>
<relativePath/>
</parent>
<groupId>org.onap.dcaegen2.collectors.ves</groupId>
<artifactId>VESCollector</artifactId>
- <version>1.8.0-SNAPSHOT</version>
+ <version>1.9.0-SNAPSHOT</version>
<name>dcaegen2-collectors-ves</name>
<description>VESCollector</description>
<properties>
@@ -50,36 +50,36 @@
${project.reporting.outputDirectory}/jacoco-ut/jacoco.xml
</sonar.coverage.jacoco.xmlReportPaths>
<!-- DEPENDENCY RELATED SETTINGS -->
- <crypt-password.version>1.3.5</crypt-password.version>
- <micrometer.version>1.4.2</micrometer.version>
- <spring.version>2.2.2.RELEASE</spring.version>
+ <crypt-password.version>1.8.0</crypt-password.version>
+ <micrometer.version>1.6.5</micrometer.version>
+ <spring.version>2.4.3</spring.version>
<maven-assembly-plugin.version>3.1.0</maven-assembly-plugin.version>
<maven-javadoc-plugin.version>3.0.1</maven-javadoc-plugin.version>
<maven-project-info-reports-plugin.version>2.9</maven-project-info-reports-plugin.version>
<maven-surefire-plugin.version>3.0.0-M1</maven-surefire-plugin.version>
<docker-maven-plugin.version>1.2.0</docker-maven-plugin.version>
<json-simple.version>1.1.1</json-simple.version>
- <json-schema-validator.version>1.0.29</json-schema-validator.version>
- <gson.version>2.8.5</gson.version>
- <json.version>20160810</json.version>
+ <json-schema-validator.version>1.0.49</json-schema-validator.version>
+ <gson.version>2.8.6</gson.version>
+ <json.version>20210307</json.version>
<cambriaClient.version>0.0.1</cambriaClient.version>
<unirest-java.version>1.4.9</unirest-java.version>
<commons-collections.version>3.2.2</commons-collections.version>
<commons-configuration.version>1.10</commons-configuration.version>
- <vavr.version>0.9.2</vavr.version>
- <spring-boot-starter-log4j2.version>2.1.5.RELEASE</spring-boot-starter-log4j2.version>
+ <vavr.version>0.10.3</vavr.version>
+ <spring-boot-starter-log4j2.version>2.4.3</spring-boot-starter-log4j2.version>
<springfox-swagger2.version>3.0.0</springfox-swagger2.version>
<junit.jupiter.version>5.7.1</junit.jupiter.version>
- <mockito-junit-jupiter.version>2.23.0</mockito-junit-jupiter.version>
- <assertj-core.version>3.8.0</assertj-core.version>
- <jimfs.version>1.1</jimfs.version>
- <wiremock-standalone.version>2.17.0</wiremock-standalone.version>
- <spring-security-test.version>5.1.1.RELEASE</spring-security-test.version>
+ <mockito-junit-jupiter.version>3.8.0</mockito-junit-jupiter.version>
+ <assertj-core.version>3.19.0</assertj-core.version>
+ <jimfs.version>1.2</jimfs.version>
+ <wiremock-standalone.version>2.27.2</wiremock-standalone.version>
+ <spring-security-test.version>5.4.5</spring-security-test.version>
<spring-boot-starter-test.version>2.2.13.RELEASE</spring-boot-starter-test.version>
- <api-custom-header.version>1.1.4</api-custom-header.version>
- <functionaljava.version>4.8.1</functionaljava.version>
- <external-schema-manager.version>1.4.3</external-schema-manager.version>
- <sdk.version>1.4.2</sdk.version>
+ <api-custom-header.version>1.8.0</api-custom-header.version>
+ <functionaljava.version>4.9</functionaljava.version>
+ <external-schema-manager.version>1.8.0</external-schema-manager.version>
+ <sdk.version>1.8.0</sdk.version>
<guava.version>30.1-jre</guava.version>
</properties>
<build>
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}