From 460c1c55994b1fa4d0f02573e4cfc6dfb26b2b30 Mon Sep 17 00:00:00 2001
From: vv770d <vv770d@att.com>
Date: Mon, 3 Jan 2022 20:28:53 +0000
Subject: [PATCH] [DCAEMOD/runtime] Fix job failures on missing snapshot

Switch helmchartgenerator-core dependency to released 1.0.2
Modified version format to address NFE

Change-Id: Ifbcb3ca19192ab5bdd6a8a5cd9c4086a3b558365
Signed-off-by: vv770d <vv770d@att.com>
Issue-ID: DCAEGEN2-3008
Issue-ID: DCAEGEN2-3028
Signed-off-by: vv770d <vv770d@att.com>
---
 mod/runtimeapi/Changelog.md                                       | 4 ++++
 mod/runtimeapi/pom.xml                                            | 4 ++--
 mod/runtimeapi/runtime-core/pom.xml                               | 8 ++++----
 .../src/main/java/org/onap/dcae/runtime/core/FlowGraphParser.java | 6 ++++--
 mod/runtimeapi/runtime-web/pom.xml                                | 8 ++++----
 5 files changed, 18 insertions(+), 12 deletions(-)

diff --git a/mod/runtimeapi/Changelog.md b/mod/runtimeapi/Changelog.md
index f7a9ebc..9e4f028 100644
--- a/mod/runtimeapi/Changelog.md
+++ b/mod/runtimeapi/Changelog.md
@@ -5,6 +5,10 @@ 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.3.2] - 2022-01-04
+- [DCAEGEN2-3028] Change version format to MMddHHmm (removed YY)
+- [DCAEGEN2-3008] Update helmgen-core from snapshot to released version
+
 ## [1.3.1] - 2021-10-13
 - [DCAEGEN2-2936] Update helmgen-core to 1.0.2
 - [DCAEGEN2-2936] Update helm version to 3.5.4
diff --git a/mod/runtimeapi/pom.xml b/mod/runtimeapi/pom.xml
index 9780570..7188527 100644
--- a/mod/runtimeapi/pom.xml
+++ b/mod/runtimeapi/pom.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
 ============LICENSE_START=======================================================
-Copyright (c) 2019-2020 AT&T Intellectual Property. All rights reserved.
+Copyright (c) 2019-2022 AT&T Intellectual Property. All rights reserved.
 ================================================================================
 Modifications Copyright (c) 2020 Nokia
 ================================================================================
@@ -34,7 +34,7 @@ limitations under the License.
 	</parent>
 	<groupId>org.onap.dcaegen2.platform.mod</groupId>
 	<artifactId>runtimeapi</artifactId>
-	<version>1.3.1</version>
+	<version>1.3.2</version>
 	<name>dcaegen2-platform-mod-runtimeapi</name>
 	<description>MOD Runtime API</description>
 	<properties>
diff --git a/mod/runtimeapi/runtime-core/pom.xml b/mod/runtimeapi/runtime-core/pom.xml
index d9dc634..626061b 100644
--- a/mod/runtimeapi/runtime-core/pom.xml
+++ b/mod/runtimeapi/runtime-core/pom.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
 ============LICENSE_START=======================================================
-Copyright (c) 2019-2020 AT&T Intellectual Property. All rights reserved.
+Copyright (c) 2019-2022 AT&T Intellectual Property. All rights reserved.
 ================================================================================
 Modifications Copyright (c) 2020 Nokia
 ================================================================================
@@ -25,12 +25,12 @@ limitations under the License.
     <parent>
         <artifactId>runtimeapi</artifactId>
         <groupId>org.onap.dcaegen2.platform.mod</groupId>
-        <version>1.3.1</version>
+        <version>1.3.2</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
     <artifactId>runtime-core</artifactId>
-    <version>1.3.1</version>
+    <version>1.3.2</version>
 
     <dependencies>
         <dependency>
@@ -51,7 +51,7 @@ limitations under the License.
         <dependency>
             <groupId>org.onap.dcaegen2.platform</groupId>
             <artifactId>helmchartgenerator-core</artifactId>
-            <version>1.0.2-SNAPSHOT</version>
+            <version>1.0.2</version>
         </dependency>
         <dependency>
             <groupId>org.yaml</groupId>
diff --git a/mod/runtimeapi/runtime-core/src/main/java/org/onap/dcae/runtime/core/FlowGraphParser.java b/mod/runtimeapi/runtime-core/src/main/java/org/onap/dcae/runtime/core/FlowGraphParser.java
index 7154cae..0d78382 100644
--- a/mod/runtimeapi/runtime-core/src/main/java/org/onap/dcae/runtime/core/FlowGraphParser.java
+++ b/mod/runtimeapi/runtime-core/src/main/java/org/onap/dcae/runtime/core/FlowGraphParser.java
@@ -1,6 +1,6 @@
 /*-
  * ============LICENSE_START=======================================================
- * Copyright (C) 2019 AT&T Intellectual Property. All rights reserved.
+ * Copyright (C) 2019-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.
@@ -50,7 +50,9 @@ public class FlowGraphParser {
     }
 
     private static int createBlueprintVersion() {
-        DateTimeFormatter formatter = DateTimeFormatter.ofPattern("yyMMddHHmm").withZone(ZoneId.of("UTC"));
+        // Generated version must be unique for each flow-graph distribution
+        // Removed year from the text to fix invalid integer issue (DCAEGEN2-3028)
+        DateTimeFormatter formatter = DateTimeFormatter.ofPattern("MMddHHmm").withZone(ZoneId.of("UTC"));
         Instant instant = Instant.now();
         String timestamp = formatter.format(instant);
         return Integer.parseInt(timestamp);
diff --git a/mod/runtimeapi/runtime-web/pom.xml b/mod/runtimeapi/runtime-web/pom.xml
index cd5acb0..3ec589f 100644
--- a/mod/runtimeapi/runtime-web/pom.xml
+++ b/mod/runtimeapi/runtime-web/pom.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
 ============LICENSE_START=======================================================
-Copyright (c) 2019-2020 AT&T Intellectual Property. All rights reserved.
+Copyright (c) 2019-2022 AT&T Intellectual Property. All rights reserved.
 ================================================================================
 Modifications Copyright (c) 2020 Nokia
 ================================================================================
@@ -24,10 +24,10 @@ limitations under the License.
 	<parent>
 		<groupId>org.onap.dcaegen2.platform.mod</groupId>
 		<artifactId>runtimeapi</artifactId>
-		<version>1.3.1</version>
+		<version>1.3.2</version>
 	</parent>
 	<artifactId>runtime-web</artifactId>
-	<version>1.3.1-SNAPSHOT</version>
+	<version>1.3.2-SNAPSHOT</version>
 	<packaging>jar</packaging>
 	<name>runtime-web</name>
 	<description>MOD Runtime Web Module</description>
@@ -35,7 +35,7 @@ limitations under the License.
 		<dependency>
 			<groupId>org.onap.dcaegen2.platform.mod</groupId>
 			<artifactId>runtime-core</artifactId>
-			<version>1.3.1</version>
+			<version>1.3.2</version>
 		</dependency>
 		<dependency>
 			<groupId>org.springframework.boot</groupId>
-- 
2.16.6