Update DCAE SDK library

Issue-ID: DCAEGEN2-2868
Issue-ID: DCAEGEN2-2863
Signed-off-by: Remigiusz Janeczek <remigiusz.janeczek@nokia.com>
Change-Id: I32348c4f6a96bfd69123b87883b0f9489f09146a

diff --git a/Changelog.md b/Changelog.md
index 9cf6dcf..abe7dc7 100644 (file)
--- a/Changelog.md
+++ b/Changelog.md
@@ -4,6 +4,10 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](http://keepachangelog.com/)
 and this project adheres to [Semantic Versioning](http://semver.org/).
 
+## [1.7.1] - 24/08/2021
+### Changed
+- Update DCAE SDK version from 1.6.0 to 1.8.7
+
 ## [1.7.0] - 11/08/2021
 ### Changed
 - Change AAI variable syntax to "{{variable}}" 

diff --git a/pom.xml b/pom.xml
index f403bbc..8d6c49e 100644 (file)
--- a/pom.xml
+++ b/pom.xml
@@ -33,7 +33,7 @@
 
   <groupId>org.onap.dcaegen2.services</groupId>
   <artifactId>prh</artifactId>
-  <version>1.7.0-SNAPSHOT</version>
+  <version>1.7.1-SNAPSHOT</version>
 
   <name>dcaegen2-services-prh</name>
   <description>PNF Registration Handler</description>
@@ -52,7 +52,7 @@
     <spring-cloud.version>2020.0.1</spring-cloud.version>
     <springfox.version>3.0.0</springfox.version>
     <immutables.version>2.7.5</immutables.version>
-    <sdk.version>1.6.0</sdk.version>
+    <sdk.version>1.8.7</sdk.version>
     <guava.version>29.0-jre</guava.version>
     <sonar.coverage.jacoco.xmlReportPaths>
       ${project.reporting.outputDirectory}/jacoco-ut/jacoco.xml

diff --git a/prh-app-server/pom.xml b/prh-app-server/pom.xml
index ed3ae81..1d0f6b0 100644 (file)
--- a/prh-app-server/pom.xml
+++ b/prh-app-server/pom.xml
@@ -27,7 +27,7 @@
   <parent>
     <groupId>org.onap.dcaegen2.services</groupId>
     <artifactId>prh</artifactId>
-    <version>1.7.0-SNAPSHOT</version>
+    <version>1.7.1-SNAPSHOT</version>
   </parent>
 
   <groupId>org.onap.dcaegen2.services.prh</groupId>

diff --git a/prh-app-server/src/test/java/org/onap/dcaegen2/services/prh/tasks/BbsActionsTaskTest.java b/prh-app-server/src/test/java/org/onap/dcaegen2/services/prh/tasks/BbsActionsTaskTest.java
index 6eed61b..801f6c1 100644 (file)
--- a/prh-app-server/src/test/java/org/onap/dcaegen2/services/prh/tasks/BbsActionsTaskTest.java
+++ b/prh-app-server/src/test/java/org/onap/dcaegen2/services/prh/tasks/BbsActionsTaskTest.java
@@ -37,6 +37,7 @@ import static org.onap.dcaegen2.services.sdk.rest.services.adapters.http.HttpMet
 
 import com.google.gson.JsonObject;
 import io.netty.handler.codec.http.HttpResponseStatus;
+import io.vavr.collection.HashMultimap;
 import java.nio.charset.StandardCharsets;
 import java.util.List;
 import java.util.Scanner;
@@ -99,7 +100,8 @@ class BbsActionsTaskTest {
         ConsumerDmaapModel consumerDmaapModel = buildConsumerDmaapModel(additionalFields);
 
         // when
-        ConsumerDmaapModel result = new BbsActionsTaskImpl(cbsConfiguration, httpClient).execute(consumerDmaapModel).block();
+        ConsumerDmaapModel result = new BbsActionsTaskImpl(cbsConfiguration, httpClient).execute(consumerDmaapModel)
+            .block();
 
         // then
         verifyZeroInteractions(httpClient);
@@ -233,6 +235,7 @@ class BbsActionsTaskTest {
             .statusCode(status.code())
             .url("")
             .rawBody(body.getBytes())
+            .headers(HashMultimap.withSeq().empty())
             .build();
     }
 

diff --git a/prh-commons/pom.xml b/prh-commons/pom.xml
index cc4b6e8..5a17c66 100644 (file)
--- a/prh-commons/pom.xml
+++ b/prh-commons/pom.xml
@@ -27,7 +27,7 @@
   <parent>
     <groupId>org.onap.dcaegen2.services</groupId>
     <artifactId>prh</artifactId>
-    <version>1.7.0-SNAPSHOT</version>
+    <version>1.7.1-SNAPSHOT</version>
   </parent>
 
   <groupId>org.onap.dcaegen2.services.prh</groupId>

diff --git a/version.properties b/version.properties
index 24828c2..cedaba1 100644 (file)
--- a/version.properties
+++ b/version.properties
@@ -1,6 +1,6 @@
 major=1
 minor=7
-patch=0
+patch=1
 base_version=${major}.${minor}.${patch}
 release_version=${base_version}
 snapshot_version=${base_version}-SNAPSHOT