[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

diff --git a/Changelog.md b/Changelog.md
index bca0833..563a860 100644 (file)
--- 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 d1d0783..044fcbe 100644 (file)
--- a/pom.xml
+++ b/pom.xml
@@ -2,7 +2,7 @@
 <!--\r
     ================================================================================\r
        Copyright (c) 2017-2019 AT&T Intellectual Property. All rights reserved.\r
-       Copyright (c) 2020 Nokia. All rights reserved.\r
+       Copyright (c) 2020-2021 Nokia. All rights reserved.\r
        ================================================================================\r
        Licensed under the Apache License, Version 2.0 (the "License"); you may not\r
        use this file except in compliance with the License. You may obtain a copy\r
@@ -19,12 +19,12 @@
   <parent>\r
     <groupId>org.onap.oparent</groupId>\r
     <artifactId>oparent</artifactId>\r
-    <version>2.0.0</version>\r
+    <version>3.2.0</version>\r
     <relativePath/>\r
   </parent>\r
   <groupId>org.onap.dcaegen2.collectors.ves</groupId>\r
   <artifactId>VESCollector</artifactId>\r
-  <version>1.8.0-SNAPSHOT</version>\r
+  <version>1.9.0-SNAPSHOT</version>\r
   <name>dcaegen2-collectors-ves</name>\r
   <description>VESCollector</description>\r
   <properties>\r
@@ -50,36 +50,36 @@
        ${project.reporting.outputDirectory}/jacoco-ut/jacoco.xml\r
     </sonar.coverage.jacoco.xmlReportPaths>\r
     <!-- DEPENDENCY RELATED SETTINGS -->\r
-    <crypt-password.version>1.3.5</crypt-password.version>\r
-    <micrometer.version>1.4.2</micrometer.version>\r
-    <spring.version>2.2.2.RELEASE</spring.version>\r
+    <crypt-password.version>1.8.0</crypt-password.version>\r
+    <micrometer.version>1.6.5</micrometer.version>\r
+    <spring.version>2.4.3</spring.version>\r
     <maven-assembly-plugin.version>3.1.0</maven-assembly-plugin.version>\r
     <maven-javadoc-plugin.version>3.0.1</maven-javadoc-plugin.version>\r
     <maven-project-info-reports-plugin.version>2.9</maven-project-info-reports-plugin.version>\r
     <maven-surefire-plugin.version>3.0.0-M1</maven-surefire-plugin.version>\r
     <docker-maven-plugin.version>1.2.0</docker-maven-plugin.version>\r
     <json-simple.version>1.1.1</json-simple.version>\r
-    <json-schema-validator.version>1.0.29</json-schema-validator.version>\r
-    <gson.version>2.8.5</gson.version>\r
-    <json.version>20160810</json.version>\r
+    <json-schema-validator.version>1.0.49</json-schema-validator.version>\r
+    <gson.version>2.8.6</gson.version>\r
+    <json.version>20210307</json.version>\r
     <cambriaClient.version>0.0.1</cambriaClient.version>\r
     <unirest-java.version>1.4.9</unirest-java.version>\r
     <commons-collections.version>3.2.2</commons-collections.version>\r
     <commons-configuration.version>1.10</commons-configuration.version>\r
-    <vavr.version>0.9.2</vavr.version>\r
-    <spring-boot-starter-log4j2.version>2.1.5.RELEASE</spring-boot-starter-log4j2.version>\r
+    <vavr.version>0.10.3</vavr.version>\r
+    <spring-boot-starter-log4j2.version>2.4.3</spring-boot-starter-log4j2.version>\r
     <springfox-swagger2.version>3.0.0</springfox-swagger2.version>\r
     <junit.jupiter.version>5.7.1</junit.jupiter.version>\r
-    <mockito-junit-jupiter.version>2.23.0</mockito-junit-jupiter.version>\r
-    <assertj-core.version>3.8.0</assertj-core.version>\r
-    <jimfs.version>1.1</jimfs.version>\r
-    <wiremock-standalone.version>2.17.0</wiremock-standalone.version>\r
-    <spring-security-test.version>5.1.1.RELEASE</spring-security-test.version>\r
+    <mockito-junit-jupiter.version>3.8.0</mockito-junit-jupiter.version>\r
+    <assertj-core.version>3.19.0</assertj-core.version>\r
+    <jimfs.version>1.2</jimfs.version>\r
+    <wiremock-standalone.version>2.27.2</wiremock-standalone.version>\r
+    <spring-security-test.version>5.4.5</spring-security-test.version>\r
     <spring-boot-starter-test.version>2.2.13.RELEASE</spring-boot-starter-test.version>\r
-    <api-custom-header.version>1.1.4</api-custom-header.version>\r
-    <functionaljava.version>4.8.1</functionaljava.version>\r
-    <external-schema-manager.version>1.4.3</external-schema-manager.version>\r
-    <sdk.version>1.4.2</sdk.version>\r
+    <api-custom-header.version>1.8.0</api-custom-header.version>\r
+    <functionaljava.version>4.9</functionaljava.version>\r
+    <external-schema-manager.version>1.8.0</external-schema-manager.version>\r
+    <sdk.version>1.8.0</sdk.version>\r
     <guava.version>30.1-jre</guava.version>\r
   </properties>\r
   <build>\r

diff --git a/src/main/java/org/onap/dcae/common/SSLContextCreator.java b/src/main/java/org/onap/dcae/common/SSLContextCreator.java
index 898e5d5..d28d5c4 100644 (file)
--- 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 6719361..9df0c69 100644 (file)
--- 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 6db90f2..a1653f6 100644 (file)
--- 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}