summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorvv770d <vv770d@att.com>2022-02-10 18:53:21 +0000
committervv770d <vv770d@att.com>2022-02-11 15:49:07 +0000
commit9d8dd5ed3fbc7aad7133f1db49ffec09b4a30c16 (patch)
tree21076ec1646afebef23959bb421b0333159e74e0
parentc85f92fc030140375addda0aa396118965d01382 (diff)
Fix blueprint upload issue3.3.6istanbul
Change-Id: I5f616670605446f5ff6a88fcda92c9486f8ab4b3 Signed-off-by: vv770d <vv770d@att.com> Issue-ID: DCAEGEN2-3077 Signed-off-by: vv770d <vv770d@att.com>
-rw-r--r--Changelog.md3
-rw-r--r--pom.xml6
-rwxr-xr-xscripts/inventory.sh6
-rw-r--r--version.properties2
4 files changed, 10 insertions, 7 deletions
diff --git a/Changelog.md b/Changelog.md
index 93586a5..f9ccec9 100644
--- 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.6] - 2022-02-10
+ - [DCAEGEN2-3077] Address inventory upload issue due to int type restriction
+
## [3.3.5] - 2021-09-10
- [DCAEGEN2-2904] DCAE blueprint version updates for Istanbul release BBS-Ep/DFC/HV-VES/KPI-MS/Slice-Analysis/SON-handler/TCAgen2/VESCollector/PMSH/PM-mapper
diff --git a/pom.xml b/pom.xml
index 3cbe307..ba35980 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1,7 +1,7 @@
<?xml version="1.0"?>
<!--
-================================================================================
-Copyright (c) 2017-2021 AT&T Intellectual Property. All rights reserved.
+============LICENSE_START=======================================================
+Copyright (c) 2017-2022 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.3.5-SNAPSHOT</version>
+ <version>3.3.6-SNAPSHOT</version>
<url>http://maven.apache.org</url>
<packaging>pom</packaging>
diff --git a/scripts/inventory.sh b/scripts/inventory.sh
index f7f217e..c199587 100755
--- a/scripts/inventory.sh
+++ b/scripts/inventory.sh
@@ -1,6 +1,6 @@
#!/bin/bash
-# ================================================================================
-# Copyright (c) 2020 AT&T Intellectual Property. All rights reserved.
+# ============LICENSE_START=======================================================
+# Copyright (c) 2020-2022 AT&T 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.
@@ -47,7 +47,7 @@ function create_service_type {
{
\"vnfTypes\": [],
\"owner\": \"${OWNER}\",
- \"typeVersion\": $(date +%y%m%d%I%M),
+ \"typeVersion\": $(date +%y%m%d%H),
\"typeName\": \"$(basename $1 .yaml)\",
\"component\": \"${COMPONENT}\",
\"application\": \"${APPLICATION}\",
diff --git a/version.properties b/version.properties
index 3db1eb0..b5732ae 100644
--- a/version.properties
+++ b/version.properties
@@ -1,6 +1,6 @@
major=3
minor=3
-patch=5
+patch=6
base_version=${major}.${minor}.${patch}
release_version=${base_version}
snapshot_version=${base_version}-SNAPSHOT