From fca26581c95f0fcfacc160a7415f17bd3f517c13 Mon Sep 17 00:00:00 2001
From: Joanna Jeremicz <joanna.jeremicz@nokia.com>
Date: Wed, 12 May 2021 11:12:08 +0200
Subject: Update EJBCA version from 6.15.2.5 to 7.4.3.2 Bump project version to
 1.0.6 Update changelog

Issue-ID: OOM-2649
Signed-off-by: Joanna Jeremicz <joanna.jeremicz@nokia.com>
Change-Id: I59b9794f0e602fcc6b6a658b1e146cfd13751f87
---
 Changelog.md                                                        | 6 ++++++
 deployment/pom.xml                                                  | 2 +-
 httpserver/pom.xml                                                  | 4 ++--
 netconfsimulator/pom.xml                                            | 4 ++--
 pnfsimulator/integration/pom.xml                                    | 4 ++--
 pnfsimulator/pom.xml                                                | 4 ++--
 pom.xml                                                             | 2 +-
 .../certservice/docker-compose-certservice-ejbca.yml                | 2 +-
 version.properties                                                  | 2 +-
 9 files changed, 18 insertions(+), 12 deletions(-)

diff --git a/Changelog.md b/Changelog.md
index 6fc918f..1fd7f9c 100644
--- a/Changelog.md
+++ b/Changelog.md
@@ -34,3 +34,9 @@ All notable changes to this project will be documented in this file.
 ### Changed
  - httpserver to be consistent with DFC csit/integration test cases
    - https://jira.onap.org/browse/DCAEGEN2-2536
+ 
+## [1.0.6]
+ 
+### Changed
+ - Update EJBCA version from `6.15.2.5` to `7.4.3.2`
+   - https://jira.onap.org/browse/OOM-2649
diff --git a/deployment/pom.xml b/deployment/pom.xml
index 1fc91fc..48b06f0 100644
--- a/deployment/pom.xml
+++ b/deployment/pom.xml
@@ -25,7 +25,7 @@
     <parent>
         <groupId>org.onap.integration.simulators.pnf-simulator</groupId>
         <artifactId>integration-pnf-simulator</artifactId>
-        <version>1.0.5-SNAPSHOT</version>
+        <version>1.0.6-SNAPSHOT</version>
     </parent>
     <artifactId>onboarding-package</artifactId>
     <build>
diff --git a/httpserver/pom.xml b/httpserver/pom.xml
index b775a83..c8fabba 100644
--- a/httpserver/pom.xml
+++ b/httpserver/pom.xml
@@ -27,11 +27,11 @@
   <parent>
     <groupId>org.onap.integration.simulators.pnf-simulator</groupId>
     <artifactId>integration-pnf-simulator</artifactId>
-    <version>1.0.5-SNAPSHOT</version>
+    <version>1.0.6-SNAPSHOT</version>
   </parent>
 
   <artifactId>httpserver</artifactId>
-  <version>1.0.5-SNAPSHOT</version>
+  <version>1.0.6-SNAPSHOT</version>
 
   <properties>
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
diff --git a/netconfsimulator/pom.xml b/netconfsimulator/pom.xml
index 3dcb3c1..2f06d9e 100644
--- a/netconfsimulator/pom.xml
+++ b/netconfsimulator/pom.xml
@@ -27,11 +27,11 @@
   <parent>
     <groupId>org.onap.integration.simulators.pnf-simulator</groupId>
     <artifactId>integration-pnf-simulator</artifactId>
-    <version>1.0.5-SNAPSHOT</version>
+    <version>1.0.6-SNAPSHOT</version>
   </parent>
 
   <artifactId>netconfsimulator</artifactId>
-  <version>1.0.5-SNAPSHOT</version>
+  <version>1.0.6-SNAPSHOT</version>
 
   <properties>
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
diff --git a/pnfsimulator/integration/pom.xml b/pnfsimulator/integration/pom.xml
index 8790a98..cb74e98 100644
--- a/pnfsimulator/integration/pom.xml
+++ b/pnfsimulator/integration/pom.xml
@@ -27,12 +27,12 @@
     <parent>
         <groupId>org.onap.integration.simulators.pnf-simulator</groupId>
         <artifactId>integration-pnf-simulator</artifactId>
-        <version>1.0.5-SNAPSHOT</version>
+        <version>1.0.6-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 
     <artifactId>pnf-simulator-integration</artifactId>
-    <version>1.0.5-SNAPSHOT</version>
+    <version>1.0.6-SNAPSHOT</version>
     <name>pnf-simulator-integration</name>
 
     <repositories>
diff --git a/pnfsimulator/pom.xml b/pnfsimulator/pom.xml
index d31a8b8..701254c 100644
--- a/pnfsimulator/pom.xml
+++ b/pnfsimulator/pom.xml
@@ -27,11 +27,11 @@
     <parent>
         <groupId>org.onap.integration.simulators.pnf-simulator</groupId>
         <artifactId>integration-pnf-simulator</artifactId>
-        <version>1.0.5-SNAPSHOT</version>
+        <version>1.0.6-SNAPSHOT</version>
     </parent>
 
     <artifactId>pnfsimulator</artifactId>
-    <version>1.0.5-SNAPSHOT</version>
+    <version>1.0.6-SNAPSHOT</version>
 
     <name>pnfsimulator</name>
 
diff --git a/pom.xml b/pom.xml
index cfc23e7..4ed78d1 100644
--- a/pom.xml
+++ b/pom.xml
@@ -33,7 +33,7 @@
 
     <groupId>org.onap.integration.simulators.pnf-simulator</groupId>
     <artifactId>integration-pnf-simulator</artifactId>
-    <version>1.0.5-SNAPSHOT</version>
+    <version>1.0.6-SNAPSHOT</version>
     <modules>
         <module>pnfsimulator</module>
         <module>httpserver</module>
diff --git a/sanitycheck/pnfsimulator-secured/certservice/docker-compose-certservice-ejbca.yml b/sanitycheck/pnfsimulator-secured/certservice/docker-compose-certservice-ejbca.yml
index a400eb9..149d531 100644
--- a/sanitycheck/pnfsimulator-secured/certservice/docker-compose-certservice-ejbca.yml
+++ b/sanitycheck/pnfsimulator-secured/certservice/docker-compose-certservice-ejbca.yml
@@ -10,7 +10,7 @@ networks:
 
 services:
   ejbca:
-    image: primekey/ejbca-ce:6.15.2.5
+    image: primekey/ejbca-ce:7.4.3.2
     hostname: cahostname
     container_name: oomcert-ejbca
     ports:
diff --git a/version.properties b/version.properties
index b1060f9..ef5e58d 100644
--- a/version.properties
+++ b/version.properties
@@ -1,6 +1,6 @@
 major=1
 minor=0
-patch=5
+patch=6
 base_version=${major}.${minor}.${patch}
 release_version=${base_version}
 snapshot_version=${base_version}-SNAPSHOT
-- 
cgit 1.2.3-korg