summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--Changelog.md5
-rw-r--r--pom.xml10
-rw-r--r--prh-app-server/pom.xml4
-rw-r--r--prh-app-server/src/test/java/org/onap/dcaegen2/services/prh/configuration/CbsConfigRefreshSchedulerTest.java6
-rw-r--r--prh-app-server/src/test/java/org/onap/dcaegen2/services/prh/tasks/BbsActionsTaskTest.java10
-rw-r--r--prh-commons/pom.xml4
6 files changed, 22 insertions, 17 deletions
diff --git a/Changelog.md b/Changelog.md
index b624e91e..78d659ce 100644
--- a/Changelog.md
+++ b/Changelog.md
@@ -4,6 +4,11 @@ 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.8.0] - 2022/02/14
+### Changed
+- Update DCAE SDK version from 1.8.7 to 1.8.8
+- [DCAEGEN2-3050] Update Spring Boot version from 2.4.8 to 2.5.9
+
## [1.7.1] - 2021/08/24
### Changed
- Update DCAE SDK version from 1.6.0 to 1.8.7
diff --git a/pom.xml b/pom.xml
index 8d6c49e2..409197e5 100644
--- a/pom.xml
+++ b/pom.xml
@@ -3,7 +3,7 @@
~ ============LICENSE_START=======================================================
~ PNF-REGISTRATION-HANDLER
~ ================================================================================
- ~ Copyright (C) 2018-2021 NOKIA Intellectual Property. All rights reserved.
+ ~ Copyright (C) 2018-2022 NOKIA Intellectual Property. All rights reserved.
~ Copyright (C) 2021 Samsung Electronics. All rights reserved.
~ ================================================================================
~ Licensed under the Apache License, Version 2.0 (the "License");
@@ -33,7 +33,7 @@
<groupId>org.onap.dcaegen2.services</groupId>
<artifactId>prh</artifactId>
- <version>1.7.1-SNAPSHOT</version>
+ <version>1.8.0-SNAPSHOT</version>
<name>dcaegen2-services-prh</name>
<description>PNF Registration Handler</description>
@@ -48,11 +48,11 @@
<properties>
<java.version>11</java.version>
- <spring-boot.version>2.4.8</spring-boot.version>
- <spring-cloud.version>2020.0.1</spring-cloud.version>
+ <spring-boot.version>2.5.9</spring-boot.version>
+ <spring-cloud.version>2020.0.5</spring-cloud.version>
<springfox.version>3.0.0</springfox.version>
<immutables.version>2.7.5</immutables.version>
- <sdk.version>1.8.7</sdk.version>
+ <sdk.version>1.8.8</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 1d0f6b03..e92515be 100644
--- a/prh-app-server/pom.xml
+++ b/prh-app-server/pom.xml
@@ -3,7 +3,7 @@
~ ============LICENSE_START=======================================================
~ PNF-REGISTRATION-HANDLER
~ ================================================================================
- ~ Copyright (C) 2018-2021 NOKIA Intellectual Property. All rights reserved.
+ ~ Copyright (C) 2018-2022 NOKIA Intellectual Property. All rights reserved.
~ Copyright (C) 2021 Samsung Electronics. All rights reserved.
~ ================================================================================
~ Licensed under the Apache License, Version 2.0 (the "License");
@@ -27,7 +27,7 @@
<parent>
<groupId>org.onap.dcaegen2.services</groupId>
<artifactId>prh</artifactId>
- <version>1.7.1-SNAPSHOT</version>
+ <version>1.8.0-SNAPSHOT</version>
</parent>
<groupId>org.onap.dcaegen2.services.prh</groupId>
diff --git a/prh-app-server/src/test/java/org/onap/dcaegen2/services/prh/configuration/CbsConfigRefreshSchedulerTest.java b/prh-app-server/src/test/java/org/onap/dcaegen2/services/prh/configuration/CbsConfigRefreshSchedulerTest.java
index 7ea08aea..71fc4983 100644
--- a/prh-app-server/src/test/java/org/onap/dcaegen2/services/prh/configuration/CbsConfigRefreshSchedulerTest.java
+++ b/prh-app-server/src/test/java/org/onap/dcaegen2/services/prh/configuration/CbsConfigRefreshSchedulerTest.java
@@ -2,7 +2,7 @@
* ============LICENSE_START=======================================================
* PNF-REGISTRATION-HANDLER
* ================================================================================
- * Copyright (C) 2019 NOKIA Intellectual Property. All rights reserved.
+ * Copyright (C) 2019-2022 NOKIA Intellectual Property. 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.
@@ -89,7 +89,7 @@ class CbsConfigRefreshSchedulerTest {
virtualTimeScheduler.advanceTimeBy(Duration.ofHours(10));
- verifyZeroInteractions(contextRefresher);
+ verifyNoInteractions(contextRefresher);
}
@Test
@@ -135,4 +135,4 @@ class CbsConfigRefreshSchedulerTest {
verify(contextRefresher).refresh();
}
-} \ No newline at end of file
+}
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 801f6c1f..8d115ffc 100644
--- 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
@@ -2,7 +2,7 @@
* ============LICENSE_START=======================================================
* PNF-REGISTRATION-HANDLER
* ================================================================================
- * Copyright (C) 2019-2021 NOKIA Intellectual Property. All rights reserved.
+ * Copyright (C) 2019-2022 NOKIA Intellectual Property. 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.
@@ -30,7 +30,7 @@ import static org.mockito.BDDMockito.given;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.times;
import static org.mockito.Mockito.verify;
-import static org.mockito.Mockito.verifyZeroInteractions;
+import static org.mockito.Mockito.verifyNoInteractions;
import static org.onap.dcaegen2.services.sdk.rest.services.adapters.http.HttpMethod.DELETE;
import static org.onap.dcaegen2.services.sdk.rest.services.adapters.http.HttpMethod.GET;
import static org.onap.dcaegen2.services.sdk.rest.services.adapters.http.HttpMethod.PUT;
@@ -86,7 +86,7 @@ class BbsActionsTaskTest {
ConsumerDmaapModel result = new BbsActionsTaskImpl(cbsConfiguration, httpClient).execute(consumerDmaapModel).block();
// then
- verifyZeroInteractions(httpClient);
+ verifyNoInteractions(httpClient);
assertThat(result).isEqualTo(consumerDmaapModel);
}
@@ -104,7 +104,7 @@ class BbsActionsTaskTest {
.block();
// then
- verifyZeroInteractions(httpClient);
+ verifyNoInteractions(httpClient);
assertThat(result).isEqualTo(consumerDmaapModel);
}
@@ -246,4 +246,4 @@ class BbsActionsTaskTest {
private String getBodyJson(String filename) {
return new Scanner(loader.getResourceAsStream(filename)).useDelimiter("\\A").next();
}
-} \ No newline at end of file
+}
diff --git a/prh-commons/pom.xml b/prh-commons/pom.xml
index 5a17c661..e5ac281e 100644
--- a/prh-commons/pom.xml
+++ b/prh-commons/pom.xml
@@ -3,7 +3,7 @@
~ ============LICENSE_START=======================================================
~ PNF-REGISTRATION-HANDLER
~ ================================================================================
- ~ Copyright (C) 2018-2021 NOKIA Intellectual Property. All rights reserved.
+ ~ Copyright (C) 2018-2022 NOKIA Intellectual Property. All rights reserved.
~ Copyright (C) 2021 Samsung electronics. All rights reserved.
~ ================================================================================
~ Licensed under the Apache License, Version 2.0 (the "License");
@@ -27,7 +27,7 @@
<parent>
<groupId>org.onap.dcaegen2.services</groupId>
<artifactId>prh</artifactId>
- <version>1.7.1-SNAPSHOT</version>
+ <version>1.8.0-SNAPSHOT</version>
</parent>
<groupId>org.onap.dcaegen2.services.prh</groupId>