From 803fa37feda37c740a7bf6b69a24ec001c6136a9 Mon Sep 17 00:00:00 2001
From: vv770d <vv770d@att.com>
Date: Tue, 4 May 2021 20:34:21 +0000
Subject: Revise PM-Mapper, PRH, RESTConf container version

PRH - 1.6.0
PM-Mapper - 1.6.0
RESTConf - 1.2.5

Change-Id: I607dad62711c207c8efef37768828deb71dee545
Signed-off-by: vv770d <vv770d@att.com>
Issue-ID: DCAEGEN2-2754
Signed-off-by: vv770d <vv770d@att.com>
---
 Changelog.md                  | 5 +++++
 blueprints/k8s-pm-mapper.yaml | 2 +-
 blueprints/k8s-prh.yaml       | 2 +-
 blueprints/k8s-restconf.yaml  | 2 +-
 pom.xml                       | 4 ++--
 version.properties            | 4 ++--
 6 files changed, 12 insertions(+), 7 deletions(-)

diff --git a/Changelog.md b/Changelog.md
index 68eb90c..e3acabb 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/).
 
+## [3.1.0] - 2021-04-16
+         - [DCAEGEN2-2420](https://jira.onap.org/browse/DCAEGEN2-2420) - PRH 1.6.0 and PM-Mapper 1.6.0 integration base image alignemnt
+         - [DCAEGEN2-2732](https://jira.onap.org/browse/DCAEGEN2-2732) - PM-Mapper 1.6.0 Utilize SDK/Dmaap client 
+         - [DCAEGEN2-2675](https://jira.onap.org/browse/DCAEGEN2-2675) - RESTConf 1.2.5 - xml parsing vulnerability
+
 ## [3.0.4] - 2021-03-10
          - [DCAEGEN2-2656](https://jira.onap.org/browse/DCAEGEN2-2656) - fix CRITICAL weak-cryptography issues identified in sonarcloud (hostname verification in DFC)
          - [DCAEGEN2-2659](https://jira.onap.org/browse/DCAEGEN2-2659) - PM-Mapper blueprint updated to 1.5.2 version (implement singleton cache for events being processed)
diff --git a/blueprints/k8s-pm-mapper.yaml b/blueprints/k8s-pm-mapper.yaml
index 22a65eb..b06d4d9 100644
--- a/blueprints/k8s-pm-mapper.yaml
+++ b/blueprints/k8s-pm-mapper.yaml
@@ -38,7 +38,7 @@ inputs:
   tag_version:
     type: string
     description: Docker image to be used
-    default: 'nexus3.onap.org:10001/onap/org.onap.dcaegen2.services.pm-mapper:1.5.2'
+    default: 'nexus3.onap.org:10001/onap/org.onap.dcaegen2.services.pm-mapper:1.6.0'
   replicas:
     type: integer
     description: Number of instances
diff --git a/blueprints/k8s-prh.yaml b/blueprints/k8s-prh.yaml
index d9c120b..ce1ba43 100644
--- a/blueprints/k8s-prh.yaml
+++ b/blueprints/k8s-prh.yaml
@@ -63,7 +63,7 @@ inputs:
     default: "admin"
   tag_version:
     type: string
-    default: "nexus3.onap.org:10001/onap/org.onap.dcaegen2.services.prh.prh-app-server:1.5.5"
+    default: "nexus3.onap.org:10001/onap/org.onap.dcaegen2.services.prh.prh-app-server:1.6.0"
   replicas:
     type: integer
     description: number of instances
diff --git a/blueprints/k8s-restconf.yaml b/blueprints/k8s-restconf.yaml
index 14740f6..85fd42a 100644
--- a/blueprints/k8s-restconf.yaml
+++ b/blueprints/k8s-restconf.yaml
@@ -33,7 +33,7 @@ inputs:
     default: "3904"
   tag_version:
     type: string
-    default:  "nexus3.onap.org:10001/onap/org.onap.dcaegen2.collectors.restconfcollector:1.2.4"
+    default:  "nexus3.onap.org:10001/onap/org.onap.dcaegen2.collectors.restconfcollector:1.2.5"
   consul_host:
     type: string
     default: "consul-server.onap.svc.cluster.local"
diff --git a/pom.xml b/pom.xml
index f55f5fd..663eb1e 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0"?>
 <!--
 ================================================================================
-Copyright (c) 2017-2020 AT&T Intellectual Property. All rights reserved.
+Copyright (c) 2017-2021 AT&T Intellectual Property. All rights reserved.
 Copyright (c) 2020 Nokia. All rights reserved.
 ================================================================================
 Licensed under the Apache License, Version 2.0 (the "License");
@@ -29,7 +29,7 @@ ECOMP is a trademark and service mark of AT&T Intellectual Property.
   <groupId>org.onap.dcaegen2.deployments</groupId>
   <artifactId>k8s-bootstrap-container</artifactId>
   <name>dcaegen2-deployments-k8s-bootstrap-container</name>
-  <version>3.0.4-SNAPSHOT</version>
+  <version>3.1.0-SNAPSHOT</version>
   <url>http://maven.apache.org</url>
   <packaging>pom</packaging>
 
diff --git a/version.properties b/version.properties
index 9477979..decdfc4 100644
--- a/version.properties
+++ b/version.properties
@@ -1,6 +1,6 @@
 major=3
-minor=0
-patch=4
+minor=1
+patch=0
 base_version=${major}.${minor}.${patch}
 release_version=${base_version}
 snapshot_version=${base_version}-SNAPSHOT
-- 
cgit 1.2.3-korg