Bootstrap version bump to 3.3.1

Revise Heartbeat blueprint to 2.3.1

Change-Id: I28acdb54de72f37f7641f76c3e74948fb197f7f9
Signed-off-by: vv770d <vv770d@att.com>
Issue-ID: DCAEGEN2-2852
Issue-ID: DCAEGEN2-2864
Issue-ID: DCAEGEN2-2834
Issue-ID: DCAEGEN2-2836

diff --git a/Changelog.md b/Changelog.md
index 8aee469..285da9b 100644 (file)
--- a/Changelog.md
+++ b/Changelog.md
@@ -4,6 +4,9 @@ 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.3.1] - 2021-07-27
+         - [DCAEGEN2-2852/DCAEGEN2-2864/DCAEGEN2-2834]- DCAE heartbeat container updated to 2.3.1 - Switched to CBS client lib 2.2.1, dockerfile update, OJSI SQL vulnerability fix
+
 ## [3.3.0] - 2021-07-22
          - [DCAEGEN2-2804](https://jira.onap.org/browse/DCAEGEN2-2804) - Update datafile-app-server to 1.6.0 - integration base image alignment, vulnerabilities removal
 

diff --git a/blueprints/k8s-heartbeat.yaml b/blueprints/k8s-heartbeat.yaml
index 2c9942a..7c0ec7e 100644 (file)
--- a/blueprints/k8s-heartbeat.yaml
+++ b/blueprints/k8s-heartbeat.yaml
@@ -27,7 +27,7 @@ imports:
 inputs:
   tag_version:
     type: string
-    default: 'nexus3.onap.org:10001/onap/org.onap.dcaegen2.services.heartbeat:2.2.0'
+    default: 'nexus3.onap.org:10001/onap/org.onap.dcaegen2.services.heartbeat:2.3.1'
   heartbeat_name:
     type: string
     default: 'dcae-heartbeat-service'

diff --git a/pom.xml b/pom.xml
index 859994c..f81083b 100644 (file)
--- a/pom.xml
+++ b/pom.xml
@@ -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.3.0-SNAPSHOT</version>
+  <version>3.3.1-SNAPSHOT</version>
   <url>http://maven.apache.org</url>
   <packaging>pom</packaging>
 

diff --git a/version.properties b/version.properties
index 497ae6f..abd3fe3 100644 (file)
--- a/version.properties
+++ b/version.properties
@@ -1,6 +1,6 @@
 major=3\r
 minor=3\r
-patch=0\r
+patch=1\r
 base_version=${major}.${minor}.${patch}\r
 release_version=${base_version}\r
 snapshot_version=${base_version}-SNAPSHOT\r